Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[tfaber] 74266: [I8042PRT][PCIIDEX] - Silence debug prints about IRP_MN_QUERY_CAPABILITIES

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 2 14:35:33 2017 New Revision: 74266 URL: http://svn.reactos.org/svn/reactos?rev=74266&view=rev Log: [I8042PRT][PCIIDEX] - Silence debug prints about IRP_MN_QUERY_CAPABILITIES Modified: trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/storage/ide/pciidex/fdo.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Sun Apr 2 14:35:33 2017 @@ -723,12 +723,17 @@ } break; } + case IRP_MN_QUERY_CAPABILITIES: /* (optional) 0x09 */ + { + TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0x0d */ { TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); } - case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ + case IRP_MN_QUERY_PNP_DEVICE_STATE: /* (optional) 0x14 */ { TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_PNP_DEVICE_STATE\n"); return ForwardIrpAndForget(DeviceObject, Irp); Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] Sun Apr 2 14:35:33 2017 @@ -462,6 +462,11 @@ DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); } + case IRP_MN_QUERY_CAPABILITIES: /* 0x09 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + } default: { DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", MinorFunction);

7 years, 8 months

[tfaber] 74265: [HAL][NTOS:PNP] - Silence some debug prints about unhandled PNP minor functions

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 2 14:24:11 2017 New Revision: 74265 URL: http://svn.reactos.org/svn/reactos?rev=74265&view=rev Log: [HAL][NTOS:PNP] - Silence some debug prints about unhandled PNP minor functions Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Sun Apr 2 14:24:11 2017 @@ -787,6 +787,34 @@ (PVOID)&Irp->IoStatus.Information); break; + case IRP_MN_QUERY_DEVICE_TEXT: + + /* Inherit whatever status we had */ + DPRINT("Query text for the PDO\n"); + Status = Irp->IoStatus.Status; + break; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + + /* Inherit whatever status we had */ + DPRINT("Filter resource requirements for the PDO\n"); + Status = Irp->IoStatus.Status; + break; + + case IRP_MN_QUERY_PNP_DEVICE_STATE: + + /* Inherit whatever status we had */ + DPRINT("Query device state for the PDO\n"); + Status = Irp->IoStatus.Status; + break; + + case IRP_MN_QUERY_BUS_INFORMATION: + + /* Inherit whatever status we had */ + DPRINT("Query bus information for the PDO\n"); + Status = Irp->IoStatus.Status; + break; + default: /* We don't handle anything else, so inherit the old state */ @@ -821,7 +849,7 @@ IN PIRP Irp) { PFDO_EXTENSION FdoExtension; - + DPRINT1("HAL: PnP Driver Power!\n"); FdoExtension = DeviceObject->DeviceExtension; if (FdoExtension->ExtensionType == FdoExtensionType) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Apr 2 14:24:11 2017 @@ -1189,6 +1189,10 @@ Status = PdoQueryId(DeviceObject, Irp, IrpSp); break; + case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_PNP_DEVICE_STATE\n"); + break; + case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); Status = PdoQueryBusInformation(DeviceObject, Irp, IrpSp);

7 years, 8 months

[dquintana] 74264: [blackshade.msstyle] Replaced the mockup image with a more up-to-date version, and added the "source" .PSD file it was created from. Someday I'll get around to to turning this in...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Apr 2 11:32:31 2017 New Revision: 74264 URL: http://svn.reactos.org/svn/reactos?rev=74264&view=rev Log: [blackshade.msstyle] Replaced the mockup image with a more up-to-date version, and added the "source" .PSD file it was created from. Someday I'll get around to to turning this into the actual theme. Someday. Added: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.psd (with props) Modified: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png Modified: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary files - no diff available. Added: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.psd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.psd ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

7 years, 8 months

