Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[sserapion] 43905: Revert wrong fix with correct one.
by sserapion＠svn.reactos.org 02 Nov '09

02 Nov '09

Author: sserapion Date: Mon Nov 2 02:23:29 2009 New Revision: 43905 URL: http://svn.reactos.org/svn/reactos?rev=43905&view=rev Log: Revert wrong fix with correct one. Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] Mon Nov 2 02:23:29 2009 @@ -647,7 +647,7 @@ v[2] = 0.0; z_value = 0.0f; - gluTessBeginPolygon(tess, &z_value); + gluTessBeginPolygon(tess, (VOID *)*(INT_PTR *)&z_value); for (loop = (DWORD) *p++; loop; --loop) { @@ -718,7 +718,7 @@ glNormal3f(0.0f, 0.0f, -1.0f); gluTessNormal(tess, 0.0F, 0.0F, -1.0F); - gluTessBeginPolygon(tess, &thickness); + gluTessBeginPolygon(tess, (VOID *)*(INT_PTR *)&thickness); for (loop = (DWORD) *p++; loop; --loop) {

1 0

[ablackmann] 43903: Implement the standard ISO 110-key scancode to virtual key conversion table for decoding the LAYOUT section. God that was tedious...
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 20:04:42 2009 New Revision: 43903 URL: http://svn.reactos.org/svn/reactos?rev=43903&view=rev Log: Implement the standard ISO 110-key scancode to virtual key conversion table for decoding the LAYOUT section. God that was tedious... Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 20:04:42 2009 @@ -20,6 +20,14 @@ PCHAR Name; struct tagKEYNAME* Next; } KEYNAME, *PKEYNAME; + +typedef struct tagSCVK +{ + USHORT ScanCode; + USHORT VirtualKey; + PCHAR Name; + PVOID Reserved; +} SCVK, *PSCVK; /* GLOBALS ********************************************************************/ @@ -59,6 +67,122 @@ "ENDKBD", }; +/* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ +SCVK ScVk[] = +{ + {0x02, '1', NULL, NULL}, + {0x03, '2', NULL, NULL}, + {0x04, '3', NULL, NULL}, + {0x05, '4', NULL, NULL}, + {0x06, '5', NULL, NULL}, + {0x07, '6', NULL, NULL}, + {0x08, '7', NULL, NULL}, + {0x09, '8', NULL, NULL}, + {0x0a, '9', NULL, NULL}, + {0x0b, '0', NULL, NULL}, + {0x0c, 0xbd, NULL, NULL}, + {0x0d, 0xbb, NULL, NULL}, + {0x10, 'Q', NULL, NULL}, + {0x11, 'W', NULL, NULL}, + {0x12, 'E', NULL, NULL}, + {0x13, 'R', NULL, NULL}, + {0x14, 'T', NULL, NULL}, + {0x15, 'Y', NULL, NULL}, + {0x16, 'U', NULL, NULL}, + {0x17, 'I', NULL, NULL}, + {0x18, 'O', NULL, NULL}, + {0x19, 'P', NULL, NULL}, + {0x1a, 0xdb, NULL, NULL}, + {0x1b, 0xdd, NULL, NULL}, + {0x1e, 'A', NULL, NULL}, + {0x1f, 'S', NULL, NULL}, + {0x20, 'D', NULL, NULL}, + {0x21, 'F', NULL, NULL}, + {0x22, 'G', NULL, NULL}, + {0x23, 'H', NULL, NULL}, + {0x24, 'J', NULL, NULL}, + {0x25, 'K', NULL, NULL}, + {0x26, 'L', NULL, NULL}, + {0x27, 0xba, NULL, NULL}, + {0x28, 0xde, NULL, NULL}, + {0x29, 0xc0, NULL, NULL}, + {0x2b, 0xdc, NULL, NULL}, + {0x2c, 'Z', NULL, NULL}, + {0x2d, 'X', NULL, NULL}, + {0x2e, 'C', NULL, NULL}, + {0x2f, 'V', NULL, NULL}, + {0x30, 'B', NULL, NULL}, + {0x31, 'N', NULL, NULL}, + {0x32, 'M', NULL, NULL}, + {0x33, 0xbc, NULL, NULL}, + {0x34, 0xbe, NULL, NULL}, + {0x35, 0xbf, NULL, NULL}, + {0x53, 0x6e, NULL, NULL}, + {0x56, 0xe2, NULL, NULL}, + {0x73, 0xc1, NULL, NULL}, + {0x7e, 0xc2, NULL, NULL}, + {0xe010, 0xb1, "Speedracer: Previous Track", NULL}, + {0xe019, 0xb0, "Speedracer: Next Track", NULL}, + {0xe01d, 0xa3, "RControl", NULL}, + {0xe020, 0xad, "Speedracer: Volume Mute", NULL}, + {0xe021, 0xb7, "Speedracer: Launch App 2", NULL}, + {0xe022, 0xb3, "Speedracer: Media Play/Pause", NULL}, + {0xe024, 0xb2, "Speedracer: Media Stop", NULL}, + {0xe02e, 0xae, "Speedracer: Volume Up", NULL}, + {0xe030, 0xaf, "Speedracer: Volume Down", NULL}, + {0xe032, 0xac, "Speedracer: Browser Home", NULL}, + {0xe035, 0x6f, "Numpad Divide", NULL}, + {0xe037, 0x2c, "Snapshot", NULL}, + {0xe038, 0xa5, "RMenu", NULL}, + {0xe047, 0x24, "Home", NULL}, + {0xe048, 0x26, "Up", NULL}, + {0xe049, 0x21, "Prior", NULL}, + {0xe04b, 0x25, "Left", NULL}, + {0xe04d, 0x27, "Right", NULL}, + {0xe04f, 0x23, "End", NULL}, + {0xe050, 0x28, "Down", NULL}, + {0xe051, 0x22, "Next", NULL}, + {0xe052, 0x2d, "Insert", NULL}, + {0xe053, 0x2e, "Delete", NULL}, + {0xe05b, 0x5b, "Left Win", NULL}, + {0xe05c, 0x5c, "Right Win", NULL}, + {0xe05d, 0x5d, "Application", NULL}, + {0xe05e, 0xff, "Power", NULL}, + {0xe05f, 0x5f, "Speedracer: Sleep", NULL}, + {0xe060, 0xff, "BAD SCANCODE", NULL}, + {0xe061, 0xff, "BAD SCANCODE", NULL}, + {0xe065, 0xaa, "Speedracer: Browser Search", NULL}, + {0xe066, 0xab, "Speedracer: Browser Favorites", NULL}, + {0xe067, 0xa8, "Speedracer: Browser Refresh", NULL}, + {0xe068, 0xa9, "Speedracer: Browser Stop", NULL}, + {0xe069, 0xa7, "Speedracer: Browser Foward", NULL}, + {0xe06a, 0xa6, "Speedracer: Browser Back", NULL}, + {0xe06b, 0xb6, "Speedracer: Launch App 1", NULL}, + {0xe06c, 0xb4, "Speedracer: Launch Mail", NULL}, + {0xe06d, 0xb5, "Speedracer: Launch Media Selector", NULL}, + {0x53, 0x6e, NULL, NULL}, + {0x0e, 0x08, NULL, NULL}, + {0x01, 0x1b, NULL, NULL}, + {0xe01c, 0x0d, "Numpad Enter", NULL}, + {0x1c, 0x0d, NULL, NULL}, + {0x39, 0x20, NULL, NULL}, + {0xe046, 0x03, "Break (Ctrl + Pause)", NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL}, + {0xFFFF, 0x00, NULL, NULL} +}; + /* FUNCTIONS ******************************************************************/ ULONG

