Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[jimtabor] 57088: [User32] - Patch by Alex Henrie : Correct dialog focus behavior. See wine bug http://bugs.winehq.org/show_bug.cgi?id=31386 and I hope someone noticed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 16 21:59:50 2012 New Revision: 57088 URL: http://svn.reactos.org/svn/reactos?rev=57088&view=rev Log: [User32] - Patch by Alex Henrie : Correct dialog focus behavior. See wine bug http://bugs.winehq.org/show_bug.cgi?id=31386 and I hope someone noticed. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Thu Aug 16 21:59:50 2012 @@ -751,9 +751,9 @@ * DEFDLG_SetFocus * * Set the focus to a control of the dialog, selecting the text if - * the control is an edit dialog. - */ -static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) + * the control is an edit dialog that has DLGC_HASSETSEL. + */ +static void DEFDLG_SetFocus( HWND hwndCtrl ) { if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); @@ -779,7 +779,7 @@ /*********************************************************************** * DEFDLG_RestoreFocus */ -static void DEFDLG_RestoreFocus( HWND hwnd ) +static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) { DIALOGINFO *infoPtr; @@ -788,12 +788,19 @@ /* Don't set the focus back to controls if EndDialog is already called.*/ if (infoPtr->flags & DF_END) return; if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + if (justActivate) return; /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + /* If there are no WS_TABSTOP controls, set focus to the first visible, + non-disabled control in the dialog */ + if (!infoPtr->hwndFocus) infoPtr->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + if (justActivate) + SetFocus( infoPtr->hwndFocus ); + else + DEFDLG_SetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -1229,12 +1236,12 @@ dwSetFlag = wParam ? DF_DIALOGACTIVE : 0; if (hwndparent != hwnd) NtUserSetThreadState(dwSetFlag, DF_DIALOGACTIVE); } - if (wParam) DEFDLG_RestoreFocus( hwnd ); + if (wParam) DEFDLG_RestoreFocus( hwnd, TRUE ); else DEFDLG_SaveFocus( hwnd ); return 0; case WM_SETFOCUS: - DEFDLG_RestoreFocus( hwnd ); + DEFDLG_RestoreFocus( hwnd, FALSE ); return 0; case DM_SETDEFID: @@ -1259,7 +1266,7 @@ HWND hwndDest = (HWND)wParam; if (!lParam) hwndDest = GetNextDlgTabItem(hwnd, GetFocus(), wParam); - if (hwndDest) DEFDLG_SetFocus( hwnd, hwndDest ); + if (hwndDest) DEFDLG_SetFocus( hwndDest ); DEFDLG_SetDefButton( hwnd, dlgInfo, hwndDest ); } return 0;

12 years, 4 months