[tfaber] 74263: [NTOS:MM] - Really only warn once in MmSecureVirtualMemory/MmUnsecureVirtualMemory, not on every 256th call

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 2 08:37:39 2017 New Revision: 74263 URL: http://svn.reactos.org/svn/reactos?rev=74263&view=rev Log: [NTOS:MM] - Really only warn once in MmSecureVirtualMemory/MmUnsecureVirtualMemory, not on every 256th call Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Apr 2 08:37:39 2017 @@ -2670,7 +2670,7 @@ IN SIZE_T Length, IN ULONG Mode) { - static BOOLEAN Warn; if (!Warn++) UNIMPLEMENTED; + static ULONG Warn; if (!Warn++) UNIMPLEMENTED; return Address; } @@ -2681,7 +2681,7 @@ NTAPI MmUnsecureVirtualMemory(IN PVOID SecureMem) { - static BOOLEAN Warn; if (!Warn++) UNIMPLEMENTED; + static ULONG Warn; if (!Warn++) UNIMPLEMENTED; } /* SYSTEM CALLS ***************************************************************/

7 years, 8 months

[ekohl] 74262: [SCEDSVC] - Implement a simple job list. - Implement NetrJobAdd, NetrJobDel and NetrJobGetInfo.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 1 22:54:30 2017 New Revision: 74262 URL: http://svn.reactos.org/svn/reactos?rev=74262&view=rev Log: [SCEDSVC] - Implement a simple job list. - Implement NetrJobAdd, NetrJobDel and NetrJobGetInfo. Modified: trunk/reactos/base/services/schedsvc/precomp.h trunk/reactos/base/services/schedsvc/rpcserver.c trunk/reactos/base/services/schedsvc/schedsvc.c Modified: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Sat Apr 1 22:54:30 2017 @@ -10,9 +10,14 @@ #include <winreg.h> #include <winsvc.h> +#include <ndk/rtlfuncs.h> + #include <atsvc_s.h> #include <wine/debug.h> + +extern LIST_ENTRY JobListHead; +extern RTL_RESOURCE JobListLock; DWORD WINAPI Modified: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Sat Apr 1 22:54:30 2017 @@ -32,6 +32,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); +typedef struct _JOB +{ + LIST_ENTRY Entry; + DWORD JobId; + + DWORD_PTR JobTime; + DWORD DaysOfMonth; + UCHAR DaysOfWeek; + UCHAR Flags; + WCHAR Command[1]; +} JOB, *PJOB; + +DWORD dwNextJobId = 0; +DWORD dwJobCount = 0; +LIST_ENTRY JobListHead; +RTL_RESOURCE JobListLock; + + /* FUNCTIONS *****************************************************************/ DWORD @@ -85,6 +103,41 @@ LPAT_INFO pAtInfo, LPDWORD pJobId) { + PJOB pJob; + + TRACE("NetrJobAdd(%S %p %p)\n", + ServerName, pAtInfo, pJobId); + + /* Allocate a new job object */ + pJob = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(JOB) + wcslen(pAtInfo->Command) * sizeof(WCHAR)); + if (pJob == NULL) + return ERROR_OUTOFMEMORY; + + /* Initialize the job object */ + pJob->JobTime = pAtInfo->JobTime; + pJob->DaysOfMonth = pAtInfo->DaysOfMonth; + pJob->DaysOfWeek = pAtInfo->DaysOfWeek; + pJob->Flags = pAtInfo->Flags; + wcscpy(pJob->Command, pAtInfo->Command); + + /* Acquire the job list lock exclusively */ + RtlAcquireResourceExclusive(&JobListLock, TRUE); + + /* Assign a new job ID */ + pJob->JobId = dwNextJobId++; + dwJobCount++; + + /* Append the new job to the job list */ + InsertTailList(&JobListHead, &pJob->Entry); + + /* Release the job list lock */ + RtlReleaseResource(&JobListLock); + + /* Return the new job ID */ + *pJobId = pJob->JobId; + return ERROR_SUCCESS; } @@ -97,6 +150,38 @@ DWORD MinJobId, DWORD MaxJobId) { + PLIST_ENTRY JobEntry, NextEntry; + PJOB CurrentJob; + + TRACE("NetrJobDel(%S %lu %lu)\n", + ServerName, MinJobId, MaxJobId); + + /* Acquire the job list lock exclusively */ + RtlAcquireResourceExclusive(&JobListLock, TRUE); + + JobEntry = JobListHead.Flink; + while (JobEntry != &JobListHead) + { + CurrentJob = CONTAINING_RECORD(JobEntry, JOB, Entry); + + if ((CurrentJob->JobId >= MinJobId) && (CurrentJob->JobId <= MaxJobId)) + { + NextEntry = JobEntry->Flink; + if (RemoveEntryList(JobEntry)) + { + dwJobCount--; + HeapFree(GetProcessHeap(), 0, CurrentJob); + JobEntry = NextEntry; + continue; + } + } + + JobEntry = JobEntry->Flink; + } + + /* Release the job list lock */ + RtlReleaseResource(&JobListLock); + return ERROR_SUCCESS; } @@ -111,6 +196,8 @@ LPDWORD pTotalEntries, LPDWORD pResumeHandle) { + TRACE("NetrJobEnum(%S %p %lu %p %p)\n", + ServerName, pEnumContainer, PreferedMaximumLength, pTotalEntries, pResumeHandle); return ERROR_SUCCESS; } @@ -123,7 +210,62 @@ DWORD JobId, LPAT_INFO *ppAtInfo) { - return ERROR_SUCCESS; + PLIST_ENTRY JobEntry; + PJOB CurrentJob; + PAT_INFO pInfo; + DWORD dwError = ERROR_FILE_NOT_FOUND; + + TRACE("NetrJobGetInfo(%S %lu %p)\n", + ServerName, JobId, ppAtInfo); + + /* Acquire the job list lock exclusively */ + RtlAcquireResourceShared(&JobListLock, TRUE); + + /* Traverse the job list */ + JobEntry = JobListHead.Flink; + while (JobEntry != &JobListHead) + { + CurrentJob = CONTAINING_RECORD(JobEntry, JOB, Entry); + + /* Do we have the right job? */ + if (CurrentJob->JobId == JobId) + { + pInfo = midl_user_allocate(sizeof(AT_INFO)); + if (pInfo == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + pInfo->Command = midl_user_allocate((wcslen(CurrentJob->Command) + 1) * sizeof(WCHAR)); + if (pInfo->Command == NULL) + { + midl_user_free(pInfo); + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + pInfo->JobTime = CurrentJob->JobTime; + pInfo->DaysOfMonth = CurrentJob->DaysOfMonth; + pInfo->DaysOfWeek = CurrentJob->DaysOfWeek; + pInfo->Flags = CurrentJob->Flags; + wcscpy(pInfo->Command, CurrentJob->Command); + + *ppAtInfo = pInfo; + + dwError = ERROR_SUCCESS; + goto done; + } + + /* Next job */ + JobEntry = JobEntry->Flink; + } + +done: + /* Release the job list lock */ + RtlReleaseResource(&JobListLock); + + return dwError; } /* EOF */ Modified: trunk/reactos/base/services/schedsvc/schedsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] Sat Apr 1 22:54:30 2017 @@ -61,6 +61,7 @@ &ServiceStatus); } + static DWORD WINAPI ServiceControlHandler(DWORD dwControl, DWORD dwEventType, @@ -114,20 +115,25 @@ { HANDLE hThread; + /* Initialize the job list */ + InitializeListHead(&JobListHead); + + /* Initialize the job list lock */ + RtlInitializeResource(&JobListLock); + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RpcThreadRoutine, NULL, 0, NULL); - if (!hThread) { ERR("Can't create PortThread\n"); return GetLastError(); } - else - CloseHandle(hThread); + + CloseHandle(hThread); return ERROR_SUCCESS; }

7 years, 8 months

[gadamopoulos] 74261: [UXTHEME] -Implement painting the corner of the scrollbars.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Apr 1 12:17:15 2017 New Revision: 74261 URL: http://svn.reactos.org/svn/reactos?rev=74261&view=rev Log: [UXTHEME] -Implement painting the corner of the scrollbars. 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] Sat Apr 1 12:17:15 2017 @@ -45,6 +45,16 @@ } return ret; +} + +BOOL +IsScrollBarVisible(HWND hWnd, INT hBar) +{ + SCROLLBARINFO sbi = {sizeof(SCROLLBARINFO)}; + if(!GetScrollBarInfo(hWnd, hBar, &sbi)) + return FALSE; + + return !(sbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN); } static BOOL @@ -487,6 +497,39 @@ pcontext->Active); } +static void ThemeDrawScrollBarsGrip(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +{ + RECT rcPart; + HWND hwndParent; + RECT ParentClientRect; + DWORD ParentStyle; + + rcPart = *prcCurrent; + + if (pcontext->wi.dwExStyle & WS_EX_LEFTSCROLLBAR) + rcPart.right = rcPart.left + GetSystemMetrics(SM_CXVSCROLL); + else + rcPart.left = rcPart.right - GetSystemMetrics(SM_CXVSCROLL); + + rcPart.top = rcPart.bottom - GetSystemMetrics(SM_CYHSCROLL); + + FillRect(pcontext->hDC, &rcPart, GetSysColorBrush(COLOR_BTNFACE)); + + hwndParent = GetParent(pcontext->hWnd); + GetClientRect(hwndParent, &ParentClientRect); + ParentStyle = GetWindowLongW(hwndParent, GWL_STYLE); + + if (HASSIZEGRIP(pcontext->wi.dwStyle, pcontext->wi.dwExStyle, ParentStyle, pcontext->wi.rcWindow, ParentClientRect)) + { + int iState; + if (pcontext->wi.dwExStyle & WS_EX_LEFTSCROLLBAR) + iState = pcontext->wi.dwExStyle & WS_EX_LEFTSCROLLBAR; + else + iState = SZB_RIGHTALIGN; + DrawThemeBackground(pcontext->scrolltheme, pcontext->hDC, SBP_SIZEBOX, iState, &rcPart, NULL); + } +} + static void ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBuffering) { @@ -516,11 +559,18 @@ if (pcontext->wi.dwExStyle & WS_EX_CLIENTEDGE) DrawEdge(pcontext->hDC, prcCurrent, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - if(pcontext->wi.dwStyle & WS_HSCROLL) + if((pcontext->wi.dwStyle & WS_HSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL)) ThemeDrawScrollBar(pcontext, SB_HORZ , NULL); - if(pcontext->wi.dwStyle & WS_VSCROLL) + if((pcontext->wi.dwStyle & WS_VSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) ThemeDrawScrollBar(pcontext, SB_VERT, NULL); + + if((pcontext->wi.dwStyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL) && + IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL) && + IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) + { + ThemeDrawScrollBarsGrip(pcontext, prcCurrent); + } } /*

