Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[fireball] 30319: Tower <tumans@nm.ru> - Russian translation for config tool.
by fireball＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: fireball Date: Sat Nov 10 14:08:08 2007 New Revision: 30319 URL: http://svn.reactos.org/svn/reactos?rev=30319&view=rev Log: Tower <tumans(a)nm.ru> - Russian translation for config tool. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc Sat Nov 10 14:08:08 2007 @@ -7,18 +7,18 @@ CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ" FONT 8,"MS Sans Serif",0,0 BEGIN - LTEXT "Path to gcc Compiler", 0x0, 10, 107, 100, 15 + LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", 0x0, 10, 107, 100, 15 LTEXT "Öâåò Ôîíà", 0x0, 10, 10, 75, 12 COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 75, 12 COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 - CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 - CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + CONTROL "Èñïîëüçîâàòü CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Ñîêðàùàòü Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Âûáîð êàòàëîãà äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Âûáîð êàòàëîãà äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP @@ -29,33 +29,33 @@ PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP - CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 + CONTROL "Ïðèâåòñòâèå!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE BEGIN - CLR0, "Black" - CLR1, "Blue" - CLR2, "Green" - CLR3, "Aqua" - CLR4, "Red" - CLR5, "Purple" - CLR6, "Yellow" - CLR7, "White" - CLR8, "Gray" - CLR9, "Light Blue" - CLR10, "Light Green" - CLR11, "Light Aqua" - CLR12, "Light Red" - CLR13, "Light Purple" - CLR14, "Light Yellow" - CLR15, "Bright White" + CLR0, "×¸ðíûé" + CLR1, "Ñèíèé" + CLR2, "Çåëåíûé" + CLR3, "Àêâà" + CLR4, "Êðàñíûé" + CLR5, "Ïóðïóðíûé" + CLR6, "Æîëòûé" + CLR7, "Áåëûé" + CLR8, "Ñåðûé" + CLR9, "Ñâåòëî-ãîëóáîé" + CLR10, "Ñâåòëî-çåë¸íûé" + CLR11, "Ñâåòëî-àêâà" + CLR12, "ßðêî-êðàñíûé" + CLR13, "Ñâåòëî-ïóðïóðíûé" + CLR14, "ßðêî-æåëòûé" + CLR15, "ßðêî-áåëûé" MSG_NOGCCFOUND, "Êîìïèëÿòîð GCC íåíàéäåí! Ïðîâåðüòå ïðàâèëüíîñòü óñòàíîâêè." MSG_FILEFAILED, "Íåâîçìîæíî ñîçäàòü ôàéë rosbe-options.cmd" MSG_DIREFAILED, "Íåâîçìîæíî ñîçäàòü ïàïêó äëÿ ëîãîâ!" - MSG_SETLOADSUC, "Previous settings loaded successfully" - MSG_FINDLOGDIR, "Please choose a directory where the the logs should be stored:" - MSG_FINDMGWDIR, "Please choose the directory where MingW is located:" - MSG_FINDOBJDIR, "Please choose the directory where you want to save OBJ Files to:" - MSG_FINDOUTDIR, "Please choose the directory where you want to save OUT Files to:" + MSG_SETLOADSUC, "Ðàíåå ñîõðàíåííûå íàñòðîéêè çàãðóæåíû." + MSG_FINDLOGDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ ëîã-ôàéëîâ:" + MSG_FINDMGWDIR, "Óêàæèòå êàòàëîã ðàñïîëîæåíèÿ Êîìïèëÿòîðà MingW:" + MSG_FINDOBJDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ îáúåêòíûõ ôàéëîâ:" + MSG_FINDOUTDIR, "Âûáåðèòå êàòàëîã ñîõðàíåíèÿ îòêîìïèëèðîâàííûõ ôàéëîâ:" END

1 0

