Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[jimtabor] 66237: [NtUser] - Reorder Destroy and Free window, getting close to how wine does it. Still more work is needed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 12 21:28:39 2015 New Revision: 66237 URL: http://svn.reactos.org/svn/reactos?rev=66237&view=rev Log: [NtUser] - Reorder Destroy and Free window, getting close to how wine does it. Still more work is needed. Modified: trunk/reactos/win32ss/user/ntuser/window.c 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] Thu Feb 12 21:28:39 2015 @@ -367,36 +367,30 @@ */ static void IntSendDestroyMsg(HWND hWnd) { - + PTHREADINFO ti; PWND Window; -#if 0 /* FIXME */ - - GUITHREADINFO info; - - if (GetGUIThreadInfo(GetCurrentThreadId(), &info)) - { - if (hWnd == info.hwndCaret) - { - DestroyCaret(); - } - } -#endif - + + ti = PsGetCurrentThreadWin32Thread(); Window = UserGetWindowObject(hWnd); + if (Window) { -// USER_REFERENCE_ENTRY Ref; -// UserRefObjectCo(Window, &Ref); - - if (!Window->spwndOwner && !IntGetParent(Window)) - { - co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); - } - -// UserDerefObjectCo(Window); - } - - /* The window could already be destroyed here */ + /* Look whether the focus is within the tree of windows we will + * be destroying. + */ + // Rule #1 + if ( ti->MessageQueue->spwndActive == Window || + (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) + { + co_WinPosActivateOtherWindow(Window); + } + + if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) + { + co_IntDestroyCaret(ti); + } + + } /* * Send the WM_DESTROY to the window. @@ -485,7 +479,6 @@ Window->style &= ~WS_VISIBLE; Window->head.pti->cVisWindows--; - IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still @@ -494,7 +487,7 @@ BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); - IntDeRegisterShellHookWindow(Window->head.h); + IntDeRegisterShellHookWindow(UserHMGetHandle(Window)); /* free child windows */ Children = IntWinListChildren(Window); @@ -528,13 +521,13 @@ RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_NOCHILDREN); if(BelongsToThreadData) - co_IntSendMessage(Window->head.h, WM_NCDESTROY, 0, 0); + co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } DestroyTimersForWindow(ThreadData, Window); /* Unregister hot keys */ - UnregisterWindowHotKeys (Window); + UnregisterWindowHotKeys(Window); /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); @@ -555,19 +548,10 @@ ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } - /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */ - -#if 0 /* FIXME */ - - WinPosCheckInternalPos(Window->head.h); - if (Window->head.h == GetCapture()) - { - ReleaseCapture(); - } - - /* free resources associated with the window */ - TIMER_RemoveWindowTimers(Window->head.h); -#endif + if (ThreadData->MessageQueue->spwndCapture == Window) + { + IntReleaseCapture(); + } if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) && Window->IDMenu && @@ -585,11 +569,6 @@ } DceFreeWindowDCE(Window); /* Always do this to catch orphaned DCs */ -#if 0 /* FIXME */ - - WINPROC_FreeProc(Window->winproc, WIN_PROC_WINDOW); - CLASS_RemoveWindow(Window->Class); -#endif IntUnlinkWindow(Window); @@ -601,7 +580,7 @@ } UserReferenceObject(Window); - UserDeleteObject(Window->head.h, TYPE_WINDOW); + UserDeleteObject(UserHMGetHandle(Window), TYPE_WINDOW); IntDestroyScrollBars(Window); @@ -2582,15 +2561,20 @@ IntSendParentNotify(Window, WM_DESTROY); } - /* Look whether the focus is within the tree of windows we will - * be destroying. - */ - if (!co_WinPosShowWindow(Window, SW_HIDE)) - { // Rule #1. - if ( ti->MessageQueue->spwndActive == Window || - (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) - { - co_WinPosActivateOtherWindow(Window); + if (!Window->spwndOwner && !IntGetParent(Window)) + { + co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); + } + + if (Window->style & WS_VISIBLE) + { + if (Window->style & WS_CHILD) + { + co_WinPosShowWindow(Window, SW_HIDE); + } + else + { + co_WinPosSetWindowPos(Window, 0, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_HIDEWINDOW ); } } @@ -2604,7 +2588,7 @@ pwndTemp->spwndLastActive = Window->spwndOwner; } - if (Window->spwndParent && IntIsWindow(Window->head.h)) + if (Window->spwndParent && IntIsWindow(UserHMGetHandle(Window))) { if ((Window->style & (WS_POPUP | WS_CHILD)) == WS_CHILD) { @@ -2640,7 +2624,7 @@ IntEngWindowChanged(Window, WOC_DELETE); - if (!IntIsWindow(Window->head.h)) + if (!IntIsWindow(UserHMGetHandle(Window))) { return TRUE; } @@ -2705,11 +2689,13 @@ msg.pt = gpsi->ptCursor; co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); + /* Send destroy messages */ - IntSendDestroyMsg(Window->head.h); - - if (!IntIsWindow(Window->head.h)) + IntSendDestroyMsg(UserHMGetHandle(Window)); + + if (!IntIsWindow(UserHMGetHandle(Window))) { return TRUE; }

