June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : advapi32: Move sid functions to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: d03eae54f43298d8f26ddc0bf35feac4f308487b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03eae54f43298d8f26ddc0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:35:17 2019 +0200 advapi32: Move sid functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 32 +-- dlls/advapi32/security.c | 329 ----------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 32 +-- dlls/kernelbase/security.c | 445 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 478 insertions(+), 361 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d03eae54f43298d8f26d…

1 0

Alexandre Julliard : vtdapi.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: f28998a1cc28d35f308a5cf835a7c59f9e1dc210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f28998a1cc28d35f308a5cf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:40:04 2019 +0200 vtdapi.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vtdapi.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vtdapi.vxd/Makefile.in b/dlls/vtdapi.vxd/Makefile.in index 685495e..7bfcc89 100644 --- a/dlls/vtdapi.vxd/Makefile.in +++ b/dlls/vtdapi.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = vtdapi.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vtdapi.c

1 0

Jacek Caban : ntoskrnl.exe: Implement KeBugCheck and KeBugCheckEx.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 39d4f9d8afed0b67928ec471be7ae4a0b07e8150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d4f9d8afed0b67928ec471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 25 15:36:15 2019 +0200 ntoskrnl.exe: Implement KeBugCheck and KeBugCheckEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45656 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 1 + include/ddk/wdm.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 79c45c7..209410c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3182,6 +3182,23 @@ BOOLEAN WINAPI KeAreApcsDisabled(void) } /*********************************************************************** + * KeBugCheck (NTOSKRNL.@) + */ +void WINAPI KeBugCheck(ULONG code) +{ + KeBugCheckEx(code, 0, 0, 0, 0); +} + +/*********************************************************************** + * KeBugCheckEx (NTOSKRNL.@) + */ +void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_PTR param3, ULONG_PTR param4) +{ + ERR( "%x %lx %lx %lx %lx\n", code, param1, param2, param3, param4 ); + ExitProcess( code ); +} + +/*********************************************************************** * ProbeForRead (NTOSKRNL.EXE.@) */ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index afe216b..d119f37 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -525,8 +525,8 @@ @ stub KeAddSystemServiceTable @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess -@ stub KeBugCheck -@ stub KeBugCheckEx +@ stdcall KeBugCheck(long) +@ stdcall KeBugCheckEx(long long long long long) @ stdcall KeCancelTimer(ptr) @ stub KeCapturePersistentThreadState @ stdcall KeClearEvent(ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 4afef81..8c7ead7 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -217,6 +217,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); BOOLEAN WINAPI KeAreApcsDisabled(void); +void WINAPI DECLSPEC_NORETURN KeBugCheck(ULONG); NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index f79b36a..e3333e9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1613,6 +1613,7 @@ void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK*); #endif void WINAPI KeAcquireSpinLockAtDpcLevel(KSPIN_LOCK*); +void WINAPI DECLSPEC_NORETURN KeBugCheckEx(ULONG,ULONG_PTR,ULONG_PTR,ULONG_PTR,ULONG_PTR); BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Justin Martin : d3d9: Implement d3d9_device_CreateRenderTargetEx().
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 6ad6c1ff4afe290482a5ac566e4d3f41f99b1e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ad6c1ff4afe290482a5ac56… Author: Justin Martin <jaming(a)protonmail.com> Date: Tue Jun 25 16:48:24 2019 +0430 d3d9: Implement d3d9_device_CreateRenderTargetEx(). Signed-off-by: Justin Martin <jaming(a)protonmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 21 ++++++++++++++++++--- dlls/d3d9/tests/d3d9ex.c | 5 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fbdceb..e2da02b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4059,16 +4059,31 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " - "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int access = WINED3D_RESOURCE_ACCESS_GPU; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "lockable %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); *surface = NULL; + + if (usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (lockable) + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + + return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), + multisample_type, multisample_quality, usage & WINED3DUSAGE_MASK, + WINED3D_BIND_RENDER_TARGET, access, width, height, NULL, surface); } static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 306241a..354a51d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3932,7 +3932,7 @@ static void test_format_unknown(void) iface = (void *)0xdeadbeef; hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; @@ -4372,8 +4372,7 @@ static void test_resource_access(void) case SURFACE_RT_EX: hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 16, 16, format, D3DMULTISAMPLE_NONE, 0, tests[j].pool != D3DPOOL_DEFAULT, &surface, NULL, tests[j].usage); - todo_wine - ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (FAILED(hr)) continue;