1 0

[ablackmann] 43902: Make some printfs DPRINT1s since they are only for debugging, and also mark LIGATURE, MODIFIERS, ATTRIBUTES and DEADKEY as sections that I don't yet intend to support for now (they're not required for most layouts).
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 19:30:57 2009 New Revision: 43902 URL: http://svn.reactos.org/svn/reactos?rev=43902&view=rev Log: Make some printfs DPRINT1s since they are only for debugging, and also mark LIGATURE, MODIFIERS, ATTRIBUTES and DEADKEY as sections that I don't yet intend to support for now (they're not required for most layouts). Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 19:30:57 2009 @@ -530,24 +530,28 @@ ULONG DoLIGATURE(PVOID LigatureData) { + printf("LIGATURE support is not yet implemented. Please bug Arch to fix it\n"); return SkipLines(); } ULONG DoATTRIBUTES(PVOID AttributeData) { + printf("ATTRIBUTES support is not yet implemented. Please bug Arch to fix it\n"); return SkipLines(); } ULONG DoMODIFIERS(VOID) -{ +{ + printf("MODIFIERS support is not yet implemented. Please bug Arch to fix it\n"); return SkipLines(); } ULONG DoDEADKEY(PVOID DeadKeyData) { + printf("DEADKEY support is not yet implemented. Please bug Arch to fix it\n"); return SkipLines(); } @@ -603,49 +607,49 @@ /* KBD */ case 0: - printf("Found KBD section\n"); + DPRINT1("Found KBD section\n"); KeyWord = DoKBD(); break; /* VERSION */ case 1: - printf("Found VERSION section\n"); + DPRINT1("Found VERSION section\n"); KeyWord = DoVERSION(); break; /* COPYRIGHT */ case 2: - printf("Found COPYRIGHT section\n"); + DPRINT1("Found COPYRIGHT section\n"); KeyWord = DoCOPYRIGHT(); break; /* COMPANY */ case 3: - printf("Found COMPANY section\n"); + DPRINT1("Found COMPANY section\n"); KeyWord = DoCOMPANY(); break; /* LOCALENAME */ case 4: - printf("Found LOCALENAME section\n"); + DPRINT1("Found LOCALENAME section\n"); KeyWord = DoLOCALENAME(); break; /* MODIFIERS */ case 5: - printf("Found MODIFIERS section\n"); + DPRINT1("Found MODIFIERS section\n"); KeyWord = DoMODIFIERS(); break; /* SHIFTSTATE */ case 6: - printf("Found SHIFTSTATE section\n"); + DPRINT1("Found SHIFTSTATE section\n"); KeyWord = DoSHIFTSTATE(&StateCount, ShiftStates); if (StateCount < 2) { @@ -659,14 +663,14 @@ /* ATTRIBUTES */ case 7: - printf("Found ATTRIBUTES section\n"); + DPRINT1("Found ATTRIBUTES section\n"); KeyWord = DoATTRIBUTES(&AttributeData); break; /* LAYOUT */ case 8: - printf("Found LAYOUT section\n"); + DPRINT1("Found LAYOUT section\n"); KeyWord = DoLAYOUT(&g_Layout, &LigatureData, ShiftStates, @@ -676,56 +680,56 @@ /* DEADKEY */ case 9: - printf("Found DEADKEY section\n"); + DPRINT1("Found DEADKEY section\n"); KeyWord = DoDEADKEY(&DeadKeyData); break; /* LIGATURE */ case 10: - printf("Found LIGATURE section\n"); + DPRINT1("Found LIGATURE section\n"); KeyWord = DoLIGATURE(&LigatureData); break; /* KEYNAME */ case 11: - printf("Found KEYNAME section\n"); + DPRINT1("Found KEYNAME section\n"); KeyWord = DoKEYNAME(&KeyNameData); break; /* KEYNAME_EXT */ case 12: - printf("Found KEYNAME_EXT section\n"); + DPRINT1("Found KEYNAME_EXT section\n"); KeyWord = DoKEYNAME(&KeyNameExtData); break; /* KEYNAME_DEAD */ case 13: - printf("Found KEYNAME_DEAD section\n"); + DPRINT1("Found KEYNAME_DEAD section\n"); KeyWord = DoKEYNAME(&KeyNameDeadData); break; /* DESCRIPTIONS */ case 14: - printf("Found DESCRIPTIONS section\n"); + DPRINT1("Found DESCRIPTIONS section\n"); KeyWord = DoDESCRIPTIONS(&DescriptionData); break; /* LANGUAGENAMES */ case 15: - printf("Found LANGUAGENAMES section\n"); + DPRINT1("Found LANGUAGENAMES section\n"); KeyWord = DoLANGUAGENAMES(&LanguageData); break; /* ENDKBD */ case 16: - printf("Found ENDKBD section\n"); + DPRINT1("Found ENDKBD section\n"); KeyWord = SkipLines(); break;