9 years, 10 months

[tkreuzer] 66236: [WIN32K] Initialize EBRUSHOBJ.psoMask in EBRUSHOBJ_vInit. Should fix CORE-9165

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 12 09:18:20 2015 New Revision: 66236 URL: http://svn.reactos.org/svn/reactos?rev=66236&view=rev Log: [WIN32K] Initialize EBRUSHOBJ.psoMask in EBRUSHOBJ_vInit. Should fix CORE-9165 Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Thu Feb 12 09:18:20 2015 @@ -64,6 +64,7 @@ pebo->pbrush = pbrush; pebo->pengbrush = NULL; pebo->flattrs = pbrush->flAttrs; + pebo->psoMask = NULL; /* Initialize 1 bpp fore and back colors */ pebo->crCurrentBack = crBackgroundClr;

9 years, 10 months

[tfaber] 66235: [NTOS:MM] - Set aside some additional system PTEs if special pool is enabled CORE-8680

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 12 09:14:52 2015 New Revision: 66235 URL: http://svn.reactos.org/svn/reactos?rev=66235&view=rev Log: [NTOS:MM] - Set aside some additional system PTEs if special pool is enabled CORE-8680 Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Feb 12 09:14:52 2015 @@ -2181,6 +2181,13 @@ // MmNumberOfSystemPtes <<= 1; } + if (MmSpecialPoolTag != 0 && MmSpecialPoolTag != -1) + { + // + // Add some extra PTEs for special pool + // + MmNumberOfSystemPtes += 0x6000; + } } DPRINT("System PTE count has been tuned to %lu (%lu bytes)\n",

9 years, 10 months

