From c654c862064db49766835c9af37f6fce9f2f8929 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Tue, 11 Oct 2016 00:19:55 +0900 Subject: [PATCH] Switch to 8 hex digit keymapfile as the value keyboardLayout is actually 32-bit unsigned integer. See [MS-RDPBCGR] - v20160714 p.45. --- instfiles/Makefile.am | 32 +++++++++++----------- instfiles/{km-0407.ini => km-00000407.ini} | 0 instfiles/{km-0409.ini => km-00000409.ini} | 0 instfiles/{km-040c.ini => km-0000040c.ini} | 0 instfiles/{km-0410.ini => km-00000410.ini} | 0 instfiles/{km-0411.ini => km-00000411.ini} | 0 instfiles/{km-0414.ini => km-00000414.ini} | 0 instfiles/{km-0415.ini => km-00000415.ini} | 0 instfiles/{km-0416.ini => km-00000416.ini} | 0 instfiles/{km-0419.ini => km-00000419.ini} | 0 instfiles/{km-041d.ini => km-0000041d.ini} | 0 instfiles/{km-0807.ini => km-00000807.ini} | 0 instfiles/{km-0809.ini => km-00000809.ini} | 0 instfiles/{km-080c.ini => km-0000080c.ini} | 0 instfiles/{km-0813.ini => km-00000813.ini} | 0 instfiles/{km-0816.ini => km-00000816.ini} | 0 instfiles/{km-100c.ini => km-0000100c.ini} | 0 xrdp/lang.c | 6 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) rename instfiles/{km-0407.ini => km-00000407.ini} (100%) rename instfiles/{km-0409.ini => km-00000409.ini} (100%) rename instfiles/{km-040c.ini => km-0000040c.ini} (100%) rename instfiles/{km-0410.ini => km-00000410.ini} (100%) rename instfiles/{km-0411.ini => km-00000411.ini} (100%) rename instfiles/{km-0414.ini => km-00000414.ini} (100%) rename instfiles/{km-0415.ini => km-00000415.ini} (100%) rename instfiles/{km-0416.ini => km-00000416.ini} (100%) rename instfiles/{km-0419.ini => km-00000419.ini} (100%) rename instfiles/{km-041d.ini => km-0000041d.ini} (100%) rename instfiles/{km-0807.ini => km-00000807.ini} (100%) rename instfiles/{km-0809.ini => km-00000809.ini} (100%) rename instfiles/{km-080c.ini => km-0000080c.ini} (100%) rename instfiles/{km-0813.ini => km-00000813.ini} (100%) rename instfiles/{km-0816.ini => km-00000816.ini} (100%) rename instfiles/{km-100c.ini => km-0000100c.ini} (100%) 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 similarity index 100% rename from instfiles/km-0407.ini rename to instfiles/km-00000407.ini diff --git a/instfiles/km-0409.ini b/instfiles/km-00000409.ini similarity index 100% rename from instfiles/km-0409.ini rename to instfiles/km-00000409.ini diff --git a/instfiles/km-040c.ini b/instfiles/km-0000040c.ini similarity index 100% rename from instfiles/km-040c.ini rename to instfiles/km-0000040c.ini diff --git a/instfiles/km-0410.ini b/instfiles/km-00000410.ini similarity index 100% rename from instfiles/km-0410.ini rename to instfiles/km-00000410.ini diff --git a/instfiles/km-0411.ini b/instfiles/km-00000411.ini similarity index 100% rename from instfiles/km-0411.ini rename to instfiles/km-00000411.ini diff --git a/instfiles/km-0414.ini b/instfiles/km-00000414.ini similarity index 100% rename from instfiles/km-0414.ini rename to instfiles/km-00000414.ini diff --git a/instfiles/km-0415.ini b/instfiles/km-00000415.ini similarity index 100% rename from instfiles/km-0415.ini rename to instfiles/km-00000415.ini diff --git a/instfiles/km-0416.ini b/instfiles/km-00000416.ini similarity index 100% rename from instfiles/km-0416.ini rename to instfiles/km-00000416.ini diff --git a/instfiles/km-0419.ini b/instfiles/km-00000419.ini similarity index 100% rename from instfiles/km-0419.ini rename to instfiles/km-00000419.ini diff --git a/instfiles/km-041d.ini b/instfiles/km-0000041d.ini similarity index 100% rename from instfiles/km-041d.ini rename to instfiles/km-0000041d.ini diff --git a/instfiles/km-0807.ini b/instfiles/km-00000807.ini similarity index 100% rename from instfiles/km-0807.ini rename to instfiles/km-00000807.ini diff --git a/instfiles/km-0809.ini b/instfiles/km-00000809.ini similarity index 100% rename from instfiles/km-0809.ini rename to instfiles/km-00000809.ini diff --git a/instfiles/km-080c.ini b/instfiles/km-0000080c.ini similarity index 100% rename from instfiles/km-080c.ini rename to instfiles/km-0000080c.ini diff --git a/instfiles/km-0813.ini b/instfiles/km-00000813.ini similarity index 100% rename from instfiles/km-0813.ini rename to instfiles/km-00000813.ini diff --git a/instfiles/km-0816.ini b/instfiles/km-00000816.ini similarity index 100% rename from instfiles/km-0816.ini rename to instfiles/km-00000816.ini diff --git a/instfiles/km-100c.ini b/instfiles/km-0000100c.ini similarity index 100% rename from instfiles/km-100c.ini rename to 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); }