1 0

[ablackmann] 43901: Implement DoKEYNAME (again, very similar to the previous two). Fixup KEYNAME structure once more to make the field names portable accross different usages (LanguageCode becomes Code). The tool now supports KEYNAME, KEYNAME_EXT and KEYNAME_DEAD sections in the layout file.
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 19:26:53 2009 New Revision: 43901 URL: http://svn.reactos.org/svn/reactos?rev=43901&view=rev Log: Implement DoKEYNAME (again, very similar to the previous two). Fixup KEYNAME structure once more to make the field names portable accross different usages (LanguageCode becomes Code). The tool now supports KEYNAME, KEYNAME_EXT and KEYNAME_DEAD sections in the layout file. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 19:26:53 2009 @@ -16,7 +16,7 @@ typedef struct tagKEYNAME { - ULONG LanguageCode; + ULONG Code; PCHAR Name; struct tagKEYNAME* Next; } KEYNAME, *PKEYNAME; @@ -233,12 +233,6 @@ } ULONG -DoMODIFIERS(VOID) -{ - return SkipLines(); -} - -ULONG DoDESCRIPTIONS(IN PKEYNAME* DescriptionData) { ULONG KeyWord = 0; @@ -297,12 +291,12 @@ } /* Fill out the structure */ - Description->LanguageCode = LanguageCode; + Description->Code = LanguageCode; Description->Name = strdup(p); Description->Next = NULL; /* Debug only */ - DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->LanguageCode, Description->Name); + DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->Code, Description->Name); /* Point to it and advance the pointer */ *DescriptionData = Description; @@ -311,24 +305,6 @@ /* We are done */ return KeyWord; -} - -ULONG -DoKEYNAME(PVOID KeyNameData) -{ - return SkipLines(); -} - -ULONG -DoLIGATURE(PVOID LigatureData) -{ - return SkipLines(); -} - -ULONG -DoATTRIBUTES(PVOID AttributeData) -{ - return SkipLines(); } ULONG @@ -390,12 +366,12 @@ } /* Fill out the structure */ - Language->LanguageCode = LanguageCode; + Language->Code = LanguageCode; Language->Name = strdup(p); Language->Next = NULL; /* Debug only */ - DPRINT1("LANGID: [%4x] Name: [%s]\n", Language->LanguageCode, Language->Name); + DPRINT1("LANGID: [%4x] Name: [%s]\n", Language->Code, Language->Name); /* Point to it and advance the pointer */ *LanguageData = Language; @@ -407,9 +383,78 @@ } ULONG -DoDEADKEY(PVOID DeadKeyData) -{ - return SkipLines(); +DoKEYNAME(IN PKEYNAME* KeyNameData) +{ + ULONG KeyWord = 0; + CHAR Token[32]; + ULONG CharacterCode; + PCHAR p, pp; + PKEYNAME KeyName; + + /* Assume nothing */ + *KeyNameData = 0; + + /* Start scanning */ + while (NextLine(gBuf, 256, gfpInput)) + { + /* Search for token */ + if (sscanf(gBuf, "%s", Token) != 1) continue; + + /* Make sure it's not just a comment */ + if (*Token == ';') continue; + + /* Make sure it's not a keyword */ + KeyWord = isKeyWord(Token); + if (KeyWord < KEYWORD_COUNT) break; + + /* Now scan for the character code */ + if (sscanf(Token, " %4x", &CharacterCode) != 1) + { + /* Skip */ + printf("An invalid character code was specified.\n"); + continue; + } + + /* Now get the actual key name */ + if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) + { + /* Skip */ + printf("A key name is missing\n"); + continue; + } + + /* Get the key name string and find the ending */ + p = strstr(gBuf, Token); + pp = strchr(p, '\n'); + if (!pp) pp = strchr(p, '\r'); + + /* Terminate the key name string here */ + if (pp) *pp = 0; + + /* Now allocate the language */ + KeyName = malloc(sizeof(KEYNAME)); + if (!KeyName) + { + /* Fail */ + printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); + exit(1); + } + + /* Fill out the structure */ + KeyName->Code = CharacterCode; + KeyName->Name = strdup(p); + KeyName->Next = NULL; + + /* Debug only */ + DPRINT1("CHARCODE: [%4x] Name: [%s]\n", KeyName->Code, KeyName->Name); + + /* Point to it and advance the pointer */ + *KeyNameData = KeyName; + KeyNameData = &KeyName->Next; + } + + /* We are done */ + return KeyWord; } ULONG @@ -447,7 +492,7 @@ /* Now read the state */ ShiftState = atoi(Token); - + /* Scan existing states */ for (i = 0; i < *StateCount; i++) { @@ -472,7 +517,7 @@ if (Verbose) printf("There were too many states (you defined %d).\n", *StateCount); } } - + /* Debug only */ DPRINT1("Found %d Shift States: [", *StateCount); for (i = 0; i < *StateCount; i++) DPRINT1("%d ", ShiftStates[i]); @@ -480,6 +525,30 @@ /* We are done */ return KeyWord; +} + +ULONG +DoLIGATURE(PVOID LigatureData) +{ + return SkipLines(); +} + +ULONG +DoATTRIBUTES(PVOID AttributeData) +{ + return SkipLines(); +} + +ULONG +DoMODIFIERS(VOID) +{ + return SkipLines(); +} + +ULONG +DoDEADKEY(PVOID DeadKeyData) +{ + return SkipLines(); } ULONG @@ -499,8 +568,8 @@ ULONG StateCount; ULONG ShiftStates[8]; PKEYNAME DescriptionData, LanguageData; + PKEYNAME KeyNameData, KeyNameExtData, KeyNameDeadData; PVOID AttributeData, LigatureData, DeadKeyData; - PVOID KeyNameData, KeyNameExtData, KeyNameDeadData; /* Parse keywords */ gLineCount = 0;