1 0

Alexandre Julliard : vwin32.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 89a160dd9ee5cd6da3c5ebebc6cfaef938c07157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89a160dd9ee5cd6da3c5ebeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:40:40 2019 +0200 vwin32.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vwin32.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in index 6157900..01e53f6 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = vwin32.vxd IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vwin32.c

1 0

Alexandre Julliard : vulkan-1: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: a6a0c82c59daf3e411abe41053a56a3a86241443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a0c82c59daf3e411abe410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:40:36 2019 +0200 vulkan-1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 2abc54d..0ec2877 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -2,6 +2,8 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan IMPORTLIB = vulkan-1 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vulkan.c

1 0

Zhiyi Zhang : winex11.drv: Use generic EnumDisplayMonitors.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 074abfe097e31d382772aaa5fc8fdee45bbc2656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=074abfe097e31d382772aaa5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 16:38:38 2019 +0800 winex11.drv: Use generic EnumDisplayMonitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 10 ------- dlls/user32/sysparams.c | 58 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 2 ++ dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 5 ++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 15 +--------- 8 files changed, 69 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b29292..bf60070 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -354,16 +354,6 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } -static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - RECT r = {0, 0, 640, 480}; - - TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - - proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); - return TRUE; -} - static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { return FALSE; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4d644b9..17becff 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -251,6 +251,9 @@ static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); + +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) /* Strings for monitor functions */ static const WCHAR DEFAULT_ADAPTER_NAME[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; @@ -3815,6 +3818,61 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, #endif } +BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + USEROBJECTFLAGS flags; + HWINSTA winstation; + BOOL success = FALSE; + HDEVINFO devinfo; + RECT monitor_rect; + DWORD state_flags; + HANDLE mutex; + DWORD type; + DWORD i = 0; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + /* Use SetupAPI to get monitors only if window station has visible display surfaces */ + winstation = GetProcessWindowStation(); + if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) + { + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) + || !(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + { + if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) + { + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return FALSE; + } + success = TRUE; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + } + + /* Fallback to report one monitor if using SetupAPI failed */ + if (!success) + { + RECT default_rect = {0, 0, 640, 480}; + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; + } + return TRUE; +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf67..a503ebe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -122,6 +122,8 @@ extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; +extern BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) DECLSPEC_HIDDEN; + struct received_message_info; enum user_obj_type diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a0495c4..ecbcd6b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -304,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ce2c568..d6969b0 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; @@ -276,6 +277,10 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) goto done; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto done; ret = TRUE; done: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 614f0b9..5b00a5d 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -20,7 +20,6 @@ @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx -@ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ed5e268..a6b0769 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,8 @@ struct x11drv_monitor { /* Name */ WCHAR name[128]; + /* RcMonitor in MONITORINFO struct */ + RECT rc_monitor; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index e401531..c8fa63f 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -321,6 +321,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * && !IsRectEmpty( &monitors[first].rcMonitor ))) { lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; if (!IsRectEmpty( &monitors[i].rcMonitor )) @@ -410,17 +411,3 @@ BOOL CDECL X11DRV_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[i].szDevice ); return TRUE; } - - -/*********************************************************************** - * X11DRV_EnumDisplayMonitors (X11DRV.@) - */ -BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) -{ - int i; - - for (i = 0; i < nb_monitors; i++) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - - return TRUE; -}

1 0

Alexandre Julliard : advapi32: Move performance stubs to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 0b709c5d853a7aae86931f13647382290af75cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b709c5d853a7aae86931f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 13:09:34 2019 +0200 advapi32: Move performance stubs to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 14 ++++---- dlls/advapi32/perf.c | 72 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 14 ++++---- dlls/kernelbase/main.c | 66 +++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 87 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index db5015e..e530ada 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ crypt_lmhash.c \ eventlog.c \ lsa.c \ - perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a0283cf..231ab05 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -555,11 +555,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -@ stdcall PerfCreateInstance(long ptr wstr long) +@ stdcall -import PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -@ stdcall PerfDeleteInstance(long ptr) +@ stdcall -import PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -575,13 +575,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -@ stdcall PerfSetCounterRefValue(long ptr long ptr) -@ stdcall PerfSetCounterSetInfo(long ptr long) +@ stdcall -import PerfSetCounterRefValue(long ptr long ptr) +@ stdcall -import PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -@ stdcall PerfStartProvider(ptr ptr ptr) -@ stdcall PerfStartProviderEx(ptr ptr ptr) -@ stdcall PerfStopProvider(long) +@ stdcall -import PerfStartProvider(ptr ptr ptr) +@ stdcall -import PerfStartProviderEx(ptr ptr ptr) +@ stdcall -import PerfStopProvider(long) @ stdcall -import PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall -import PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c deleted file mode 100644 index 6712eae..0000000 --- a/dlls/advapi32/perf.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * advapi32 perf functions - * - * Copyright 2017 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "perflib.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) -{ - FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); - return NULL; -} - -ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) -{ - FIXME("%p %p: stub\n", provider, block); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) -{ - FIXME("%p %p %u: stub\n", handle, template, size); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) -{ - FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) -{ - FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) -{ - FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStopProvider(HANDLE handle) -{ - FIXME("%p: stub\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; -} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 6322e69..95dd28c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1145,20 +1145,20 @@ @ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA @ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) kernel32.PeekNamedPipe -@ stdcall PerfCreateInstance(long ptr wstr long) advapi32.PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue -@ stdcall PerfDeleteInstance(long ptr) advapi32.PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfIncrementULongCounterValue # @ stub PerfIncrementULongLongCounterValue # @ stub PerfQueryInstance -@ stdcall PerfSetCounterRefValue(long ptr long ptr) advapi32.PerfSetCounterRefValue -@ stdcall PerfSetCounterSetInfo(long ptr long) advapi32.PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -@ stdcall PerfStartProvider(ptr ptr ptr) advapi32.PerfStartProvider -@ stdcall PerfStartProviderEx(ptr ptr ptr) advapi32.PerfStartProviderEx -@ stdcall PerfStopProvider(long) advapi32.PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) # @ stub PoolPerAppKeyStateInternal @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus # @ stub PrefetchVirtualMemory diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 240b730..e00f9d1 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -24,6 +24,7 @@ #include "windows.h" #include "appmodel.h" #include "shlwapi.h" +#include "perflib.h" #include "wine/debug.h" #include "wine/heap.h" @@ -94,6 +95,71 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po } /*********************************************************************** + * PerfCreateInstance (KERNELBASE.@) + */ +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, + const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +/*********************************************************************** + * PerfDeleteInstance (KERNELBASE.@) + */ +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfSetCounterSetInfo (KERNELBASE.@) + */ +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfSetCounterRefValue (KERNELBASE.@) + */ +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, + ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStartProvider (KERNELBASE.@) + */ +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStartProviderEx (KERNELBASE.@) + */ +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStopProvider (KERNELBASE.@) + */ +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * QuirkIsEnabled (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled(void *arg)

