Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ablackmann] 43975: Create layout entries for built-in non-redefined scancodes as well, based on the 110-key table (mostly things like the extended keys/SpeedRacer/MediaButtons, etc).
by ablackmann＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: ablackmann Date: Thu Nov 5 20:24:24 2009 New Revision: 43975 URL: http://svn.reactos.org/svn/reactos?rev=43975&view=rev Log: Create layout entries for built-in non-redefined scancodes as well, based on the 110-key table (mostly things like the extended keys/SpeedRacer/MediaButtons, etc). 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] Thu Nov 5 20:24:24 2009 @@ -918,6 +918,43 @@ } } + /* Process the scan code table */ + Entry = &LayoutData->Entry[ScanCodeCount]; + for (i = 0; i < 110; i++) + { + /* Get the scan code */ + CurrentCode = ScVk[i].ScanCode; + if (CurrentCode == 0xFFFF) break; + + /* Check if this entry had been processed */ + if (ScVk[i].Processed) + { + /* Skip it */ + ScVk[i].Processed = FALSE; + } + else + { + /* Do we have too many? */ + if (++ScanCodeCount >= 110) + { + /* Fail */ + printf("ScanCode %02x - too many scancodes here to parse.\n", CurrentCode); + exit(1); + } + + /* Build an entry for it */ + Entry++; + Entry->ScanCode = CurrentCode; + Entry->VirtualKey = ScVk[i].VirtualKey; + Entry->OriginalVirtualKey = ScVk[i].VirtualKey; + Entry->Name = ScVk[i].Name; + Entry->Processed = TRUE; + Entry->LineCount = 0; + DPRINT1("AUTOMATIC ENTRY: [%x %x %s]\n", + Entry->VirtualKey, Entry->ScanCode, Entry->Name); + } + } + /* Skip what's left */ return KeyWord; }

1 0

[fireball] 43974: - Fix incorrect clipping calculation when empty region is passed to RosDeviceSetClipping. Instead of setting clipping to full underlying surface access, it should set it to the dc rectangle intersected with the underlying surface rect. Fixes visual glitch when painting non-client area of a window. - Fix a typo which lead to using stack allocated RECTs array only for one rectangle instead of 8 possible. This fix reduces pool memory allocations for complex regions.
by fireball＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: fireball Date: Thu Nov 5 14:38:01 2009 New Revision: 43974 URL: http://svn.reactos.org/svn/reactos?rev=43974&view=rev Log: - Fix incorrect clipping calculation when empty region is passed to RosDeviceSetClipping. Instead of setting clipping to full underlying surface access, it should set it to the dc rectangle intersected with the underlying surface rect. Fixes visual glitch when painting non-client area of a window. - Fix a typo which lead to using stack allocated RECTs array only for one rectangle instead of 8 possible. This fix reduces pool memory allocations for complex regions. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Nov 5 14:38:01 2009 @@ -452,7 +452,7 @@ PDC pDC; RECTL pStackBuf[8]; RECTL *pSafeRects = pStackBuf; - RECTL rcSafeBounds; + RECTL rcSafeBounds, rcSurface; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -467,7 +467,7 @@ ProbeForRead(pRects, count * sizeof(RECTL), 1); /* Use pool allocated buffer if data doesn't fit */ - if (count > sizeof(*pStackBuf) / sizeof(RECTL)) + if (count > sizeof(pStackBuf) / sizeof(RECTL)) pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); /* Copy points data */ @@ -515,19 +515,24 @@ if (count == 0) { - /* Special case, set it to full screen then */ - /*RECTL_vSetRect(&rcSafeBounds, - pDC->rcVport.left, - pDC->rcVport.top, - pDC->rcVport.right, - pDC->rcVport.bottom);*/ - + /* Set unclipped mode (clip by dc rect) */ RECTL_vSetRect(&rcSafeBounds, + pDC->rcDcRect.left, + pDC->rcDcRect.top, + pDC->rcDcRect.right, + pDC->rcDcRect.bottom); + + RECTL_vOffsetRect(&rcSafeBounds, pDC->rcVport.left, pDC->rcVport.top); + + /* Intersect it with an underlying surface rectangle */ + RECTL_vSetRect(&rcSurface, 0, 0, pDC->pBitmap->SurfObj.sizlBitmap.cx, pDC->pBitmap->SurfObj.sizlBitmap.cy); + RECTL_bIntersectRect(&rcSafeBounds, &rcSafeBounds, &rcSurface); + /* Set the clipping object */ pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); }

1 0

