Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[ekohl] 73796: [UMPNPMGR] PNP_GetDeviceList and PNP_GetDeviceListSize: - Do not return CR_CALL_NOT_IMPLEMENTED by default. - pulLength is counted in characters, not in bytes! - Use the correct Rela...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 13 22:59:40 2017 New Revision: 73796 URL: http://svn.reactos.org/svn/reactos?rev=73796&view=rev Log: [UMPNPMGR] PNP_GetDeviceList and PNP_GetDeviceListSize: - Do not return CR_CALL_NOT_IMPLEMENTED by default. - pulLength is counted in characters, not in bytes! - Use the correct Relations value for PowerRelations. [NDK] Add the PowerRelations value to a comment. [DEVMGR] CM_Get_Device_ID_List_Size_ExW and CM_Get_Device_ID_List_ExW count the buffer length in characters, not in bytes! Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/devmgr/properties/advprop.cpp trunk/reactos/sdk/include/ndk/cmtypes.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -489,7 +489,7 @@ DWORD ulFlags) { PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; - CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; DPRINT("PNP_GetDeviceList() called\n"); @@ -501,9 +501,7 @@ return CR_INVALID_POINTER; // if (Buffer == NULL) -// return - - *pulLength = 0; +// return CR_INVALID_POINTER; if (ulFlags & (CM_GETIDLIST_FILTER_BUSRELATIONS | @@ -519,19 +517,18 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) { - /* FIXME */ + PlugPlayData.Relations = 2; + } + else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) + { + PlugPlayData.Relations = 1; + } + else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) + { PlugPlayData.Relations = 0; } - else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) - { - PlugPlayData.Relations = 1; - } - else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) - { - PlugPlayData.Relations = 0; - } - - PlugPlayData.BufferSize = *pulLength; + + PlugPlayData.BufferSize = *pulLength * sizeof(WCHAR); PlugPlayData.Buffer = Buffer; Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, @@ -539,7 +536,7 @@ sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); if (NT_SUCCESS(Status)) { - *pulLength = PlugPlayData.BufferSize; + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); } else { @@ -548,15 +545,15 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else /* CM_GETIDLIST_FILTER_NONE */ { - + ret = CR_CALL_NOT_IMPLEMENTED; } return ret; @@ -573,7 +570,7 @@ DWORD ulFlags) { PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; - CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; DPRINT("PNP_GetDeviceListSize() called\n"); @@ -600,8 +597,7 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) { - /* FIXME */ - PlugPlayData.Relations = 0; + PlugPlayData.Relations = 2; } else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) { @@ -620,7 +616,7 @@ sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); if (NT_SUCCESS(Status)) { - *pulLength = PlugPlayData.BufferSize; + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); } else { @@ -629,15 +625,15 @@ } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) { - + ret = CR_CALL_NOT_IMPLEMENTED; } else /* CM_GETIDLIST_FILTER_NONE */ { - + ret = CR_CALL_NOT_IMPLEMENTED; } return ret; @@ -994,7 +990,7 @@ done: - if(pulTransferLen) + if (pulTransferLen) *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; if (hKey != NULL) Modified: trunk/reactos/dll/win32/devmgr/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/propertie… ============================================================================== --- trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/properties/advprop.cpp [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -1339,7 +1339,6 @@ ULONG ulLength = 0; LPWSTR pszBuffer = NULL, pszStr; INT index = 0, len; - CONFIGRET ret; ret = CM_Get_Device_ID_List_Size_ExW(&ulLength, @@ -1351,7 +1350,7 @@ pszBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - ulLength); + ulLength * sizeof(WCHAR)); if (pszBuffer == NULL) return; Modified: trunk/reactos/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/cmtypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] Mon Feb 13 22:59:40 2017 @@ -466,7 +466,7 @@ typedef struct _PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA { UNICODE_STRING DeviceInstance; - ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 3:BusRelations + ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 2:PowerRelations, 3:BusRelations ULONG BufferSize; PWCHAR Buffer; } PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA;

7 years, 7 months