[jimtabor] 57087: [User32|WineTest] - Patch by Alex Henrie: Correct dialog focus behavior.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 16 21:53:34 2012 New Revision: 57087 URL: http://svn.reactos.org/svn/reactos?rev=57087&view=rev Log: [User32|WineTest] - Patch by Alex Henrie: Correct dialog focus behavior. Modified: trunk/rostests/winetests/user32/dialog.c Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Thu Aug 16 21:53:34 2012 @@ -829,7 +829,7 @@ return "unknown handle"; } -static void test_initial_focus(void) +static void test_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG @@ -901,6 +901,8 @@ HRSRC hResource; HANDLE hTemplate; DLGTEMPLATE* pTemplate; + HWND hTextbox; + DWORD selectionStart = 0xdead, selectionEnd = 0xbeef; hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", RT_DIALOG); hTemplate = LoadResource(g_hinst, hResource); @@ -912,6 +914,20 @@ ok ((g_hwndInitialFocusT1 == 0), "Focus should not be set for an invisible DS_CONTROL dialog %p.\n", g_hwndInitialFocusT1); + + /* Also make sure that WM_SETFOCUS selects the textbox's text */ + hTextbox = GetDlgItem(hDlg, 200); + SendMessage(hTextbox, WM_SETTEXT, 0, (LPARAM)"Hello world"); + + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 11, "Text selection after WM_SETFOCUS is [%i, %i) expected [0, 11)\n", selectionStart, selectionEnd); + + /* but WM_ACTIVATE does not */ + SendMessage(hTextbox, EM_SETSEL, 0, 0); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 0, "Text selection after WM_ACTIVATE is [%i, %i) expected [0, 0)\n", selectionStart, selectionEnd); DestroyWindow(hDlg); } @@ -930,13 +946,25 @@ pTemplate = LockResource(hTemplate); hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); - g_hwndInitialFocusT1 = GetFocus(); + ok(hDlg != 0, "Failed to create test dialog.\n"); hLabel = GetDlgItem(hDlg, 200); - ok (hDlg != 0, "Failed to create test dialog.\n"); - - ok ((g_hwndInitialFocusT1 == hLabel), - "Focus should have been set to the first control, expected (%p) got (%p).\n", - hLabel, g_hwndInitialFocusT1); + + ok(GetFocus() == hLabel, "Focus not set to label, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + DestroyWindow(hDlg); + + /* Also check focus after WM_ACTIVATE and WM_SETFOCUS */ + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, NULL, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + hLabel = GetDlgItem(hDlg, 200); + + SetFocus(NULL); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + ok(GetFocus() == NULL, "Focus set on WM_ACTIVATE, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + SetFocus(NULL); + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + ok(GetFocus() == hLabel, "Focus not set to label on WM_SETFOCUS, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); DestroyWindow(hDlg); } @@ -1405,7 +1433,7 @@ test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); - test_initial_focus(); + test_focus(); test_GetDlgItem(); test_GetDlgItemText(); test_DialogBoxParamA();

12 years, 4 months

[akhaldi] 57086: [KERNEL32] * Fix a comment and a last error value. By Hermes Belusca. See issue #7240 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 16 15:39:40 2012 New Revision: 57086 URL: http://svn.reactos.org/svn/reactos?rev=57086&view=rev Log: [KERNEL32] * Fix a comment and a last error value. By Hermes Belusca. See issue #7240 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Aug 16 15:39:40 2012 @@ -2976,7 +2976,11 @@ IMAGE_SUBSYSTEM_WINDOWS_CUI != SectionImageInfo.SubSystemType) { DPRINT1("Invalid subsystem %d\n", SectionImageInfo.SubSystemType); - SetLastError(ERROR_BAD_EXE_FORMAT); + /* + * Despite the name of the error code suggests, it corresponds to the + * well-known "The %1 application cannot be run in Win32 mode" message. + */ + SetLastError(ERROR_CHILD_NOT_COMPLETE); goto Cleanup; } @@ -3269,7 +3273,7 @@ if (hSection) NtClose(hSection); if (hThread) { - /* We don't know any more details then this */ + /* We don't know any more details than this */ NtTerminateProcess(hProcess, STATUS_UNSUCCESSFUL); NtClose(hThread); }

12 years, 4 months

[gadamopoulos] 57085: [user32_apitest] - Deactivate Test_SimpleParameters in AttachThreadInput tests until it doesn't crash in win32k. - Add some more tests in Test_SimpleParameters that should bri...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Aug 16 08:43:43 2012 New Revision: 57085 URL: http://svn.reactos.org/svn/reactos?rev=57085&view=rev Log: [user32_apitest] - Deactivate Test_SimpleParameters in AttachThreadInput tests until it doesn't crash in win32k. - Add some more tests in Test_SimpleParameters that should bring win32k to its limits Modified: trunk/rostests/apitests/user32/AttachThreadInput.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Thu Aug 16 08:43:43 2012 @@ -328,6 +328,29 @@ ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); ok(ret==1, "expected AttachThreadInput to succeed\n"); } + + /* test detaching in thread cleanup */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + TerminateThread(data[1].hThread, 0); + + ret = AttachThreadInput( data[0].tid, data[1].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* Create Thread1 again */ + CreateTestThread(1, NULL); + } + } void Test_Focus() //Focus Active Capture Foreground Capture @@ -634,8 +657,9 @@ if(!InitThreads()) return; - Test_SimpleParameters(); - cleanup_attachments(); + win_skip("skip Test_SimpleParameters that crash ros\n"); + //Test_SimpleParameters(); + //cleanup_attachments(); Test_Focus(); cleanup_attachments(); Test_UnaffectedMessages();