1 0

[ablackmann] 43900: Implement LANGUAGENAMES parsing (very similar to DESCRIPTIONS). Make KEYNAME structure portable accross other parsers, not just DESCRIPTIONS.
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 19:17:30 2009 New Revision: 43900 URL: http://svn.reactos.org/svn/reactos?rev=43900&view=rev Log: Implement LANGUAGENAMES parsing (very similar to DESCRIPTIONS). Make KEYNAME structure portable accross other parsers, not just DESCRIPTIONS. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 19:17:30 2009 @@ -17,7 +17,7 @@ typedef struct tagKEYNAME { ULONG LanguageCode; - PCHAR Description; + PCHAR Name; struct tagKEYNAME* Next; } KEYNAME, *PKEYNAME; @@ -298,11 +298,11 @@ /* Fill out the structure */ Description->LanguageCode = LanguageCode; - Description->Description = strdup(p); + Description->Name = strdup(p); Description->Next = NULL; /* Debug only */ - DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->LanguageCode, Description->Description); + DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->LanguageCode, Description->Name); /* Point to it and advance the pointer */ *DescriptionData = Description; @@ -332,9 +332,78 @@ } ULONG -DoLANGUAGENAMES(PVOID LanguageData) -{ - return SkipLines(); +DoLANGUAGENAMES(IN PKEYNAME* LanguageData) +{ + ULONG KeyWord = 0; + CHAR Token[32]; + ULONG LanguageCode; + PCHAR p, pp; + PKEYNAME Language; + + /* Assume nothing */ + *LanguageData = 0; + + /* Start scanning */ + while (NextLine(gBuf, 256, gfpInput)) + { + /* Search for token */ + if (sscanf(gBuf, "%s", Token) != 1) continue; + + /* Make sure it's not just a comment */ + if (*Token == ';') continue; + + /* Make sure it's not a keyword */ + KeyWord = isKeyWord(Token); + if (KeyWord < KEYWORD_COUNT) break; + + /* Now scan for the language code */ + if (sscanf(Token, " %4x", &LanguageCode) != 1) + { + /* Skip */ + printf("An invalid LANGID was specified.\n"); + continue; + } + + /* Now get the actual language */ + if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) + { + /* Skip */ + printf("A language name is missing\n"); + continue; + } + + /* Get the language string and find the ending */ + p = strstr(gBuf, Token); + pp = strchr(p, '\n'); + if (!pp) pp = strchr(p, '\r'); + + /* Terminate the language string here */ + if (pp) *pp = 0; + + /* Now allocate the language */ + Language = malloc(sizeof(KEYNAME)); + if (!Language) + { + /* Fail */ + printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); + exit(1); + } + + /* Fill out the structure */ + Language->LanguageCode = LanguageCode; + Language->Name = strdup(p); + Language->Next = NULL; + + /* Debug only */ + DPRINT1("LANGID: [%4x] Name: [%s]\n", Language->LanguageCode, Language->Name); + + /* Point to it and advance the pointer */ + *LanguageData = Language; + LanguageData = &Language->Next; + } + + /* We are done */ + return KeyWord; } ULONG @@ -429,9 +498,9 @@ ULONG KeyWord; ULONG StateCount; ULONG ShiftStates[8]; - PKEYNAME DescriptionData; + PKEYNAME DescriptionData, LanguageData; PVOID AttributeData, LigatureData, DeadKeyData; - PVOID KeyNameData, KeyNameExtData, KeyNameDeadData, LanguageData; + PVOID KeyNameData, KeyNameExtData, KeyNameDeadData; /* Parse keywords */ gLineCount = 0;

