Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[ekohl] 51313: [NETAPI32] NetUserModalsGet failed if the domain SID returned by LsaQueryInformationPolicy was NULL. Handle the NULL SID case correctly. See issue #6102 for more details.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Apr 10 15:42:55 2011 New Revision: 51313 URL: http://svn.reactos.org/svn/reactos?rev=51313&view=rev Log: [NETAPI32] NetUserModalsGet failed if the domain SID returned by LsaQueryInformationPolicy was NULL. Handle the NULL SID case correctly. See issue #6102 for more details. Modified: trunk/reactos/dll/win32/netapi32/access.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sun Apr 10 15:42:55 2011 @@ -793,7 +793,7 @@ PPOLICY_ACCOUNT_DOMAIN_INFO domainInfo; NTSTATUS ntStatus; PSID domainIdentifier = NULL; - int domainNameLen; + int domainNameLen, domainIdLen; ZeroMemory(&objectAttributes, sizeof(objectAttributes)); objectAttributes.Length = sizeof(objectAttributes); @@ -820,11 +820,12 @@ } domainIdentifier = domainInfo->DomainSid; + domainIdLen = (domainIdentifier) ? GetLengthSid(domainIdentifier) : 0; domainNameLen = lstrlenW(domainInfo->DomainName.Buffer) + 1; LsaClose(policyHandle); ntStatus = NetApiBufferAllocate(sizeof(USER_MODALS_INFO_2) + - GetLengthSid(domainIdentifier) + + domainIdLen + domainNameLen * sizeof(WCHAR), (LPVOID *)pbuffer); @@ -836,15 +837,16 @@ } umi = (USER_MODALS_INFO_2 *) *pbuffer; - umi->usrmod2_domain_id = *pbuffer + sizeof(USER_MODALS_INFO_2); + umi->usrmod2_domain_id = (domainIdLen > 0) ? (*pbuffer + sizeof(USER_MODALS_INFO_2)) : NULL; umi->usrmod2_domain_name = (LPWSTR)(*pbuffer + - sizeof(USER_MODALS_INFO_2) + GetLengthSid(domainIdentifier)); + sizeof(USER_MODALS_INFO_2) + domainIdLen); lstrcpynW(umi->usrmod2_domain_name, domainInfo->DomainName.Buffer, domainNameLen); - CopySid(GetLengthSid(domainIdentifier), umi->usrmod2_domain_id, - domainIdentifier); + if (domainIdLen > 0) + CopySid(GetLengthSid(domainIdentifier), umi->usrmod2_domain_id, + domainIdentifier); LsaFreeMemory(domainInfo);

13 years, 8 months