[tkreuzer] 30318: fix bug in NtUserToUnicodeEx. It still ignores the hkl parameter. NtUserVkScanKeyEx: use HKL instead of ULONG_PTR. See issue #2557 for more details.
by tkreuzer＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: tkreuzer Date: Sat Nov 10 07:53:02 2007 New Revision: 30318 URL: http://svn.reactos.org/svn/reactos?rev=30318&view=rev Log: fix bug in NtUserToUnicodeEx. It still ignores the hkl parameter. NtUserVkScanKeyEx: use HKL instead of ULONG_PTR. See issue #2557 for more details. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Nov 10 07:53:02 2007 @@ -2357,7 +2357,7 @@ NTAPI NtUserVkKeyScanEx( WCHAR wChar, - ULONG_PTR KeyboardLayout, + HKL KeyboardLayout, DWORD Unknown2); DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Sat Nov 10 07:53:02 2007 @@ -196,7 +196,15 @@ KS_DOWN_BIT) ModBits |= GetShiftBit( pkKT, VK_SHIFT ); + if (KeysSet( pkKT, KeyState, VK_SHIFT, 0 ) & + KS_DOWN_BIT) + ModBits |= GetShiftBit( pkKT, VK_SHIFT ); + if (KeysSet( pkKT, KeyState, VK_LCONTROL, VK_RCONTROL ) & + KS_DOWN_BIT ) + ModBits |= GetShiftBit( pkKT, VK_CONTROL ); + + if (KeysSet( pkKT, KeyState, VK_CONTROL, 0 ) & KS_DOWN_BIT ) ModBits |= GetShiftBit( pkKT, VK_CONTROL ); @@ -406,36 +414,6 @@ END_CLEANUP; } - - -int STDCALL ToUnicodeEx( UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags, - HKL dwhkl ) -{ - int ToUnicodeResult = 0; - - if (0 == (lpKeyState[wVirtKey] & KS_DOWN_BIT)) - { - ToUnicodeResult = 0; - } - else - { - ToUnicodeResult = ToUnicodeInner( wVirtKey, - wScanCode, - lpKeyState, - pwszBuff, - cchBuff, - wFlags, - PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0 ); - } - - return ToUnicodeResult; -} BOOL FASTCALL @@ -741,13 +719,14 @@ } RtlZeroMemory( OutPwszBuff, sizeof( WCHAR ) * cchBuff ); - ret = ToUnicodeEx( wVirtKey, - wScanCode, - KeyStateBuf, - OutPwszBuff, - cchBuff, - wFlags, - dwhkl ); + ret = ToUnicodeInner( wVirtKey, + wScanCode, + KeyStateBuf, + OutPwszBuff, + cchBuff, + wFlags, + PsGetCurrentThreadWin32Thread() ? + PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0 ); MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff); ExFreePool(OutPwszBuff); @@ -1008,7 +987,7 @@ STDCALL NtUserVkKeyScanEx( WCHAR wChar, - ULONG_PTR KeyboardLayout, + HKL KeyboardLayout, DWORD Unknown2) { /* FIXME: currently, this routine doesnt seem to need any locking */ @@ -1023,7 +1002,7 @@ if(!KeyboardLayout) return -1; - KeyLayout = UserHklToKbl((HKL)KeyboardLayout)->KBTables; + KeyLayout = UserHklToKbl(KeyboardLayout)->KBTables; for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++) {

1 0