7 years, 8 months

[gadamopoulos] 74260: [WIN32K] -Correct one parameter in NtUserPaintMenuBar and make it return the height of the menu bar. [UXTHEME] -Pass the correct parameter to PaintMenuBar. Draw the edge of WS...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Apr 1 10:18:40 2017 New Revision: 74260 URL: http://svn.reactos.org/svn/reactos?rev=74260&view=rev Log: [WIN32K] -Correct one parameter in NtUserPaintMenuBar and make it return the height of the menu bar. [UXTHEME] -Pass the correct parameter to PaintMenuBar. Draw the edge of WS_EX_CLIENTEDGE even if the window has a themed frame. Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/win32ss/user/ntuser/menu.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] Sat Apr 1 10:18:40 2017 @@ -474,11 +474,17 @@ InflateRect(prcCurrent, -Width, -Height); } - - if (context->wi.dwExStyle & WS_EX_CLIENTEDGE) - { - DrawEdge(context->hDC, prcCurrent, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - } +} + +static void ThemeDrawMenuBar(PDRAW_CONTEXT pcontext, RECT* prcCurrent) +{ + /* Let the window manager paint the menu */ + prcCurrent->top += PaintMenuBar(pcontext->hWnd, + pcontext->hDC, + pcontext->wi.cxWindowBorders, + pcontext->wi.cxWindowBorders, + prcCurrent->top, + pcontext->Active); } static void @@ -505,7 +511,10 @@ return; if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) - PaintMenuBar(pcontext->hWnd, pcontext->hDC, prcCurrent->left, prcCurrent->right, prcCurrent->top, pcontext->Active); + ThemeDrawMenuBar(pcontext, prcCurrent); + + if (pcontext->wi.dwExStyle & WS_EX_CLIENTEDGE) + DrawEdge(pcontext->hDC, prcCurrent, EDGE_SUNKEN, BF_RECT | BF_ADJUST); if(pcontext->wi.dwStyle & WS_HSCROLL) ThemeDrawScrollBar(pcontext, SB_HORZ , NULL); Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Apr 1 10:18:40 2017 @@ -6050,13 +6050,14 @@ NtUserPaintMenuBar( HWND hWnd, HDC hDC, - ULONG left, - ULONG right, + ULONG leftBorder, + ULONG rightBorder, ULONG top, BOOL bActive) { PWND Window; RECT Rect; + DWORD ret; UserEnterExclusive(); @@ -6067,17 +6068,16 @@ return 0; } - Rect.left = left; - Rect.right = right; + Rect.left = leftBorder; + Rect.right = Window->rcWindow.right - Window->rcWindow.left - rightBorder; Rect.top = top; Rect.bottom = 0; - MENU_DrawMenuBar(hDC, &Rect, Window, FALSE); + ret = MENU_DrawMenuBar(hDC, &Rect, Window, FALSE); UserLeave(); - /* I am not sure about what this function returns */ - return 0; + return ret; } /*