1 0

[ablackmann] 43899: Add support for DESCRIPTIONS section (tested on test.klc). Add KEYNAME structure. Fixup some of the code in the SHIFTSTATES implementation.
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 18:43:51 2009 New Revision: 43899 URL: http://svn.reactos.org/svn/reactos?rev=43899&view=rev Log: Add support for DESCRIPTIONS section (tested on test.klc). Add KEYNAME structure. Fixup some of the code in the SHIFTSTATES implementation. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 18:43:51 2009 @@ -13,6 +13,13 @@ #include <stdio.h> #include <stdlib.h> #include <host/typedefs.h> + +typedef struct tagKEYNAME +{ + ULONG LanguageCode; + PCHAR Description; + struct tagKEYNAME* Next; +} KEYNAME, *PKEYNAME; /* GLOBALS ********************************************************************/ @@ -232,9 +239,78 @@ } ULONG -DoDESCRIPTIONS(PVOID DescriptionData) -{ - return SkipLines(); +DoDESCRIPTIONS(IN PKEYNAME* DescriptionData) +{ + ULONG KeyWord = 0; + CHAR Token[32]; + ULONG LanguageCode; + PCHAR p, pp; + PKEYNAME Description; + + /* Assume nothing */ + *DescriptionData = 0; + + /* Start scanning */ + while (NextLine(gBuf, 256, gfpInput)) + { + /* Search for token */ + if (sscanf(gBuf, "%s", Token) != 1) continue; + + /* Make sure it's not just a comment */ + if (*Token == ';') continue; + + /* Make sure it's not a keyword */ + KeyWord = isKeyWord(Token); + if (KeyWord < KEYWORD_COUNT) break; + + /* Now scan for the language code */ + if (sscanf(Token, " %4x", &LanguageCode) != 1) + { + /* Skip */ + printf("An invalid LANGID was specified.\n"); + continue; + } + + /* Now get the actual description */ + if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) + { + /* Skip */ + printf("A language description is missing.\n"); + continue; + } + + /* Get the description string and find the ending */ + p = strstr(gBuf, Token); + pp = strchr(p, '\n'); + if (!pp) pp = strchr(p, '\r'); + + /* Terminate the description string here */ + if (pp) *pp = 0; + + /* Now allocate the description */ + Description = malloc(sizeof(KEYNAME)); + if (!Description) + { + /* Fail */ + printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); + exit(1); + } + + /* Fill out the structure */ + Description->LanguageCode = LanguageCode; + Description->Description = strdup(p); + Description->Next = NULL; + + /* Debug only */ + DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->LanguageCode, Description->Description); + + /* Point to it and advance the pointer */ + *DescriptionData = Description; + DescriptionData = &Description->Next; + } + + /* We are done */ + return KeyWord; } ULONG @@ -293,15 +369,16 @@ if (KeyWord < KEYWORD_COUNT) break; /* Now scan for the shift state */ - if (sscanf(gBuf, " %1s[01234567]", Token) != 1) + if (sscanf(gBuf, " %1s[012367]", Token) != 1) { /* We failed -- should we warn? */ - if (Verbose) printf("Invalid shift state\n"); + if (Verbose) printf("An invalid shift state '%s' was found (use 0, 1, 2, 3, 6, or 7.)\n", Token); continue; } /* Now read the state */ ShiftState = atoi(Token); + /* Scan existing states */ for (i = 0; i < *StateCount; i++) { @@ -309,7 +386,7 @@ if ((ShiftStates[i] == ShiftState) && (Verbose)) { /* Warn user */ - printf("Duplicate shift state\n"); + printf("The state '%d' was duplicated for this Virtual Key.\n", ShiftStates[i]); break; } } @@ -323,14 +400,14 @@ else { /* Too many states -- should we warn? */ - if (Verbose) printf("Too many shift states: %d\n", *StateCount); + if (Verbose) printf("There were too many states (you defined %d).\n", *StateCount); } } /* Debug only */ - printf("Found %d Shift States: [", *StateCount); - for (i = 0; i < *StateCount; i++) printf("%d ", ShiftStates[i]); - printf("]\n"); + DPRINT1("Found %d Shift States: [", *StateCount); + for (i = 0; i < *StateCount; i++) DPRINT1("%d ", ShiftStates[i]); + DPRINT1("]\n"); /* We are done */ return KeyWord; @@ -352,7 +429,8 @@ ULONG KeyWord; ULONG StateCount; ULONG ShiftStates[8]; - PVOID AttributeData, LigatureData, DeadKeyData, DescriptionData; + PKEYNAME DescriptionData; + PVOID AttributeData, LigatureData, DeadKeyData; PVOID KeyNameData, KeyNameExtData, KeyNameDeadData, LanguageData; /* Parse keywords */