[tkreuzer] 30317: some tests for NtUserToUnicodeEx
by tkreuzer＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: tkreuzer Date: Sat Nov 10 07:21:35 2007 New Revision: 30317 URL: http://svn.reactos.org/svn/reactos?rev=30317&view=rev Log: some tests for NtUserToUnicodeEx Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c trunk/rostests/apitests/w32knapi/w32knapi.c Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c Sat Nov 10 07:21:35 2007 @@ -1,0 +1,438 @@ + +INT +Test_NtUserToUnicodeEx(PTESTINFO pti) +{ + BYTE KeyState[256] = {0}; + WCHAR Buffer[10]; + HKL hkl = LoadKeyboardLayoutW(L"00000409", KLF_NOTELLSHELL); + + TEST(NtUserToUnicodeEx(27, 1, KeyState, Buffer, 10, 0, 0) == 1); + + /* Test with no key pressed */ + ZeroMemory(KeyState, 256); + TEST(NtUserToUnicodeEx(27, 1, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 27); + TEST(NtUserToUnicodeEx(49, 2, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '1'); + TEST(NtUserToUnicodeEx(50, 3, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '2'); + TEST(NtUserToUnicodeEx(51, 4, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '3'); + TEST(NtUserToUnicodeEx(52, 5, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '4'); + TEST(NtUserToUnicodeEx(53, 6, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '5'); + TEST(NtUserToUnicodeEx(54, 7, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '6'); + TEST(NtUserToUnicodeEx(55, 8, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '7'); + TEST(NtUserToUnicodeEx(56, 9, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '8'); + TEST(NtUserToUnicodeEx(57, 10, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '9'); + TEST(NtUserToUnicodeEx(48, 11, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '0'); + TEST(NtUserToUnicodeEx(189, 12, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '-'); + TEST(NtUserToUnicodeEx(187, 13, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '='); + TEST(NtUserToUnicodeEx(8, 14, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 8); + TEST(NtUserToUnicodeEx(9, 15, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + TEST(NtUserToUnicodeEx(81, 16, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'q'); + TEST(NtUserToUnicodeEx(87, 17, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'w'); + TEST(NtUserToUnicodeEx(69, 18, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'e'); + TEST(NtUserToUnicodeEx(82, 19, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'r'); + TEST(NtUserToUnicodeEx(84, 20, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 't'); + TEST(NtUserToUnicodeEx(89, 21, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'y'); + TEST(NtUserToUnicodeEx(85, 22, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'u'); + TEST(NtUserToUnicodeEx(73, 23, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'i'); + TEST(NtUserToUnicodeEx(79, 24, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'o'); + TEST(NtUserToUnicodeEx(80, 25, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'p'); + TEST(NtUserToUnicodeEx(219, 26, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '['); + TEST(NtUserToUnicodeEx(221, 27, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ']'); + TEST(NtUserToUnicodeEx(13, 28, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 13); + TEST(NtUserToUnicodeEx(65, 30, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'a'); + TEST(NtUserToUnicodeEx(83, 31, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 's'); + TEST(NtUserToUnicodeEx(68, 32, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'd'); + TEST(NtUserToUnicodeEx(70, 33, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'f'); + TEST(NtUserToUnicodeEx(71, 34, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'g'); + TEST(NtUserToUnicodeEx(72, 35, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'h'); + TEST(NtUserToUnicodeEx(74, 36, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'j'); + TEST(NtUserToUnicodeEx(75, 37, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'k'); + TEST(NtUserToUnicodeEx(76, 38, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'l'); + TEST(NtUserToUnicodeEx(186, 39, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ';'); + TEST(NtUserToUnicodeEx(222, 40, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\''); + TEST(NtUserToUnicodeEx(192, 41, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '`'); + TEST(NtUserToUnicodeEx(220, 43, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\\'); + TEST(NtUserToUnicodeEx(90, 44, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'z'); + TEST(NtUserToUnicodeEx(88, 45, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'x'); + TEST(NtUserToUnicodeEx(67, 46, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'c'); + TEST(NtUserToUnicodeEx(86, 47, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'v'); + TEST(NtUserToUnicodeEx(66, 48, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'b'); + TEST(NtUserToUnicodeEx(78, 49, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'n'); + TEST(NtUserToUnicodeEx(77, 50, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'm'); + TEST(NtUserToUnicodeEx(188, 51, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ','); + TEST(NtUserToUnicodeEx(190, 52, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '.'); + TEST(NtUserToUnicodeEx(191, 53, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '/'); + TEST(NtUserToUnicodeEx(106, 55, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '*'); + TEST(NtUserToUnicodeEx(32, 57, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ' '); + TEST(NtUserToUnicodeEx(109, 74, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '-'); + TEST(NtUserToUnicodeEx(107, 78, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '+'); + TEST(NtUserToUnicodeEx(226, 86, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\\'); + TEST(NtUserToUnicodeEx(9, 124, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + + /* Test with shift key pressed */ + ZeroMemory(KeyState, 256); + KeyState[VK_SHIFT] = 0xff; + TEST(NtUserToUnicodeEx(27, 1, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 27); + TEST(NtUserToUnicodeEx(49, 2, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '!'); + TEST(NtUserToUnicodeEx(50, 3, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '@'); + TEST(NtUserToUnicodeEx(51, 4, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '#'); + TEST(NtUserToUnicodeEx(52, 5, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '$'); + TEST(NtUserToUnicodeEx(53, 6, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\%'); + TEST(NtUserToUnicodeEx(54, 7, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '^'); + TEST(NtUserToUnicodeEx(55, 8, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '&'); + TEST(NtUserToUnicodeEx(56, 9, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '*'); + TEST(NtUserToUnicodeEx(57, 10, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '('); + TEST(NtUserToUnicodeEx(48, 11, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ')'); + TEST(NtUserToUnicodeEx(189, 12, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '_'); + TEST(NtUserToUnicodeEx(187, 13, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '+'); + TEST(NtUserToUnicodeEx(8, 14, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 8); + TEST(NtUserToUnicodeEx(9, 15, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + TEST(NtUserToUnicodeEx(81, 16, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Q'); + TEST(NtUserToUnicodeEx(87, 17, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'W'); + TEST(NtUserToUnicodeEx(69, 18, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'E'); + TEST(NtUserToUnicodeEx(82, 19, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'R'); + TEST(NtUserToUnicodeEx(84, 20, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'T'); + TEST(NtUserToUnicodeEx(89, 21, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Y'); + TEST(NtUserToUnicodeEx(85, 22, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'U'); + TEST(NtUserToUnicodeEx(73, 23, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'I'); + TEST(NtUserToUnicodeEx(79, 24, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'O'); + TEST(NtUserToUnicodeEx(80, 25, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'P'); + TEST(NtUserToUnicodeEx(219, 26, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '{'); + TEST(NtUserToUnicodeEx(221, 27, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '}'); + TEST(NtUserToUnicodeEx(13, 28, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 13); + TEST(NtUserToUnicodeEx(65, 30, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'A'); + TEST(NtUserToUnicodeEx(83, 31, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'S'); + TEST(NtUserToUnicodeEx(68, 32, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'D'); + TEST(NtUserToUnicodeEx(70, 33, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'F'); + TEST(NtUserToUnicodeEx(71, 34, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'G'); + TEST(NtUserToUnicodeEx(72, 35, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'H'); + TEST(NtUserToUnicodeEx(74, 36, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'J'); + TEST(NtUserToUnicodeEx(75, 37, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'K'); + TEST(NtUserToUnicodeEx(76, 38, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'L'); + TEST(NtUserToUnicodeEx(186, 39, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ':'); + TEST(NtUserToUnicodeEx(222, 40, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '"'); + TEST(NtUserToUnicodeEx(192, 41, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '~'); + TEST(NtUserToUnicodeEx(220, 43, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '|'); + TEST(NtUserToUnicodeEx(90, 44, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Z'); + TEST(NtUserToUnicodeEx(88, 45, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'X'); + TEST(NtUserToUnicodeEx(67, 46, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'C'); + TEST(NtUserToUnicodeEx(86, 47, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'V'); + TEST(NtUserToUnicodeEx(66, 48, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'B'); + TEST(NtUserToUnicodeEx(78, 49, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'N'); + TEST(NtUserToUnicodeEx(77, 50, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'M'); + TEST(NtUserToUnicodeEx(188, 51, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '<'); + TEST(NtUserToUnicodeEx(190, 52, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '>'); + TEST(NtUserToUnicodeEx(191, 53, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '?'); + TEST(NtUserToUnicodeEx(106, 55, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '*'); + TEST(NtUserToUnicodeEx(32, 57, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ' '); + TEST(NtUserToUnicodeEx(109, 74, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '-'); + TEST(NtUserToUnicodeEx(107, 78, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '+'); + TEST(NtUserToUnicodeEx(226, 86, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '|'); + TEST(NtUserToUnicodeEx(9, 124, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + + /* Test with ctrl key pressed */ + ZeroMemory(KeyState, 256); + KeyState[VK_CONTROL] = 0xff; +// TEST(NtUserToUnicodeEx(27, 1, KeyState, Buffer, 10, 0, hkl) == 1); +// TEST(Buffer[0] == 27); +// TEST(NtUserToUnicodeEx(8, 14, KeyState, Buffer, 10, 0, hkl) == 1); +// TEST(Buffer[0] == 127); + TEST(NtUserToUnicodeEx(81, 16, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 17); + TEST(NtUserToUnicodeEx(87, 17, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 23); + TEST(NtUserToUnicodeEx(69, 18, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 5); + TEST(NtUserToUnicodeEx(82, 19, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 18); + TEST(NtUserToUnicodeEx(84, 20, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 20); + TEST(NtUserToUnicodeEx(89, 21, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 25); + TEST(NtUserToUnicodeEx(85, 22, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 21); + TEST(NtUserToUnicodeEx(73, 23, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + TEST(NtUserToUnicodeEx(79, 24, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 15); + TEST(NtUserToUnicodeEx(80, 25, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 16); + TEST(NtUserToUnicodeEx(219, 26, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 27); + TEST(NtUserToUnicodeEx(221, 27, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 29); + TEST(NtUserToUnicodeEx(13, 28, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 10); + TEST(NtUserToUnicodeEx(65, 30, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 1); + TEST(NtUserToUnicodeEx(83, 31, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 19); + TEST(NtUserToUnicodeEx(68, 32, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 4); + TEST(NtUserToUnicodeEx(70, 33, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 6); + TEST(NtUserToUnicodeEx(71, 34, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 7); + TEST(NtUserToUnicodeEx(72, 35, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 8); + TEST(NtUserToUnicodeEx(74, 36, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 10); + TEST(NtUserToUnicodeEx(75, 37, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 11); + TEST(NtUserToUnicodeEx(76, 38, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 12); + TEST(NtUserToUnicodeEx(220, 43, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 28); + TEST(NtUserToUnicodeEx(90, 44, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 26); + TEST(NtUserToUnicodeEx(88, 45, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 24); + TEST(NtUserToUnicodeEx(67, 46, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 3); + TEST(NtUserToUnicodeEx(86, 47, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 22); + TEST(NtUserToUnicodeEx(66, 48, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 2); + TEST(NtUserToUnicodeEx(78, 49, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 14); + TEST(NtUserToUnicodeEx(77, 50, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 13); +// TEST(NtUserToUnicodeEx(32, 57, KeyState, Buffer, 10, 0, hkl) == 1); +// TEST(Buffer[0] == 32); + TEST(NtUserToUnicodeEx(226, 86, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 28); + + /* Test with VK_CAPITAL key pressed */ + ZeroMemory(KeyState, 256); + KeyState[VK_CAPITAL] = 0xff; + TEST(NtUserToUnicodeEx(27, 1, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 27); + TEST(NtUserToUnicodeEx(49, 2, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '1'); + TEST(NtUserToUnicodeEx(50, 3, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '2'); + TEST(NtUserToUnicodeEx(51, 4, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '3'); + TEST(NtUserToUnicodeEx(52, 5, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '4'); + TEST(NtUserToUnicodeEx(53, 6, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '5'); + TEST(NtUserToUnicodeEx(54, 7, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '6'); + TEST(NtUserToUnicodeEx(55, 8, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '7'); + TEST(NtUserToUnicodeEx(56, 9, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '8'); + TEST(NtUserToUnicodeEx(57, 10, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '9'); + TEST(NtUserToUnicodeEx(48, 11, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '0'); + TEST(NtUserToUnicodeEx(189, 12, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '-'); + TEST(NtUserToUnicodeEx(187, 13, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '='); + TEST(NtUserToUnicodeEx(8, 14, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 8); + TEST(NtUserToUnicodeEx(9, 15, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + TEST(NtUserToUnicodeEx(81, 16, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Q'); + TEST(NtUserToUnicodeEx(87, 17, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'W'); + TEST(NtUserToUnicodeEx(69, 18, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'E'); + TEST(NtUserToUnicodeEx(82, 19, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'R'); + TEST(NtUserToUnicodeEx(84, 20, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'T'); + TEST(NtUserToUnicodeEx(89, 21, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Y'); + TEST(NtUserToUnicodeEx(85, 22, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'U'); + TEST(NtUserToUnicodeEx(73, 23, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'I'); + TEST(NtUserToUnicodeEx(79, 24, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'O'); + TEST(NtUserToUnicodeEx(80, 25, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'P'); + TEST(NtUserToUnicodeEx(219, 26, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '['); + TEST(NtUserToUnicodeEx(221, 27, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ']'); + TEST(NtUserToUnicodeEx(13, 28, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 13); + TEST(NtUserToUnicodeEx(65, 30, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'A'); + TEST(NtUserToUnicodeEx(83, 31, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'S'); + TEST(NtUserToUnicodeEx(68, 32, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'D'); + TEST(NtUserToUnicodeEx(70, 33, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'F'); + TEST(NtUserToUnicodeEx(71, 34, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'G'); + TEST(NtUserToUnicodeEx(72, 35, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'H'); + TEST(NtUserToUnicodeEx(74, 36, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'J'); + TEST(NtUserToUnicodeEx(75, 37, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'K'); + TEST(NtUserToUnicodeEx(76, 38, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'L'); + TEST(NtUserToUnicodeEx(186, 39, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ';'); + TEST(NtUserToUnicodeEx(222, 40, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\''); + TEST(NtUserToUnicodeEx(192, 41, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '`'); + TEST(NtUserToUnicodeEx(220, 43, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\\'); + TEST(NtUserToUnicodeEx(90, 44, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'Z'); + TEST(NtUserToUnicodeEx(88, 45, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'X'); + TEST(NtUserToUnicodeEx(67, 46, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'C'); + TEST(NtUserToUnicodeEx(86, 47, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'V'); + TEST(NtUserToUnicodeEx(66, 48, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'B'); + TEST(NtUserToUnicodeEx(78, 49, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'N'); + TEST(NtUserToUnicodeEx(77, 50, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 'M'); + TEST(NtUserToUnicodeEx(188, 51, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ','); + TEST(NtUserToUnicodeEx(190, 52, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '.'); + TEST(NtUserToUnicodeEx(191, 53, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '/'); + TEST(NtUserToUnicodeEx(106, 55, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '*'); + TEST(NtUserToUnicodeEx(32, 57, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == ' '); + TEST(NtUserToUnicodeEx(109, 74, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '-'); + TEST(NtUserToUnicodeEx(107, 78, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '+'); + TEST(NtUserToUnicodeEx(226, 86, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == '\\'); + TEST(NtUserToUnicodeEx(9, 124, KeyState, Buffer, 10, 0, hkl) == 1); + TEST(Buffer[0] == 9); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Sat Nov 10 07:21:35 2007 @@ -22,6 +22,7 @@ #include "ntuser/NtUserCountClipboardFormats.c" #include "ntuser/NtUserFindExistingCursorIcon.c" #include "ntuser/NtUserRedrawWindow.c" +#include "ntuser/NtUserToUnicodeEx.c" /* The List of tests */ TESTENTRY TestList[] = @@ -48,7 +49,8 @@ /* ntuser */ { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, - { L"NtUserRedrawWindow", Test_NtUserRedrawWindow } + { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, + { L"NtUserToUnicodeEx", Test_NtUserToUnicodeEx } }; /* The function that gives us the number of tests */ Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Sat Nov 10 07:21:35 2007 @@ -59,7 +59,7 @@ int nCmdShow) { g_hInstance = hInstance; - GDIQUERYPROC GdiQueryHandleTable; + GDIQUERYPROC GdiQueryTable; printf("Win32k native API test\n"); @@ -73,12 +73,12 @@ return -1; } - GdiQueryHandleTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); - if(!GdiQueryHandleTable) + GdiQueryTable = (GDIQUERYPROC)GetProcAddress(GetModuleHandleW(L"GDI32.DLL"), "GdiQueryTable"); + if(!GdiQueryTable) { return -1; } - GdiHandleTable = GdiQueryHandleTable(); + GdiHandleTable = GdiQueryTable(); if(!GdiHandleTable) { return -1;

