Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 73893: * Addendum to r73870.
by akhaldi＠svn.reactos.org 23 Feb '17

23 Feb '17

Author: akhaldi Date: Thu Feb 23 19:09:35 2017 New Revision: 73893 URL: http://svn.reactos.org/svn/reactos?rev=73893&view=rev Log: * Addendum to r73870. Removed: trunk/reactos/base/wmi/

1 0

[tfaber] 73892: [USBSTOR] - Fix error paths around SCSI_REQUEST_BLOCK::DataBuffer. Spotted by curiousone. CORE-12816 #resolve
by tfaber＠svn.reactos.org 23 Feb '17

23 Feb '17

Author: tfaber Date: Thu Feb 23 09:28:20 2017 New Revision: 73892 URL: http://svn.reactos.org/svn/reactos?rev=73892&view=rev Log: [USBSTOR] - Fix error paths around SCSI_REQUEST_BLOCK::DataBuffer. Spotted by curiousone. CORE-12816 #resolve Modified: trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Thu Feb 23 09:28:20 2017 @@ -1041,7 +1041,7 @@ Request->DataBuffer = ExAllocatePoolWithTag(NonPagedPool, DataTransferLength, USB_STOR_TAG); - if (!Request) + if (!Request->DataBuffer) { // // no memory @@ -1061,6 +1061,7 @@ // no memory // IoFreeIrp(Irp); + ExFreePoolWithTag(Request->DataBuffer, USB_STOR_TAG); ExFreePoolWithTag(Request, USB_STOR_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1173,6 +1174,7 @@ // // free resources // + ExFreePoolWithTag(Request->DataBuffer, USB_STOR_TAG); ExFreePoolWithTag(Request, USB_STOR_TAG); IoFreeIrp(Irp); return Status;

1 0

[tfaber] 73891: [USBSTOR] - Use pool tagging
by tfaber＠svn.reactos.org 23 Feb '17

23 Feb '17

Author: tfaber Date: Thu Feb 23 09:20:09 2017 New Revision: 73891 URL: http://svn.reactos.org/svn/reactos?rev=73891&view=rev Log: [USBSTOR] - Use pool tagging Modified: trunk/reactos/drivers/usb/usbstor/descriptor.c trunk/reactos/drivers/usb/usbstor/disk.c trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] Thu Feb 23 09:20:09 2017 @@ -414,7 +414,7 @@ // DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n", Status); FreeItem(InterfaceList); - ExFreePool(Urb); + ExFreePoolWithTag(Urb, 0); return Status; } @@ -428,7 +428,7 @@ // failed to allocate interface information structure // FreeItem(InterfaceList); - ExFreePool(Urb); + ExFreePoolWithTag(Urb, 0); return Status; } @@ -473,7 +473,7 @@ // free interface list & urb // FreeItem(InterfaceList); - ExFreePool(Urb); + ExFreePoolWithTag(Urb, 0); // // done Modified: trunk/reactos/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/disk.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/disk.c [iso-8859-1] Thu Feb 23 09:20:09 2017 @@ -581,7 +581,9 @@ /* Legacy port capability query */ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(PVOID)) { - Capabilities = *((PVOID *)Irp->AssociatedIrp.SystemBuffer) = ExAllocatePool(NonPagedPool, sizeof(IO_SCSI_CAPABILITIES)); + Capabilities = *((PVOID *)Irp->AssociatedIrp.SystemBuffer) = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_SCSI_CAPABILITIES), + USB_STOR_TAG); Irp->IoStatus.Information = sizeof(PVOID); } else Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Thu Feb 23 09:20:09 2017 @@ -268,7 +268,7 @@ // // Free Work Item Data // - ExFreePool(WorkItemData); + ExFreePoolWithTag(WorkItemData, USB_STOR_TAG); } VOID @@ -326,7 +326,7 @@ // // Free Work Item Data // - ExFreePool(WorkItemData); + ExFreePoolWithTag(WorkItemData, USB_STOR_TAG); } @@ -389,7 +389,9 @@ if (ResetDevice && FDODeviceExtension->TimerWorkQueueEnabled && FDODeviceExtension->SrbErrorHandlingActive == FALSE) { - WorkItemData = (PERRORHANDLER_WORKITEM_DATA)ExAllocatePool(NonPagedPool, sizeof(ERRORHANDLER_WORKITEM_DATA)); + WorkItemData = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ERRORHANDLER_WORKITEM_DATA), + USB_STOR_TAG); if (WorkItemData) { // Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Thu Feb 23 09:20:09 2017 @@ -1018,7 +1018,9 @@ // // create scsi block // - Request = (PSCSI_REQUEST_BLOCK)ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); + Request = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SCSI_REQUEST_BLOCK), + USB_STOR_TAG); if (!Request) { // @@ -1036,14 +1038,16 @@ // // allocate data transfer block // - Request->DataBuffer = ExAllocatePool(NonPagedPool, DataTransferLength); + Request->DataBuffer = ExAllocatePoolWithTag(NonPagedPool, + DataTransferLength, + USB_STOR_TAG); if (!Request) { // // no memory // IoFreeIrp(Irp); - ExFreePool(Request); + ExFreePoolWithTag(Request, USB_STOR_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1057,7 +1061,7 @@ // no memory // IoFreeIrp(Irp); - ExFreePool(Request); + ExFreePoolWithTag(Request, USB_STOR_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1169,7 +1173,7 @@ // // free resources // - ExFreePool(Request); + ExFreePoolWithTag(Request, USB_STOR_TAG); IoFreeIrp(Irp); return Status; } @@ -1255,7 +1259,7 @@ // // free response // - ExFreePool(Response); + ExFreePoolWithTag(Response, USB_STOR_TAG); return Status; }