1 0

[ablackmann] 43898: Implement support for parsing shift states. Seems to work fine on the test.klc.
by ablackmann＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ablackmann Date: Sun Nov 1 16:46:36 2009 New Revision: 43898 URL: http://svn.reactos.org/svn/reactos?rev=43898&view=rev Log: Implement support for parsing shift states. Seems to work fine on the test.klc. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sun Nov 1 16:46:36 2009 @@ -271,8 +271,69 @@ DoSHIFTSTATE(IN PULONG StateCount, IN OUT PULONG ShiftStates) { - *StateCount = 10; - return SkipLines(); + ULONG KeyWord; + ULONG i; + ULONG ShiftState; + CHAR Token[32]; + + /* Reset the shift states */ + for (i = 0; i < 8; i++) ShiftStates[i] = -1; + + /* Start with no states */ + *StateCount = 0; + + /* Scan for shift states */ + while (NextLine(gBuf, 256, gfpInput)) + { + /* Search for token */ + if (sscanf(gBuf, "%s", Token) != 1) continue; + + /* Make sure it's not a keyword */ + KeyWord = isKeyWord(Token); + if (KeyWord < KEYWORD_COUNT) break; + + /* Now scan for the shift state */ + if (sscanf(gBuf, " %1s[01234567]", Token) != 1) + { + /* We failed -- should we warn? */ + if (Verbose) printf("Invalid shift state\n"); + continue; + } + + /* Now read the state */ + ShiftState = atoi(Token); + /* Scan existing states */ + for (i = 0; i < *StateCount; i++) + { + /* Check for duplicate */ + if ((ShiftStates[i] == ShiftState) && (Verbose)) + { + /* Warn user */ + printf("Duplicate shift state\n"); + break; + } + } + + /* Make sure we won't overflow */ + if (*StateCount < 8) + { + /* Save this state */ + ShiftStates[(*StateCount)++] = ShiftState; + } + else + { + /* Too many states -- should we warn? */ + if (Verbose) printf("Too many shift states: %d\n", *StateCount); + } + } + + /* Debug only */ + printf("Found %d Shift States: [", *StateCount); + for (i = 0; i < *StateCount; i++) printf("%d ", ShiftStates[i]); + printf("]\n"); + + /* We are done */ + return KeyWord; } ULONG