1 0

[tkreuzer] 30316: add VK_OEM_102 to us keyboard layout
by tkreuzer＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: tkreuzer Date: Sat Nov 10 06:44:31 2007 New Revision: 30316 URL: http://svn.reactos.org/svn/reactos?rev=30316&view=rev Log: add VK_OEM_102 to us keyboard layout Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.c Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.c (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.c Sat Nov 10 06:44:31 2007 @@ -81,7 +81,7 @@ VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, /* - 59 - */ VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ @@ -170,6 +170,7 @@ { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_OEM_102,0,{'\\','|', 0x1c /* FS */} }, { VK_RETURN,0, {'\r', '\r', '\n'} }, { 0,0 } };

1 0

[peterw] 30315: - Update the readmes and changelog a bit.
by peterw＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: peterw Date: Sat Nov 10 06:38:19 2007 New Revision: 30315 URL: http://svn.reactos.org/svn/reactos?rev=30315&view=rev Log: - Update the readmes and changelog a bit. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/README.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sat Nov 10 06:38:19 2007 @@ -40,13 +40,21 @@ - Fix the Case where you enable Logging and want to keep the default Path for it. (Daniel Reimer) - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) -- Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. +- Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. (Peter Ward) +- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' (Peter Ward) + instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can + also use part of the file name ie. 'ntdll*' instead of 'ntdll.dll' and + it will match it. Searchs the current directory and all sub-directories. + (does not match directories of course) + (yes you can still specify the full path if you like) +- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this (Peter Ward) + file can also be used outside of the RosBE to initialize and GCC/MinGW + in the current directory. - Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) - Added a minimal replacement for tee. (Peter Ward) - Added ccache 2.4 to RosBE. (Daniel Reimer) - Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) - Readd chdefdir due to popular Demand. (Daniel Reimer) -- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) - Move Options cmd and srcdir.txt to Application Data Folder. (Peter Ward) - Move Temp Files to Temp Folder. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/README.txt Sat Nov 10 06:38:19 2007 @@ -17,7 +17,7 @@ mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.05-win32 +nasm-0.99.06-win32 mingw-4.1.3-20071015-prerelease patched with: - GCC-v4.1-r129382-prerelease-w3seek.patch Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 06:38:19 2007 @@ -38,7 +38,7 @@ ;; MUI begin. ;; -;; Read our custom page ini, remove previous version and check if the user has administrative privileges. +;; Read our custom page ini, remove previous version. ;; Function .onInit Call UninstallPrevious