[jimtabor] 66234: [NtUser] - Fix the results from the new API CreateWindowEx tests. Message sequence and isolating each job Destroy and Free perform will come later. Refer to CORE-8703. This may no...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 12 00:17:41 2015 New Revision: 66234 URL: http://svn.reactos.org/svn/reactos?rev=66234&view=rev Log: [NtUser] - Fix the results from the new API CreateWindowEx tests. Message sequence and isolating each job Destroy and Free perform will come later. Refer to CORE-8703. This may not fix the crash while in wine test User32:msg.c. - Dedicated to Thomas Faber. - Fix build window list using threads. The link list works okay for locking but for tracking thread windows, use the snapshot method. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Feb 12 00:17:41 2015 @@ -640,6 +640,14 @@ if (wparam) UserDerefObjectCo(Window); return lRes; } + case WM_ASYNC_DESTROYWINDOW: + { + ERR("WM_ASYNC_DESTROYWINDOW\n"); + if (pWnd->style & WS_CHILD) + return co_UserFreeWindow(pWnd, PsGetCurrentProcessWin32Process(), PsGetCurrentThreadWin32Thread(), TRUE); + else + co_UserDestroyWindow(pWnd); + } } return 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] Thu Feb 12 00:17:41 2015 @@ -112,7 +112,8 @@ { WM_ASYNC_SHOWWINDOW = 0x80000000, WM_ASYNC_SETWINDOWPOS, - WM_ASYNC_SETACTIVEWINDOW + WM_ASYNC_SETACTIVEWINDOW, + WM_ASYNC_DESTROYWINDOW }; BOOL FASTCALL MsqIsHung(PTHREADINFO pti); 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] Thu Feb 12 00:17:41 2015 @@ -408,32 +408,24 @@ * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow * make sure that the window still exists when we come back. */ -#if 0 /* FIXME */ - - if (IsWindow(Wnd)) + + if (IntIsWindow(hWnd)) { HWND* pWndArray; int i; - if (!(pWndArray = WIN_ListChildren( hwnd ))) - return; - - /* start from the end (FIXME: is this needed?) */ + if (!(pWndArray = IntWinListChildren( Window ))) return; + for (i = 0; pWndArray[i]; i++) - ; - - while (--i >= 0) - { - if (IsWindow( pWndArray[i] )) - WIN_SendDestroyMsg( pWndArray[i] ); - } - HeapFree(GetProcessHeap(), 0, pWndArray); + { + if (IntIsWindow( pWndArray[i] )) IntSendDestroyMsg( pWndArray[i] ); + } + ExFreePoolWithTag(pWndArray, USERTAG_WINDOWLIST); } else { TRACE("destroyed itself while in WM_DESTROY!\n"); } -#endif } static VOID @@ -471,10 +463,10 @@ * done in CreateWindow is undone here and not in DestroyWindow:-P */ -static LRESULT co_UserFreeWindow(PWND Window, - PPROCESSINFO ProcessData, - PTHREADINFO ThreadData, - BOOLEAN SendMessages) +LRESULT co_UserFreeWindow(PWND Window, + PPROCESSINFO ProcessData, + PTHREADINFO ThreadData, + BOOLEAN SendMessages) { HWND *Children; HWND *ChildHandle; @@ -504,12 +496,6 @@ IntDeRegisterShellHookWindow(Window->head.h); - if(SendMessages) - { - /* Send destroy messages */ - IntSendDestroyMsg(Window->head.h); - } - /* free child windows */ Children = IntWinListChildren(Window); if (Children) @@ -521,7 +507,7 @@ if(!IntWndBelongsToThread(Child, ThreadData)) { /* send WM_DESTROY messages to windows not belonging to the same thread */ - IntSendDestroyMsg(Child->head.h); + co_IntSendMessage( UserHMGetHandle(Child), WM_ASYNC_DESTROYWINDOW, 0, 0 ); } else co_UserFreeWindow(Child, ProcessData, ThreadData, SendMessages); @@ -1415,8 +1401,8 @@ { PETHREAD Thread; PTHREADINFO W32Thread; - PLIST_ENTRY Current; PWND Window; + HWND *List = NULL; Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); if (!NT_SUCCESS(Status)) @@ -1431,35 +1417,42 @@ return ERROR_INVALID_PARAMETER; } - Current = W32Thread->WindowListHead.Flink; - while (Current != &(W32Thread->WindowListHead)) - { - Window = CONTAINING_RECORD(Current, WND, ThreadListEntry); - ASSERT(Window); - - if (dwCount < *pBufSize && pWnd) - { - _SEH2_TRY + // Do not use Thread link list due to co_UserFreeWindow!!! + // Current = W32Thread->WindowListHead.Flink; + // Fixes Api:CreateWindowEx tests!!! + List = IntWinListChildren(UserGetDesktopWindow()); + if (List) + { + int i; + for (i = 0; List[i]; i++) + { + Window = ValidateHwndNoErr(List[i]); + if (Window && Window->head.pti == W32Thread) { - ProbeForWrite(pWnd, sizeof(HWND), 1); - *pWnd = Window->head.h; - pWnd++; + if (dwCount < *pBufSize && pWnd) + { + _SEH2_TRY + { + ProbeForWrite(pWnd, sizeof(HWND), 1); + *pWnd = Window->head.h; + pWnd++; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + ERR("Failure to build window list!\n"); + SetLastNtError(Status); + break; + } + } + dwCount++; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if (!NT_SUCCESS(Status)) - { - ERR("Failure to build window list!\n"); - SetLastNtError(Status); - break; - } - } - dwCount++; - Current = Window->ThreadListEntry.Flink; - } + } + } ObDereferenceObject(Thread); } @@ -2711,6 +2704,10 @@ msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + + /* Send destroy messages */ + + IntSendDestroyMsg(Window->head.h); if (!IntIsWindow(Window->head.h)) { Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Thu Feb 12 00:17:41 2015 @@ -63,5 +63,6 @@ PWND FASTCALL IntGetNonChildAncestor(PWND); LONG FASTCALL co_UserSetWindowLong(HWND,DWORD,LONG,BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); +LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); /* EOF */

9 years, 10 months

[jimtabor] 66233: [ApiTest] - Add Thomas Faber API test from CORE-8703.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 11 23:53:08 2015 New Revision: 66233 URL: http://svn.reactos.org/svn/reactos?rev=66233&view=rev Log: [ApiTest] - Add Thomas Faber API test from CORE-8703. Added: trunk/rostests/apitests/user32/CreateWindowEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -3,6 +3,7 @@ AttachThreadInput.c helper.c CreateIconFromResourceEx.c + CreateWindowEx.c DeferWindowPos.c DestroyCursorIcon.c DrawIconEx.c Added: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c (added) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -0,0 +1,189 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CreateWindow stuff + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <winuser.h> +#include "helper.h" + +static HWND hWndList[5 + 1]; +static const int hWndCount = sizeof(hWndList) / sizeof(hWndList[0]) - 1; +static DWORD dwThreadId; + +#define ok_hwnd(val, exp) do \ + { \ + HWND _val = (val), _exp = (exp); \ + int _ival = get_iwnd(_val, FALSE); \ + int _iexp = get_iwnd(_exp, FALSE); \ + ok(_val == _exp, #val " = %p (%d), expected %p (%d)\n", _val, _ival, _exp, _iexp); \ + } while (0) + +static +int +get_iwnd( + _In_ HWND hWnd, + _In_ BOOL set) +{ + int i; + if (!hWnd) + return 0; + for (i = 1; i <= hWndCount; i++) + { + if (hWndList[i] == hWnd) + return i; + } + if (!set) + return 0; + for (i = 1; i <= hWndCount; i++) + { + if (hWndList[i] == NULL) + { + hWndList[i] = hWnd; + return i; + } + } + ok(0, "Too many windows!\n"); + return 0; +} + +static +BOOL +CALLBACK +EnumProc( + _In_ HWND hWnd, + _In_ LPARAM lParam) +{ + HWND hLookingFor = (HWND)lParam; + return hWnd != hLookingFor; +} + +static +LRESULT +CALLBACK +WndProc( + _In_ HWND hWnd, + _In_ UINT message, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + HWND hTest; + int iwnd = get_iwnd(hWnd, TRUE); + + ok(GetCurrentThreadId() == dwThreadId, "Thread 0x%lx instead of 0x%lx\n", GetCurrentThreadId(), dwThreadId); + if (message > WM_USER || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProcW(hWnd, message, wParam, lParam); + + RECOND_MESSAGE(iwnd, message, SENT, wParam, lParam); + + switch(message) + { + case WM_DESTROY: + if (GetParent(hWnd)) + { + /* child window */ + ok(EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)hWnd), "Child window %p (%d) enumerated\n", hWnd, iwnd); + ok(!EnumChildWindows(GetParent(hWnd), EnumProc, (LPARAM)hWnd), "Child window %p (%d) not enumerated\n", hWnd, iwnd); + ok(!EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)GetParent(hWnd)), "Parent window of %p (%d) not enumerated\n", hWnd, iwnd); + } + else + { + /* top-level window */ + ok(!EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)hWnd), "Window %p (%d) not enumerated in WM_DESTROY\n", hWnd, iwnd); + } + if (hWnd == hWndList[3]) + { + hTest = SetParent(hWndList[4], hWndList[2]); + ok_hwnd(hTest, hWndList[1]); + hTest = SetParent(hWndList[5], hWndList[1]); + ok_hwnd(hTest, hWndList[2]); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), hWndList[1]); + ok_hwnd(GetParent(hWndList[4]), hWndList[2]); + ok_hwnd(GetParent(hWndList[5]), hWndList[1]); + } + break; + } + + return DefWindowProcW(hWnd, message, wParam, lParam); +} + + +START_TEST(CreateWindowEx) +{ + HWND hWnd; + MSG msg; + + SetCursorPos(0,0); + + dwThreadId = GetCurrentThreadId(); + hWndList[0] = INVALID_HANDLE_VALUE; + RegisterSimpleClass(WndProc, L"CreateTest"); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[1], "Got %p, expected %p\n", hWnd, hWndList[1]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, 0, 40, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[2], "Got %p, expected %p\n", hWnd, hWndList[2]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 60, 10, 20, 20, hWndList[1], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[3], "Got %p, expected %p\n", hWnd, hWndList[3]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 80, 10, 20, 20, hWndList[1], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[4], "Got %p, expected %p\n", hWnd, hWndList[4]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 60, 10, 20, 20, hWndList[2], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[5], "Got %p, expected %p\n", hWnd, hWndList[5]); + +trace("\n"); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd, FALSE); + if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + DispatchMessageA( &msg ); + } +trace("\n"); + TRACE_CACHE(); +trace("\n"); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), hWndList[1]); + ok_hwnd(GetParent(hWndList[4]), hWndList[1]); + ok_hwnd(GetParent(hWndList[5]), hWndList[2]); + + DestroyWindow(hWndList[1]); + ok(!IsWindow(hWndList[1]), "\n"); + ok( IsWindow(hWndList[2]), "\n"); + ok(!IsWindow(hWndList[3]), "\n"); + ok( IsWindow(hWndList[4]), "\n"); + ok(!IsWindow(hWndList[5]), "\n"); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), NULL); + ok_hwnd(GetParent(hWndList[4]), hWndList[2]); + ok_hwnd(GetParent(hWndList[5]), NULL); + +trace("\n"); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd, FALSE); + if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + DispatchMessageA( &msg ); + } +trace("\n"); + TRACE_CACHE(); + } Propchange: trunk/rostests/apitests/user32/CreateWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32/CreateWindowEx.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -23,6 +23,12 @@ { switch(msg) { + case WM_CREATE: return "WM_CREATE"; + case WM_NCCREATE: return "WM_NCCREATE"; + case WM_PARENTNOTIFY: return "WM_PARENTNOTIFY"; + case WM_DESTROY: return "WM_DESTROY"; + case WM_NCDESTROY: return "WM_NCDESTROY"; + case WM_CHILDACTIVATE: return "WM_CHILDACTIVATE"; case WM_NCACTIVATE: return "WM_NCACTIVATE"; case WM_ACTIVATE: return "WM_ACTIVATE"; case WM_ACTIVATEAPP: return "WM_ACTIVATEAPP"; 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] Wed Feb 11 23:53:08 2015 @@ -5,6 +5,7 @@ extern void func_AttachThreadInput(void); extern void func_CreateIconFromResourceEx(void); +extern void func_CreateWindowEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); @@ -33,6 +34,7 @@ { { "AttachThreadInput", func_AttachThreadInput }, { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, + { "CreateWindowEx", func_CreateWindowEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx },

9 years, 10 months

[tkreuzer] 66232: [MESA] Partly sync find_value() with MESA 10.4.4. Fixes endless loop when GoogleEarth is started. GoogleEarth now loads and displays the earth, but it doesn't handle any input and...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 11 21:36:01 2015 New Revision: 66232 URL: http://svn.reactos.org/svn/reactos?rev=66232&view=rev Log: [MESA] Partly sync find_value() with MESA 10.4.4. Fixes endless loop when GoogleEarth is started. GoogleEarth now loads and displays the earth, but it doesn't handle any input and makes the entire GUI hang. Modified: trunk/reactos/dll/opengl/mesa/main/get.c Modified: trunk/reactos/dll/opengl/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/get.c… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/get.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/get.c [iso-8859-1] Wed Feb 11 21:36:01 2015 @@ -1132,10 +1132,20 @@ mask = Elements(table) - 1; hash = (pname * prime_factor); while (1) { - d = &values[table[hash & mask]]; - + int idx = table[hash & mask]; + + /* If the enum isn't valid, the hash walk ends with index 0, + * pointing to the first entry of values[] which doesn't hold + * any valid enum. */ + if (unlikely(idx == 0)) { + _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func, + _mesa_lookup_enum_by_nr(pname)); + return &error_value; + } + + d = &values[idx]; if (likely(d->pname == pname)) - break; + break; hash += prime_step; }