1 0

[dreimer] 43897: did put 7-zip in the wrong category, sry
by dreimer＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: dreimer Date: Sun Nov 1 13:47:06 2009 New Revision: 43897 URL: http://svn.reactos.org/svn/reactos?rev=43897&view=rev Log: did put 7-zip in the wrong category, sry Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sun Nov 1 13:47:06 2009 @@ -6,7 +6,7 @@ Licence = LGPL Description = Utility to create and open 7zip, zip, tar, rar and other archive files. Size = 0.9M -Category = 1 +Category = 12 URLSite = http://www.7-zip.org/ URLDownload = http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z465.exe CDPath = none

1 0

[hpoussin] 43896: [freeldr] Fix typos introduced in r43875
by hpoussin＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: hpoussin Date: Sun Nov 1 13:19:37 2009 New Revision: 43896 URL: http://svn.reactos.org/svn/reactos?rev=43896&view=rev Log: [freeldr] Fix typos introduced in r43875 Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Nov 1 13:19:37 2009 @@ -153,19 +153,19 @@ { LoadAndBootWindows(SectionName, SettingValue, 0); } - else if (_stricmp(SettingValue, "WindowsNT40") == 0) - { - LoadAndBootWindows(BootType, SettingValue, _WIN32_WINNT_NT4); - } - else if (_stricmp(SettingValue, "Windows2003") == 0) - { - LoadAndBootWindows(BootType, SettingValue, _WIN32_WINNT_WS03); - } - else if (_stricmp(SettingValue, "Linux") == 0) - { - LoadAndBootLinux(BootType, OperatingSystemDisplayNames[SelectedOperatingSystem]); - } - else if (_stricmp(SettingValue, "BootSector") == 0) + else if (_stricmp(BootType, "WindowsNT40") == 0) + { + LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_NT4); + } + else if (_stricmp(BootType, "Windows2003") == 0) + { + LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); + } + else if (_stricmp(BootType, "Linux") == 0) + { + LoadAndBootLinux(SectionName, OperatingSystemDisplayNames[SelectedOperatingSystem]); + } + else if (_stricmp(BootType, "BootSector") == 0) { LoadAndBootBootSector(SectionName); }