1 0

[peterw] 30314: - Remove the admin checks, no reason for them anymore.
by peterw＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: peterw Date: Sat Nov 10 05:55:45 2007 New Revision: 30314 URL: http://svn.reactos.org/svn/reactos?rev=30314&view=rev Log: - Remove the admin checks, no reason for them anymore. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 05:55:45 2007 @@ -34,7 +34,6 @@ !include "MUI2.nsh" !include "InstallOptions.nsh" !include "RosSourceDir.nsh" -!include "LogicLib.nsh" ;; MUI begin. @@ -42,7 +41,6 @@ ;; Read our custom page ini, remove previous version and check if the user has administrative privileges. ;; Function .onInit - Call CheckAdminOrCurrent Call UninstallPrevious !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" FunctionEnd @@ -258,7 +256,6 @@ FunctionEnd Function un.onInit - Call un.CheckAdminOrCurrent MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Are you sure you want to completely remove ReactOS Build Environment and all of its components?" \ IDYES +2 @@ -336,25 +333,3 @@ UninstallPrevious_yes: ExecWait '$R0 _?=$INSTDIR' FunctionEnd - -Function CheckAdminOrCurrent - userInfo::getAccountType - pop $R0 - ${If} $R0 == "Admin" - Return - ${else} - messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. You need to set a folder with writing rights to install your BE and Code to. NO Vista Support possible!" - Return - ${EndIf} -FunctionEnd - -Function un.CheckAdminOrCurrent - userInfo::getAccountType - pop $R0 - ${If} $R0 == "Admin" - Return - ${else} - Return - ${EndIf} -FunctionEnd