[ekohl] 73795: [NTOSKRNL] Implement IopGetDeviceRelations().

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 13 22:38:11 2017 New Revision: 73795 URL: http://svn.reactos.org/svn/reactos?rev=73795&view=rev Log: [NTOSKRNL] Implement IopGetDeviceRelations(). Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Mon Feb 13 22:38:11 2017 @@ -163,7 +163,6 @@ } return IopTraverseDeviceNode(IopRootDeviceNode, DeviceInstance); - } static NTSTATUS @@ -357,7 +356,7 @@ { _SEH2_TRY { - memcpy(PropertyData->Buffer, Buffer, BufferSize); + RtlCopyMemory(PropertyData->Buffer, Buffer, BufferSize); PropertyData->BufferSize = BufferSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -645,11 +644,160 @@ NTSTATUS IopGetDeviceRelations(PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA RelationsData) { + UNICODE_STRING DeviceInstance; + PDEVICE_OBJECT DeviceObject = NULL; + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations = NULL; + PDEVICE_OBJECT ChildDeviceObject; + PDEVICE_NODE ChildDeviceNode; + ULONG i; + ULONG Relations; + ULONG BufferSize, RequiredSize; + ULONG BufferLeft; + PWCHAR Buffer, Ptr; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("IopGetDeviceRelations() called\n"); DPRINT("Device name: %wZ\n", &RelationsData->DeviceInstance); - DPRINT("Relations: %lu\n", &RelationsData->Relations); - - return STATUS_NOT_IMPLEMENTED; + DPRINT("Relations: %lu\n", RelationsData->Relations); + DPRINT("BufferSize: %lu\n", RelationsData->BufferSize); + DPRINT("Buffer: %p\n", RelationsData->Buffer); + + _SEH2_TRY + { + Relations = RelationsData->Relations; + BufferSize = RelationsData->BufferSize; + Buffer = RelationsData->Buffer; + + ProbeForWrite(RelationsData->Buffer, + RelationsData->BufferSize, + sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + Status = IopCaptureUnicodeString(&DeviceInstance, &RelationsData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopCaptureUnicodeString() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + if (DeviceObject == NULL) + { + DPRINT1("IopGetDeviceObjectFromDeviceInstance() returned NULL\n"); + Status = STATUS_NO_SUCH_DEVICE; + goto done; + } + + switch (Relations) + { + case 0: /* EjectRelations */ + Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; + break; + + case 1: /* RemovalRelations */ + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; + break; + + case 2: /* PowerRelations */ + Stack.Parameters.QueryDeviceRelations.Type = PowerRelations; + break; + + case 3: /* BusRelations */ + Stack.Parameters.QueryDeviceRelations.Type = BusRelations; + break; + + default: + Status = STATUS_INVALID_PARAMETER; + goto done; + } + + Status = IopInitiatePnpIrp(DeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); + goto done; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + DPRINT("Found %d device relations\n", DeviceRelations->Count); + + _SEH2_TRY + { + RequiredSize = 0; + BufferLeft = BufferSize; + Ptr = Buffer; + + for (i = 0; i < DeviceRelations->Count; i++) + { + ChildDeviceObject = DeviceRelations->Objects[i]; + + ChildDeviceNode = IopGetDeviceNode(ChildDeviceObject); + if (ChildDeviceNode) + { + DPRINT("Device instance: %wZ\n", &ChildDeviceNode->InstancePath); + DPRINT("RequiredSize: %hu\n", ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + + if (Ptr != NULL) + { + if (BufferLeft < ChildDeviceNode->InstancePath.Length + 2 * sizeof(WCHAR)) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + RtlCopyMemory(Ptr, + ChildDeviceNode->InstancePath.Buffer, + ChildDeviceNode->InstancePath.Length); + Ptr = (PWCHAR)((ULONG_PTR)Ptr + ChildDeviceNode->InstancePath.Length); + *Ptr = UNICODE_NULL; + Ptr = (PWCHAR)((ULONG_PTR)Ptr + sizeof(WCHAR)); + + BufferLeft -= (ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + } + + RequiredSize += (ChildDeviceNode->InstancePath.Length + sizeof(WCHAR)); + } + } + + if (Ptr != NULL && BufferLeft >= sizeof(WCHAR)) + *Ptr = UNICODE_NULL; + + if (RequiredSize > 0) + RequiredSize += sizeof(WCHAR); + + DPRINT("BufferSize: %lu RequiredSize: %lu\n", RelationsData->BufferSize, RequiredSize); + + RelationsData->BufferSize = RequiredSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + +done: + if (DeviceRelations != NULL) + ExFreePool(DeviceRelations); + + if (DeviceObject != NULL) + ObDereferenceObject(DeviceObject); + + if (DeviceInstance.Buffer != NULL) + ExFreePool(DeviceInstance.Buffer); + + return Status; } static NTSTATUS