1 0

[lsuggs] 43895: nslookup compiles and links now.
by lsuggs＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: lsuggs Date: Sun Nov 1 07:26:28 2009 New Revision: 43895 URL: http://svn.reactos.org/svn/reactos?rev=43895&view=rev Log: nslookup compiles and links now. Added: branches/nslookup/base/applications/network/nslookup/dighost.c (with props) branches/nslookup/base/applications/network/nslookup/include/ (with props) branches/nslookup/base/applications/network/nslookup/include/dig/ (with props) branches/nslookup/base/applications/network/nslookup/include/dig/dig.h (with props) Removed: branches/nslookup/base/applications/network/nslookup/nslookup.rc branches/nslookup/base/applications/network/nslookup/utility.c Modified: branches/nslookup/base/applications/network/nslookup/nslookup.c branches/nslookup/base/applications/network/nslookup/nslookup.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/nslookup/base/applications/network/nslookup/dighost.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw… Added: branches/nslookup/base/applications/network/nslookup/include/dig/dig.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw… Modified: branches/nslookup/base/applications/network/nslookup/nslookup.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw… Modified: branches/nslookup/base/applications/network/nslookup/nslookup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw… Removed: branches/nslookup/base/applications/network/nslookup/nslookup.rc URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw… Removed: branches/nslookup/base/applications/network/nslookup/utility.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/base/applications/netw…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009