1 0

[khornicek] 73890: [WIN32K] - Clean up after myself. Thanks, Giannis and Thomas.
by khornicek＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: khornicek Date: Wed Feb 22 21:18:18 2017 New Revision: 73890 URL: http://svn.reactos.org/svn/reactos?rev=73890&view=rev Log: [WIN32K] - Clean up after myself. Thanks, Giannis and Thomas. Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Feb 22 21:18:18 2017 @@ -2053,7 +2053,7 @@ /* Check for zero rectangles and return TRUE for translation only matrices */ if (prgn->rdh.nCount < 1) - return pmx->flAccel & XFORM_UNITY; + return (pmx->flAccel & XFORM_UNITY) != 0; /* Check if this is a scaling only matrix (off-diagonal elements are 0 */ if (pmx->flAccel & XFORM_SCALE) Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Feb 22 21:18:18 2017 @@ -2333,7 +2333,6 @@ if (SYSTEMCUR(ARROW) == NULL) { ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); - //ASSERT(FALSE); } else {

1 0

[hbelusca] 73889: [WIN32K]: Replace some checks against UserGetDesktopWindow() and UserGetMessageWindow() by checks against FNID_xxx flags. Fixes some FIXMEs in the code encountered while investiga...
by hbelusca＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: hbelusca Date: Wed Feb 22 20:19:50 2017 New Revision: 73889 URL: http://svn.reactos.org/svn/reactos?rev=73889&view=rev Log: [WIN32K]: Replace some checks against UserGetDesktopWindow() and UserGetMessageWindow() by checks against FNID_xxx flags. Fixes some FIXMEs in the code encountered while investigating the origin of "err: NtUserSetWindowPos bad window handle!" messages. Reviewed by James Tabor. CORE-12819 Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/ntuser/scrollex.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -1806,7 +1806,7 @@ { ERR("Failed to open desktop\n"); SetLastNtError(Status); - return 0; + return NULL; } TRACE("Opened desktop %S with handle 0x%p\n", ObjectAttributes->ObjectName->Buffer, Desktop); Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -181,10 +181,35 @@ HDC FASTCALL UserGetDesktopDC(ULONG,BOOL,BOOL); #define IntIsActiveDesktop(Desktop) \ - ((Desktop)->rpwinstaParent->ActiveDesktop == (Desktop)) + ((Desktop)->rpwinstaParent->ActiveDesktop == (Desktop)) HWND FASTCALL IntGetMessageWindow(VOID); PWND FASTCALL UserGetMessageWindow(VOID); + +#if 0 +static __inline BOOL +UserIsDesktopWindow(IN PWND pWnd) +{ + // return (pWnd == UserGetDesktopWindow()); + return (pWnd && (pWnd->fnid == FNID_DESKTOP)); +} + +static __inline BOOL +UserIsMessageWindow(IN PWND pWnd) +{ + // return (pWnd == UserGetMessageWindow()); + return (pWnd && (pWnd->fnid == FNID_MESSAGEWND)); +} +#else + +#define UserIsDesktopWindow(pWnd) \ + ((pWnd) && ((pWnd)->fnid == FNID_DESKTOP)) + +#define UserIsMessageWindow(pWnd) \ + ((pWnd) && ((pWnd)->fnid == FNID_MESSAGEWND)) + +#endif + static __inline PVOID DesktopHeapAlloc(IN PDESKTOP Desktop, 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] Wed Feb 22 20:19:50 2017 @@ -616,9 +616,7 @@ // USER_REFERENCE_ENTRY Ref; // PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - if (!pWnd || - pWnd == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!pWnd || UserIsDesktopWindow(pWnd) || UserIsMessageWindow(pWnd)) return 0; TRACE("Internal Event Msg 0x%x hWnd 0x%p\n", msg, pWnd->head.h); Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -1501,7 +1501,7 @@ if ((TopWnd->style & (WS_POPUP|WS_CHILD)) != WS_CHILD) break; parent = UserGetAncestor( TopWnd, GA_PARENT ); - if (!parent || parent == UserGetDesktopWindow()) break; + if (!parent || UserIsDesktopWindow(parent)) break; TopWnd = parent; } @@ -1885,7 +1885,7 @@ if (!pWnd) return HTNOWHERE; - if (pWnd == UserGetDesktopWindow()) // pWnd->fnid == FNID_DESKTOP) + if (UserIsDesktopWindow(pWnd)) { rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; rcWindow.right = UserGetSystemMetrics(SM_CXSCREEN); Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -175,7 +175,7 @@ } // Send to all the children if this is the desktop window. - if ( Wnd == UserGetDesktopWindow() ) + if (UserIsDesktopWindow(Wnd)) { if ( Flags & RDW_ALLCHILDREN || ( !(Flags & RDW_NOCHILDREN) && Wnd->style & WS_CLIPCHILDREN)) @@ -567,9 +567,9 @@ * Update child windows. */ - if (!(Flags & RDW_NOCHILDREN) && - Flags & RDW_ALLCHILDREN && - Wnd != UserGetDesktopWindow() ) + if (!(Flags & RDW_NOCHILDREN) && + (Flags & RDW_ALLCHILDREN) && + !UserIsDesktopWindow(Wnd)) { PWND Child; @@ -1239,7 +1239,7 @@ PaintWnd->state &= ~WNDS_UPDATEDIRTY; Window = PaintWnd; - while( Window && Window != UserGetDesktopWindow()) + while (Window && !UserIsDesktopWindow(Window)) { // Role back and check for clip children, do not set if any. if (Window->spwndParent && !(Window->spwndParent->style & WS_CLIPCHILDREN)) @@ -1578,7 +1578,7 @@ POINT ppt; INT x = 0, y = 0; - if ( pWndParent != UserGetDesktopWindow()) + if (!UserIsDesktopWindow(pWndParent)) { x = pWndParent->rcClient.left - pWnd->rcClient.left; y = pWndParent->rcClient.top - pWnd->rcClient.top; @@ -1825,7 +1825,7 @@ RegionType = SIMPLEREGION; - if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + if (!UserIsDesktopWindow(Window)) { RECTL_vOffsetRect(&Rect, -Window->rcClient.left, @@ -1846,7 +1846,7 @@ return RegionType; } - if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + if (!UserIsDesktopWindow(Window)) { NtGdiOffsetRgn(hRgn, -Window->rcClient.left, @@ -1896,7 +1896,7 @@ if (IntIntersectWithParents(Window, pRect)) { - if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + if (!UserIsDesktopWindow(Window)) { RECTL_vOffsetRect(pRect, -Window->rcClient.left, @@ -2593,9 +2593,8 @@ if (hwnd) { - if (!(Window = UserGetWindowObject(hwnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hwnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { goto Exit; } Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -1161,9 +1161,8 @@ TRACE("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { RETURN(FALSE); } @@ -1247,9 +1246,8 @@ TRACE("Enter NtUserSetScrollInfo\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if(!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { RETURN( 0); } Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollex.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -392,7 +392,7 @@ { UserRefObjectCo(Child, &WndRef); - if (Window->spwndParent == UserGetDesktopWindow()) // Window->spwndParent->fnid == FNID_DESKTOP ) + if (UserIsDesktopWindow(Window->spwndParent)) lParam = MAKELONG(Child->rcClient.left, Child->rcClient.top); else lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); 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 Feb 22 20:19:50 2017 @@ -1125,8 +1125,7 @@ /* Link the window with its new siblings */ IntLinkHwnd( Wnd, ((0 == (Wnd->ExStyle & WS_EX_TOPMOST) && - WndNewParent == UserGetDesktopWindow() ) ? HWND_TOP : HWND_TOPMOST ) ); - + UserIsDesktopWindow(WndNewParent) ) ? HWND_TOP : HWND_TOPMOST ) ); } if ( WndNewParent == co_GetDesktopWindow(Wnd) && @@ -1158,7 +1157,7 @@ } } - if (WndOldParent == UserGetMessageWindow() || WndNewParent == UserGetMessageWindow()) + if (UserIsMessageWindow(WndOldParent) || UserIsMessageWindow(WndNewParent)) swFlags |= SWP_NOACTIVATE; IntNotifyWinEvent(EVENT_OBJECT_PARENTCHANGE, Wnd ,OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); @@ -1437,7 +1436,7 @@ if ( (pWindow->style & (WS_CHILD | WS_POPUP)) == WS_CHILD && !(pWindow->ExStyle & WS_EX_NOPARENTNOTIFY)) { - if (VerifyWnd(pWindow->spwndParent) && pWindow->spwndParent != UserGetDesktopWindow()) + if (VerifyWnd(pWindow->spwndParent) && !UserIsDesktopWindow(pWindow->spwndParent)) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(pWindow->spwndParent, &Ref); @@ -2252,7 +2251,7 @@ IntSendParentNotify(Window, WM_CREATE); /* Notify the shell that a new window was created */ - if (Window->spwndParent == UserGetDesktopWindow() && + if (UserIsDesktopWindow(Window->spwndParent) && Window->spwndOwner == NULL && (Window->style & WS_VISIBLE) && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || @@ -3452,7 +3451,7 @@ RETURN(FALSE); } - if(!(WndListView = UserGetWindowObject(hwndListView))) + if (!(WndListView = UserGetWindowObject(hwndListView))) { RETURN(FALSE); } @@ -3623,7 +3622,7 @@ co_IntSendMessage(hWnd, WM_STYLECHANGING, GWL_STYLE, (LPARAM) &Style); /* WS_CLIPSIBLINGS can't be reset on top-level windows */ - if (Window->spwndParent == UserGetDesktopWindow()) Style.styleNew |= WS_CLIPSIBLINGS; + if (UserIsDesktopWindow(Window->spwndParent)) Style.styleNew |= WS_CLIPSIBLINGS; /* WS_MINIMIZE can't be reset */ if (OldValue & WS_MINIMIZE) Style.styleNew |= WS_MINIMIZE; /* Fixes wine FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change WS_EX_WINDOWEDGE too */ Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Wed Feb 22 20:19:50 2017 @@ -99,7 +99,7 @@ Rect->bottom = UserGetSystemMetrics(SM_CYMINIMIZED); return; } - if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + if (!UserIsDesktopWindow(Wnd)) { *Rect = Wnd->rcClient; RECTL_vOffsetRect(Rect, -Wnd->rcClient.left, -Wnd->rcClient.top); @@ -122,7 +122,7 @@ ASSERT( Wnd ); ASSERT( Rect ); if (!Wnd) return FALSE; - if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + if (!UserIsDesktopWindow(Wnd)) { *Rect = Wnd->rcWindow; } @@ -151,7 +151,7 @@ Delta.x = Delta.y = 0; mirror_from = mirror_to = FALSE; - if (FromWnd && FromWnd != UserGetDesktopWindow()) // FromWnd->fnid != FNID_DESKTOP) + if (FromWnd && !UserIsDesktopWindow(FromWnd)) { if (FromWnd->ExStyle & WS_EX_LAYOUTRTL) { @@ -164,7 +164,7 @@ Delta.y = FromWnd->rcClient.top; } - if (ToWnd && ToWnd != UserGetDesktopWindow()) // ToWnd->fnid != FNID_DESKTOP) + if (ToWnd && !UserIsDesktopWindow(ToWnd)) { if (ToWnd->ExStyle & WS_EX_LAYOUTRTL) { @@ -255,7 +255,7 @@ } VOID -SelectWindowRgn( PWND Window, HRGN hRgnClip) +SelectWindowRgn(PWND Window, HRGN hRgnClip) { if (Window->hrgnClip) { @@ -267,7 +267,7 @@ if (hRgnClip > HRGN_WINDOW) { - /*if (Window != UserGetDesktopWindow()) // Window->fnid != FNID_DESKTOP) + /*if (!UserIsDesktopWindow(Window)) { NtGdiOffsetRgn(hRgnClip, Window->rcWindow.left, Window->rcWindow.top); }*/ @@ -480,7 +480,7 @@ POINT Size; RECTL Rect = *RestoreRect; - if (Wnd->spwndParent && Wnd->spwndParent != UserGetDesktopWindow()) + if (Wnd->spwndParent && !UserIsDesktopWindow(Wnd->spwndParent)) { RECTL_vOffsetRect(&Rect, -Wnd->spwndParent->rcClient.left, @@ -782,7 +782,7 @@ int x, y, xspacing, yspacing; pwndParent = Window->spwndParent; - if (pwndParent == UserGetDesktopWindow()) + if (UserIsDesktopWindow(pwndParent)) { ERR("FIXME: Parent is Desktop, Min off screen!\n"); /* FIXME: ReactOS doesn't support iconic minimize to desktop */ @@ -1972,7 +1972,7 @@ 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); - if (Window->spwndParent == UserGetDesktopWindow()) + if (UserIsDesktopWindow(Window->spwndParent)) co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM)Window->head.h, 0); Window->style &= ~WS_VISIBLE; //IntSetStyle( Window, 0, WS_VISIBLE ); @@ -1981,7 +1981,7 @@ } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (Window->spwndParent == UserGetDesktopWindow() && + if (UserIsDesktopWindow(Window->spwndParent) && Window->spwndOwner == NULL && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) @@ -2330,7 +2330,7 @@ co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SIZE, wParam, lParam); - if (Wnd->spwndParent == UserGetDesktopWindow()) // Wnd->spwndParent->fnid == FNID_DESKTOP ) + if (UserIsDesktopWindow(Wnd->spwndParent)) lParam = MAKELONG(Wnd->rcClient.left, Wnd->rcClient.top); else lParam = MAKELONG(Wnd->rcClient.left-Wnd->spwndParent->rcClient.left, Wnd->rcClient.top-Wnd->spwndParent->rcClient.top); @@ -2582,7 +2582,7 @@ { if ( Wnd == pti->MessageQueue->spwndActive && pti->MessageQueue == IntGetFocusMessageQueue() ) { - if ( Wnd->spwndParent == UserGetDesktopWindow()) + if (UserIsDesktopWindow(Wnd->spwndParent)) { if (!ActivateOtherWindowMin(Wnd)) { @@ -2599,7 +2599,8 @@ if (Wnd == pti->MessageQueue->spwndFocus) { Parent = Wnd->spwndParent; - if (Wnd->spwndParent == UserGetDesktopWindow()) Parent = 0; + if (UserIsDesktopWindow(Wnd->spwndParent)) + Parent = 0; co_UserSetFocus(Parent); } // Hide, just return. @@ -2753,7 +2754,7 @@ Pt.x = x; Pt.y = y; - if (Parent != UserGetDesktopWindow()) + if (!UserIsDesktopWindow(Parent)) { Pt.x += Parent->rcClient.left; Pt.y += Parent->rcClient.top; @@ -2795,7 +2796,7 @@ Pt.x = x; Pt.y = y; - if (Parent != UserGetDesktopWindow()) + if (!UserIsDesktopWindow(Parent)) { if (Parent->ExStyle & WS_EX_LAYOUTRTL) Pt.x = Parent->rcClient.right - Pt.x; @@ -3059,9 +3060,7 @@ } pWnd = UserGetWindowObject(Wnd); - if ( !pWnd || // FIXME: - pWnd == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!pWnd || UserIsDesktopWindow(pWnd) || UserIsMessageWindow(pWnd)) { goto Exit; } @@ -3072,9 +3071,7 @@ WndInsertAfter != HWND_NOTOPMOST ) { pWndIA = UserGetWindowObject(WndInsertAfter); - if ( !pWndIA || - pWndIA == UserGetDesktopWindow() || - pWndIA == UserGetMessageWindow() ) + if (!pWndIA || UserIsDesktopWindow(pWndIA) || UserIsMessageWindow(pWndIA)) { goto Exit; } @@ -3221,9 +3218,7 @@ UserEnterExclusive(); pWnd = UserGetWindowObject(hWnd); - if ( !pWnd || // FIXME: - pWnd == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!pWnd || UserIsDesktopWindow(pWnd) || UserIsMessageWindow(pWnd)) { goto Exit; } @@ -3302,9 +3297,8 @@ TRACE("Enter NtUserSetWindowPos\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { ERR("NtUserSetWindowPos bad window handle!\n"); RETURN(FALSE); @@ -3316,8 +3310,7 @@ hWndInsertAfter != HWND_NOTOPMOST ) { if (!(pWndIA = UserGetWindowObject(hWndInsertAfter)) || - pWndIA == UserGetDesktopWindow() || - pWndIA == UserGetMessageWindow() ) + UserIsDesktopWindow(pWndIA) || UserIsMessageWindow(pWndIA)) { ERR("NtUserSetWindowPos bad insert window handle!\n"); RETURN(FALSE); @@ -3370,9 +3363,8 @@ TRACE("Enter NtUserSetWindowRgn\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { RETURN( 0); } @@ -3432,8 +3424,7 @@ UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hwnd)) || // FIXME: - Wnd == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Wnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + UserIsDesktopWindow(Wnd) || UserIsMessageWindow(Wnd)) { RETURN( FALSE); } @@ -3501,9 +3492,8 @@ TRACE("Enter NtUserSetWindowPlacement\n"); UserEnterExclusive(); - if (!(Wnd = UserGetWindowObject(hWnd)) || // FIXME: - Wnd == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Wnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Wnd = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Wnd) || UserIsMessageWindow(Wnd)) { RETURN( FALSE); } @@ -3552,9 +3542,8 @@ TRACE("Enter NtUserShowWindowAsync\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { RETURN(FALSE); } @@ -3592,9 +3581,8 @@ TRACE("Enter NtUserShowWindow hWnd %p SW_ %d\n",hWnd, nCmdShow); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: - Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + if (!(Window = UserGetWindowObject(hWnd)) || + UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { RETURN(FALSE); }