7 years, 7 months

[gadamopoulos] 73794: [SHELL32] -Call CPlApplet export of control panel applets with the correct activation context.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 22:09:14 2017 New Revision: 73794 URL: http://svn.reactos.org/svn/reactos?rev=73794&view=rev Log: [SHELL32] -Call CPlApplet export of control panel applets with the correct activation context. Modified: trunk/reactos/dll/win32/shell32/wine/control.c trunk/reactos/dll/win32/shell32/wine/cpanel.h Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Mon Feb 13 22:09:14 2017 @@ -53,6 +53,11 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { +#ifdef __REACTOS__ + ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID}; + ULONG_PTR cookie; + BOOL bActivated; +#endif CPlApplet* applet; DWORD len; unsigned i; @@ -79,6 +84,13 @@ } applet->hWnd = hWnd; + +#ifdef __REACTOS__ + ActCtx.lpSource = applet->cmd; + ActCtx.lpResourceName = (LPCWSTR)123; + applet->hActCtx = CreateActCtx(&ActCtx); + bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE); +#endif if (!(applet->hModule = LoadLibraryW(applet->cmd))) { WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); @@ -171,6 +183,11 @@ } } +#ifdef __REACTOS__ + if (bActivated) + DeactivateActCtx(0, cookie); +#endif + #ifndef __REACTOS__ list_add_head( &panel->applets, &applet->entry ); #endif @@ -805,6 +822,10 @@ applet = Control_LoadApplet(hWnd, buffer, panel); if (applet) { +#ifdef __REACTOS__ + ULONG_PTR cookie; + BOOL bActivated; +#endif /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { @@ -820,10 +841,20 @@ sp = 0; } +#ifdef __REACTOS__ + bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE); +#endif + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); Control_UnloadApplet(applet); + +#ifdef __REACTOS__ + if (bActivated) + DeactivateActCtx(0, cookie); +#endif + } HeapFree(GetProcessHeap(), 0, buffer); Modified: trunk/reactos/dll/win32/shell32/wine/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cpa… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/cpanel.h [iso-8859-1] Mon Feb 13 22:09:14 2017 @@ -41,6 +41,8 @@ typedef struct CPlApplet { #ifndef __REACTOS__ struct list entry; +#else + HANDLE hActCtx; #endif HWND hWnd; LPWSTR cmd; /* path to applet */

7 years, 7 months

[pschweitzer] 73793: [FASTFAT] In order to make VfatVerify() work on something else than floppies, ask for change count when issuing IOCTL_DISK_CHECK_VERIFY

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 13 21:17:26 2017 New Revision: 73793 URL: http://svn.reactos.org/svn/reactos?rev=73793&view=rev Log: [FASTFAT] In order to make VfatVerify() work on something else than floppies, ask for change count when issuing IOCTL_DISK_CHECK_VERIFY Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Mon Feb 13 21:17:26 2017 @@ -624,6 +624,7 @@ PDEVICE_EXTENSION DeviceExt; BOOLEAN AllowRaw; PVPB Vpb; + ULONG ChangeCount, BufSize = sizeof(ChangeCount); DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); @@ -642,8 +643,8 @@ IOCTL_DISK_CHECK_VERIFY, NULL, 0, - NULL, - 0, + &ChangeCount, + &BufSize, TRUE); if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) {

7 years, 7 months