[gadamopoulos] 51312: [user32_apitest] - Add some more tests for SetCursorPos

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Apr 10 15:14:15 2011 New Revision: 51312 URL: http://svn.reactos.org/svn/reactos?rev=51312&view=rev Log: [user32_apitest] - Add some more tests for SetCursorPos Modified: trunk/rostests/apitests/user32/SetCursorPos.c Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Sun Apr 10 15:14:15 2011 @@ -10,29 +10,153 @@ #include <windows.h> #include <assert.h> -HHOOK hMouseHook; -int hook_calls = 0; +HHOOK hMouseHookLL, hMouseHook; -LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam) +struct _test_info { - hook_calls++; + int ll_hook_called; + int hook_called; + int mouse_move_called; +}; + +struct _test_info info[] = { {0,0,0}, /* SetCursorPos without a window */ + {1,2,0}, /* mouse_event without a window */ + {0,1,1}, /* SetCursorPos with a window */ + {1,1,1}, /* mouse_event with a window */ + {0,1,1}, /* multiple SetCursorPos with a window with coalescing */ + {0,2,2}, /* multiple SetCursorPos with a window without coalescing */ + {2,1,1}, /* multiple mouse_event with a window with coalescing */ + {2,2,2}, /* multiple mouse_event with a window without coalescing */ + }; + +struct _test_info results[8]; +int test_no = 0; + + +LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + results[test_no].ll_hook_called++; + return CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); +} + +LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + results[test_no].hook_called++; return CallNextHookEx(hMouseHook, nCode, wParam, lParam); +} + +static LRESULT CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + if(msg == WM_MOUSEMOVE) + results[test_no].mouse_move_called++; + + return DefWindowProcA( hWnd, msg, wParam, lParam ); +} + +static HWND CreateTestWindow() +{ + MSG msg; + WNDCLASSA wclass; + HANDLE hInstance = GetModuleHandleA( NULL ); + HWND hWndTest; + + wclass.lpszClassName = "MouseInputTestClass"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = WndProc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + RegisterClassA( &wclass ); + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowA( wclass.lpszClassName, "MouseInputTestTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + assert( hWndTest ); + ShowWindow( hWndTest, SW_SHOWMAXIMIZED); + SetWindowPos( hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); + SetForegroundWindow( hWndTest ); + UpdateWindow( hWndTest); + SetFocus(hWndTest); + + /* flush pending messages */ + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + return hWndTest; } void Test_SetCursorPos() { - hMouseHook = SetWindowsHookEx(WH_MOUSE_LL, LowLevelMouseProc, GetModuleHandleA( NULL ), 0); - ok(hMouseHook!=NULL,"failed to set hook\n"); - - /* try SetCursorPos */ - SetCursorPos(0,0); - ok (hook_calls == 0, "hooks shouldn't be called\n"); - - /* try mouse_event with MOUSEEVENTF_MOVE*/ - mouse_event(MOUSEEVENTF_MOVE, 100,100, 0,0); - ok (hook_calls == 1, "hooks should have been called\n"); - - UnhookWindowsHookEx (hMouseHook); + HWND hwnd; + MSG msg; + int i; + + memset(results, sizeof(results), 0); + + hMouseHookLL = SetWindowsHookEx(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleA( NULL ), 0); + hMouseHook = SetWindowsHookEx(WH_MOUSE, MouseHookProc, GetModuleHandleA( NULL ), 0); + ok(hMouseHook!=NULL,"failed to set hook\n"); + ok(hMouseHookLL!=NULL,"failed to set hook\n"); + + test_no = 0; + SetCursorPos(1,1); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 1; + mouse_event(MOUSEEVENTF_MOVE, 2,2, 0,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + hwnd = CreateTestWindow(); + SetCapture(hwnd); + + test_no = 2; + SetCursorPos(50,50); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 3; + mouse_event(MOUSEEVENTF_MOVE, 100,100, 0,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 4; + SetCursorPos(50,50); + SetCursorPos(60,60); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 5; + SetCursorPos(50,50); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + SetCursorPos(60,60); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 6; + mouse_event(MOUSEEVENTF_MOVE, 50,50, 0,0); + mouse_event(MOUSEEVENTF_MOVE, 60,60, 0,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + test_no = 7; + mouse_event(MOUSEEVENTF_MOVE, 50,50, 0,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + mouse_event(MOUSEEVENTF_MOVE, 60,60, 0,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + for(i = 0; i< 8; i++) + { +#define TEST(s,x,y) ok(y == x, "%d: %s called %d times instead of %d\n",i,s, y,x); + TEST("WH_MOUSE_LL", info[i].ll_hook_called, results[i].ll_hook_called); + /* WH_MOUSE results vary greatly among windows versions */ + //TEST("WH_MOUSE", info[i].hook_called, results[i].hook_called); + TEST("WM_MOUSEMOVE", info[i].mouse_move_called, results[i].mouse_move_called); + } + + SetCapture(NULL); + DestroyWindow(hwnd); + + UnhookWindowsHookEx (hMouseHook); + UnhookWindowsHookEx (hMouseHookLL); + } START_TEST(SetCursorPos)

13 years, 8 months

[osiejka] 51311: Fix build. The translation patch was outdated.

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Apr 10 14:55:11 2011 New Revision: 51311 URL: http://svn.reactos.org/svn/reactos?rev=51311&view=rev Log: Fix build. The translation patch was outdated. Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] Sun Apr 10 14:55:11 2011 @@ -51,27 +51,13 @@ IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 LTEXT "Vyváení", -1, 4, 35, 80, 42 LTEXT "Hlasitost", -1, 4, 100, 77, 108 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX - CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 -} - -IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 -STYLE WS_POPUP | WS_BORDER -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 - CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balance", -1, 4, 35, 80, 42 - LTEXT "Volume", -1, 4, 100, 77, 108 - CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 - CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END

13 years, 8 months

[mkupfer] 51310: Radek Liska <radekliska AT gmail DOT com> - Czech translations for sndrec32 and sndvol32. - See issue #6098 for details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Apr 10 13:19:01 2011 New Revision: 51310 URL: http://svn.reactos.org/svn/reactos?rev=51310&view=rev Log: Radek Liska <radekliska AT gmail DOT com> - Czech translations for sndrec32 and sndvol32. - See issue #6098 for details. Added: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc Added: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] Sun Apr 10 13:19:01 2011 @@ -1,0 +1,59 @@ +/* FILE: applications/sndrec32/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2011-04-09 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Záznam zvuku" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + LTEXT "ReactOS Záznam zvuku, verze 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 + DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "Soubor" + BEGIN + MENUITEM "Nový", ID_NEW + MENUITEM "Otevøít...", ID_FILE_OPEN + MENUITEM "Uloit", ID_FILE_SAVE, GRAYED + MENUITEM "Uloit jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Konec", ID_EXIT + END + MENUITEM "todo1", 0 + MENUITEM "todo2", 0 + POPUP "?" + BEGIN + MENUITEM "O programu...", ID__ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Záznam zvuku" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END + +STRINGTABLE +BEGIN + IDS_STRPOS "Pozice: %.2f s" + IDS_STRDUR "Délka: %.2f s" + IDS_STRBUF "Buffer: %.2f kb" + IDS_STRFMT "%.1f kHz %u bitù" + IDS_STRMONO "mono" + IDS_STRSTEREO "stereo" + IDS_STRCHAN "%s" +END Propchange: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Sun Apr 10 13:19:01 2011 @@ -16,6 +16,7 @@ IDB_BITMAP2_START_DIS BITMAP "resources/but_start_dis.bmp" IDB_BITMAP2_STOP_DIS BITMAP "resources/but_stop_dis.bmp" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] Sun Apr 10 13:19:01 2011 @@ -1,7 +1,7 @@ /* FILE: applications/sndvol32/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * THANKS TO: Denzil, who translated major part of this file - * UPDATED: 2010-05-25 + * UPDATED: 2011-04-09 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -51,6 +51,20 @@ IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" +{ + LTEXT "Celková hlasitost", IDC_LINE_NAME, 4, 7, 100, 15 + CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 + LTEXT "Vyváení", -1, 4, 35, 80, 42 + LTEXT "Hlasitost", -1, 4, 100, 77, 108 + CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 + CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 + CHECKBOX "&Ztlumit", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 +} + +IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 +STYLE WS_POPUP | WS_BORDER +FONT 8, "MS Shell Dlg" BEGIN LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1

13 years, 8 months

[janderwald] 51309: [SHELL32] - Fix control style of property dialogs - Patch Edijs Kolesnikovics, terminedijs@yahoo.com, irc:Edijus

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 10 10:44:05 2011 New Revision: 51309 URL: http://svn.reactos.org/svn/reactos?rev=51309&view=rev Log: [SHELL32] - Fix control style of property dialogs - Patch Edijs Kolesnikovics, terminedijs(a)yahoo.com, irc:Edijus Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…

13 years, 8 months

[osiejka] 51308: [WIN32CSR] Polish translation of Command prompt window title

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Apr 10 08:49:31 2011 New Revision: 51308 URL: http://svn.reactos.org/svn/reactos?rev=51308&view=rev Log: [WIN32CSR] Polish translation of Command prompt window title Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] Sun Apr 10 08:49:31 2011 @@ -2,6 +2,7 @@ * translated by xrogers (http://rogers.cyberdusk.pl/) * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl +* translation update by Olaf Siejka (Caemyr), Apr 2011 */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -59,5 +60,5 @@ IDS_SCROLLUP "Przewiñ do góry" IDS_SCROLLDOWN "Przewiñ na dó³" - IDS_COMMAND_PROMPT "Command Prompt" + IDS_COMMAND_PROMPT "Wiersz polecenia" END