1 0

[jimtabor] 73888: [Win32SS] - Implement Exclude Update Region, for testing. See CORE-12649.
by jimtabor＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: jimtabor Date: Wed Feb 22 17:50:38 2017 New Revision: 73888 URL: http://svn.reactos.org/svn/reactos?rev=73888&view=rev Log: [Win32SS] - Implement Exclude Update Region, for testing. See CORE-12649. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Feb 22 17:50:38 2017 @@ -2063,7 +2063,7 @@ NtUserEvent( DWORD Unknown0); -DWORD +INT NTAPI NtUserExcludeUpdateRgn( HDC hDC, @@ -2470,7 +2470,7 @@ LPRECT lpRect, BOOL fErase); -int +INT NTAPI NtUserGetUpdateRgn( HWND hWnd, Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 22 17:50:38 2017 @@ -98,17 +98,6 @@ APIENTRY NtUserEvent( DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserExcludeUpdateRgn( - HDC hDC, - HWND hWnd) { STUB Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Feb 22 17:50:38 2017 @@ -2473,6 +2473,81 @@ return NtUserDrawCaptionTemp(hWnd, hDC, lpRc, 0, 0, NULL, uFlags); } +INT FASTCALL +co_UserExcludeUpdateRgn(HDC hDC, PWND Window) +{ + POINT pt; + RECT rc; + + if (Window->hrgnUpdate) + { + if (Window->hrgnUpdate == HRGN_WINDOW) + { + return NtGdiIntersectClipRect(hDC, 0, 0, 0, 0); + } + else + { + INT ret = ERROR; + HRGN hrgn = NtGdiCreateRectRgn(0,0,0,0); + + if ( hrgn && GreGetDCPoint( hDC, GdiGetDCOrg, &pt) ) + { + if ( NtGdiGetRandomRgn( hDC, hrgn, CLIPRGN) == NULLREGION ) + { + NtGdiOffsetRgn(hrgn, pt.x, pt.y); + } + else + { + HRGN hrgnScreen; + PMONITOR pm = UserGetPrimaryMonitor(); + hrgnScreen = NtGdiCreateRectRgn(0,0,0,0); + NtGdiCombineRgn(hrgnScreen, hrgnScreen, pm->hrgnMonitor, RGN_OR); + + NtGdiCombineRgn(hrgn, hrgnScreen, NULL, RGN_COPY); + + GreDeleteObject(hrgnScreen); + } + + NtGdiCombineRgn(hrgn, hrgn, Window->hrgnUpdate, RGN_DIFF); + + NtGdiOffsetRgn(hrgn, -pt.x, -pt.y); + + ret = NtGdiExtSelectClipRgn(hDC, hrgn, RGN_COPY); + + GreDeleteObject(hrgn); + } + return ret; + } + } + else + { + return GdiGetClipBox( hDC, &rc); + } +} + +INT +APIENTRY +NtUserExcludeUpdateRgn( + HDC hDC, + HWND hWnd) +{ + INT ret = ERROR; + PWND pWnd; + + TRACE("Enter NtUserExcludeUpdateRgn\n"); + UserEnterExclusive(); + + pWnd = UserGetWindowObject(hWnd); + + if (hDC && pWnd) + ret = co_UserExcludeUpdateRgn(hDC, pWnd); + + TRACE("Leave NtUserExcludeUpdateRgn, ret=%i\n", ret); + + UserLeave(); + return ret; +} + BOOL APIENTRY NtUserInvalidateRect(

