August 2019 - Wine-devel - list.winehq.org

[PATCH 3/3] winex11.drv: Make screen helpers independent of Xinerama.
by Zhiyi Zhang 21 Aug '19

21 Aug '19

So that other display device handlers such as XRandR can be introduced because they might report a virtual screen size with different top-left corner and the primary screen may be different as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 70 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xinerama.c | 33 ----------------- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a0f8489245..f96fd93a54 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,6 +104,34 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; +static RECT virtual_screen_rect; +static RECT primary_monitor_rect; + +POINT virtual_screen_to_root(INT x, INT y) +{ + POINT pt; + pt.x = x - virtual_screen_rect.left; + pt.y = y - virtual_screen_rect.top; + return pt; +} + +POINT root_to_virtual_screen(INT x, INT y) +{ + POINT pt; + pt.x = x + virtual_screen_rect.left; + pt.y = y + virtual_screen_rect.top; + return pt; +} + +RECT get_virtual_screen_rect(void) +{ + return virtual_screen_rect; +} + +RECT get_primary_monitor_rect(void) +{ + return primary_monitor_rect; +} void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { @@ -293,6 +321,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); + if (video_index == 0) + primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -317,6 +348,9 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + SetRectEmpty(&virtual_screen_rect); + SetRectEmpty(&primary_monitor_rect); + /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -365,6 +399,36 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Initialize virtual screen rect and primary monitor rect for current process */ +static void init_screen_rects(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + RECT rect; + + /* Already initialized */ + if (!IsRectEmpty(&virtual_screen_rect)) + return; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, + sizeof(rect), NULL, 0)) + ERR("Failed to get monitor size property\n"); + + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); + if (i == 1) + primary_monitor_rect = rect; + } + SetupDiDestroyDeviceInfoList(devinfo); + + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); +} + void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -393,7 +457,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) + { + init_screen_rects(); goto done; + } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -440,6 +507,9 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); + done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 75ef3a2a99..370d34e9cd 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -static RECT virtual_screen_rect; - static MONITORINFOEXW default_monitor = { sizeof(default_monitor), /* cbSize */ @@ -161,32 +159,6 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ -POINT virtual_screen_to_root( INT x, INT y ) -{ - POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; - return pt; -} - -POINT root_to_virtual_screen( INT x, INT y ) -{ - POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; - return pt; -} - -RECT get_virtual_screen_rect(void) -{ - return virtual_screen_rect; -} - -RECT get_primary_monitor_rect(void) -{ - return get_primary()->rcMonitor; -} - static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -349,7 +321,6 @@ void xinerama_init( unsigned int width, unsigned int height ) } primary = get_primary(); - SetRectEmpty( &virtual_screen_rect ); /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -357,7 +328,6 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); - UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor 0x%x: %s work %s%s\n", i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), @@ -373,7 +343,4 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.pFreeAdapters = xinerama_free_adapters; handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); - - TRACE( "virtual size: %s primary: %s\n", - wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

3 2

[PATCH 2/3] winex11.drv: Add xrandr_get_screen_resources() helper.
by Zhiyi Zhang 21 Aug '19

21 Aug '19

Getting screen resources will be used in multiple places. So put it in a function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9f63310291..288b83fde5 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -274,6 +274,20 @@ static void xrandr10_init_modes(void) #ifdef HAVE_XRRGETSCREENRESOURCES +static XRRScreenResources *xrandr_get_screen_resources(void) +{ + XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); + if (resources && !resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + resources = pXRRGetScreenResources( gdi_display, root_window ); + } + + if (!resources) + ERR("Failed to get screen resources.\n"); + return resources; +} + static int xrandr12_get_current_mode(void) { XRRScreenResources *resources; @@ -448,21 +462,8 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); + if (!(resources = xrandr_get_screen_resources())) return ret; - } - - if (!resources->ncrtc) - { - pXRRFreeScreenResources( resources ); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return ret; - } - } if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) { -- 2.20.1

3 2

[PATCH 1/3] user32: Wait for graphics driver to be ready in EnumDisplayDevicesW.
by Zhiyi Zhang 21 Aug '19

21 Aug '19

It's possible that EnumDisplayDevicesW gets called before graphics driver is loaded. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 167499. dlls/user32/sysparams.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3f93f9c827..4541795672 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -736,6 +736,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW( GetDesktopWindow(), WM_NULL, 0, 0 ); + ready = TRUE; + } +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -4058,6 +4070,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); /* Find adapter */ -- 2.20.1

3 2

[PATCH 3/5] jscript: Support properties argument in Object.create.
by Jacek Caban 21 Aug '19

21 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 2/5] jscript: Add Object.defineProperties implementation.
by Jacek Caban 21 Aug '19

21 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 67 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] jscript: Support enumerating own properties.
by Jacek Caban 21 Aug '19

21 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 54 ++++++++++++++++++++++++------------------ dlls/jscript/jscript.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-)

1 0

[PATCH 2/2] wined3d: Fix stencil reference truncation.
by Zhiyi Zhang 21 Aug '19

21 Aug '19

This fix a regression introduced by a9e199e5ad76c0540381f25011d6051ace3e7c0a, which is causing ULTIMATE MARVEL VS CAPCOM 3 (SteamID: 357190) to have black artifacts in characters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/cs.c | 7 +++++-- dlls/wined3d/state.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c7de570b42..55d2223212 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11206,7 +11206,7 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 280, 360); - todo_wine ok(color == 0x000000f0, "has color 0x%08x, expected 0x00000090\n", color); + ok(color == 0x000000f0, "has color 0x%08x, expected 0x00000090\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32f9954a03..044d586b29 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1152,9 +1152,12 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + else if (prev) { - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + if (prev->format->stencil_size != op->view->format->stencil_size) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); } device_invalidate_state(device, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4cdca277f6..54c0c67fba 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -925,7 +925,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; mask = state->render_states[WINED3D_RS_STENCILMASK]; - ref = state->render_states[WINED3D_RS_STENCILREF] & mask; + ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb->depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); -- 2.23.0.rc1

2 1

Re: [PATCH] iphlpapi: restore spaces after 65549c5e58d42b4736bb47251030a6f6d0c0a66a.
by Serge Gautherie 21 Aug '19

21 Aug '19

Hum. Restoring consistent indentation is my very point... On 20/08/2019 22:35, Marvin wrote: > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Formatting". > > Either the indentation is messed up --

2 1

[PATCH 1/3] ntoskrnl.exe: Use a manual-reset event for remove locks.
by Zebediah Figura 20 Aug '19

20 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 4ab8b49724..7aed1d0483 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1205,7 +1205,7 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n", lock, tag, max_minutes, max_count, size); - KeInitializeEvent( &lock->Common.RemoveEvent, SynchronizationEvent, FALSE ); + KeInitializeEvent( &lock->Common.RemoveEvent, NotificationEvent, FALSE ); lock->Common.Removed = FALSE; lock->Common.IoCount = 0; } -- 2.22.0

2 5

[PATCH 1/2] widl: Check for redefinition of named user types.
by Zebediah Figura 20 Aug '19

20 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typetree.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index faa582034f..524d00571f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -285,6 +285,8 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined t->details.enumeration->enums = enums; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of enum %s\n", name); return t; } @@ -311,6 +313,8 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of struct %s\n", name); return t; } @@ -336,6 +340,8 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of union %s\n", name); return t; } @@ -367,6 +373,8 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio t->details.structure->fields = append_var(t->details.structure->fields, union_field); t->defined = TRUE; } + else + error_loc("redefinition of union %s\n", name); return t; } -- 2.22.0

1 1