13 years, 8 months

[akhaldi] 51307: [DOSKEY/SNDREC32] - Activate polish translations. Patch by Adam Stachowicz.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 9 21:02:25 2011 New Revision: 51307 URL: http://svn.reactos.org/svn/reactos?rev=51307&view=rev Log: [DOSKEY/SNDREC32] - Activate polish translations. Patch by Adam Stachowicz. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/sndrec32/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Sat Apr 9 21:02:25 2011 @@ -9,4 +9,5 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/pl-PL.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Sat Apr 9 21:02:25 2011 @@ -21,6 +21,7 @@ #include "lang/es-ES.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

13 years, 8 months

[jimtabor] 51306: - Fix build

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 9 20:41:04 2011 New Revision: 51306 URL: http://svn.reactos.org/svn/reactos?rev=51306&view=rev Log: - Fix build Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Apr 9 20:41:04 2011 @@ -2575,7 +2575,7 @@ msg.wParam = IntGetSysCursorInfo()->ButtonsDown; msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; - co_MsqInsertMouseMessage(&msg, 0, 0); + co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); if (!IntIsWindow(Window->head.h)) {

13 years, 8 months

[jimtabor] 51305: [Win32k] - Revert parts of 51283, thanks to Giannis for setting me straight on SetCursorPos and without breaking setting the Track window for TrackMouseEvent. Pass the new SetCurs...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 9 20:32:52 2011 New Revision: 51305 URL: http://svn.reactos.org/svn/reactos?rev=51305&view=rev Log: [Win32k] - Revert parts of 51283, thanks to Giannis for setting me straight on SetCursorPos and without breaking setting the Track window for TrackMouseEvent. Pass the new SetCursorPos, and wine test_TrackMouseEvent and input test_mouse_ll_hook tests. Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -69,7 +69,7 @@ INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); -BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo); +BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); int UserShowCursor(BOOL bShow); Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -245,7 +245,7 @@ VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL -co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo); +co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -159,7 +159,7 @@ return OldCursor; } -BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo) +BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook) { PWND DesktopWindow; PSYSTEM_CURSORINFO CurInfo; @@ -194,12 +194,12 @@ pt.x = x; pt.y = y; - /* 3. Generate a mouse move message, this sets the htEx. */ + /* 3. Generate a mouse move message, this sets the htEx and Track Window too. */ Msg.message = WM_MOUSEMOVE; Msg.wParam = CurInfo->ButtonsDown; Msg.lParam = MAKELPARAM(x, y); Msg.pt = pt; - co_MsqInsertMouseMessage(&Msg, flags, dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, flags, dwExtraInfo, Hook); /* 1. Store the new cursor position */ gpsi->ptCursor = pt; @@ -677,7 +677,7 @@ { CurInfo->bClipped = TRUE; RECTL_bIntersectRect(&CurInfo->rcClip, prcl, &DesktopWindow->rcWindow); - UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y, 0, 0); + UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y, 0, 0, FALSE); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -1046,7 +1046,7 @@ ObDereferenceObject(Hook->Thread); } - if ( Global && !pti->sphkCurrent) + if ( Global ) { PTHREADINFO ptiHook; @@ -1061,7 +1061,6 @@ * hook ID, this will have to post to each of the thread message queues * or make a direct call. */ - pti->sphkCurrent = Hook; // Prevent recursion within this thread. do { /* Hook->Thread is null, we hax around this with Hook->head.pti. */ @@ -1109,7 +1108,6 @@ } while ( Hook ); DPRINT("Ret: Global HookId %d Result 0x%x\n", HookId,Result); - pti->sphkCurrent = NULL; } Exit: return Result; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -1138,7 +1138,7 @@ if(mi->dwFlags & MOUSEEVENTF_MOVE) { - UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo); + UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo, TRUE); } if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { @@ -1146,7 +1146,7 @@ Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { @@ -1154,7 +1154,7 @@ Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { @@ -1162,7 +1162,7 @@ Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { @@ -1170,7 +1170,7 @@ Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { @@ -1178,7 +1178,7 @@ Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { @@ -1186,7 +1186,7 @@ Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && @@ -1204,14 +1204,14 @@ gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } } else if(mi->dwFlags & MOUSEEVENTF_XUP) @@ -1222,21 +1222,21 @@ gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } } if(mi->dwFlags & MOUSEEVENTF_WHEEL) { Msg.message = WM_MOUSEWHEEL; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -291,7 +291,7 @@ } VOID FASTCALL -co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo) +co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook) { LARGE_INTEGER LargeTickCount; MSLLHOOKSTRUCT MouseHookData; @@ -326,8 +326,11 @@ MouseHookData.dwExtraInfo = dwExtraInfo; /* If the hook procedure returned non zero, dont send the message */ - if (co_HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, Msg->message, (LPARAM) &MouseHookData)) - return; + if (Hook) + { + if (co_HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, Msg->message, (LPARAM) &MouseHookData)) + return; + } /* Get the desktop window */ pwndDesktop = UserGetDesktopWindow(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Apr 9 20:32:52 2011 @@ -473,7 +473,7 @@ RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_SETCURSORPOS: - RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2, 0, 0)); + RETURN( (DWORD_PTR)UserSetCursorPos((int)Param1, (int)Param2, 0, 0, FALSE)); case TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK: RETURN( IntUnhookWindowsHook((int)Param1, (HOOKPROC)Param2));