1 0

Alexandre Julliard : advapi32: Move access control functions to kernelbase.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: de406c70e515ce5cfbf9453ab4368cb22e9cfe1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de406c70e515ce5cfbf9453a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:36:14 2019 +0200 advapi32: Move access control functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 58 +++--- dlls/advapi32/security.c | 379 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 58 +++--- dlls/kernelbase/security.c | 272 ++++++++++++++++++++++++++++ 4 files changed, 330 insertions(+), 437 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de406c70e515ce5cfbf9…

1 0

Ken Thomases : gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 7c2d5a7c25437bc872c8ddf335466cffc0e995fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c2d5a7c25437bc872c8ddf3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 25 16:39:11 2019 +0800 gdi32: Also accept "\\.\DISPLAY<n>" devices names with <n> other than 1 as display devices. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 96c2f1f..dcbc480 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -136,6 +136,32 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** + * is_display_device + */ +static BOOL is_display_device( LPCWSTR name ) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW( name, display_deviceW, sizeof(display_deviceW) / sizeof(WCHAR) )) + return FALSE; + + p += sizeof(display_deviceW) / sizeof(WCHAR); + + if (!isdigitW( *p++ )) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW( *p )) + return FALSE; + } + + return TRUE; +} + + +/********************************************************************** * DRIVER_load_driver */ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) @@ -143,10 +169,9 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) HMODULE module; struct graphics_driver *driver, *new_driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); + if (!strcmpiW( name, displayW ) || is_display_device( name )) return get_display_driver(); if ((module = GetModuleHandleW( name ))) { @@ -883,13 +908,12 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) { static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR empty_strW[] = { 0 }; WCHAR *p; /* display is a special case */ if (!strcmpiW( device, displayW ) || - !strcmpiW( device, display1W )) + is_display_device( device )) { lstrcpynW( driver, displayW, size ); return TRUE;

1 0