12 years, 4 months

[gadamopoulos] 57084: [user32] - change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Aug 16 07:54:40 2012 New Revision: 57084 URL: http://svn.reactos.org/svn/reactos?rev=57084&view=rev Log: [user32] - change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Aug 16 07:54:40 2012 @@ -1262,7 +1262,7 @@ ULONG_PTR LowLimit; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Hit = 0, Data = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1326,7 +1326,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 1; + ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); } _SEH2_END; @@ -1375,7 +1375,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 2; + ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); } _SEH2_END; @@ -1397,18 +1397,6 @@ Exit: if (Hook) EndUserApiHook(); - if (Hit) - { - switch(Hit) - { - case 1: - ERR("CallWindowProcW Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - case 2: - ERR("CallWindowProcW Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - } - } return Result; } @@ -1426,7 +1414,7 @@ ULONG_PTR LowLimit; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Hit = 0, Data = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1480,7 +1468,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 1; + ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); } _SEH2_END; @@ -1534,7 +1522,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 2; + ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); } _SEH2_END; @@ -1561,18 +1549,6 @@ Exit: if (Hook) EndUserApiHook(); - if (Hit) - { - switch(Hit) - { - case 1: - ERR("CallWindowProcA Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - case 2: - ERR("CallWindowProcA Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - } - } return Result; }

12 years, 4 months

[gadamopoulos] 57083: [win32k] - Do not treat the release of the windows key as a hotkey if it was used as a modifier for another hotkey that was pressed - Now if I press win+R only the Run window ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Aug 16 07:32:49 2012 New Revision: 57083 URL: http://svn.reactos.org/svn/reactos?rev=57083&view=rev Log: [win32k] - Do not treat the release of the windows key as a hotkey if it was used as a modifier for another hotkey that was pressed - Now if I press win+R only the Run window opens Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Thu Aug 16 07:32:49 2012 @@ -25,6 +25,7 @@ HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; PHOT_KEY gphkFirst = &hkWinKey; +BOOL bWinHotkeyActive = FALSE; /* FUNCTIONS *****************************************************************/ @@ -140,40 +141,6 @@ } return NULL; -} - -/* - * SendSysCmdMsg - * - * Sends syscommand to specified window - */ -static -VOID NTAPI -SendSysCmdMsg(HWND hWnd, WPARAM Cmd, LPARAM lParam) -{ - PWND pWnd; - MSG Msg; - LARGE_INTEGER LargeTickCount; - - /* Get ptr to given window */ - pWnd = UserGetWindowObject(hWnd); - if (!pWnd) - { - WARN("Invalid window!\n"); - return; - } - - /* Prepare WM_SYSCOMMAND message */ - Msg.hwnd = hWnd; - Msg.message = WM_SYSCOMMAND; - Msg.wParam = Cmd; - Msg.lParam = lParam; - KeQueryTickCount(&LargeTickCount); - Msg.time = MsqCalculateMessageTime(&LargeTickCount); - Msg.pt = gpsi->ptCursor; - - /* Post message to window */ - MsqPostMessage(pWnd->head.pti->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); } /* @@ -206,21 +173,39 @@ /* WIN and F12 keys are hardcoded here. See: http://ivanlef0u.fr/repo/windoz/VI20051005.html */ if (pHotKey == &hkWinKey) - SendSysCmdMsg(InputWindowStation->ShellWindow, SC_TASKLIST, 0); + { + if(bWinHotkeyActive == TRUE) + { + UserPostMessage(InputWindowStation->ShellWindow, WM_SYSCOMMAND, SC_TASKLIST, 0); + bWinHotkeyActive = FALSE; + } + } else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12) { //co_ActivateDebugger(); // FIXME } else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) // FIXME: Those hotkeys doesn't depend on RegisterHotKey { - SendSysCmdMsg(pHotKey->hWnd, SC_HOTKEY, (LPARAM)pHotKey->hWnd); + UserPostMessage(pHotKey->hWnd, WM_SYSCOMMAND, SC_HOTKEY, (LPARAM)pHotKey->hWnd); } else { + /* If a hotkey with the WIN modifier was activated, do not treat the release of the WIN key as a hotkey*/ + if((pHotKey->fsModifiers & MOD_WIN) != 0) + bWinHotkeyActive = FALSE; + MsqPostHotKeyMessage(pHotKey->pThread, pHotKey->hWnd, (WPARAM)pHotKey->id, MAKELPARAM((WORD)fModifiers, wVk)); + } + } + else + { + if (pHotKey == &hkWinKey) + { + /* The user pressed the win key */ + bWinHotkeyActive = TRUE; } }

12 years, 4 months

[jimtabor] 57082: [NtUser] - Prevent a crash when Tcb.Win32Thread NULL.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 16 02:11:11 2012 New Revision: 57082 URL: http://svn.reactos.org/svn/reactos?rev=57082&view=rev Log: [NtUser] - Prevent a crash when Tcb.Win32Thread NULL. Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -490,9 +490,9 @@ } /* Free the message queue */ - if(ptiCurrent->MessageQueue) - { - MsqDestroyMessageQueue(ptiCurrent->MessageQueue); + if (ptiCurrent->MessageQueue) + { + MsqDestroyMessageQueue(ptiCurrent); } /* Find the THREADINFO in the PROCESSINFO's list */ Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -1902,15 +1902,14 @@ } VOID FASTCALL -MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) -{ +MsqCleanupMessageQueue(PTHREADINFO pti) +{ + PUSER_MESSAGE_QUEUE MessageQueue; PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; - PTHREADINFO pti; - - pti = MessageQueue->Thread->Tcb.Win32Thread; - + + MessageQueue = pti->MessageQueue; /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->PostedMessagesListHead)) @@ -2026,7 +2025,7 @@ } // Clear it all out. - if(pti->pcti) + if (pti->pcti) { pti->pcti->fsWakeBits = 0; pti->pcti->fsChangeBits = 0; @@ -2059,7 +2058,6 @@ UserDereferenceObject(pCursor); } - } PUSER_MESSAGE_QUEUE FASTCALL @@ -2090,9 +2088,10 @@ } VOID FASTCALL -MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) +MsqDestroyMessageQueue(PTHREADINFO pti) { PDESKTOP desk; + PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; MessageQueue->QF_flags |= QF_INDESTROY; @@ -2104,7 +2103,7 @@ } /* clean it up */ - MsqCleanupMessageQueue(MessageQueue); + MsqCleanupMessageQueue(pti); if (MessageQueue->NewMessagesHandle != NULL) ZwClose(MessageQueue->NewMessagesHandle); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -50,6 +50,7 @@ /* Reference counter, only access this variable with interlocked functions! */ LONG References; + PTHREADINFO ptiSysLock; /* Owner of the message queue */ struct _ETHREAD *Thread; /* Queue of messages sent to the queue. */ @@ -182,7 +183,7 @@ OUT MSG* pMsg); BOOLEAN FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(struct _ETHREAD *Thread); -VOID FASTCALL MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); +VOID FASTCALL MsqDestroyMessageQueue(PTHREADINFO); INIT_FUNCTION NTSTATUS NTAPI MsqInitializeImpl(VOID); BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); NTSTATUS FASTCALL

12 years, 4 months