1 0

[jimtabor] 73887: [Win32SS] - Implement Fill Window, for testing.
by jimtabor＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: jimtabor Date: Wed Feb 22 17:45:19 2017 New Revision: 73887 URL: http://svn.reactos.org/svn/reactos?rev=73887&view=rev Log: [Win32SS] - Implement Fill Window, for testing. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/userfuncs.h Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Feb 22 17:45:19 2017 @@ -953,23 +953,6 @@ } /* - * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. - */ -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserFillWindow(HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush) -{ - STUB - - return 0; -} - -/* * @unimplemented */ BOOL APIENTRY Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Feb 22 17:45:19 2017 @@ -1555,6 +1555,50 @@ return TRUE; } +BOOL FASTCALL +IntFillWindow(PWND pWndParent, + PWND pWnd, + HDC hDC, + HBRUSH hBrush) +{ + RECT Rect, Rect1; + INT type; + + if (!pWndParent) + pWndParent = pWnd; + + type = GdiGetClipBox(hDC, &Rect); + + IntGetClientRect(pWnd, &Rect1); + + if ( type != NULLREGION && // Clip box is not empty, + (!(pWnd->pcls->style & CS_PARENTDC) || // not parent dc or + RECTL_bIntersectRect( &Rect, &Rect, &Rect1) ) ) // intersecting. + { + POINT ppt; + INT x = 0, y = 0; + + if ( pWndParent != UserGetDesktopWindow()) + { + x = pWndParent->rcClient.left - pWnd->rcClient.left; + y = pWndParent->rcClient.top - pWnd->rcClient.top; + } + + GreSetBrushOrg(hDC, x, y, &ppt); + + if ( hBrush < (HBRUSH)CTLCOLOR_MAX ) + hBrush = GetControlColor( pWndParent, pWnd, hDC, HandleToUlong(hBrush) + WM_CTLCOLORMSGBOX); + + FillRect(hDC, &Rect, hBrush); + + GreSetBrushOrg(hDC, ppt.x, ppt.y, NULL); + + return TRUE; + } + else + return FALSE; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -1653,6 +1697,50 @@ TRACE("Leave NtUserEndPaint, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; +} + +/* + * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. + */ +/* + * @implemented + */ +BOOL APIENTRY +NtUserFillWindow(HWND hWndParent, + HWND hWnd, + HDC hDC, + HBRUSH hBrush) +{ + BOOL ret = FALSE; + PWND pWnd, pWndParent = NULL; + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserFillWindow\n"); + UserEnterExclusive(); + + if (!hDC) + { + goto Exit; + } + + if (!(pWnd = UserGetWindowObject(hWnd))) + { + goto Exit; + } + + if (hWndParent && !(pWndParent = UserGetWindowObject(hWndParent))) + { + goto Exit; + } + + UserRefObjectCo(pWnd, &Ref); + ret = IntFillWindow( pWndParent, pWnd, hDC, hBrush ); + UserDerefObjectCo(pWnd); + +Exit: + TRACE("Leave NtUserFillWindow, ret=%i\n",ret); + UserLeave(); + return ret; } /* Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Wed Feb 22 17:45:19 2017 @@ -102,7 +102,8 @@ VOID FASTCALL IntSetWindowState(PWND, UINT); VOID FASTCALL IntClearWindowState(PWND, UINT); PTHREADINFO FASTCALL IntTID2PTI(HANDLE); -HBRUSH FASTCALL GetControlBrush(PWND pwnd,HDC hdc,UINT ctlType); +HBRUSH FASTCALL GetControlBrush(PWND,HDC,UINT); +HBRUSH FASTCALL GetControlColor(PWND,PWND,HDC,UINT); /*************** MESSAGE.C ***************/