7 years, 8 months

[ekohl] 74259: [UMPNPMGR] Broadcast a WM_DEVICECHANGE message on device arrrival and removal. CORE-12977

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 1 08:07:39 2017 New Revision: 74259 URL: http://svn.reactos.org/svn/reactos?rev=74259&view=rev Log: [UMPNPMGR] Broadcast a WM_DEVICECHANGE message on device arrrival and removal. CORE-12977 Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/CMa… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Sat Apr 1 08:07:39 2017 @@ -12,5 +12,5 @@ target_link_libraries(umpnpmgr wdmguid ${PSEH_LIB}) set_module_type(umpnpmgr win32dll UNICODE) -add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll) +add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt user32 kernel32 ntdll) add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all) 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] Sat Apr 1 08:07:39 2017 @@ -37,6 +37,8 @@ #include <winbase.h> #include <winreg.h> #include <winsvc.h> +#include <winuser.h> +#include <dbt.h> #include <stdio.h> #include <cmfuncs.h> #include <rtlfuncs.h> @@ -3563,8 +3565,16 @@ } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { + DWORD dwRecipient; + DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); - /* FIXME: ? */ + + dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; + BroadcastSystemMessageW(BSF_POSTMESSAGE, + &dwRecipient, + WM_DEVICECHANGE, + DBT_DEVNODES_CHANGED, + 0); } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) { @@ -3576,11 +3586,29 @@ } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) { + DWORD dwRecipient; + DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + + dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; + BroadcastSystemMessageW(BSF_POSTMESSAGE, + &dwRecipient, + WM_DEVICECHANGE, + DBT_DEVNODES_CHANGED, + 0); } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) { + DWORD dwRecipient; + DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + + dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; + BroadcastSystemMessageW(BSF_POSTMESSAGE, + &dwRecipient, + WM_DEVICECHANGE, + DBT_DEVNODES_CHANGED, + 0); } else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) {

7 years, 8 months

[jimtabor] 74258: [Win32SS] - Patch by Alex Henrie : Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. - Modified for ReactOS.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Apr 1 02:01:59 2017 New Revision: 74258 URL: http://svn.reactos.org/svn/reactos?rev=74258&view=rev Log: [Win32SS] - Patch by Alex Henrie : Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. - Modified for ReactOS. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Apr 1 02:01:59 2017 @@ -720,6 +720,16 @@ */ ERR("WM_NCRBUTTONUP\n"); break; + + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) + { + co_IntSendMessage(UserHMGetHandle(Wnd), WM_APPCOMMAND, (WPARAM)UserHMGetHandle(Wnd), + MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); + } + break; + case WM_CONTEXTMENU: { Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sat Apr 1 02:01:59 2017 @@ -374,6 +374,15 @@ * message to the window". When is it appropriate? */ ERR("WM_NCRBUTTONUP\n"); + break; + + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) + { + SendMessageW(hWnd, WM_APPCOMMAND, (WPARAM)hWnd, + MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); + } break; case WM_CONTEXTMENU:

7 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2017