Switch to 8 hex digit keymapfile

as the value keyboardLayout is actually 32-bit unsigned integer.
See [MS-RDPBCGR] - v20160714 p.45.

18 files changed, 19 insertions, 19 deletions

diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am
index 58c64ea9..f9a28fa1 100644
--- a/instfiles/Makefile.am
+++ b/instfiles/Makefile.am
@@ -9,23 +9,23 @@ EXTRA_DIST = \
 startscriptdir=$(sysconfdir)/xrdp
 
 dist_startscript_DATA = \
-  km-0407.ini \
-  km-0409.ini \
+  km-00000407.ini \
+  km-00000409.ini \
   km-040a.ini \
-  km-040c.ini \
-  km-0410.ini \
-  km-0411.ini \
-  km-0414.ini \
-  km-0415.ini \
-  km-0416.ini \
-  km-0419.ini \
-  km-041d.ini \
-  km-0807.ini \
-  km-0809.ini \
-  km-080c.ini \
-  km-0813.ini \
-  km-0816.ini \
-  km-100c.ini \
+  km-0000040c.ini \
+  km-00000410.ini \
+  km-00000411.ini \
+  km-00000414.ini \
+  km-00000415.ini \
+  km-00000416.ini \
+  km-00000419.ini \
+  km-0000041d.ini \
+  km-00000807.ini \
+  km-00000809.ini \
+  km-0000080c.ini \
+  km-00000813.ini \
+  km-00000816.ini \
+  km-0000100c.ini \
   km-e0010411.ini \
   km-e0200411.ini \
   km-e0210411.ini
diff --git a/instfiles/km-0407.ini b/instfiles/km-00000407.ini
index 6021211d..6021211d 100644
--- a/instfiles/km-0407.ini
+++ b/instfiles/km-00000407.ini
diff --git a/instfiles/km-0409.ini b/instfiles/km-00000409.ini
index a565a9b0..a565a9b0 100644
--- a/instfiles/km-0409.ini
+++ b/instfiles/km-00000409.ini
diff --git a/instfiles/km-040c.ini b/instfiles/km-0000040c.ini
index 6895c4a2..6895c4a2 100644
--- a/instfiles/km-040c.ini
+++ b/instfiles/km-0000040c.ini
diff --git a/instfiles/km-0410.ini b/instfiles/km-00000410.ini
index a9723117..a9723117 100644
--- a/instfiles/km-0410.ini
+++ b/instfiles/km-00000410.ini
diff --git a/instfiles/km-0411.ini b/instfiles/km-00000411.ini
index e860e6fd..e860e6fd 100644
--- a/instfiles/km-0411.ini
+++ b/instfiles/km-00000411.ini
diff --git a/instfiles/km-0414.ini b/instfiles/km-00000414.ini
index 08ba2ab8..08ba2ab8 100644
--- a/instfiles/km-0414.ini
+++ b/instfiles/km-00000414.ini
diff --git a/instfiles/km-0415.ini b/instfiles/km-00000415.ini
index 884e534f..884e534f 100644
--- a/instfiles/km-0415.ini
+++ b/instfiles/km-00000415.ini
diff --git a/instfiles/km-0416.ini b/instfiles/km-00000416.ini
index 9f2eb4db..9f2eb4db 100644
--- a/instfiles/km-0416.ini
+++ b/instfiles/km-00000416.ini
diff --git a/instfiles/km-0419.ini b/instfiles/km-00000419.ini
index 81395886..81395886 100644
--- a/instfiles/km-0419.ini
+++ b/instfiles/km-00000419.ini
diff --git a/instfiles/km-041d.ini b/instfiles/km-0000041d.ini
index 3cf432b2..3cf432b2 100644
--- a/instfiles/km-041d.ini
+++ b/instfiles/km-0000041d.ini
diff --git a/instfiles/km-0807.ini b/instfiles/km-00000807.ini
index 7733eaf3..7733eaf3 100644
--- a/instfiles/km-0807.ini
+++ b/instfiles/km-00000807.ini
diff --git a/instfiles/km-0809.ini b/instfiles/km-00000809.ini
index 33c3dfa5..33c3dfa5 100644
--- a/instfiles/km-0809.ini
+++ b/instfiles/km-00000809.ini
diff --git a/instfiles/km-080c.ini b/instfiles/km-0000080c.ini
index 3b160b37..3b160b37 100644
--- a/instfiles/km-080c.ini
+++ b/instfiles/km-0000080c.ini
diff --git a/instfiles/km-0813.ini b/instfiles/km-00000813.ini
index 3b160b37..3b160b37 100644
--- a/instfiles/km-0813.ini
+++ b/instfiles/km-00000813.ini
diff --git a/instfiles/km-0816.ini b/instfiles/km-00000816.ini
index 3a5801b2..3a5801b2 100644
--- a/instfiles/km-0816.ini
+++ b/instfiles/km-00000816.ini
diff --git a/instfiles/km-100c.ini b/instfiles/km-0000100c.ini
index fd963fc0..fd963fc0 100644
--- a/instfiles/km-100c.ini
+++ b/instfiles/km-0000100c.ini
diff --git a/xrdp/lang.c b/xrdp/lang.c
index fa284112..ae577596 100644
--- a/xrdp/lang.c
+++ b/xrdp/lang.c
@@ -231,12 +231,12 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
 
     filename = (char *)g_malloc(256, 0);
     /* check if there is a keymap file */
-    g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout);
+    g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout);
 
     /* if the file does not exist, try again with 'en-us' as fallback */
     if (!g_file_exist(filename))
     {
-        g_snprintf(filename, 255, "%s/km-0409.ini", XRDP_CFG_PATH);
+        g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH);
     }
 
     if (g_file_exist(filename))
@@ -263,7 +263,7 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
             if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
             {
                 log_message(LOG_LEVEL_WARNING,
-                            "local keymap file for 0x%4.4x found and doesn't match "
+                            "local keymap file for 0x%08x found and doesn't match "
                             "built in keymap, using local keymap file", keylayout);
             }