[gadamopoulos] 73792: [UXTHEME] -Move the global variables for the scrollbars into the WND_CONTEXT. Hook ThemeGetScrollInfo to set the correct tracking position as tracking is handled completely in...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 18:45:18 2017 New Revision: 73792 URL: http://svn.reactos.org/svn/reactos?rev=73792&view=rev Log: [UXTHEME] -Move the global variables for the scrollbars into the WND_CONTEXT. Hook ThemeGetScrollInfo to set the correct tracking position as tracking is handled completely in uxtheme. Fixes scrolling while dragging the scrollbar thumb in the listview control. Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Feb 13 18:45:18 2017 @@ -13,15 +13,6 @@ #include <assert.h> -static BOOL SCROLL_trackVertical; -static enum SCROLL_HITTEST SCROLL_trackHitTest; -/* Is the moving thumb being displayed? */ -static BOOL SCROLL_MovingThumb = FALSE; -static HWND SCROLL_TrackingWin = 0; -static INT SCROLL_TrackingBar = 0; -static INT SCROLL_TrackingPos = 0; -static INT SCROLL_TrackingVal = 0; - static void ScreenToWindow( HWND hWnd, POINT* pt) { RECT rcWnd; @@ -244,9 +235,9 @@ } } -static void SCROLL_DrawMovingThumb( PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, BOOL vertical) -{ - INT pos = SCROLL_TrackingPos; +static void SCROLL_DrawMovingThumb(PWND_CONTEXT pwndContext, PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, BOOL vertical) +{ + INT pos = pwndContext->SCROLL_TrackingPos; INT max_size; if( vertical ) @@ -263,7 +254,7 @@ SCROLL_DrawInterior(pcontext, psbi, pos, vertical, SCROLL_THUMB, 0); - SCROLL_MovingThumb = !SCROLL_MovingThumb; + pwndContext->SCROLL_MovingThumb = !pwndContext->SCROLL_MovingThumb; } @@ -274,12 +265,16 @@ SCROLLBARINFO sbi; BOOL vertical; enum SCROLL_HITTEST htHot = SCROLL_NOWHERE; - - if (SCROLL_TrackingWin) - return; + PWND_CONTEXT pwndContext; if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) return; + + if (!(pwndContext = ThemeGetWndContext(pcontext->hWnd))) + return; + + if (pwndContext->SCROLL_TrackingWin) + return; /* Retrieve scrollbar info */ sbi.cbSize = sizeof(sbi); @@ -372,7 +367,7 @@ } static void -SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +SCROLL_HandleScrollEvent(PWND_CONTEXT pwndContext, HWND hwnd, INT nBar, UINT msg, POINT pt) { /* Previous mouse position for timer events */ static POINT prevPt; @@ -402,7 +397,7 @@ return; } - if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) + if ((pwndContext->SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) return; ThemeInitDrawContext(&context, hwnd, 0); @@ -417,8 +412,8 @@ { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(hwnd); /* hide caret while holding down LBUTTON */ - SCROLL_trackVertical = vertical; - SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt, FALSE ); + pwndContext->SCROLL_trackVertical = vertical; + pwndContext->SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt, FALSE ); lastClickPos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x - sbi.rcScrollBar.left); lastMousePos = lastClickPos; trackThumbPos = sbi.xyThumbTop; @@ -451,15 +446,15 @@ //TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", // hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); - switch(SCROLL_trackHitTest) + switch(pwndContext->SCROLL_trackHitTest) { case SCROLL_NOWHERE: /* No tracking in progress */ break; case SCROLL_TOP_ARROW: - if (hittest == SCROLL_trackHitTest) - { - SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0 ); + if (hittest == pwndContext->SCROLL_trackHitTest) + { + SCROLL_DrawArrows( &context, &sbi, vertical, pwndContext->SCROLL_trackHitTest, 0 ); if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, @@ -478,8 +473,8 @@ break; case SCROLL_TOP_RECT: - SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, SCROLL_trackHitTest, 0); - if (hittest == SCROLL_trackHitTest) + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, pwndContext->SCROLL_trackHitTest, 0); + if (hittest == pwndContext->SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { @@ -495,20 +490,20 @@ case SCROLL_THUMB: if (msg == WM_LBUTTONDOWN) { - SCROLL_TrackingWin = hwnd; - SCROLL_TrackingBar = nBar; - SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos; - SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, - vertical, SCROLL_TrackingPos ); - if (!SCROLL_MovingThumb) - SCROLL_DrawMovingThumb(&context, &sbi, vertical); + pwndContext->SCROLL_TrackingWin = hwnd; + pwndContext->SCROLL_TrackingBar = nBar; + pwndContext->SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos; + pwndContext->SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, + vertical, pwndContext->SCROLL_TrackingPos ); + if (!pwndContext->SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical); } else if (msg == WM_LBUTTONUP) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb(&context, &sbi, vertical); - - SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0, SCROLL_trackHitTest ); + if (pwndContext->SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical); + + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0, pwndContext->SCROLL_trackHitTest ); } else /* WM_MOUSEMOVE */ { @@ -521,28 +516,28 @@ pt = SCROLL_ClipPos( &sbi.rcScrollBar, pt ); pos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x - sbi.rcScrollBar.left); } - if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) + if ( (pos != lastMousePos) || (!pwndContext->SCROLL_MovingThumb) ) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( &context, &sbi, vertical); + if (pwndContext->SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical); lastMousePos = pos; - SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; - SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, + pwndContext->SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; + pwndContext->SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar, vertical, - SCROLL_TrackingPos ); + pwndContext->SCROLL_TrackingPos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, - MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), + MAKEWPARAM( SB_THUMBTRACK, pwndContext->SCROLL_TrackingVal), (LPARAM)hwndCtl ); - if (!SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( &context, &sbi, vertical); + if (!pwndContext->SCROLL_MovingThumb) + SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical); } } break; case SCROLL_BOTTOM_RECT: - if (hittest == SCROLL_trackHitTest) - { - SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, SCROLL_trackHitTest, 0 ); + if (hittest == pwndContext->SCROLL_trackHitTest) + { + SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, pwndContext->SCROLL_trackHitTest, 0 ); if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, @@ -559,9 +554,9 @@ break; case SCROLL_BOTTOM_ARROW: - if (hittest == SCROLL_trackHitTest) - { - SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0 ); + if (hittest == pwndContext->SCROLL_trackHitTest) + { + SCROLL_DrawArrows( &context, &sbi, vertical, pwndContext->SCROLL_trackHitTest, 0 ); if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, @@ -593,8 +588,8 @@ if (msg == WM_LBUTTONUP) { - hittest = SCROLL_trackHitTest; - SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */ + hittest = pwndContext->SCROLL_trackHitTest; + pwndContext->SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */ if (hittest == SCROLL_THUMB) { @@ -608,7 +603,7 @@ SB_ENDSCROLL, (LPARAM)hwndCtl ); /* Terminate tracking */ - SCROLL_TrackingWin = 0; + pwndContext->SCROLL_TrackingWin = 0; } ThemeCleanupDrawContext(&context); @@ -618,10 +613,13 @@ SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; + PWND_CONTEXT pwndContext = ThemeGetWndContext(hwnd); + if(!pwndContext) + return; ScreenToWindow(hwnd, &pt); - SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); + SCROLL_HandleScrollEvent(pwndContext, hwnd, scrollbar, WM_LBUTTONDOWN, pt ); do { @@ -635,7 +633,7 @@ pt.y = GET_Y_LPARAM(msg.lParam); ClientToScreen(hwnd, &pt); ScreenToWindow(hwnd, &pt); - SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); + SCROLL_HandleScrollEvent(pwndContext, hwnd, scrollbar, msg.message, pt ); } else { Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Mon Feb 13 18:45:18 2017 @@ -267,6 +267,44 @@ } return user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw); +} + +BOOL ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) +{ + PWND_CONTEXT pwndContext; + DWORD style; + BOOL ret; + + /* Avoid creating a window context if it is not needed */ + if(!IsAppThemed()) + goto dodefault; + + style = GetWindowLongW(hwnd, GWL_STYLE); + if((style & (WS_HSCROLL|WS_VSCROLL))==0) + goto dodefault; + + pwndContext = ThemeGetWndContext(hwnd); + if (pwndContext == NULL) + goto dodefault; + + /* + * Uxtheme needs to handle the tracking of the scrollbar itself + * This means than if an application needs to get the track position + * with GetScrollInfo, it will get wrong data. So uxtheme needs to + * hook it and set the correct tracking position itself + */ + ret = user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); + if ( lpsi && + (lpsi->fMask & SIF_TRACKPOS) && + pwndContext->SCROLL_TrackingWin == hwnd && + pwndContext->SCROLL_TrackingBar == fnBar) + { + lpsi->nTrackPos = pwndContext->SCROLL_TrackingVal; + } + return ret; + +dodefault: + return user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); } /********************************************************************** @@ -303,6 +341,7 @@ puah->DlgProcArray.Size = UAHOWP_MAX_SIZE; puah->SetWindowRgn = ThemeSetWindowRgn; + puah->GetScrollInfo = (FARPROC)ThemeGetScrollInfo; UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Mon Feb 13 18:45:18 2017 @@ -118,6 +118,16 @@ LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD *dwValueLen); + /* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; /* The window context stores data for the window needed through the life of the window */ typedef struct _WND_CONTEXT @@ -127,6 +137,14 @@ BOOL HasThemeRgn; BOOL UpdatingRgn; BOOL DirtyThemeRegion; + + BOOL SCROLL_trackVertical; + enum SCROLL_HITTEST SCROLL_trackHitTest; + BOOL SCROLL_MovingThumb; /* Is the moving thumb being displayed? */ + HWND SCROLL_TrackingWin; + INT SCROLL_TrackingBar; + INT SCROLL_TrackingPos; + INT SCROLL_TrackingVal; } WND_CONTEXT, *PWND_CONTEXT; /* The draw context stores data that are needed by the drawing operations in the non client area of the window */ @@ -168,17 +186,6 @@ BUTTON_INACTIVE } THEME_BUTTON_STATES; - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - #define HT_ISBUTTON(ht) ((ht) == HTMINBUTTON || (ht) == HTMAXBUTTON || (ht) == HTCLOSE || (ht) == HTHELP) #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \

7 years, 7 months

[gadamopoulos] 73791: [UXTHEME] -Remove an overzealous check that prevented the scrollbar from being repainted when the cursor was moving in it.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 17:31:14 2017 New Revision: 73791 URL: http://svn.reactos.org/svn/reactos?rev=73791&view=rev Log: [UXTHEME] -Remove an overzealous check that prevented the scrollbar from being repainted when the cursor was moving in it. Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Feb 13 17:31:14 2017 @@ -706,10 +706,6 @@ tme.dwFlags = TME_LEAVE | TME_NONCLIENT; TrackMouseEvent(&tme); } - - /* Dont do any drawing if the hit test wasn't changed */ - if (ht == pcontext->lastHitTest) - return 0; ThemeInitDrawContext(&context, hWnd, 0); if (context.wi.dwStyle & WS_SYSMENU)

7 years, 7 months

[gadamopoulos] 73790: [UXTHEME] -Fix the size of the thump in the themed scrollbar. CORE-7988

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 17:27:13 2017 New Revision: 73790 URL: http://svn.reactos.org/svn/reactos?rev=73790&view=rev Log: [UXTHEME] -Fix the size of the thump in the themed scrollbar. CORE-7988 Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Feb 13 17:27:13 2017 @@ -113,7 +113,7 @@ pt.y -= psbi->rcScrollBar.top; if (pt.y < psbi->xyThumbTop) return SCROLL_TOP_RECT; - if (pt.y >= psbi->xyThumbTop + psbi->dxyLineButton) + if (pt.y >= psbi->xyThumbBottom) return SCROLL_BOTTOM_RECT; } else /* horizontal */ @@ -127,7 +127,7 @@ pt.x -= psbi->rcScrollBar.left; if (pt.x < psbi->xyThumbTop) return SCROLL_TOP_RECT; - if (pt.x >= psbi->xyThumbTop + psbi->dxyLineButton) + if (pt.x >= psbi->xyThumbBottom) return SCROLL_BOTTOM_RECT; } return SCROLL_THUMB; @@ -215,12 +215,12 @@ if (vertical) { rcPart = r; - rcPart.bottom = rcPart.top + thumbPos - psbi->dxyLineButton; + rcPart.bottom = thumbPos; SCROLL_ThemeDrawPart(pcontext, SBP_UPPERTRACKVERT, BUTTON_NORMAL, psbi, SCROLL_TOP_RECT, htDown, htHot, &rcPart); r.top = rcPart.bottom; rcPart = r; - rcPart.top += psbi->dxyLineButton; + rcPart.top += psbi->xyThumbBottom - psbi->xyThumbTop; SCROLL_ThemeDrawPart(pcontext, SBP_LOWERTRACKVERT, BUTTON_NORMAL, psbi, SCROLL_BOTTOM_RECT, htDown, htHot, &rcPart); r.bottom = rcPart.top; @@ -230,12 +230,12 @@ else /* horizontal */ { rcPart = r; - rcPart.right = rcPart.left + thumbPos - psbi->dxyLineButton; + rcPart.right = thumbPos; SCROLL_ThemeDrawPart(pcontext, SBP_UPPERTRACKHORZ, BUTTON_NORMAL, psbi, SCROLL_TOP_RECT, htDown, htHot, &rcPart); r.left = rcPart.right; rcPart = r; - rcPart.left += psbi->dxyLineButton; + rcPart.left += psbi->xyThumbBottom - psbi->xyThumbTop; SCROLL_ThemeDrawPart(pcontext, SBP_LOWERTRACKHORZ, BUTTON_NORMAL, psbi, SCROLL_BOTTOM_RECT, htDown, htHot, &rcPart); r.right = rcPart.left; @@ -252,12 +252,12 @@ if( vertical ) max_size = psbi->rcScrollBar.bottom - psbi->rcScrollBar.top; else - max_size = psbi->rcScrollBar.right - psbi->rcScrollBar.left; - - max_size -= (psbi->dxyLineButton -SCROLL_ARROW_THUMB_OVERLAP) + psbi->dxyLineButton; - - if( pos < (psbi->dxyLineButton-SCROLL_ARROW_THUMB_OVERLAP) ) - pos = (psbi->dxyLineButton-SCROLL_ARROW_THUMB_OVERLAP); + max_size = psbi->rcScrollBar.right - psbi->rcScrollBar.left; + + max_size -= psbi->xyThumbBottom - psbi->xyThumbTop + psbi->dxyLineButton; + + if( pos < (psbi->dxyLineButton) ) + pos = (psbi->dxyLineButton); else if( pos > max_size ) pos = max_size; @@ -274,6 +274,12 @@ SCROLLBARINFO sbi; BOOL vertical; enum SCROLL_HITTEST htHot = SCROLL_NOWHERE; + + if (SCROLL_TrackingWin) + return; + + if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || + ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) return; /* Retrieve scrollbar info */ sbi.cbSize = sizeof(sbi); @@ -296,9 +302,6 @@ ScreenToWindow(pcontext->hWnd, pt); htHot = SCROLL_HitTest(pcontext->hWnd, &sbi, vertical, *pt, FALSE); } - - if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || - ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) return; /* do not draw if the scrollbar rectangle is empty */ if(IsRectEmpty(&sbi.rcScrollBar)) return;