13 years, 8 months

[gadamopoulos] 51304: add some tests for GetKeyState and SetCursorPos

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Apr 9 19:12:49 2011 New Revision: 51304 URL: http://svn.reactos.org/svn/reactos?rev=51304&view=rev Log: add some tests for GetKeyState and SetCursorPos Added: trunk/rostests/apitests/user32/GetKeyState.c (with props) trunk/rostests/apitests/user32/SetCursorPos.c (with props) Modified: trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Added: trunk/rostests/apitests/user32/GetKeyState.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetKeySta… ============================================================================== --- trunk/rostests/apitests/user32/GetKeyState.c (added) +++ trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] Sat Apr 9 19:12:49 2011 @@ -1,0 +1,127 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetKeyState + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include <assert.h> + +HHOOK hKbdHook, hKbdLLHook; + + +LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) +{ + BOOL pressed = !(lParam & (1<<31)); + BOOL altPressed = lParam & (1<<29); + + if(pressed) + { + ok(altPressed,"\n"); + ok((GetKeyState(VK_MENU) & 0x8000), "Alt should not be pressed\n"); + } + else + { + ok(!altPressed,"\n"); + ok(!(GetKeyState(VK_MENU) & 0x8000), "Alt should be pressed\n"); + } + + return CallNextHookEx(hKbdHook, code, wParam, lParam); +} + +LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + PKBDLLHOOKSTRUCT pLLHook = (PKBDLLHOOKSTRUCT)lParam; + + if(wParam == WM_SYSKEYDOWN) + { + ok(pLLHook->flags & LLKHF_ALTDOWN,"Didn't get LLKHF_ALTDOWN flag\n"); + ok((GetAsyncKeyState (VK_MENU) & 0x8000), "Alt should not be pressed in global kbd status\n"); + ok(!(GetKeyState(VK_MENU) & 0x8000), "Alt should not be pressed in queue state\n"); + } + else if(wParam == WM_SYSKEYUP) + { + ok(!(pLLHook->flags & LLKHF_ALTDOWN),"got LLKHF_ALTDOWN flag\n"); + ok(!(GetAsyncKeyState (VK_MENU) & 0x8000), "Alt should not be pressed in global kbd status\n"); + ok((GetKeyState(VK_MENU) & 0x8000), "Alt should be pressed in queue state\n"); + } + + return CallNextHookEx(hKbdLLHook, nCode, wParam, lParam); +} + +static LRESULT CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return DefWindowProcA( hWnd, msg, wParam, lParam ); +} + +static HWND CreateTestWindow() +{ + MSG msg; + WNDCLASSA wclass; + HANDLE hInstance = GetModuleHandleA( NULL ); + HWND hWndTest; + + wclass.lpszClassName = "InputSysKeyTestClass"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = WndProc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + RegisterClassA( &wclass ); + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowA( wclass.lpszClassName, "InputSysKeyTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + assert( hWndTest ); + ShowWindow( hWndTest, SW_SHOW); + SetWindowPos( hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); + SetForegroundWindow( hWndTest ); + UpdateWindow( hWndTest); + + /* flush pending messages */ + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + return hWndTest; +} + +void Test_GetKeyState() +{ + HWND hwnd; + MSG msg; + + hwnd = CreateTestWindow(); + + hKbdHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, GetModuleHandleA( NULL ), 0); + hKbdLLHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, GetModuleHandleA( NULL ), 0); + + ok(hKbdHook!=NULL," \n"); + ok(hKbdLLHook!=NULL," \n"); + + keybd_event(VK_MENU, 0, 0,0); + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP,0); + + //fixme this hangs the test + //while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessageA( &msg ); + + DestroyWindow(hwnd); + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + + UnhookWindowsHookEx (hKbdHook); + UnhookWindowsHookEx (hKbdLLHook); +} + +START_TEST(GetKeyState) +{ + Test_GetKeyState(); +} Propchange: trunk/rostests/apitests/user32/GetKeyState.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c (added) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Sat Apr 9 19:12:49 2011 @@ -1,0 +1,41 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetCursorPos + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include <assert.h> + +HHOOK hMouseHook; +int hook_calls = 0; + +LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + hook_calls++; + return CallNextHookEx(hMouseHook, nCode, wParam, lParam); +} + +void Test_SetCursorPos() +{ + hMouseHook = SetWindowsHookEx(WH_MOUSE_LL, LowLevelMouseProc, GetModuleHandleA( NULL ), 0); + ok(hMouseHook!=NULL,"failed to set hook\n"); + + /* try SetCursorPos */ + SetCursorPos(0,0); + ok (hook_calls == 0, "hooks shouldn't be called\n"); + + /* try mouse_event with MOUSEEVENTF_MOVE*/ + mouse_event(MOUSEEVENTF_MOVE, 100,100, 0,0); + ok (hook_calls == 1, "hooks should have been called\n"); + + UnhookWindowsHookEx (hMouseHook); +} + +START_TEST(SetCursorPos) +{ + Test_SetCursorPos(); +} Propchange: trunk/rostests/apitests/user32/SetCursorPos.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sat Apr 9 19:12:49 2011 @@ -13,6 +13,8 @@ extern void func_GetIconInfo(void); extern void func_GetPeekMessage(void); extern void func_DeferWindowPos(void); +extern void func_GetKeyState(void); +extern void func_SetCursorPos(void); const struct test winetest_testlist[] = { @@ -24,7 +26,8 @@ { "GetIconInfo", func_GetIconInfo }, { "GetPeekMessage", func_GetPeekMessage }, { "DeferWindowPos", func_DeferWindowPos }, - + { "GetKeyState", func_GetKeyState }, + { "SetCursorPos", func_SetCursorPos }, { 0, 0 } }; Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Sat Apr 9 19:12:49 2011 @@ -10,6 +10,7 @@ <file>testlist.c</file> <file>user32_apitest.rc</file> + <file>GetKeyState.c</file> <file>InitializeLpkHooks.c</file> <file>RealGetWindowClass.c</file> <file>ScrollDC.c</file> @@ -18,6 +19,7 @@ <file>GetIconInfo.c</file> <file>GetPeekMessage.c</file> <file>DeferWindowPos.c</file> + <file>SetCursorPos.c</file> </module> </group>

13 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011