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

Alexandre Julliard : vwin32.vxd: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

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

Jacek Caban : tdi.sys: Fix EXTRADLLFLAGS.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: d03f825241d524feadae18c64e79681993ebf95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d03f825241d524feadae18c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 24 23:34:42 2019 +0200 tdi.sys: Fix EXTRADLLFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 9d5e05f..eef2fec 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wl,--subsystem,native -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Zhiyi Zhang : winex11.drv: Use generic EnumDisplayMonitors.
by Alexandre Julliard 25 Jun '19

25 Jun '19

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

Zhiyi Zhang : winex11.drv: Use generic GetMonitorInfo.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 23b28323cb904bc9823f422ac21aa499690c4e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b28323cb904bc9823f422a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 16:39:01 2019 +0800 winex11.drv: Use generic GetMonitorInfo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 23 ----------------- dlls/user32/sysparams.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/display.c | 12 +++++++++ dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xinerama.c | 40 +++-------------------------- 7 files changed, 72 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23b28323cb904bc9823f…

1 0

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

25 Jun '19

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

Alexandre Julliard : advapi32: Move registry functions to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: c7548d6c4fcc37844503f67d41e2a4bc2e429dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7548d6c4fcc37844503f67d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:34:15 2019 +0200 advapi32: Move registry functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 + dlls/advapi32/advapi32.spec | 94 +- dlls/advapi32/registry.c | 3545 +++------------------------------------ dlls/kernelbase/kernelbase.spec | 98 +- dlls/kernelbase/main.c | 2 +- dlls/kernelbase/registry.c | 3112 +++++++++++++++++++++++++++++++++- include/winreg.h | 3 + 7 files changed, 3424 insertions(+), 3431 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7548d6c4fcc37844503…

1 0

Alexandre Julliard : advapi32: Move sid functions to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

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 : advapi32: Move token functions to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 7557620aeb92eba6793ba3f5249c27c8658ace30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7557620aeb92eba6793ba3f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:35:37 2019 +0200 advapi32: Move token functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 36 +-- dlls/advapi32/security.c | 569 ---------------------------------------- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/kernelbase.spec | 36 +-- dlls/kernelbase/security.c | 352 +++++++++++++++++++++++++ 5 files changed, 389 insertions(+), 606 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7557620aeb92eba6793b…

1 0

Alexandre Julliard : advapi32: Move security descriptor functions to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 0ded44024280316baba41ac9c6458dc1ca3f4f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ded44024280316baba41ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 12:35:52 2019 +0200 advapi32: Move security descriptor functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 52 ++--- dlls/advapi32/security.c | 481 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 52 ++--- dlls/kernelbase/security.c | 401 +++++++++++++++++++++++++++++++++ 4 files changed, 453 insertions(+), 533 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ded44024280316baba4…

1 0

Alexandre Julliard : advapi32: Move access control functions to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

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