1 0

[jimtabor] 73886: [NtGDI] - Add function for NtUser.
by jimtabor＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: jimtabor Date: Wed Feb 22 17:20:43 2017 New Revision: 73886 URL: http://svn.reactos.org/svn/reactos?rev=73886&view=rev Log: [NtGDI] - Add function for NtUser. Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Wed Feb 22 17:20:43 2017 @@ -180,6 +180,7 @@ COLORREF FASTCALL IntSetDCBrushColor(HDC,COLORREF); COLORREF FASTCALL IntSetDCPenColor(HDC,COLORREF); int FASTCALL GreGetGraphicsMode(HDC); +BOOL FASTCALL GreSetBrushOrg(HDC,INT,INT,LPPOINT); INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Wed Feb 22 17:20:43 2017 @@ -220,6 +220,31 @@ } DC_UnlockDc(dc); return OldColor; +} + +BOOL FASTCALL +GreSetBrushOrg( + HDC hdc, + INT x, + INT y, + LPPOINT pptOut) +{ + PDC pdc = DC_LockDc(hdc); + if (pdc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (pptOut != NULL) + { + *pptOut = pdc->pdcattr->ptlBrushOrigin; + } + + DC_vSetBrushOrigin(pdc, x, y); + + DC_UnlockDc(pdc); + return TRUE; } COLORREF FASTCALL