9 years, 10 months

[tkreuzer] 66231: [WIN32K] Implement support for hatch brush masks.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 11 21:35:48 2015 New Revision: 66231 URL: http://svn.reactos.org/svn/reactos?rev=66231&view=rev Log: [WIN32K] Implement support for hatch brush masks. Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Feb 11 21:35:48 2015 @@ -424,7 +424,37 @@ NTAPI EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo) { - return NULL; + HBITMAP hbmMask; + PSURFACE psurfMask; + PPDEVOBJ ppdev; + + /* Check if we don't have a mask yet */ + if (pebo->psoMask == NULL) + { + /* Check if this is a hatch brush */ + if (pebo->flattrs & BR_IS_HATCH) + { + /* Get the PDEV */ + ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev; + if (!ppdev) + ppdev = gppdevPrimary; + + /* Use the hatch bitmap as the mask */ + hbmMask = (HBITMAP)ppdev->ahsurf[pebo->pbrush->iHatch]; + psurfMask = SURFACE_ShareLockSurface(hbmMask); + if (psurfMask == NULL) + { + ERR("Failed to lock hatch brush for PDEV %p, iHatch %lu\n", + ppdev, pebo->pbrush->iHatch); + return NULL; + } + + NT_ASSERT(psurfMask->SurfObj.iBitmapFormat == BMF_1BPP); + pebo->psoMask = &psurfMask->SurfObj; + } + } + + return pebo->psoMask; } /** Exported DDI functions ****************************************************/

9 years, 10 months

[tkreuzer] 66230: [WIN32K] Fix handling of mask bitmap in NtGdiMaskBlt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 11 21:35:09 2015 New Revision: 66230 URL: http://svn.reactos.org/svn/reactos?rev=66230&view=rev Log: [WIN32K] Fix handling of mask bitmap in NtGdiMaskBlt Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Wed Feb 11 21:35:09 2015 @@ -324,51 +324,44 @@ BOOL Status = FALSE; EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; - BOOL UsesSource = ROP_USES_SOURCE(dwRop); - BOOL UsesMask; - - FIXUP_ROP(dwRop); - - UsesMask = ROP_USES_MASK(dwRop); + BOOL UsesSource; + + FIXUP_ROP(dwRop); // FIXME: why do we need this??? //DPRINT1("dwRop : 0x%08x\n", dwRop); + UsesSource = ROP_USES_SOURCE(dwRop); if (!hdcDest || (UsesSource && !hdcSrc)) { EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - /* Take care of mask bitmap */ - if(hbmMask) - { + /* Check if we need a mask and have a mask bitmap */ + if (ROP_USES_MASK(dwRop) && (hbmMask != NULL)) + { + /* Reference the mask bitmap */ psurfMask = SURFACE_ShareLockSurface(hbmMask); - if(!psurfMask) + if (psurfMask == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - } - - if(UsesMask) - { - if(!psurfMask) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(gajBitsPerFormat[psurfMask->SurfObj.iBitmapFormat] != 1) + + /* Make sure the mask bitmap is 1 BPP */ + if (gajBitsPerFormat[psurfMask->SurfObj.iBitmapFormat] != 1) { EngSetLastError(ERROR_INVALID_PARAMETER); SURFACE_ShareUnlockSurface(psurfMask); return FALSE; } } - else if(psurfMask) - { - WARN("Getting Mask bitmap without needing it?\n"); - SURFACE_ShareUnlockSurface(psurfMask); + else + { + /* We use NULL, if we need a mask, the Eng function will take care of + that and use the brushobject to get a mask */ psurfMask = NULL; } + MaskPoint.x = xMask; MaskPoint.y = yMask;

9 years, 10 months

[tkreuzer] 66229: [WIN32K] - Handle the case where we have a masked ROP, but no mask surface in EngBitBlt - Alloc ROPs with a mask in EngPaint Fixes ASSERT when GoogleEarth is launched.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 11 21:34:42 2015 New Revision: 66229 URL: http://svn.reactos.org/svn/reactos?rev=66229&view=rev Log: [WIN32K] - Handle the case where we have a masked ROP, but no mask surface in EngBitBlt - Alloc ROPs with a mask in EngPaint Fixes ASSERT when GoogleEarth is launched. Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/bitblt_new.c trunk/reactos/win32ss/gdi/eng/paint.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -458,6 +458,19 @@ else { clippingType = pco->iDComplexity; + } + + /* Check if we need a mask but have no mask surface */ + if (UsesMask && (psoMask == NULL)) + { + /* Check if the BRUSHOBJ can provide the mask */ + psoMask = BRUSHOBJ_psoMask(pbo); + if (psoMask == NULL) + { + /* We have no mask, assume the mask is all foreground */ + rop4 &= (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + UsesMask = FALSE; + } } if (UsesMask) Modified: trunk/reactos/win32ss/gdi/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt_new… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -210,7 +210,7 @@ if (ROP4_USES_PATTERN(rop4)) { /* Must have a brush */ - ASSERT(pbo); // FIXME: test this! + NT_ASSERT(pbo); // FIXME: test this! /* Copy the solid color */ bltdata.ulSolidColor = pbo->iSolidColor; @@ -253,11 +253,22 @@ /* Check if the ROP uses a mask */ if (ROP4_USES_MASK(rop4)) { - /* Must have a mask surface and point */ - ASSERT(psoMask); - ASSERT(pptlMask); - //__debugbreak(); + + /* Check if we don't have a mask surface */ + if (psoMask == NULL) + { + /* Must have a brush */ + NT_ASSERT(pbo); // FIXME: test this! + + /* Check if the BRUSHOBJ can provide the mask */ + psoMask = BRUSHOBJ_psoMask(pbo); + if (psoMask == NULL) + { + /* We have no mask, assume the mask is all foreground */ + rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + } + } /* Set the mask format info */ bltdata.siMsk.iFormat = psoMask->iBitmapFormat; Modified: trunk/reactos/win32ss/gdi/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/paint.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/paint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/paint.c [iso-8859-1] Wed Feb 11 21:34:42 2015 @@ -63,9 +63,8 @@ /* Convert the MIX, consisting of 2 ROP2 codes into a ROP4 */ rop4 = MIX_TO_ROP4(mix); - /* Sanity checks */ + /* Sanity check */ NT_ASSERT(!ROP4_USES_SOURCE(rop4)); - NT_ASSERT(!ROP4_USES_MASK(rop4)); /* Forward the call to Eng/DrvBitBlt */ return IntEngBitBlt(pso,

9 years, 10 months

