From 0b3d75997e2dcd6297ea3150b31ce0c2a956fd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?=
 <c2woody@users.sourceforge.net>
Date: Thu, 29 Jan 2009 23:17:59 +0000
Subject: [PATCH] fix layout extraction

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3276
---
 src/dos/dos_keyboard_layout.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/dos/dos_keyboard_layout.cpp b/src/dos/dos_keyboard_layout.cpp
index 36c4378a..90d55d84 100644
--- a/src/dos/dos_keyboard_layout.cpp
+++ b/src/dos/dos_keyboard_layout.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_keyboard_layout.cpp,v 1.17 2009-01-23 19:27:53 c2woody Exp $ */
+/* $Id: dos_keyboard_layout.cpp,v 1.18 2009-01-29 23:17:59 c2woody Exp $ */
 
 #include "dosbox.h"
 #include "bios.h"
@@ -1078,14 +1078,9 @@ public:
 			char layoutID_string[KL_NAMELENGTH];
 			if (GetKeyboardLayoutName(layoutID_string)) {
 				if (strlen(layoutID_string) == 8) {
-					int cur_kb_layout_by_name = ((layoutID_string[4]-'0')<<12) +
-												((layoutID_string[5]-'0')<<8) +
-												((layoutID_string[6]-'0')<<4) +
-												((layoutID_string[7]-'0'));
-					int subID = ((layoutID_string[0]-'0')<<12) +
-								((layoutID_string[1]-'0')<<8) +
-								((layoutID_string[2]-'0')<<4) +
-								((layoutID_string[3]-'0'));
+					int cur_kb_layout_by_name = ConvHexWord((char*)&layoutID_string[4]);
+					layoutID_string[4] = 0;
+					int subID = ConvHexWord((char*)&layoutID_string[0]);
 					if ((cur_kb_layout_by_name>0) && (cur_kb_layout_by_name<65536)) {
 						// use layout ID extracted from the layout string
 						cur_kb_layout = (WORD)cur_kb_layout_by_name;
@@ -1112,6 +1107,9 @@ public:
 					layoutname = "gr";
 					wants_dos_codepage = 437;
 					break;
+				case 1033:
+					// US
+					return;
 				case 1032:
 					layoutname = "gk";
 					break;