1 0

[peterw] 30313: - Switch to MUI2, have optional components selected by default and deactivate the license page for the time being.
by peterw＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: peterw Date: Sat Nov 10 05:24:43 2007 New Revision: 30313 URL: http://svn.reactos.org/svn/reactos?rev=30313&view=rev Log: - Switch to MUI2, have optional components selected by default and deactivate the license page for the time being. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 05:24:43 2007 @@ -31,7 +31,8 @@ CRCCheck force SetCompressor /FINAL /SOLID lzma -!include "MUI.nsh" +!include "MUI2.nsh" +!include "InstallOptions.nsh" !include "RosSourceDir.nsh" !include "LogicLib.nsh" @@ -43,7 +44,7 @@ Function .onInit Call CheckAdminOrCurrent Call UninstallPrevious - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" FunctionEnd ;; @@ -56,7 +57,7 @@ !define MUI_WELCOMEPAGE_TITLE_3LINES !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "Root\License.txt" +;!insertmacro MUI_PAGE_LICENSE "Root\License.txt" !insertmacro MUI_PAGE_DIRECTORY ;; @@ -93,7 +94,7 @@ ;; ;; Language and reserve files ;; -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English" ;; MUI end. @@ -130,7 +131,7 @@ File /r Components\4.1.3\*.* SectionEnd -Section /o "RosBE Configurator" SEC03 +Section "RosBE Configurator (options)" SEC03 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -146,7 +147,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "SVN Tools" SEC04 +Section "SVN Tools (ssvn)" SEC04 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -166,7 +167,7 @@ File /r Root\Tools\licenses\*.* SectionEnd -Section /o "Shortcut Tool" SEC05 +Section "Shortcut Tool (scut)" SEC05 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -176,14 +177,14 @@ File /r Root\Tools\scut.exe SectionEnd -Section /o "CCache" SEC06 +Section "CCache" SEC06 SetShellVarContext current SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try File /r Root\Tools\ccache.exe SectionEnd -Section /o "relAddr2Line Tool" SEC07 +Section "relAddr2Line Tool" SEC07 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -195,7 +196,7 @@ File /r Root\Tools\chkslash.exe SectionEnd -Section /o "Other Tools" SEC08 +Section "Other Tools (chdefdir, chdefgcc and config)" SEC08 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Sat Nov 10 05:24:43 2007 @@ -6,11 +6,11 @@ Function RosDir.show !insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later." - !insertmacro MUI_INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source" + !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" FunctionEnd Function RosDir.leave - !insertmacro MUI_INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir.ini" "Field 2" "State" + !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir.ini" "Field 2" "State" FunctionEnd !macroend