[fireball] 43973: [shell32] - Remove extra semicolon, spotted by Gabriel.
by fireball＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: fireball Date: Thu Nov 5 14:27:52 2009 New Revision: 43973 URL: http://svn.reactos.org/svn/reactos?rev=43973&view=rev Log: [shell32] - Remove extra semicolon, spotted by Gabriel. Modified: trunk/reactos/dll/win32/shell32/stubs.c Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Thu Nov 5 14:27:52 2009 @@ -142,7 +142,7 @@ { FIXME("SHGetUnreadMailCountW() stub\n"); return E_FAIL; -}; +} /* * Unimplemented

1 0

[tkreuzer] 43972: [KDCOM] add a few dbgprints
by tkreuzer＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: tkreuzer Date: Thu Nov 5 13:18:16 2009 New Revision: 43972 URL: http://svn.reactos.org/svn/reactos?rev=43972&view=rev Log: [KDCOM] add a few dbgprints Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Thu Nov 5 13:18:16 2009 @@ -150,6 +150,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive a PacketType. */ + KDDBGPRINT("KdReceivePacket - Didn't receive a PacketType.\n"); return KdStatus; } @@ -157,6 +158,7 @@ if (Packet.PacketLeader == CONTROL_PACKET_LEADER && Packet.PacketType == PACKET_TYPE_KD_RESEND) { + KDDBGPRINT("KdReceivePacket - PACKET_TYPE_KD_RESEND.\n"); return KDP_PACKET_RESEND; } @@ -165,6 +167,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive ByteCount. */ + KDDBGPRINT("KdReceivePacket - Didn't receive ByteCount.\n"); return KdStatus; } @@ -173,6 +176,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive PacketId. */ + KDDBGPRINT("KdReceivePacket - Didn't receive PacketId.\n"); return KdStatus; } @@ -189,6 +193,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive Checksum. */ + KDDBGPRINT("KdReceivePacket - Didn't receive Checksum.\n"); return KdStatus; } @@ -281,7 +286,7 @@ /* Do we have data? */ if (MessageData->Length) { - KDDBGPRINT("KdReceivePacket - got data\n"); + KDDBGPRINT("KdReceivePacket - 0x%lx bytes data\n", *DataLength); /* Receive the message data */ KdStatus = KdpReceiveBuffer(MessageData->Buffer, @@ -325,6 +330,7 @@ if (Packet.PacketId != RemotePacketId) { /* Continue with next packet */ + KDDBGPRINT("KdReceivePacket - Wrong PacketId.\n"); continue; }

1 0

[fireball] 43971: [shell32] Gabriel Ilardi - Properly stub SHSetUnreadMailCountW and SHGetUnreadMailCountW to unregress Thunderbird and possibly other email clients. See issue #4940 for more details.
by fireball＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: fireball Date: Thu Nov 5 11:07:16 2009 New Revision: 43971 URL: http://svn.reactos.org/svn/reactos?rev=43971&view=rev Log: [shell32] Gabriel Ilardi - Properly stub SHSetUnreadMailCountW and SHGetUnreadMailCountW to unregress Thunderbird and possibly other email clients. See issue #4940 for more details. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Thu Nov 5 11:07:16 2009 @@ -316,7 +316,7 @@ 316 stdcall SHGetSpecialFolderLocation(long long ptr) 317 stdcall SHGetSpecialFolderPathA(long ptr long long) 318 stdcall SHGetSpecialFolderPathW(long ptr long long) -319 stub SHGetUnreadMailCountW +319 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) 320 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA 321 stdcall SHHelpShortcuts_RunDLLA(long long long long) 322 stdcall SHHelpShortcuts_RunDLLW(long long long long) @@ -332,7 +332,7 @@ 332 stdcall SHQueryRecycleBinA(str ptr) 333 stdcall SHQueryRecycleBinW(wstr ptr) 334 stdcall SHSetLocalizedName(wstr wstr long) -335 stub SHSetUnreadMailCountW +335 stdcall SHSetUnreadMailCountW (wstr long wstr) 336 stdcall SHUpdateRecycleBinIcon() 337 stdcall SheChangeDirA(str) 338 stdcall SheChangeDirExA(str) Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Thu Nov 5 11:07:16 2009 @@ -128,6 +128,32 @@ LPVOID lpUnknown2) { FIXME("SHCreateFileExtractIconW() stub\n"); + return E_FAIL; +} + +HRESULT +WINAPI +SHGetUnreadMailCountW(HKEY hKeyUser, + LPCWSTR pszMailAddress, + DWORD *pdwCount, + FILETIME *pFileTime, + LPCWSTR pszShellExecuteCommand, + int cchShellExecuteCommand) +{ + FIXME("SHGetUnreadMailCountW() stub\n"); + return E_FAIL; +}; + +/* + * Unimplemented + */ +HRESULT +WINAPI +SHSetUnreadMailCountW(LPCWSTR pszMailAddress, + DWORD dwCount, + LPCWSTR pszShellExecuteCommand) +{ + FIXME("SHSetUnreadMailCountW() stub\n"); return E_FAIL; }

