- Wine-Devel - list.winehq.org

[PATCH v3] winegstreamer: Set specific large buffer sizes for decodebin
by Andrew Eikum March 18, 2021

March 18, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index aefb097f7f0..e0eff9ee309 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -546,9 +546,9 @@ static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) { - g_object_set(parser->decodebin, "max-size-buffers", 0, NULL); - g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(0), NULL); - g_object_set(parser->decodebin, "max-size-bytes", 0, NULL); + g_object_set(parser->decodebin, "max-size-buffers", G_MAXUINT, NULL); + g_object_set(parser->decodebin, "max-size-time", G_MAXUINT64, NULL); + g_object_set(parser->decodebin, "max-size-bytes", G_MAXUINT, NULL); } static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) -- 2.31.0

2 1

[PATCH v2] winegstreamer: Set specific large buffer sizes for decodebin
by Andrew Eikum March 18, 2021

March 18, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Use max ints instead. I tested that it still works for my case. dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/wg_parser.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 55a62361966..69833a40b62 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -173,7 +173,7 @@ struct unix_funcs void **data, uint64_t *offset, uint32_t *size); void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, bool ret); - void (CDECL *wg_parser_set_unlimited_buffering)(struct wg_parser *parser); + void (CDECL *wg_parser_set_large_buffering)(struct wg_parser *parser); uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3260175f45a..828d15f906e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1125,7 +1125,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * never deselects it). Remove buffering limits from decodebin in order to * account for this. Note that this does leak memory, but the same memory * leak occurs with native. */ - unix_funcs->wg_parser_set_unlimited_buffering(parser); + unix_funcs->wg_parser_set_large_buffering(parser); object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index aefb097f7f0..974ed756430 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -544,11 +544,11 @@ static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool pthread_cond_signal(&parser->read_done_cond); } -static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) +static void CDECL wg_parser_set_large_buffering(struct wg_parser *parser) { - g_object_set(parser->decodebin, "max-size-buffers", 0, NULL); - g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(0), NULL); - g_object_set(parser->decodebin, "max-size-bytes", 0, NULL); + g_object_set(parser->decodebin, "max-size-buffers", G_MAXUINT, NULL); + g_object_set(parser->decodebin, "max-size-time", G_MAXUINT64, NULL); + g_object_set(parser->decodebin, "max-size-bytes", G_MAXUINT, NULL); } static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) @@ -1915,7 +1915,7 @@ static const struct unix_funcs funcs = wg_parser_get_read_request, wg_parser_complete_read_request, - wg_parser_set_unlimited_buffering, + wg_parser_set_large_buffering, wg_parser_get_stream_count, wg_parser_get_stream, -- 2.31.0

2 1

[PATCH] ntdll/tests: Add RtlQueryPerformanceCounter tests.
by Rémi Bernon March 18, 2021

March 18, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 107 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 2 files changed, 108 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 51d9115b87c..3e3127ccf29 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -19,8 +19,10 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntdll_test.h" #include "ddk/wdm.h" +#include "intrin.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -35,6 +37,9 @@ static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATIO static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); +static BOOL (WINAPI *pRtlQueryPerformanceCounter)(LARGE_INTEGER*); +static BOOL (WINAPI *pRtlQueryPerformanceFrequency)(LARGE_INTEGER*); + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -122,6 +127,105 @@ static void test_NtQueryPerformanceCounter(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); } +struct hypervisor_shared_data +{ + UINT64 unknown; + UINT64 QpcMultiplier; + UINT64 QpcBias; +}; + +#ifndef _MSVC_VER +static UINT64 __umulh(UINT64 a, UINT64 b) +{ + UINT64 ah = a >> 32, al = (UINT32)a, bh = b >> 32, bl = (UINT32)b, m; + m = (ah * bl) + (bh * al) + ((al * bl) >> 32); + return (ah * bh) + (m >> 32); +} +#endif + +static void test_RtlQueryPerformanceCounter(void) +{ + struct hypervisor_shared_data *hsd; + KSHARED_USER_DATA *usd = (void *)0x7ffe0000; + LARGE_INTEGER frequency, counter; + NTSTATUS status; + UINT64 tsc0, tsc1; + ULONG len; + BOOL ret; + + if (!pRtlQueryPerformanceCounter || !pRtlQueryPerformanceFrequency) + { + win_skip( "RtlQueryPerformanceCounter/Frequency not available, skipping tests\n" ); + return; + } + + if (!(usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED)) + { + todo_wine win_skip("QpcBypassEnabled is not set, skipping tests\n"); + return; + } + + if ((usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE)) + { + ok( usd->u3.s.QpcBypassEnabled == (SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP), + "unexpected QpcBypassEnabled %x, expected 0x83\n", usd->u3.s.QpcBypassEnabled ); + ok( usd->QpcFrequency == 10000000, "unexpected QpcFrequency %I64d, expected 10000000\n", usd->QpcFrequency ); + ok( !usd->u3.s.QpcShift, "unexpected QpcShift %d, expected 0\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcInterruptTimeIncrement %I64x, expected 1<<63\n", usd->QpcInterruptTimeIncrement ); + ok( usd->QpcInterruptTimeIncrementShift == 1, + "unexpected QpcInterruptTimeIncrementShift %d, expected 1\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcSystemTimeIncrement %I64x, expected 1<<63\n", usd->QpcSystemTimeIncrement ); + ok( usd->QpcSystemTimeIncrementShift == 1, + "unexpected QpcSystemTimeIncrementShift %d, expected 1\n", usd->QpcSystemTimeIncrementShift ); + + hsd = NULL; + status = pNtQuerySystemInformation( SystemHypervisorSharedPageInformation, &hsd, sizeof(void *), &len ); + ok( !status, "NtQuerySystemInformation returned %x\n", status ); + ok( len == sizeof(void *), "unexpected SystemHypervisorSharedPageInformation length %u\n", len ); + ok( !!hsd, "unexpected SystemHypervisorSharedPageInformation address %p\n", hsd ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 = __umulh(tsc0, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + tsc1 = __umulh(tsc1, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + else + { + ok( usd->u3.s.QpcShift == 10, "unexpected QpcShift %d, expected 10\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrementShift == 2, + "unexpected QpcInterruptTimeIncrementShift %d, expected 2\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrementShift == 2, + "unexpected QpcSystemTimeIncrementShift %d, expected 2\n", usd->QpcSystemTimeIncrementShift ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 += usd->QpcBias; + tsc0 >>= usd->u3.s.QpcShift; + tsc1 += usd->QpcBias; + tsc1 >>= usd->u3.s.QpcShift; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + + ret = pRtlQueryPerformanceFrequency( &frequency ); + ok( ret, "RtlQueryPerformanceFrequency failed\n" ); + ok( frequency.QuadPart == usd->QpcFrequency, + "RtlQueryPerformanceFrequency returned %I64d, expected USD QpcFrequency %I64d\n", + frequency.QuadPart, usd->QpcFrequency ); +} + static void test_RtlQueryTimeZoneInformation(void) { RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo, tzinfo2; @@ -266,6 +370,8 @@ START_TEST(time) pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); + pRtlQueryPerformanceCounter = (void *)GetProcAddress(mod, "RtlQueryPerformanceCounter"); + pRtlQueryPerformanceFrequency = (void *)GetProcAddress(mod, "RtlQueryPerformanceFrequency"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -274,4 +380,5 @@ START_TEST(time) test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); test_user_shared_data_time(); + test_RtlQueryPerformanceCounter(); } diff --git a/include/winternl.h b/include/winternl.h index d35d509eb41..fcdedaec8aa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

3 3

[PATCH] user32: Add clipping region tests on window resize.
by Piotr Caban March 18, 2021

March 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/dce.c | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] windows.media.speech: Cleanup test to better check results and ignore refcounts.
by Rémi Bernon March 18, 2021

March 18, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.media.speech/tests/Makefile.in | 2 +- .../tests/{statics.c => speech.c} | 52 ++++++++----------- 2 files changed, 22 insertions(+), 32 deletions(-) rename dlls/windows.media.speech/tests/{statics.c => speech.c} (71%) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index fad32174647..f3e458f53d1 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = windows.media.speech.dll IMPORTS = uuid C_SRCS = \ - statics.c + speech.c diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/speech.c similarity index 71% rename from dlls/windows.media.speech/tests/statics.c rename to dlls/windows.media.speech/tests/speech.c index 9faa49dfc5d..33ce75c0c0e 100644 --- a/dlls/windows.media.speech/tests/statics.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -52,69 +52,59 @@ static void test_SpeechSynthesizer(void) IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; HSTRING str; HRESULT hr; - ULONG rc, size; + ULONG size; hr = pRoInitialize(RO_INIT_MULTITHREADED); - ok(SUCCEEDED(hr), "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); hr = pWindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); - ok(SUCCEEDED(hr), "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(SUCCEEDED(hr), "RoGetActivationFactory failed, hr %#x\n", hr); - - rc = IActivationFactory_AddRef(factory); - ok(rc == 3, "IActivationFactory_AddRef returned %d\n", rc); - rc = IActivationFactory_Release(factory); - ok(rc == 2, "IActivationFactory_Release returned %d\n", rc); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - ok(SUCCEEDED(hr), "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); - ok(SUCCEEDED(hr), "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(SUCCEEDED(hr), "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); - ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(FAILED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); - rc = IVectorView_VoiceInformation_Release(voices); - ok(rc == 0, "IVectorView_VoiceInformation_Release returned unexpected refcount %d\n", rc); + IVectorView_VoiceInformation_Release(voices); - rc = IInstalledVoicesStatic_Release(voices_static); - ok(rc == 4, "IInstalledVoicesStatic_Release returned unexpected refcount %d\n", rc); + IInstalledVoicesStatic_Release(voices_static); - rc = IAgileObject_Release(agile_object); - ok(rc == 3, "IAgileObject_Release returned unexpected refcount %d\n", rc); - rc = IInspectable_Release(inspectable); - ok(rc == 2, "IInspectable_Release returned unexpected refcount %d\n", rc); - rc = IActivationFactory_Release(factory); - ok(rc == 1, "IActivationFactory_Release returned unexpected refcount %d\n", rc); + IAgileObject_Release(agile_object); + IInspectable_Release(inspectable); + IActivationFactory_Release(factory); pWindowsDeleteString(str); @@ -130,10 +120,10 @@ static void test_VoiceInformation(void) HRESULT hr; hr = pRoInitialize(RO_INIT_MULTITHREADED); - ok(SUCCEEDED(hr), "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); hr = pWindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); - ok(SUCCEEDED(hr), "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); @@ -143,7 +133,7 @@ static void test_VoiceInformation(void) pRoUninitialize(); } -START_TEST(statics) +START_TEST(speech) { HMODULE combase; -- 2.30.2

2 10

[PATCH] urlmon: Implement IMoniker_ComposeWith() for url monikers
by David White March 18, 2021

March 18, 2021

Signed-off-by: David White <dwhite(a)codeweavers.com> --- dlls/urlmon/tests/url.c | 112 ++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 25 +++++++-- 2 files changed, 132 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6dd47732dda..dab70f8eca0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -40,6 +40,7 @@ static HRESULT (WINAPI *pCreateAsyncBindCtxEx)(IBindCtx *, DWORD, IBindStatusCallback *, IEnumFORMATETC *, IBindCtx **, DWORD); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); +DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); @@ -2896,6 +2897,114 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) if (winetest_debug > 1) trace("URL: %s\n", wine_dbgstr_w(current_url)); } +static void test_MonikerComposeWith(void) +{ + static const struct test_data + { + const WCHAR *l, *r, *expected; + } data[] = + { + {L"https://test.winehq.org/", L"/tests/hello.html", L"https://test.winehq.org/tests/hello.html"}, + {L"url1", L"url2", L"url2"}, + {L"http://", L"tests.winehq.org", L"http:///tests.winehq.org"}, + {L"http://a/b/c/d;p?q#f", L"g", L"http://a/b/c/g"}, + {L"http://a/b/c/d;p?q#f", L"./g", L"http://a/b/c/g"}, + {L"http://a/b/c/d;p?q#f", L"g/", L"http://a/b/c/g/"}, + {L"http://a/b/c/d;p?q#f", L"/g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"//g", L"http://g/"}, + {L"http://a/b/c/d;p?q#f", L"?y", L"http://a/b/c/d;p?y"}, + {L"http://a/b/c/d;p?q#f", L"g?y", L"http://a/b/c/g?y"}, + {L"http://a/b/c/d;p?q#f", L"g?y/./x", L"http://a/b/c/g?y/./x"}, + {L"http://a/b/c/d;p?q#f", L"#s", L"http://a/b/c/d;p?q#s"}, + {L"http://a/b/c/d;p?q#f", L"g#s", L"http://a/b/c/g#s"}, + {L"http://a/b/c/d;p?q#f", L"g#s/./x", L"http://a/b/c/g#s/./x"}, + {L"http://a/b/c/d;p?q#f", L"g?y#s", L"http://a/b/c/g?y#s"}, + {L"http://a/b/c/d;p?q#f", L";x", L"http://a/b/c/;x"}, + {L"http://a/b/c/d;p?q#f", L"g;x", L"http://a/b/c/g;x"}, + {L"http://a/b/c/d;p?q#f", L"g;x?y#s", L"http://a/b/c/g;x?y#s"}, + {L"http://a/b/c/d;p?q#f", L".", L"http://a/b/c/"}, + {L"http://a/b/c/d;p?q#f", L"./", L"http://a/b/c/"}, + {L"http://a/b/c/d;p?q#f", L"..", L"http://a/b/"}, + {L"http://a/b/c/d;p?q#f", L"../", L"http://a/b/"}, + {L"http://a/b/c/d;p?q#f", L"../g", L"http://a/b/g"}, + {L"http://a/b/c/d;p?q#f", L"../..", L"http://a/"}, + {L"http://a/b/c/d;p?q#f", L"../../", L"http://a/"}, + {L"http://a/b/c/d;p?q#f", L"../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"../../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"../../../../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"/./g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"/../g", L"http://a/g"}, + {L"http://a/b/c/d;p?q#f", L"g.", L"http://a/b/c/g."}, + {L"http://a/b/c/d;p?q#f", L".g", L"http://a/b/c/.g"}, + {L"http://a/b/c/d;p?q#f", L"g..", L"http://a/b/c/g.."}, + {L"http://a/b/c/d;p?q#f", L"..g", L"http://a/b/c/..g"}, + {L"http://a/b/c/d;p?q#f", L"./../g", L"http://a/b/g"}, + {L"http://a/b/c/d;p?q#f", L"./g/.", L"http://a/b/c/g/"}, + {L"http://a/b/c/d;p?q#f", L"g/./h", L"http://a/b/c/g/h"}, + {L"http://a/b/c/d;p?q#f", L"g/../h", L"http://a/b/c/h"}, + {L"file://a/b/c/d;p?q#f", L"http:g", L"http:g"}, + {L"http://a/b/c/d;p?q#f", L"http://g/h", L"http://g/h"}, + }; + IMoniker *lmon, *rmon, *outmon, *filemon; + HRESULT hres; + LPOLESTR urlpath; + CLSID clsid; + int i; + IBindCtx* bind; + + CreateBindCtx(0, &bind); + for(i = 0; i < ARRAY_SIZE( data ); i++){ + hres = CreateURLMoniker(NULL, data[i].l, &lmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateURLMoniker(NULL, data[i].r, &rmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, rmon, FALSE, &outmon); + ok(hres == S_OK, + "ComposeWith failed: l: %s, r: %s, ret: %08x\n", wine_dbgstr_w(data[i].l), wine_dbgstr_w(data[i].r), hres); + + IMoniker_GetClassID(outmon, &clsid); + ok(IsEqualCLSID(&clsid, &CLSID_StdURLMoniker), + "ComposeWith error: expected URL CLSID, got %s\n", wine_dbgstr_guid(&clsid)); + IMoniker_GetDisplayName(outmon, bind, NULL, &urlpath); + ok(lstrcmpW(data[i].expected, urlpath) == S_OK, + "ComposeWith expected %s got %s\n", wine_dbgstr_w(data[i].expected), wine_dbgstr_w(urlpath)); + + IMoniker_Release(lmon); + IMoniker_Release(rmon); + IMoniker_Release(outmon); + CoTaskMemFree(urlpath); + } + IBindCtx_Release(bind); + + hres = CreateURLMoniker(NULL, data[0].l, &lmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateURLMoniker(NULL, data[0].r, &rmon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + hres = CreateFileMoniker(L"/a/b", &filemon); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, NULL, FALSE, &outmon); + ok(hres == E_INVALIDARG, "ComposeWith error: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, rmon, FALSE, NULL); + ok(hres == E_INVALIDARG, "ComposeWith error: %08x\n", hres); + + hres = IMoniker_ComposeWith(lmon, filemon, TRUE, &outmon); + ok(hres == MK_E_NEEDGENERIC, "ComposeWith error: %08x\n", hres); + hres = IMoniker_ComposeWith(lmon, filemon, FALSE, &outmon); + ok(hres == S_OK, "ComposeWith error: %08x\n", hres); + + IMoniker_GetClassID(outmon, &clsid); + ok(IsEqualCLSID(&clsid, &CLSID_CompositeMoniker), + "ComposeWith: got CLSID %s, not generic\n", wine_dbgstr_guid(&clsid)); + + IMoniker_Release(lmon); + IMoniker_Release(rmon); + IMoniker_Release(filemon); + IMoniker_Release(outmon); +} + static void test_BindToStorage(int protocol, DWORD flags, DWORD t) { IMoniker *mon; @@ -3931,6 +4040,9 @@ START_TEST(url) trace("test StdURLMoniker...\n"); test_StdURLMoniker(); + trace("test URLMonikerComposeWith...\n"); + test_MonikerComposeWith(); + trace("synchronous http test...\n"); test_BindToStorage(HTTP_TEST, 0, TYMED_ISTREAM); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index e51b2f07d26..7959468ecd7 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -295,12 +295,27 @@ static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, return MK_S_REDUCED_TO_SELF; } -static HRESULT WINAPI URLMoniker_ComposeWith(IMoniker *iface, IMoniker *pmkRight, - BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite) +static HRESULT WINAPI URLMoniker_ComposeWith(IMoniker *iface, IMoniker *right, + BOOL only_if_not_generic, IMoniker **composite) { - URLMoniker *This = impl_from_IMoniker(iface); - FIXME("(%p)->(%p,%d,%p): stub\n",This,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - return E_NOTIMPL; + HRESULT res; + IUri *right_uri; + IUriContainer *uri_container; + + TRACE("(%p)->(%p,%d,%p)\n", iface, right, only_if_not_generic, composite); + + if (!right || !composite) return E_INVALIDARG; + + res = IMoniker_QueryInterface(right, &IID_IUriContainer, (void**)&uri_container); + if (SUCCEEDED(res)){ + res = IUriContainer_GetIUri(uri_container, &right_uri); + if (SUCCEEDED(res)) res = CreateURLMonikerEx2(iface, right_uri, composite, 0); + IUriContainer_Release(uri_container); + return res; + } + + if(only_if_not_generic) return MK_E_NEEDGENERIC; + return CreateGenericComposite(iface, right, composite); } static HRESULT WINAPI URLMoniker_Enum(IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker) -- 2.27.0

3 2

[PATCH v3 3/4] winex11.drv: Query virtual screen and primary screen rectangles from the wineserver.
by Zhiyi Zhang March 18, 2021

March 18, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 39 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d10e1bb4b25..9de73926d18 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -47,7 +47,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* Wine specific properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); 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_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -146,14 +145,11 @@ void release_display_device_init_mutex(HANDLE mutex) 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; + NTSTATUS status; DWORD i = 0; INT result; - DWORD type; - BOOL ret = FALSE; EnterCriticalSection(&screen_section); if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) @@ -169,15 +165,21 @@ static BOOL update_screen_cache(void) 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)) + while (TRUE) { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) - goto fail; + SERVER_START_REQ(enum_monitor) + { + req->index = i++; + if (!(status = wine_server_call(req))) + { + SetRect(&monitor_rect, reply->monitor_rect.left, reply->monitor_rect.top, + reply->monitor_rect.right, reply->monitor_rect.bottom); + } + } + SERVER_END_REQ; + + if (status) + break; UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); if (i == 1) @@ -189,13 +191,8 @@ static BOOL update_screen_cache(void) 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; + return TRUE; } POINT virtual_screen_to_root(INT x, INT y) @@ -622,10 +619,6 @@ 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; /* Adapter name */ length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, -- 2.27.0

2 1

[PATCH 1/6] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_unordered_access_view().
by Zebediah Figura March 18, 2021

March 18, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 9 +++++---- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8afa298b905..dbc242f1ba0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1579,19 +1579,20 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con device_invalidate_state(cs->c.device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline)); } -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline, - unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) +void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, + enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, + unsigned int initial_count) { struct wined3d_cs_set_unordered_access_view *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->pipeline = pipeline; op->view_idx = view_idx; op->view = view; op->initial_count = initial_count; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c4700d2dc65..14a68b4f3b1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1915,7 +1915,8 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { for (j = 0; j < MAX_UNORDERED_ACCESS_VIEWS; ++j) { - wined3d_cs_emit_set_unordered_access_view(device->cs, i, j, state->unordered_access_view[i][j], ~0); + wined3d_device_context_emit_set_unordered_access_view(context, i, j, + state->unordered_access_view[i][j], ~0); } } @@ -2697,7 +2698,7 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev if (uav) wined3d_unordered_access_view_incref(uav); state->unordered_access_view[pipeline][idx] = uav; - wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); + wined3d_device_context_emit_set_unordered_access_view(&device->cs->c, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19ef894021b..781d21a91c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4783,9 +4783,6 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined3d_pipeline pipeline, - unsigned int view_idx, struct wined3d_unordered_access_view *view, - unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4828,6 +4825,9 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, + enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, + unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; -- 2.20.1

3 12

[PATCH] wined3d: Check whether a register is a UAV before recording UAV reads.
by Zebediah Figura March 18, 2021

March 18, 2021

"Discovery Tour by Assassin's Creed: Ancient Egypt" uses atomic RMW instructions with TGSM. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/shader.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e1142990139..4d169b051d8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1649,23 +1649,28 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) { - unsigned int reg_idx; + const struct wined3d_shader_register *reg; + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || ins.handler_idx == WINED3DSIH_LD_RAW) - reg_idx = ins.src[1].reg.idx[0].offset; + reg = &ins.src[1].reg; else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED) - reg_idx = ins.src[2].reg.idx[0].offset; + reg = &ins.src[2].reg; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) - reg_idx = ins.dst[0].reg.idx[0].offset; + reg = &ins.dst[0].reg; else if (ins.handler_idx == WINED3DSIH_BUFINFO) - reg_idx = ins.src[0].reg.idx[0].offset; + reg = &ins.src[0].reg; else - reg_idx = ins.dst[1].reg.idx[0].offset; - if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) + reg = &ins.dst[1].reg; + + if (reg->type == WINED3DSPR_UAV) { - ERR("Invalid UAV index %u.\n", reg_idx); - break; + if (reg->idx[0].offset >= MAX_UNORDERED_ACCESS_VIEWS) + { + ERR("Invalid UAV index %u.\n", reg->idx[0].offset); + break; + } + reg_maps->uav_read_mask |= (1u << reg->idx[0].offset); } - reg_maps->uav_read_mask |= (1u << reg_idx); } else if (ins.handler_idx == WINED3DSIH_NRM) { -- 2.20.1

2 1

[PATCH v3 4/4] user32: Remove code that queries monitor information from SetupAPI device properties.
by Zhiyi Zhang March 18, 2021

March 18, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 156 ++-------------------------------------- 1 file changed, 4 insertions(+), 152 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 85f4446cc11..bde878f8401 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -102,25 +102,10 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 /* 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_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) -/* Cached monitor information */ -static MONITORINFOEXW *monitors; -static UINT monitor_count; -static FILETIME last_query_monitors_time; -static CRITICAL_SECTION monitors_section; -static CRITICAL_SECTION_DEBUG monitors_critsect_debug = -{ - 0, 0, &monitors_section, - { &monitors_critsect_debug.ProcessLocksList, &monitors_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": monitors_section") } -}; -static CRITICAL_SECTION monitors_section = { &monitors_critsect_debug, -1 , 0, 0, 0, 0 }; - static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -144,7 +129,6 @@ static DPI_AWARENESS dpi_awareness; static DPI_AWARENESS default_awareness = DPI_AWARENESS_UNAWARE; static HKEY volatile_base_key; -static HKEY video_key; union sysparam_all_entry; @@ -3782,100 +3766,8 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } -/* Return FALSE on failure and TRUE on success */ -static BOOL update_monitor_cache(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - MONITORINFOEXW *monitor_array; - FILETIME filetime = {0}; - DWORD device_count = 0; - HANDLE mutex = NULL; - DWORD state_flags; - BOOL ret = FALSE; - BOOL is_replica; - DWORD i = 0, j; - DWORD type; - - /* Update monitor cache from SetupAPI if it's outdated */ - if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) - return FALSE; - if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) - return FALSE; - if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) - return TRUE; - - mutex = get_display_device_init_mutex(); - EnterCriticalSection( &monitors_section ); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT ); - - 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(DWORD), NULL, 0 )) - goto fail; - if (state_flags & DISPLAY_DEVICE_ACTIVE) - device_count++; - } - - if (device_count && monitor_count < device_count) - { - monitor_array = heap_alloc( device_count * sizeof(*monitor_array) ); - if (!monitor_array) - goto fail; - heap_free( monitors ); - monitors = monitor_array; - } - - for (i = 0, monitor_count = 0; SetupDiEnumDeviceInfo( devinfo, i, &device_data ); i++) - { - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) - goto fail; - if (!(state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) - goto fail; - - /* Replicas in mirroring monitor sets don't get enumerated */ - is_replica = FALSE; - for (j = 0; j < monitor_count; j++) - { - if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) - { - is_replica = TRUE; - break; - } - } - if (is_replica) - continue; - - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, - (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) - goto fail; - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, - (BYTE *)monitors[monitor_count].szDevice, CCHDEVICENAME * sizeof(WCHAR), NULL, 0)) - goto fail; - monitors[monitor_count].dwFlags = - !wcscmp( L"\\\\.\\DISPLAY1", monitors[monitor_count].szDevice ) ? MONITORINFOF_PRIMARY : 0; - - monitor_count++; - } - - last_query_monitors_time = filetime; - ret = TRUE; -fail: - SetupDiDestroyDeviceInfoList( devinfo ); - LeaveCriticalSection( &monitors_section ); - release_display_device_init_mutex( mutex ); - return ret; -} - BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { - UINT index = (UINT_PTR)handle - 1; NTSTATUS status; TRACE("(%p, %p)\n", handle, info); @@ -3917,29 +3809,8 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return TRUE; } - if (!update_monitor_cache()) - { - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } - - EnterCriticalSection( &monitors_section ); - if (index < monitor_count) - { - info->rcMonitor = monitors[index].rcMonitor; - info->rcWork = monitors[index].rcWork; - info->dwFlags = monitors[index].dwFlags; - if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[index].szDevice ); - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - else - { - LeaveCriticalSection( &monitors_section ); - SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return FALSE; - } + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); + return FALSE; } /*********************************************************************** @@ -4081,27 +3952,8 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (i) return TRUE; - if (update_monitor_cache()) - { - while (TRUE) - { - EnterCriticalSection( &monitors_section ); - if (i >= monitor_count) - { - LeaveCriticalSection( &monitors_section ); - return TRUE; - } - monitor_rect = monitors[i].rcMonitor; - LeaveCriticalSection( &monitors_section ); - - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) - return FALSE; - - ++i; - } - } - - /* Fallback to report one monitor if using SetupAPI failed */ + /* Fallback to report one monitor if wineserver calls failed */ + ERR("Failed to enumerate monitors, reporting a 640x480 monitor.\n"); SetRect( &monitor_rect, 0, 0, 640, 480 ); if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; -- 2.27.0

1 0