1 0

[peterw] 30312: - Fix a bug in renv.
by peterw＠svn.reactos.org 10 Nov '07

10 Nov '07

Author: peterw Date: Sat Nov 10 03:43:08 2007 New Revision: 30312 URL: http://svn.reactos.org/svn/reactos?rev=30312&view=rev Log: - Fix a bug in renv. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Sat Nov 10 03:43:08 2007 @@ -8,7 +8,7 @@ MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* -RENV = for /f "usebackq" %i in (`set _ROSBE_`) do @echo %i +RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* SVN = "%_ROSBE_BASEDIR%\Tools\svn.exe" $*

1 0

[peterw] 30311: - Center the title in the banner better.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Sat Nov 10 02:46:10 2007 New Revision: 30311 URL: http://svn.reactos.org/svn/reactos?rev=30311&view=rev Log: - Center the title in the banner better. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Nov 10 02:46:10 2007 @@ -107,7 +107,7 @@ :RosBE4 echo ******************************************************************************* echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION% * + echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo.

1 0

[peterw] 30310: - Only install the icon we require.
by peterw＠svn.reactos.org 09 Nov '07

09 Nov '07

Author: peterw Date: Sat Nov 10 02:33:19 2007 New Revision: 30310 URL: http://svn.reactos.org/svn/reactos?rev=30310&view=rev Log: - Only install the icon we require. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 02:33:19 2007 @@ -102,7 +102,7 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Icons\*.* + File /r Icons\rosbe.ico File /r Root\readme.pdf File /r Root\RosBE.mac File /r Root\changelog.txt

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
89
Older →

Jump to page:

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 2007