7 years, 7 months

[gadamopoulos] 73789: [COMCTL32] -Fix drawing the borders of themed controls. Patch by Sylvain Deverre. CORE-10761

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 15:08:47 2017 New Revision: 73789 URL: http://svn.reactos.org/svn/reactos?rev=73789&view=rev Log: [COMCTL32] -Fix drawing the borders of themed controls. Patch by Sylvain Deverre. CORE-10761 Modified: trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Mon Feb 13 15:08:47 2017 @@ -10637,8 +10637,10 @@ CombineRgn (cliprgn, cliprgn, region, RGN_AND); OffsetRect(&r, -r.left, -r.top); - dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); + dc = GetWindowDC(infoPtr->hwndSelf); + /* Exclude client part */ + ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom -cyEdge); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwndSelf, dc, &r); Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] Mon Feb 13 15:08:47 2017 @@ -52,9 +52,11 @@ CombineRgn (cliprgn, cliprgn, region, RGN_AND); OffsetRect(&r, -r.left, -r.top); - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); - + dc = GetWindowDC(hwnd); + /* Exclude client part */ + ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom -cyEdge); + if (IsThemeBackgroundPartiallyTransparent (theme, part, state)) DrawThemeParentBackground(hwnd, dc, &r); DrawThemeBackground (theme, dc, part, state, &r, 0); Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_l… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_listbox.c [iso-8859-1] Mon Feb 13 15:08:47 2017 @@ -42,9 +42,11 @@ CombineRgn (cliprgn, cliprgn, region, RGN_AND); OffsetRect(&r, -r.left, -r.top); - dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); - + dc = GetWindowDC(hwnd); + /* Exclude client part */ + ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom -cyEdge); + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(hwnd, dc, &r); DrawThemeBackground (theme, dc, 0, 0, &r, 0); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Mon Feb 13 15:08:47 2017 @@ -5429,8 +5429,10 @@ CombineRgn (cliprgn, cliprgn, region, RGN_AND); OffsetRect(&r, -r.left, -r.top); - dc = GetDCEx(infoPtr->hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); - OffsetRect(&r, -r.left, -r.top); + dc = GetWindowDC(infoPtr->hwnd); + /* Exclude client part */ + ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, + r.right - cxEdge, r.bottom -cyEdge); if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) DrawThemeParentBackground(infoPtr->hwnd, dc, &r);

7 years, 7 months

[gadamopoulos] 73788: [BROWSEUI] -Fix a couple of cases where the tree view can cause a crash.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 15:04:03 2017 New Revision: 73788 URL: http://svn.reactos.org/svn/reactos?rev=73788&view=rev Log: [BROWSEUI] -Fix a couple of cases where the tree view can cause a crash. Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Mon Feb 13 15:04:03 2017 @@ -358,10 +358,12 @@ { /* Destroy memory associated to our node */ NodeInfo* ptr = GetNodeInfo(pnmtv->itemNew.hItem); - - ILFree(ptr->relativePidl); - ILFree(ptr->absolutePidl); - delete ptr; + if (ptr) + { + ILFree(ptr->relativePidl); + ILFree(ptr->absolutePidl); + delete ptr; + } return TRUE; } @@ -1511,7 +1513,10 @@ hr = pDropTarget->DragEnter(pCurObject, glfKeyState, pt, pdwEffect); childTargetNode = info.hItem; } - hr = pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + if (pDropTarget) + { + hr = pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + } } else {

7 years, 7 months

[gadamopoulos] 73787: [USER32_APITEST]: Add a couple more tests for GetClassInfoExW.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 13 09:58:06 2017 New Revision: 73787 URL: http://svn.reactos.org/svn/reactos?rev=73787&view=rev Log: [USER32_APITEST]: Add a couple more tests for GetClassInfoExW. Modified: trunk/rostests/apitests/user32/RegisterClassEx.c Modified: trunk/rostests/apitests/user32/RegisterClassEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RegisterC… ============================================================================== --- trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RegisterClassEx.c [iso-8859-1] Mon Feb 13 09:58:06 2017 @@ -188,6 +188,7 @@ ActivateActCtx(h1, &cookie1); proc2 = _GetWndproc(L"VersionTestClass1", hmod); c = _RegisterClass(L"VersionTestClass1", hmod, 0, DefWindowProcW); + d = _GetClassAtom(L"VersionTestClass1", hmod); proc3 = _GetWndproc(L"VersionTestClass1", hmod); proc4 = _GetWndproc((LPCWSTR)(DWORD_PTR)a, hmod); DeactivateActCtx(0, cookie1); @@ -195,7 +196,9 @@ ok( a != 0, "\n"); ok( b == 0, "\n"); ok( c != 0, "\n"); + ok( d != 0, "\n"); ok( a == c, "\n"); + ok( a == d, "\n"); ok (proc1 == DefWindowProcA, "\n"); ok (proc2 == NULL, "Got 0x%p, expected NULL\n", proc2); ok (proc3 == DefWindowProcW, "Got 0x%p, expected 0x%p\n", proc3, DefWindowProcW);

7 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
36
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 2017