[tkreuzer] 66228: [WIN32K] Add minimal infrastructure for handling pattern brush masks.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 11 21:34:11 2015 New Revision: 66228 URL: http://svn.reactos.org/svn/reactos?rev=66228&view=rev Log: [WIN32K] Add minimal infrastructure for handling pattern brush masks. Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed Feb 11 21:34:11 2015 @@ -9,8 +9,7 @@ #include <win32k.h> -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(GdiFont); static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] = { @@ -128,6 +127,7 @@ ASSERT(pebo->flattrs & BR_IS_SOLID); /* Set the RGB color */ + crColor &= 0xFFFFFF; pebo->crRealize = crColor; pebo->ulRGBColor = crColor; @@ -167,6 +167,12 @@ pebo->BrushObject.pvRbrush = NULL; } + if (pebo->psoMask != NULL) + { + SURFACE_ShareUnlockSurface(pebo->psoMask); + pebo->psoMask = NULL; + } + /* Dereference the palettes */ PALETTE_ShareUnlockPalette(pebo->ppalSurf); PALETTE_ShareUnlockPalette(pebo->ppalDC); @@ -175,7 +181,8 @@ VOID NTAPI -EBRUSHOBJ_vUpdateFromDC(EBRUSHOBJ *pebo, +EBRUSHOBJ_vUpdateFromDC( + EBRUSHOBJ *pebo, PBRUSH pbrush, PDC pdc) { @@ -288,7 +295,8 @@ { BOOL bResult; PFN_DrvRealizeBrush pfnRealizeBrush = NULL; - PSURFACE psurfPattern, psurfMask; + PSURFACE psurfPattern; + SURFOBJ *psoMask; PPDEVOBJ ppdev; EXLATEOBJ exlo; PPALETTE ppalPattern; @@ -300,13 +308,30 @@ ASSERT(pebo->psurfTrg); ppdev = (PPDEVOBJ)pebo->psurfTrg->SurfObj.hdev; - if (!ppdev) ppdev = gppdevPrimary; + if (!ppdev) + ppdev = gppdevPrimary; if (bCallDriver) + { + /* Get the Drv function */ pfnRealizeBrush = ppdev->DriverFunctions.RealizeBrush; - - if (!pfnRealizeBrush) + if (pfnRealizeBrush == NULL) + { + ERR("No DrvRealizeBrush. Cannot realize brush\n"); + return FALSE; + } + + /* Get the mask */ + psoMask = EBRUSHOBJ_psoMask(pebo); + } + else + { + /* Use the Eng function */ pfnRealizeBrush = EngRealizeBrush; + + /* We don't handle the mask bitmap here. We do this only on demand */ + psoMask = NULL; + } /* Check if this is a hatch brush */ if (pbr->flAttrs & BR_IS_HATCH) @@ -325,9 +350,6 @@ psurfPattern = SURFACE_ShareLockSurface(hbmPattern); ASSERT(psurfPattern); ASSERT(psurfPattern->ppal); - - /* FIXME: implement mask */ - psurfMask = NULL; /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ if (pbr->flAttrs & BR_IS_DIBPALCOLORS) @@ -354,17 +376,15 @@ bResult = pfnRealizeBrush(&pebo->BrushObject, &pebo->psurfTrg->SurfObj, &psurfPattern->SurfObj, - psurfMask ? &psurfMask->SurfObj : NULL, + psoMask, &exlo.xlo, iHatch); /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); - /* Unlock surfaces */ + /* Unlock surface */ SURFACE_ShareUnlockSurface(psurfPattern); - if (psurfMask) - SURFACE_ShareUnlockSurface(psurfMask); return bResult; } @@ -400,6 +420,12 @@ return psurfPattern ? &psurfPattern->SurfObj : NULL; } +SURFOBJ* +NTAPI +EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo) +{ + return NULL; +} /** Exported DDI functions ****************************************************/ Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed Feb 11 21:34:11 2015 @@ -73,6 +73,8 @@ DWORD ulUnique; // DWORD dwUnknown54; // DWORD dwUnknown58; + + SURFOBJ *psoMask; } EBRUSHOBJ, *PEBRUSHOBJ; /* GDI Brush Attributes */ @@ -158,6 +160,13 @@ #define BRUSHOBJ_psoPattern(pbo) \ EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) +SURFOBJ* +NTAPI +EBRUSHOBJ_psoMask(EBRUSHOBJ *pebo); + +#define BRUSHOBJ_psoMask(pbo) \ + EBRUSHOBJ_psoMask(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) + FORCEINLINE ULONG EBRUSHOBJ_iSetSolidColor(EBRUSHOBJ *pebo, ULONG iSolidColor)

9 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
38
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 February 2015