[jimtabor] 57081: [NtUser] - Use window object instead of handle.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 15 23:31:30 2012 New Revision: 57081 URL: http://svn.reactos.org/svn/reactos?rev=57081&view=rev Log: [NtUser] - Use window object instead of handle. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -29,7 +29,7 @@ IntGetCaptureWindow(VOID) { PUSER_MESSAGE_QUEUE ForegroundQueue = IntGetFocusMessageQueue(); - return ForegroundQueue != NULL ? ForegroundQueue->CaptureWindow : 0; + return ( ForegroundQueue ? (ForegroundQueue->spwndCapture ? UserHMGetHandle(ForegroundQueue->spwndCapture) : 0) : 0); } HWND FASTCALL @@ -655,7 +655,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - RETURN( ThreadQueue ? ThreadQueue->CaptureWindow : 0); + RETURN( ThreadQueue ? (ThreadQueue->spwndCapture ? UserHMGetHandle(ThreadQueue->spwndCapture) : 0) : 0); CLEANUP: TRACE("Leave IntGetCapture, ret=%i\n",_ret_); @@ -705,7 +705,7 @@ ThreadQueue->QF_flags &= ~QF_CAPTURELOCKED; } - ThreadQueue->CaptureWindow = hWnd; + ThreadQueue->spwndCapture = Window; if (hWnd == NULL) // Release mode. { Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -454,7 +454,6 @@ ptiFrom->MessageQueue->spwndActive = ptiFrom->pqAttach->spwndActive; ptiFrom->MessageQueue->spwndFocus = ptiFrom->pqAttach->spwndFocus; ptiFrom->MessageQueue->CursorObject = ptiFrom->pqAttach->CursorObject; - ptiFrom->MessageQueue->CaptureWindow = ptiFrom->pqAttach->CaptureWindow; ptiFrom->MessageQueue->spwndCapture = ptiFrom->pqAttach->spwndCapture; ptiFrom->MessageQueue->QF_flags ^= ((ptiFrom->MessageQueue->QF_flags ^ ptiFrom->pqAttach->QF_flags) & QF_CAPTURELOCKED); ptiFrom->MessageQueue->CaretInfo = ptiFrom->pqAttach->CaretInfo; @@ -489,6 +488,7 @@ ptiFrom->MessageQueue->CursorObject = NULL; ptiFrom->MessageQueue->spwndActive = NULL; ptiFrom->MessageQueue->spwndFocus = NULL; + ptiFrom->MessageQueue->spwndCapture = NULL; ptiFrom->pqAttach = NULL; ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; } Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -360,7 +360,7 @@ SafeGui.hwndActive = MsgQueue->spwndActive ? UserHMGetHandle(MsgQueue->spwndActive) : 0; SafeGui.hwndFocus = MsgQueue->spwndFocus ? UserHMGetHandle(MsgQueue->spwndFocus) : 0; - SafeGui.hwndCapture = MsgQueue->CaptureWindow; + SafeGui.hwndCapture = MsgQueue->spwndCapture ? UserHMGetHandle(MsgQueue->spwndCapture) : 0; SafeGui.hwndMenuOwner = MsgQueue->MenuOwner; SafeGui.hwndMoveSize = MsgQueue->MoveSize; SafeGui.hwndCaret = CaretInfo->hWnd; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -1343,10 +1343,11 @@ pDesk = pwndDesktop->head.rpdesk; /* find the window to dispatch this mouse message to */ - if (MessageQueue->CaptureWindow) + if (MessageQueue->spwndCapture) { hittest = HTCLIENT; - pwndMsg = IntGetWindowObject(MessageQueue->CaptureWindow); + pwndMsg = MessageQueue->spwndCapture; + if (pwndMsg) UserReferenceObject(pwndMsg); } else { @@ -1521,7 +1522,7 @@ RETURN(FALSE); } - if ((*RemoveMessages == FALSE) || MessageQueue->CaptureWindow) + if ((*RemoveMessages == FALSE) || MessageQueue->spwndCapture) { /* Accept the message */ msg->message = message; @@ -2180,8 +2181,8 @@ switch(Type) { case MSQ_STATE_CAPTURE: - Prev = MessageQueue->CaptureWindow; - MessageQueue->CaptureWindow = hWnd; + Prev = MessageQueue->spwndCapture ? UserHMGetHandle(MessageQueue->spwndCapture) : 0; + MessageQueue->spwndCapture = UserGetWindowObject(hWnd); return Prev; case MSQ_STATE_ACTIVE: Prev = MessageQueue->spwndActive ? UserHMGetHandle(MessageQueue->spwndActive) : 0; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -75,7 +75,6 @@ /* Last time PeekMessage() was called. */ ULONG LastMsgRead; /* Current capture window for this queue. */ - HWND CaptureWindow; PWND spwndCapture; /* Current window with focus (ie. receives keyboard input) for this queue. */ PWND spwndFocus; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Aug 15 23:31:30 2012 @@ -2430,8 +2430,8 @@ Window->head.pti->MessageQueue->spwndFocus = NULL; if (Window->head.pti->MessageQueue->spwndActivePrev == Window) Window->head.pti->MessageQueue->spwndActivePrev = NULL; - if (Window->head.pti->MessageQueue->CaptureWindow == Window->head.h) - Window->head.pti->MessageQueue->CaptureWindow = NULL; + if (Window->head.pti->MessageQueue->spwndCapture == Window) + Window->head.pti->MessageQueue->spwndCapture = NULL; /* * Check if this window is the Shell's Desktop Window. If so set hShellWindow to NULL

12 years, 4 months

[fireball] 57080: [NTOS] - Hermes Belusca: Give pnp driver object a name. See issue #7241 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 15 22:29:11 2012 New Revision: 57080 URL: http://svn.reactos.org/svn/reactos?rev=57080&view=rev Log: [NTOS] - Hermes Belusca: Give pnp driver object a name. See issue #7241 for more details. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Wed Aug 15 22:29:11 2012 @@ -364,6 +364,7 @@ ULONG Disposition; HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle, ControlHandle; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); + UNICODE_STRING PnpManagerDriverName = RTL_CONSTANT_STRING(L"\\Driver\\PnpManager"); PDEVICE_OBJECT Pdo; /* Initialize locks and such */ @@ -468,7 +469,7 @@ } /* Create the root driver */ - Status = IoCreateDriver(NULL, PnpRootDriverEntry); + Status = IoCreateDriver(&PnpManagerDriverName, PnpRootDriverEntry); if (!NT_SUCCESS(Status)) { DPRINT1("IoCreateDriverObject() failed\n");

12 years, 4 months

[gadamopoulos] 57079: [user32_apitest] - Hack around the fact that desktop handling in ros is awful. Now the child threads use the proper desktop. - Convert all calls to SendMessage to SendMessageT...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Aug 15 19:37:29 2012 New Revision: 57079 URL: http://svn.reactos.org/svn/reactos?rev=57079&view=rev Log: [user32_apitest] - Hack around the fact that desktop handling in ros is awful. Now the child threads use the proper desktop. - Convert all calls to SendMessage to SendMessageTimeout to make sure it won't hang (it doesn't hang in windows but who knows what can happen in ros) - Add a few more tests Modified: trunk/rostests/apitests/user32/AttachThreadInput.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Wed Aug 15 19:37:29 2012 @@ -26,7 +26,7 @@ } THREAD_DATA; DWORD tidMouseMove; -THREAD_DATA data[5]; +THREAD_DATA data[6]; HHOOK hMouseHookLL = NULL; HHOOK hKbdHookLL = NULL; @@ -66,6 +66,7 @@ static void FlushMessages() { MSG msg; + LRESULT res; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) { @@ -76,10 +77,14 @@ } /* Use SendMessage to sync with the other queues */ - SendMessage(data[1].hWnd, WM_APP, 0,0); - SendMessage(data[2].hWnd, WM_APP, 0,0); - SendMessage(data[3].hWnd, WM_APP, 0,0); - SendMessage(data[4].hWnd, WM_APP, 0,0); + res = SendMessageTimeout(data[1].hWnd, WM_APP, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); + res = SendMessageTimeout(data[2].hWnd, WM_APP, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); + res = SendMessageTimeout(data[3].hWnd, WM_APP, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); + res = SendMessageTimeout(data[4].hWnd, WM_APP, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); } static DWORD WINAPI thread_proc(void *param) @@ -93,7 +98,6 @@ { hdesk = CreateDesktopW(current_data->Desktop, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); SetThreadDesktop(hdesk); - ok(GetThreadDesktop(current_data->tid) == hdesk, "Thread in wrong desktop. Following results may be bogus!\n"); } /* create test window */ @@ -196,6 +200,9 @@ /* create thread2(same desktop) */ if(!CreateTestThread(2, NULL)) return FALSE; + /* ugly ros hack to bypass desktop crapiness */ + if(!CreateTestThread(6, L"ThreadTestDesktop")) return FALSE; + /* create thread3(different desktop) */ if(!CreateTestThread(3, L"ThreadTestDesktop")) return FALSE; @@ -203,6 +210,21 @@ if(!CreateTestThread(4, L"ThreadTestDesktop")) return FALSE; return TRUE; +} + +static void cleanup_attachments() +{ + int i,j; + BOOL ret; + + for(i = 0; i< 4; i++); + { + for(j = 0; j< 4; j++); + { + ret = AttachThreadInput(data[i].tid,data[j].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + } + } } @@ -228,10 +250,14 @@ /* try to attach to a thread on another desktop*/ ret = AttachThreadInput( data[2].tid,data[3].tid, TRUE); ok(ret==0, "expected AttachThreadInput to fail\n"); + if(ret == 1 ) + AttachThreadInput( data[2].tid,data[3].tid, FALSE); /* test other desktop to this */ ret = AttachThreadInput( data[3].tid,data[2].tid, TRUE); ok(ret==0, "expected AttachThreadInput to fail\n"); + if(ret == 1 ) + AttachThreadInput( data[3].tid,data[2].tid, FALSE); /* attach two threads that are both in ThreadTestDesktop */ { @@ -253,21 +279,29 @@ ret = AttachThreadInput( data[1].tid,data[2].tid, TRUE); ok(ret==1, "expected AttachThreadInput to succeed\n"); + /* attach in the opposite order */ + ret = AttachThreadInput( data[2].tid,data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + /* Now try to detach 0 from 1 */ ret = AttachThreadInput( data[0].tid,data[1].tid, FALSE); ok(ret==0, "expected AttachThreadInput to fail\n"); /* also try to detach 3 from 2 */ - ret = AttachThreadInput( data[2].tid,data[1].tid, FALSE); + ret = AttachThreadInput( data[3].tid,data[2].tid, FALSE); ok(ret==0, "expected AttachThreadInput to fail\n"); /* cleanup previous attachment */ ret = AttachThreadInput( data[1].tid,data[2].tid, FALSE); ok(ret==1, "expected AttachThreadInput to succeed\n"); - } - - /*too bad this causes a crash in win32k */ -#if 0 + + ret = AttachThreadInput( data[2].tid,data[1].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + ret = AttachThreadInput( data[1].tid,data[2].tid, FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + /* test triple attach */ { ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); @@ -294,7 +328,6 @@ ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); ok(ret==1, "expected AttachThreadInput to succeed\n"); } -#endif } void Test_Focus() //Focus Active Capture Foreground Capture @@ -408,6 +441,7 @@ void Test_UnaffectedMessages() { BOOL ret; + LRESULT res; EMPTY_CACHE_(&data[0].cache); EMPTY_CACHE_(&data[1].cache); @@ -444,8 +478,10 @@ } /* test messages send to the wrong thread */ - SendMessage(data[0].hWnd, WM_USER, 0,0); - SendMessage(data[1].hWnd, WM_USER, 1,0); + res = SendMessageTimeout(data[0].hWnd, WM_USER, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); + res = SendMessageTimeout(data[1].hWnd, WM_USER, 1,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); { MSG_ENTRY Thread0_chain[]={ @@ -461,11 +497,14 @@ ret = AttachThreadInput( data[2].tid, data[1].tid , TRUE); ok(ret==1, "expected AttachThreadInput to succeed\n"); - SendMessage(data[0].hWnd, WM_USER, 2,0); - SendMessage(data[1].hWnd, WM_USER, 3,0); + res = SendMessageTimeout(data[0].hWnd, WM_USER, 2,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); + res = SendMessageTimeout(data[1].hWnd, WM_USER, 3,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); /* Try to send a fake input message */ - SendMessage(data[1].hWnd, WM_MOUSEMOVE, 0,0); + res = SendMessageTimeout(data[1].hWnd, WM_MOUSEMOVE, 0,0, SMTO_NORMAL, 1000, NULL); + ok (res != ERROR_TIMEOUT, "SendMessageTimeout timed out\n"); COMPARE_CACHE_(&data[0].cache, Thread0_chain); COMPARE_CACHE_(&data[1].cache, Thread1_chain); @@ -596,9 +635,13 @@ return; Test_SimpleParameters(); + cleanup_attachments(); Test_Focus(); + cleanup_attachments(); Test_UnaffectedMessages(); + cleanup_attachments(); Test_SendInput(); + cleanup_attachments(); if(hMouseHookLL) UnhookWindowsHookEx(hMouseHookLL);

12 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
20
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 August 2012