1 0

[gadamopoulos] 73885: [COMCTL32] -Fix several tests for the v6 button when themes are enabled.
by gadamopoulos＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: gadamopoulos Date: Wed Feb 22 13:58:49 2017 New Revision: 73885 URL: http://svn.reactos.org/svn/reactos?rev=73885&view=rev Log: [COMCTL32] -Fix several tests for the v6 button when themes are enabled. Modified: trunk/reactos/dll/win32/comctl32/button.c trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Wed Feb 22 13:58:49 2017 @@ -205,7 +205,7 @@ return hrgn; } -BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC); +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag); #endif @@ -234,7 +234,7 @@ /* GetDC appears to give a dc with a clip rect that includes the whoe parent, not sure if it is correct or not. */ GetClientRect(hwnd, &rc); IntersectClipRect (hdc, rc.left, rc. top, rc.right, rc.bottom); - if (theme && BUTTON_PaintWithTheme(theme, hwnd, hdc)) + if (theme && BUTTON_PaintWithTheme(theme, hwnd, hdc, 0)) { ReleaseDC( hwnd, hdc ); return; @@ -426,7 +426,7 @@ HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); #ifndef _USER32_ HTHEME theme = GetWindowTheme(hWnd); - if (theme && BUTTON_PaintWithTheme(theme, hWnd, hdc)) + if (theme && BUTTON_PaintWithTheme(theme, hWnd, hdc, uMsg == WM_PRINTCLIENT ? lParam : 0)) { if ( !wParam ) EndPaint( hWnd, &ps ); return 0; Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Wed Feb 22 13:58:49 2017 @@ -34,7 +34,20 @@ STATE_DEFAULTED } ButtonState; -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag); + +#define STATE_GWL_OFFSET 0 +#define HFONT_GWL_OFFSET (sizeof(LONG)) + +static inline LONG get_button_state( HWND hwnd ) +{ + return GetWindowLongPtrW( hwnd, STATE_GWL_OFFSET ); +} + +static inline HFONT get_button_font( HWND hwnd ) +{ + return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); +} static UINT get_drawtext_flags(DWORD style, DWORD ex_style) { @@ -87,12 +100,12 @@ return text; } -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; RECT bgRect, textRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT font = get_button_font(hwnd); HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; int state = states[ drawState ]; WCHAR *text = get_button_text(hwnd); @@ -100,8 +113,12 @@ GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + } + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); if (text) { @@ -127,7 +144,7 @@ if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int cb_states[3][5] = { @@ -145,7 +162,7 @@ SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; - LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); + LRESULT checkState = get_button_state(hwnd) & 3; DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON @@ -168,7 +185,7 @@ created_font = TRUE; } } else { - font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + font = get_button_font(hwnd); hPrevFont = SelectObject(hDC, font); } @@ -186,7 +203,10 @@ bgRect.right = bgRect.left + sz.cx; textRect.left = bgRect.right + 6; - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + DrawThemeParentBackground(hwnd, hDC, NULL); + } DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (text) @@ -214,7 +234,7 @@ if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; @@ -235,7 +255,7 @@ created_font = TRUE; } } else { - font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + font = get_button_font(hwnd); hPrevFont = SelectObject(hDC, font); } @@ -257,8 +277,12 @@ GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + } + DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); SelectClipRgn(hDC, NULL); @@ -294,12 +318,12 @@ NULL, /* Not defined */ }; -BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC) +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) { DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + int state = get_button_state(hwnd); ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; if (!paint) @@ -314,6 +338,6 @@ } else drawState = STATE_DISABLED; - paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS); + paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); return TRUE; }

1 0

[gadamopoulos] 73884: [COMCTL32] -Fix a couple more button tests.
by gadamopoulos＠svn.reactos.org 22 Feb '17

22 Feb '17

Author: gadamopoulos Date: Wed Feb 22 13:24:17 2017 New Revision: 73884 URL: http://svn.reactos.org/svn/reactos?rev=73884&view=rev Log: [COMCTL32] -Fix a couple more button tests. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Wed Feb 22 13:24:17 2017 @@ -626,7 +626,10 @@ case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); set_button_state( hWnd, get_button_state(hWnd) | BST_FOCUS ); - InvalidateRect(hWnd, NULL, FALSE); + if (btn_type == BS_OWNERDRAW) + paint_button( hWnd, btn_type, ODA_FOCUS ); + else + InvalidateRect(hWnd, NULL, FALSE); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; @@ -635,7 +638,6 @@ TRACE("WM_KILLFOCUS %p\n",hWnd); state = get_button_state( hWnd ); set_button_state( hWnd, state & ~BST_FOCUS ); - paint_button( hWnd, btn_type, ODA_FOCUS ); if ((state & BUTTON_BTNPRESSED) && GetCapture() == hWnd) ReleaseCapture();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs