February 2022 - Wine-commits

Rémi Bernon : dinput: Only read effect state reports when exclusively acquired.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 6d7889ef5314ef73187a408a98db0d9113914ac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7889ef5314ef73187a408a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:14 2022 +0100 dinput: Only read effect state reports when exclusively acquired. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4987a9f9872..13c168bca89 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1273,7 +1273,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) if (impl->base.hEvent && memcmp( &params.old_state, impl->base.device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } - else if (report_buf[0] == impl->pid_effect_state.id) + else if (report_buf[0] == impl->pid_effect_state.id && is_exclusively_acquired( impl )) { status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, &index, impl->preparsed, report_buf, report_len );

1 0

Rémi Bernon : dinput: Remove unnecessary critical section entry.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: d5ff6917b76e1584d3a317c6a38687e99340dc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5ff6917b76e1584d3a317c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:15 2022 +0100 dinput: Remove unnecessary critical section entry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 13c168bca89..ee67c904fa5 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1279,7 +1279,6 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) &index, impl->preparsed, report_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_GetUsageValue EFFECT_BLOCK_INDEX returned %#lx\n", status ); - EnterCriticalSection( &impl->base.crit ); effect_state = 0; device_state = impl->base.force_feedback_state & DIGFFS_EMPTY; while (count--) @@ -1308,7 +1307,6 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) LIST_FOR_EACH_ENTRY( effect, &impl->effect_list, struct hid_joystick_effect, entry ) if (effect->index == index) effect->status = effect_state; impl->base.force_feedback_state = device_state; - LeaveCriticalSection( &impl->base.crit ); } memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) );

1 0

Rémi Bernon : dinput: Report optional force feedback state only if supported.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 482768a9e61dccc23099f447f6ceb7a4a8306d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482768a9e61dccc23099f447… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 18 10:31:16 2022 +0100 dinput: Report optional force feedback state only if supported. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ee67c904fa5..00fd01b483a 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -163,6 +163,9 @@ struct pid_effect_state { BYTE id; UINT collection; + struct hid_value_caps *safety_switch_caps; + struct hid_value_caps *actuator_power_caps; + struct hid_value_caps *actuator_override_switch_caps; }; struct hid_joystick @@ -1298,9 +1301,12 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) } } if (!(device_state & DIGFFS_ACTUATORSON)) device_state |= DIGFFS_ACTUATORSOFF; - if (!(device_state & DIGFFS_SAFETYSWITCHON)) device_state |= DIGFFS_SAFETYSWITCHOFF; - if (!(device_state & DIGFFS_USERFFSWITCHON)) device_state |= DIGFFS_USERFFSWITCHOFF; - if (!(device_state & DIGFFS_POWERON)) device_state |= DIGFFS_POWEROFF; + if (!(device_state & DIGFFS_SAFETYSWITCHON) && impl->pid_effect_state.safety_switch_caps) + device_state |= DIGFFS_SAFETYSWITCHOFF; + if (!(device_state & DIGFFS_USERFFSWITCHON) && impl->pid_effect_state.actuator_override_switch_caps) + device_state |= DIGFFS_USERFFSWITCHOFF; + if (!(device_state & DIGFFS_POWERON) && impl->pid_effect_state.actuator_power_caps) + device_state |= DIGFFS_POWEROFF; TRACE( "effect %lu state %#x, device state %#x\n", index, effect_state, device_state ); @@ -1772,7 +1778,15 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap return DIENUM_CONTINUE; if (instance->wCollectionNumber == effect_state->collection) + { SET_REPORT_ID( effect_state ); + if (instance->wUsage == PID_USAGE_SAFETY_SWITCH) + effect_state->safety_switch_caps = caps; + if (instance->wUsage == PID_USAGE_ACTUATOR_POWER) + effect_state->actuator_power_caps = caps; + if (instance->wUsage == PID_USAGE_ACTUATOR_OVERRIDE_SWITCH) + effect_state->actuator_override_switch_caps = caps; + } if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE;

1 0

Matteo Bruni : d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap().
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: dbfd33e5015d65a00ea933e31724ca952b5debc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbfd33e5015d65a00ea933e3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:25 2022 +0100 d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52561 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 62f4eaec124..2ed9131d788 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -4520,7 +4520,7 @@ static void test_D3DXSHProjectCubeMap(void) { hr = IDirect3DCubeTexture9_LockRect(texture, face, level, &map_desc, NULL, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - memset(map_desc.pBits, 0xcc, 4 * map_desc.Pitch); + memset(map_desc.pBits, 0xcc, (8 >> level) * map_desc.Pitch); hr = IDirect3DCubeTexture9_UnlockRect(texture, face, level); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); }

1 0

Matteo Bruni : d3dx9/tests: Initialize an input variable.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: e1463532beb330acd0f30fc556a7fe9e558d20f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1463532beb330acd0f30fc5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:26 2022 +0100 d3dx9/tests: Initialize an input variable. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2ed9131d788..501895665f7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3309,6 +3309,7 @@ static void test_D3DXFloat_Array(void) }; /* exception on NULL out or in parameter */ + single.f = 0.0f; out = D3DXFloat32To16Array(&half, &single.f, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half);

1 0

Matteo Bruni : d3dx9/tests: Get rid of unnecessary ifs.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 6cf61d4239f3266624487bb8eb7ca9075bde332e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf61d4239f3266624487bb8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:27 2022 +0100 d3dx9/tests: Get rid of unnecessary ifs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 177 +++++++++++++++++++++---------------------- 1 file changed, 85 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf61d4239f326662448…

1 0

Matteo Bruni : d3dx9: Build with nameless unions.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 514bac00cc1b36f593c5099dfa6bd2fdf57dd571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=514bac00cc1b36f593c5099d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:28 2022 +0100 d3dx9: Build with nameless unions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 - dlls/d3dx9_36/effect.c | 10 +- dlls/d3dx9_36/math.c | 772 +++++++++++++++++++++--------------------- dlls/d3dx9_36/mesh.c | 38 +-- 4 files changed, 412 insertions(+), 409 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=514bac00cc1b36f593c5…

1 0

Matteo Bruni : d3dx9: Handle D3DXCONSTTABLE_LARGEADDRESSAWARE flag.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 67f6073b9e299303a63fc4a7ce7640a9b9c8d693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f6073b9e299303a63fc4a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 18 11:14:29 2022 +0100 d3dx9: Handle D3DXCONSTTABLE_LARGEADDRESSAWARE flag. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 16 ++++++++++++---- dlls/d3dx9_36/tests/shader.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d5b58222ca2..2241455898e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -681,11 +681,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re } -struct ID3DXConstantTableImpl { +struct ID3DXConstantTableImpl +{ ID3DXConstantTable ID3DXConstantTable_iface; LONG ref; char *ctab; DWORD size; + DWORD flags; D3DXCONSTANTTABLE_DESC desc; struct ctab_constant *constants; }; @@ -860,6 +862,9 @@ static inline struct ctab_constant *get_valid_constant(struct ID3DXConstantTable if (c) return c; } + if (table->flags & D3DXCONSTTABLE_LARGEADDRESSAWARE) + return NULL; + return get_constant_by_name(table, NULL, handle); } @@ -1959,9 +1964,10 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, const D3DXSHADER_CONSTANTINFO *constant_info; DWORD i; - TRACE("byte_code %p, flags %x, constant_table %p\n", byte_code, flags, constant_table); + TRACE("byte_code %p, flags %#x, constant_table %p.\n", byte_code, flags, constant_table); - if (constant_table) *constant_table = NULL; + if (constant_table) + *constant_table = NULL; if (!byte_code || !constant_table) { @@ -1975,7 +1981,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, return D3D_OK; } - if (flags) FIXME("Flags (%#x) are not handled, yet!\n", flags); + if (flags & ~D3DXCONSTTABLE_LARGEADDRESSAWARE) + FIXME("Flags %#x not handled.\n", flags); hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) @@ -2014,6 +2021,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, object->size = size; memcpy(object->ctab, data, object->size); + object->flags = flags; object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index a698afcb53b..fe3dfde9001 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -556,6 +556,34 @@ static void test_get_shader_constant_table_ex(void) ID3DXConstantTable_Release(constant_table); + hr = D3DXGetShaderConstantTableEx(shader_with_ctab_constants, D3DXCONSTTABLE_LARGEADDRESSAWARE, &constant_table); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!constant_table, "Unexpected constant table %p.\n", constant_table); + + hr = ID3DXConstantTable_GetDesc(constant_table, &desc); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(desc.Creator, "Wine project"), "Unexpected Creator %s.\n", debugstr_a(desc.Creator)); + ok(desc.Version == D3DVS_VERSION(3, 0), "Unexpected Version %#x.\n", desc.Version); + ok(desc.Constants == 3, "Unexpected Constants %u.\n", desc.Constants); + + constant = ID3DXConstantTable_GetConstant(constant_table, NULL, 0); + ok(!!constant, "No constant found.\n"); + hr = ID3DXConstantTable_GetConstantDesc(constant_table, constant, &constant_desc, &nb); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(constant_desc.Name, "Constant1"), "Unexpected Name %s.\n", debugstr_a(constant_desc.Name)); + ok(constant_desc.Class == D3DXPC_VECTOR, "Unexpected Class %u.\n", constant_desc.Class); + ok(constant_desc.Type == D3DXPT_FLOAT, "Unexpected Type %u.\n", constant_desc.Type); + ok(constant_desc.Rows == 1, "Unexpected Rows %u.\n", constant_desc.Rows); + ok(constant_desc.Columns == 4, "Unexpected Columns %u.\n", constant_desc.Columns); + + if (0) + { + /* Native d3dx crashes with this. */ + hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant3", &constant_desc, &nb); + } + + ID3DXConstantTable_Release(constant_table); + hr = D3DXGetShaderConstantTableEx(fx_shader_with_ctab, 0, &constant_table); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); ok(!constant_table, "D3DXGetShaderConstantTableEx() returned a non-NULL constant table.\n");

1 0

Jacek Caban : winex11: Get virtual screen rect from win32u.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 586f377b46b28c9693870b81b3f2a1cbb25c62e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586f377b46b28c9693870b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 18 13:37:12 2022 +0100 winex11: Get virtual screen rect from win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 3 +++ dlls/winex11.drv/display.c | 8 +------- include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7af1e20f008..09a04892d2d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4534,6 +4534,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return HandleToUlong( get_sys_color_pen(arg) ); case NtUserGetSystemMetrics: return get_system_metrics( arg ); + case NtUserGetVirtualScreenRect: + *(RECT *)arg = get_virtual_screen_rect( 0 ); + return 1; case NtUserMessageBeep: return message_beep( arg ); /* temporary exports */ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 04380ff660f..bff14d3370c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -54,7 +54,6 @@ struct x11drv_display_device_handler desktop_handler; /* Cached screen information, protected by screen_section */ static HKEY video_key; -static RECT virtual_screen_rect; static RECT primary_monitor_rect; static FILETIME last_query_screen_time; static CRITICAL_SECTION screen_section; @@ -124,7 +123,6 @@ static BOOL update_screen_cache(void) } EnterCriticalSection(&screen_section); - virtual_screen_rect = virtual_rect; primary_monitor_rect = primary_rect; last_query_screen_time = filetime; LeaveCriticalSection(&screen_section); @@ -160,11 +158,7 @@ POINT root_to_virtual_screen(INT x, INT y) RECT get_virtual_screen_rect(void) { RECT virtual; - - update_screen_cache(); - EnterCriticalSection(&screen_section); - virtual = virtual_screen_rect; - LeaveCriticalSection(&screen_section); + NtUserCallOneParam( (UINT_PTR)&virtual, NtUserGetVirtualScreenRect ); return virtual; } diff --git a/include/ntuser.h b/include/ntuser.h index 51f1c624ba6..43c1880fc9b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -79,6 +79,7 @@ enum NtUserGetSysColorBrush, NtUserGetSysColorPen, NtUserGetSystemMetrics, + NtUserGetVirtualScreenRect, NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */

1 0