1 0

[ablackmann] 43970: The tool now generates 75% of a typical keyboard layout C file. Lots of stuff still missing, but most of the annoying work is done now... it just has to start filling in the dynamic data. A full-fledged file will have ligature data, up to 8 shift states, dead keys, etc, but that's not stuff we'll have to deal with at first for simple layouts. By tomorrow we should be able to fully process and generate latin-alphabet-based language keyboard layouts.
by ablackmann＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: ablackmann Date: Thu Nov 5 06:20:01 2009 New Revision: 43970 URL: http://svn.reactos.org/svn/reactos?rev=43970&view=rev Log: The tool now generates 75% of a typical keyboard layout C file. Lots of stuff still missing, but most of the annoying work is done now... it just has to start filling in the dynamic data. A full-fledged file will have ligature data, up to 8 shift states, dead keys, etc, but that's not stuff we'll have to deal with at first for simple layouts. By tomorrow we should be able to fully process and generate latin-alphabet-based language keyboard layouts. Modified: trunk/reactos/tools/kbdtool/output.c trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov 5 06:20:01 2009 @@ -141,7 +141,6 @@ /* We made it */ return TRUE; - } BOOLEAN @@ -387,8 +386,443 @@ IN PKEYNAME KeyNameExtData, IN PKEYNAME KeyNameDeadData) { - /* FIXME: Stub */ - return FALSE; + CHAR OutputFile[13]; + FILE *FileHandle; + + /* Build the keyboard name and internal name */ + strcpy(OutputFile, gKBDName); + strcat(OutputFile, ".C"); + + /* Open it */ + FileHandle = fopen(OutputFile, "wt"); + if (!FileHandle) + { + /* Fail */ + printf(" %12s : can't open for write.\n", OutputFile); + return FALSE; + } + + /* Print the header */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* Module Name: %s\n*\n* keyboard layout\n" + "*\n" + "* Copyright (c) 2009, ReactOS Foundation\n" + "*\n" + "* History:\n" + "* KBDTOOL v%d.%02d - Created %s" + "\\***************************************************************************/\n\n", + OutputFile, + gVersion, + gSubVersion, + asctime(Now)); + + /* What kind of driver is this? */ + if (FallbackDriver) + { + /* Fallback only */ + fprintf(FileHandle, "#include \"precomp.h\"\n"); + } + else + { + /* Add the includes */ + fprintf(FileHandle, + "#include <windows.h>\n" + "#include \"kbd.h\"\n" + "#include \"%s.h\"\n\n", + gKBDName); + } + + /* What kind of driver is this? */ + if (FallbackDriver) + { + /* Only one section */ + fprintf(FileHandle, + "#pragma data_seg(\"%s\")\n#define ALLOC_SECTION_LDATA\n\n", + ".kbdfallback"); + } + else + { + /* Section and attributes depend on architecture */ + fprintf(FileHandle, + "#if defined(_M_IA64)\n" + "#pragma section(\"%s\")\n" + "#define ALLOC_SECTION_LDATA __declspec(allocate(\"%s\"))\n" + "#else\n" + "#pragma data_seg(\"%s\")\n" + "#define ALLOC_SECTION_LDATA\n" + "#endif\n\n", + ".data", + ".data", + ".data"); + } + + /* Scan code to virtual key conversion table header */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* ausVK[] - Virtual Scan Code to Virtual Key conversion table\n" + "\\***************************************************************************/\n\n"); + + /* Table begin */ + fprintf(FileHandle, + "static ALLOC_SECTION_LDATA USHORT ausVK[] = {\n" + " T00, T01, T02, T03, T04, T05, T06, T07,\n" + " T08, T09, T0A, T0B, T0C, T0D, T0E, T0F,\n" + " T10, T11, T12, T13, T14, T15, T16, T17,\n" + " T18, T19, T1A, T1B, T1C, T1D, T1E, T1F,\n" + " T20, T21, T22, T23, T24, T25, T26, T27,\n" + " T28, T29, T2A, T2B, T2C, T2D, T2E, T2F,\n" + " T30, T31, T32, T33, T34, T35,\n\n"); + + /* Table continue */ + fprintf(FileHandle, + " /*\n" + " * Right-hand Shift key must have KBDEXT bit set.\n" + " */\n" + " T36 | KBDEXT,\n\n" + " T37 | KBDMULTIVK, // numpad_* + Shift/Alt -> SnapShot\n\n" + " T38, T39, T3A, T3B, T3C, T3D, T3E,\n" + " T3F, T40, T41, T42, T43, T44,\n\n"); + + /* Table continue */ + fprintf(FileHandle, + " /*\n" + " * NumLock Key:\n" + " * KBDEXT - VK_NUMLOCK is an Extended key\n" + " * KBDMULTIVK - VK_NUMLOCK or VK_PAUSE (without or with CTRL)\n" + " */\n" + " T45 | KBDEXT | KBDMULTIVK,\n\n" + " T46 | KBDMULTIVK,\n\n"); + + /* Numpad table */ + fprintf(FileHandle, + " /*\n" + " * Number Pad keys:\n" + " * KBDNUMPAD - digits 0-9 and decimal point.\n" + " * KBDSPECIAL - require special processing by Windows\n" + " */\n" + " T47 | KBDNUMPAD | KBDSPECIAL, // Numpad 7 (Home)\n" + " T48 | KBDNUMPAD | KBDSPECIAL, // Numpad 8 (Up),\n" + " T49 | KBDNUMPAD | KBDSPECIAL, // Numpad 9 (PgUp),\n" + " T4A,\n" + " T4B | KBDNUMPAD | KBDSPECIAL, // Numpad 4 (Left),\n" + " T4C | KBDNUMPAD | KBDSPECIAL, // Numpad 5 (Clear),\n" + " T4D | KBDNUMPAD | KBDSPECIAL, // Numpad 6 (Right),\n" + " T4E,\n" + " T4F | KBDNUMPAD | KBDSPECIAL, // Numpad 1 (End),\n" + " T50 | KBDNUMPAD | KBDSPECIAL, // Numpad 2 (Down),\n" + " T51 | KBDNUMPAD | KBDSPECIAL, // Numpad 3 (PgDn),\n" + " T52 | KBDNUMPAD | KBDSPECIAL, // Numpad 0 (Ins),\n" + " T53 | KBDNUMPAD | KBDSPECIAL, // Numpad . (Del),\n\n"); + + /* Table finish */ + fprintf(FileHandle, + " T54, T55, T56, T57, T58, T59, T5A, T5B,\n" + " T5C, T5D, T5E, T5F, T60, T61, T62, T63,\n" + " T64, T65, T66, T67, T68, T69, T6A, T6B,\n" + " T6C, T6D, T6E, T6F, T70, T71, T72, T73,\n" + " T74, T75, T76, T77, T78, T79, T7A, T7B,\n" + " T7C, T7D, T7E\n\n" + "};\n\n"); + + /* Key name table header */ + fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE0VscToVk[] = {\n"); + + /* FIXME: Key names */ + + /* Key name table finish */ + fprintf(FileHandle, " { 0, 0 }\n};\n\n"); + + /* Extended key name table header */ + fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE1VscToVk[] = {\n"); + + /* FIXME: Extended scancodes */ + + /* Extended key name table finish */ + fprintf(FileHandle, + " { 0x1D, Y1D }, // Pause\n" + " { 0 , 0 }\n};\n\n"); + + /* Modifier table description */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* aVkToBits[] - map Virtual Keys to Modifier Bits\n" + "*\n" + "* See kbd.h for a full description.\n" + "*\n" + "* The keyboard has only three shifter keys:\n" + "* SHIFT (L & R) affects alphabnumeric keys,\n" + "* CTRL (L & R) is used to generate control characters\n" + "* ALT (L & R) used for generating characters by number with numpad\n" + "\\***************************************************************************/\n"); + + /* Modifier table header */ + fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_BIT aVkToBits[] = {\n"); + + /* FIXME: Key modifiers */ + + /* Modifier table finish */ + fprintf(FileHandle, " { 0, 0 }\n};\n\n"); + + /* Modifier conversion table description */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* aModification[] - map character modifier bits to modification number\n" + "*\n" + "* See kbd.h for a full description.\n" + "*\n" + "\\***************************************************************************/\n\n"); + + /* Modifier conversion table header */ + fprintf(FileHandle, + "static ALLOC_SECTION_LDATA MODIFIERS CharModifiers = {\n" + " &aVkToBits[0],\n" + " %d,\n" + " {\n" + " // Modification# // Keys Pressed\n" + " // ============= // =============\n", + 2); /* FIXME: STATE STUFF */ + + /* Modifier conversion table end */ + fprintf(FileHandle," }\n" "};\n\n"); + + /* Shift state translation table description */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "*\n" + "* aVkToWch2[] - Virtual Key to WCHAR translation for 2 shift states\n" + "* aVkToWch3[] - Virtual Key to WCHAR translation for 3 shift states\n" + "* aVkToWch4[] - Virtual Key to WCHAR translation for 4 shift states\n"); + + /* FIXME: STATE STUFF */ + + /* Shift state translation table description continue */ + fprintf(FileHandle, + "*\n" + "* Table attributes: Unordered Scan, null-terminated\n" + "*\n" + "* Search this table for an entry with a matching Virtual Key to find the\n" + "* corresponding unshifted and shifted WCHAR characters.\n" + "*\n" + "* Special values for VirtualKey (column 1)\n" + "* 0xff - dead chars for the previous entry\n" + "* 0 - terminate the list\n" + "*\n" + "* Special values for Attributes (column 2)\n" + "* CAPLOK bit - CAPS-LOCK affect this key like SHIFT\n" + "*\n" + "* Special values for wch[*] (column 3 & 4)\n" + "* WCH_NONE - No character\n" + "* WCH_DEAD - Dead Key (diaresis) or invalid (US keyboard has none)\n" + "* WCH_LGTR - Ligature (generates multiple characters)\n" + "*\n" + "\\***************************************************************************/\n\n"); + + /* FIXME: STATE STUFF */ + + /* Numpad translation table */ + fprintf(FileHandle, + "// Put this last so that VkKeyScan interprets number characters\n" + "// as coming from the main section of the kbd (aVkToWch2 and\n" + "// aVkToWch5) before considering the numpad (aVkToWch1).\n\n" + "static ALLOC_SECTION_LDATA VK_TO_WCHARS1 aVkToWch1[] = {\n" + " { VK_NUMPAD0 , 0 , '0' },\n" + " { VK_NUMPAD1 , 0 , '1' },\n" + " { VK_NUMPAD2 , 0 , '2' },\n" + " { VK_NUMPAD3 , 0 , '3' },\n" + " { VK_NUMPAD4 , 0 , '4' },\n" + " { VK_NUMPAD5 , 0 , '5' },\n" + " { VK_NUMPAD6 , 0 , '6' },\n" + " { VK_NUMPAD7 , 0 , '7' },\n" + " { VK_NUMPAD8 , 0 , '8' },\n" + " { VK_NUMPAD9 , 0 , '9' },\n" + " { 0 , 0 , '\\0' }\n" + "};\n\n"); + + /* Translation tables header */ + fprintf(FileHandle,"static ALLOC_SECTION_LDATA VK_TO_WCHAR_TABLE aVkToWcharTable[] = {\n"); + + /* FIXME: STATE STUFF */ + + /* Array of translation tables */ + fprintf(FileHandle, + " { (PVK_TO_WCHARS1)aVkToWch2, 2, sizeof(aVkToWch2[0]) },\n" + " { (PVK_TO_WCHARS1)aVkToWch1, 1, sizeof(aVkToWch1[0]) },\n" + " { NULL, 0, 0 },\n" + "};\n\n"); + + /* Scan code to key name conversion table description */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* aKeyNames[], aKeyNamesExt[] - Virtual Scancode to Key Name tables\n" + "*\n" + "* Table attributes: Ordered Scan (by scancode), null-terminated\n" + "*\n" + "* Only the names of Extended, NumPad, Dead and Non-Printable keys are here.\n" + "* (Keys producing printable characters are named by that character)\n" + "\\***************************************************************************/\n\n"); + + /* Check for key name data */ + if (KeyNameData) + { + /* Table header */ + fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNames[] = {\n"); + + /* FIXME: TODO: Print table */ + + /* Table end */ + fprintf(FileHandle, "};\n\n"); + } + + /* Check for extended key name data */ + if (KeyNameExtData) + { + /* Table header */ + fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNamesExt[] = {\n"); + + /* FIXME: TODO: Print table */ + + /* Table end */ + fprintf(FileHandle, "};\n\n"); + } + + /* Check for dead key name data */ + if (KeyNameDeadData) + { + /* Not yet supported */ + printf("Dead key name data not supported!\n"); + exit(1); + } + + /* Check for dead key data */ + if (DeadKeyData) + { + /* Not yet supported */ + printf("Dead key data not supported!\n"); + //exit(1); + } + + /* Check for ligature data */ + if (LigatureData) + { + /* Not yet supported */ + printf("Ligature key data not supported!\n"); + exit(1); + } + + /* Main keyboard table descriptor type */ + fprintf(FileHandle, "static "); + + /* FIXME? */ + + /* Main keyboard table descriptor header */ + fprintf(FileHandle, + "ALLOC_SECTION_LDATA KBDTABLES KbdTables%s = {\n" + " /*\n" + " * Modifier keys\n" + " */\n" + " &CharModifiers,\n\n" + " /*\n" + " * Characters tables\n" + " */\n" + " aVkToWcharTable,\n\n" + " /*\n" + " * Diacritics\n" + " */\n", + FallbackDriver ? "Fallback" : "" ); + + /* Descriptor dead key data section */ + if (DeadKeyData) + { + fprintf(FileHandle," aDeadKey,\n\n"); + } + else + { + fprintf(FileHandle," NULL,\n\n"); + } + + /* Descriptor key name comment */ + fprintf(FileHandle, + " /*\n" + " * Names of Keys\n" + " */\n"); + + /* Descriptor key name section */ + if (KeyNameData) + { + fprintf(FileHandle," aKeyNames,\n"); + } + else + { + fprintf(FileHandle," NULL,\n"); + } + + /* Descriptor extended key name section */ + if (KeyNameExtData) + { + fprintf(FileHandle," aKeyNamesExt,\n"); + } + else + { + fprintf(FileHandle," NULL,\n"); + } + + /* Descriptor dead key name section */ + if ((DeadKeyData) && (KeyNameDeadData)) + { + fprintf(FileHandle," aKeyNamesDead,\n\n"); + } + else + { + fprintf(FileHandle," NULL,\n\n"); + } + + /* Descriptor conversion table section */ + fprintf(FileHandle, + " /*\n" + " * Scan codes to Virtual Keys\n" + " */\n" + " ausVK,\n" + " sizeof(ausVK) / sizeof(ausVK[0]),\n" + " aE0VscToVk,\n" + " aE1VscToVk,\n\n" + " /*\n" + " * Locale-specific special processing\n" + " */\n"); + + /* FIXME: AttributeData and KLLF_ALTGR stuff */ + + /* Descriptor locale-specific section */ + fprintf(FileHandle, " MAKELONG(%s, KBD_VERSION),\n\n", (PCHAR)AttributeData); + + /* Descriptor ligature data comment */ + fprintf(FileHandle, " /*\n * Ligatures\n */\n %d,\n", 0); /* FIXME */ + + /* Descriptor ligature data section */ + if (!LigatureData) + { + fprintf(FileHandle, " 0,\n"); + fprintf(FileHandle, " NULL\n"); + } + else + { + fprintf(FileHandle, " sizeof(aLigature[0]),\n"); + fprintf(FileHandle, " (PLIGATURE1)aLigature\n"); + } + + /* Descriptor finish */ + fprintf(FileHandle,"};\n\n"); + + /* Keyboard layout callback function */ + if (!FallbackDriver) fprintf(FileHandle, + "PKBDTABLES KbdLayerDescriptor(VOID)\n" + "{\n" + " return &KbdTables;\n" + "}\n"); + + /* Clean up */ + fclose(FileHandle); + return TRUE; } ULONG 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] Thu Nov 5 06:20:01 2009 @@ -929,9 +929,9 @@ ULONG KeyWord; ULONG StateCount; ULONG ShiftStates[8]; - PKEYNAME DescriptionData, LanguageData; - PKEYNAME KeyNameData, KeyNameExtData, KeyNameDeadData; - PVOID AttributeData, LigatureData, DeadKeyData; + PKEYNAME DescriptionData = NULL, LanguageData = NULL; + PKEYNAME KeyNameData = NULL, KeyNameExtData = NULL, KeyNameDeadData = NULL; + PVOID AttributeData = NULL, LigatureData = NULL, DeadKeyData = NULL; /* Parse keywords */ gLineCount = 0;

1 0

[tkreuzer] 43969: undefine i386 in the pspec file
by tkreuzer＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: tkreuzer Date: Thu Nov 5 04:25:46 2009 New Revision: 43969 URL: http://svn.reactos.org/svn/reactos?rev=43969&view=rev Log: undefine i386 in the pspec file Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] Thu Nov 5 04:25:46 2009 @@ -1,4 +1,5 @@ #include "include/reactos/msvctarget.h" +#undef i386 @ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add @ stdcall -arch=i386 FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div

1 0

[tkreuzer] 43968: add memcpy symbol, to resolve references created by the compiler
by tkreuzer＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: tkreuzer Date: Thu Nov 5 04:24:40 2009 New Revision: 43968 URL: http://svn.reactos.org/svn/reactos?rev=43968&view=rev Log: add memcpy symbol, to resolve references created by the compiler Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/i386/memmove_asm.s Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Thu Nov 5 04:24:40 2009 @@ -4,8 +4,10 @@ * NOTE: This code is duplicated in memcpy_asm.s */ +.globl _memcpy .globl _memmove +_memcpy: _memmove: push %ebp mov %esp,%ebp

1 0

[ablackmann] 43967: Now write out the DEF file (okay that was too easy).
by ablackmann＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: ablackmann Date: Thu Nov 5 03:04:04 2009 New Revision: 43967 URL: http://svn.reactos.org/svn/reactos?rev=43967&view=rev Log: Now write out the DEF file (okay that was too easy). Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov 5 03:04:04 2009 @@ -348,8 +348,32 @@ BOOLEAN kbd_def(VOID) { - /* FIXME: Stub */ - return FALSE; + CHAR OutputFile[13]; + FILE *FileHandle; + + /* Build the keyboard name and internal name */ + strcpy(OutputFile, gKBDName); + strcat(OutputFile, ".DEF"); + + /* Open it */ + FileHandle = fopen(OutputFile, "wt"); + if (!FileHandle) + { + /* Fail */ + printf(" %12s : can't open for write.\n", OutputFile); + return FALSE; + } + + /* Write the file exports */ + fprintf(FileHandle, + "LIBRARY %s\n\n" + "EXPORTS\n" + " KbdLayerDescriptor @1\n", + gKBDName); + + /* Clean up */ + fclose(FileHandle); + return TRUE; } BOOLEAN

1 0

[ablackmann] 43966: Kbdtool can now create the resource (RC) file as well!
by ablackmann＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: ablackmann Date: Thu Nov 5 02:57:08 2009 New Revision: 43966 URL: http://svn.reactos.org/svn/reactos?rev=43966&view=rev Log: Kbdtool can now create the resource (RC) file as well! Modified: trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Thu Nov 5 02:57:08 2009 @@ -82,6 +82,8 @@ extern CHAR gKBDName[10]; extern CHAR gCopyright[256]; extern CHAR gDescription[256]; +extern CHAR gCompany[256]; +extern CHAR gLocaleName[256]; extern ULONG gVersion, gSubVersion; /* EOF */ Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Thu Nov 5 02:57:08 2009 @@ -12,6 +12,9 @@ /* GLOBALS ********************************************************************/ +ULONG gStringIdForDescriptions = 1000; +ULONG gStringIdForLanguageNames = 1100; +ULONG gStringIdForLocaleName = 1200; time_t Clock; struct tm *Now; @@ -145,8 +148,201 @@ kbd_rc(IN PKEYNAME DescriptionData, IN PKEYNAME LanguageData) { - /* FIXME: Stub */ - return FALSE; + CHAR OutputFile[13]; + CHAR InternalName[13]; + CHAR TimeBuffer[5]; + FILE *FileHandle; + ULONG Length; + PCHAR p; + PKEYNAME NextDescription, NextLanguage; + + /* Build the keyboard name and internal name */ + strcpy(OutputFile, gKBDName); + strcat(OutputFile, ".RC"); + strcpy(InternalName, gKBDName); + for (p = InternalName; *p; p++) *p = tolower(*p); + + /* Open it */ + FileHandle = fopen(OutputFile, "wb"); + if (!FileHandle) + { + /* Fail */ + printf(" %12s : can't open for write.\n", OutputFile); + return FALSE; + } + + /* Check if we have copyright */ + Length = strlen(gCopyright); + if (!Length) + { + /* Set time string */ + strftime(TimeBuffer, 5, "%Y", Now); + + /* Add copyright character */ + strcpy(gCopyright, "(C)"); + + /* Add the year */ + strcat(gCopyright, TimeBuffer); + + /* Add blank company */ + strcat(gCopyright, " "); + } + + /* Write the resource file header */ + fprintf(FileHandle, + "#include \"winver.h\"\r\n" + "1 VERSIONINFO\r\n" + " FILEVERSION 1,0,%d,%d\r\n" + " PRODUCTVERSION 1,0,%d,%d\r\n" + " FILEFLAGSMASK 0x3fL\r\n" + " FILEFLAGS 0x0L\r\n" + "FILEOS 0x40004L\r\n" + " FILETYPE VFT_DLL\r\n" + " FILESUBTYPE VFT2_DRV_KEYBOARD\r\n" + "BEGIN\r\n" + " BLOCK \"StringFileInfo\"\r\n" + " BEGIN\r\n" + " BLOCK \"000004B0\"\r\n" + " BEGIN\r\n" + " VALUE \"CompanyName\", \"%s\\0\"\r\n" + " VALUE \"FileDescription\", \"%s Keyboard Layout\\0\"\r\n" + " VALUE \"FileVersion\", \"1, 0, %d, %d\\0\"\r\n", + gVersion, + gSubVersion, + gVersion, + gSubVersion, + gCompany, + gDescription, + gVersion, + gSubVersion); + + /* Continue writing it */ + fprintf(FileHandle, + " VALUE \"InternalName\", \"%s (%d.%d)\\0\"\r\n" + " VALUE \"ProductName\",\"%s\\0\"\r\n" + " VALUE \"Release Information\",\"%s\\0\"\r\n" + " VALUE \"LegalCopyright\", \"%s\\0\"\r\n" + " VALUE \"OriginalFilename\",\"%s\\0\"\r\n" + " VALUE \"ProductVersion\", \"1, 0, %d, %d\\0\"\r\n" + " END\r\n" + " END\r\n" + " BLOCK \"VarFileInfo\"\r\n" + " BEGIN\r\n" + " VALUE \"Translation\", 0x0000, 0x04B0\r\n" + " END\r\n" + "END\r\n", + InternalName, + gVersion, + gSubVersion, + "Created by ReactOS KbdTool", + "Created by ReactOS KbdTool", + gCopyright, + InternalName, + gVersion, + gSubVersion); + + /* Now check if we have a locale name */ + Length = strlen(gLocaleName); + if (Length) + { + /* Write the stringtable header */ + fprintf(FileHandle, + "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", + 9, + 1); + fprintf(FileHandle, "BEGIN\r\n"); + + /* Language or locale? */ + if (strchr(gLocaleName, '\"')) + { + /* Write the language name */ + fprintf(FileHandle, " %d %s\r\n", gStringIdForLanguageNames, gLocaleName); + } + else + { + /* Write the locale name */ + fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLocaleName, gLocaleName); + } + + /* Terminate the entry */ + fprintf(FileHandle, "END\r\n\r\n"); + } + + /* Check for description information */ + while (DescriptionData) + { + /* Remember the next pointer */ + NextDescription = DescriptionData->Next; + + /* Write the header */ + fprintf(FileHandle, + "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", + DescriptionData->Code & 0x3FF, + DescriptionData->Code >> 10); + fprintf(FileHandle, "BEGIN\r\n"); + + /* Quoted string or not? */ + if (strchr(DescriptionData->Name, '\"')) + { + /* Write the description name */ + fprintf(FileHandle, " %d %s\r\n", gStringIdForDescriptions, DescriptionData->Name); + } + else + { + /* Write the description name */ + fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForDescriptions, DescriptionData->Name); + } + + /* Terminate the entry */ + fprintf(FileHandle, "END\r\n\r\n"); + + /* Free the allocation */ + free(DescriptionData->Name); + free(DescriptionData); + + /* Move to the next entry */ + DescriptionData = NextDescription; + } + + /* Check for language information */ + while (LanguageData) + { + /* Remember the next pointer */ + NextLanguage = LanguageData->Next; + + /* Write the header */ + fprintf(FileHandle, + "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", + LanguageData->Code & 0x3FF, + LanguageData->Code >> 10); + fprintf(FileHandle, "BEGIN\r\n"); + + /* Quoted string or not? */ + if (strchr(LanguageData->Name, '\"')) + { + /* Write the language name */ + fprintf(FileHandle, " %d %s\r\n", gStringIdForLanguageNames, LanguageData->Name); + } + else + { + /* Write the language name */ + fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLanguageNames, LanguageData->Name); + } + + /* Terminate the entry */ + fprintf(FileHandle, "END\r\n\r\n"); + + /* Free the allocation */ + free(LanguageData->Name); + free(LanguageData); + + /* Move to the next entry */ + LanguageData = NextLanguage; + } + + /* We're done! */ + fclose(FileHandle); + return TRUE; } BOOLEAN

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