Jacek Caban : winex11: Get primary monitor rect from win32u.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 656edbb508d51cbe3155d856ee3f2c27a6cd4cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=656edbb508d51cbe3155d856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 18 13:37:29 2022 +0100 winex11: Get primary monitor rect from win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 11 +++-- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 101 +------------------------------------------ include/ntuser.h | 1 + 4 files changed, 11 insertions(+), 104 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 09a04892d2d..58bd22a3adf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1474,7 +1474,7 @@ RECT get_display_rect( const WCHAR *display ) return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); } -static RECT get_primary_monitor_rect(void) +static RECT get_primary_monitor_rect( UINT dpi ) { struct monitor *monitor; RECT rect = {0}; @@ -1489,7 +1489,7 @@ static RECT get_primary_monitor_rect(void) } unlock_display_devices(); - return map_dpi_rect( rect, system_dpi, get_thread_dpi() ); + return map_dpi_rect( rect, system_dpi, dpi ); } /********************************************************************** @@ -4203,10 +4203,10 @@ int get_system_metrics( int index ) case SM_MOUSEWHEELPRESENT: return 1; case SM_CXSCREEN: - rect = get_primary_monitor_rect(); + rect = get_primary_monitor_rect( get_thread_dpi() ); return rect.right - rect.left; case SM_CYSCREEN: - rect = get_primary_monitor_rect(); + rect = get_primary_monitor_rect( get_thread_dpi() ); return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: rect = get_virtual_screen_rect( get_thread_dpi() ); @@ -4528,6 +4528,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_sys_color( arg ); case NtUserRealizePalette: return realize_palette( UlongToHandle(arg) ); + case NtUserGetPrimaryMonitorRect: + *(RECT *)arg = get_primary_monitor_rect( 0 ); + return 1; case NtUserGetSysColorBrush: return HandleToUlong( get_sys_color_brush(arg) ); case NtUserGetSysColorPen: diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 64df2075cc4..93a975d7f63 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winex11.drv -IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32 win32u +IMPORTS = uuid user32 gdi32 advapi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index bff14d3370c..ab5dcdac23f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -19,52 +19,14 @@ */ #include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "winreg.h" -#include "cfgmgr32.h" -#include "initguid.h" -#include "devguid.h" -#include "devpkey.h" -#include "ntddvdeo.h" -#include "setupapi.h" -#define WIN32_NO_STATUS -#include "winternl.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "x11drv.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* Wine specific properties */ -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); - -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; -static const WCHAR video_keyW[] = { - 'H','A','R','D','W','A','R','E','\\', - 'D','E','V','I','C','E','M','A','P','\\', - 'V','I','D','E','O',0}; - static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; -/* Cached screen information, protected by screen_section */ -static HKEY video_key; -static RECT primary_monitor_rect; -static FILETIME last_query_screen_time; -static CRITICAL_SECTION screen_section; -static CRITICAL_SECTION_DEBUG screen_critsect_debug = -{ - 0, 0, &screen_section, - {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, - 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} -}; -static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; - HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -80,61 +42,6 @@ void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ -static BOOL update_screen_cache(void) -{ - RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - FILETIME filetime = {0}; - HANDLE mutex = NULL; - DWORD i = 0; - INT result; - DWORD type; - BOOL ret = FALSE; - - EnterCriticalSection(&screen_section); - if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) - || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) - { - LeaveCriticalSection(&screen_section); - return FALSE; - } - result = CompareFileTime(&filetime, &last_query_screen_time); - LeaveCriticalSection(&screen_section); - if (result < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); - if (devinfo == INVALID_HANDLE_VALUE) - goto fail; - - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) - goto fail; - - UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); - if (i == 1) - primary_rect = monitor_rect; - } - - EnterCriticalSection(&screen_section); - primary_monitor_rect = primary_rect; - last_query_screen_time = filetime; - LeaveCriticalSection(&screen_section); - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - if (!ret) - WARN("Update screen cache failed!\n"); - return ret; -} - POINT virtual_screen_to_root(INT x, INT y) { RECT virtual = get_virtual_screen_rect(); @@ -165,11 +72,7 @@ RECT get_virtual_screen_rect(void) RECT get_primary_monitor_rect(void) { RECT primary; - - update_screen_cache(); - EnterCriticalSection(&screen_section); - primary = primary_monitor_rect; - LeaveCriticalSection(&screen_section); + NtUserCallOneParam( (UINT_PTR)&primary, NtUserGetPrimaryMonitorRect ); return primary; } diff --git a/include/ntuser.h b/include/ntuser.h index 43c1880fc9b..b7e2e63dcb3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -75,6 +75,7 @@ enum { NtUserGetClipCursor, NtUserGetCursorPos, + NtUserGetPrimaryMonitorRect, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0