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

Piotr Caban : d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d3f5b69bdc8513dd4720724695200b113601eb25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f5b69bdc8513dd47207246… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:15 2022 +0200 d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index db46a9353f6..89165a55af2 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -345,6 +345,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *reso return E_OUTOFMEMORY; if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) + rsrc = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); @@ -377,6 +379,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return E_OUTOFMEMORY; if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) + rsrc = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object);

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: 1c66d05a9c5b634f0e141113536bd9431c5e371e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c66d05a9c5b634f0e141113… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:34 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 89165a55af2..716eb7f44fb 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -398,6 +398,12 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor) +{ + FIXME("info %p, processor %p stub!\n", info, processor); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 82b71b5fa5c..c0a2c9fa56c 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -16,7 +16,7 @@ @ stdcall D3DX10CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) -@ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) +@ stdcall D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) @ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stdcall D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) diff --git a/include/d3dx10.h b/include/d3dx10.h index cb7b65c53cc..004342411b6 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -29,9 +29,9 @@ #include "d3d10.h" #include "d3dx10math.h" #include "d3dx10core.h" -#include "d3dx10async.h" #include "d3dx10tex.h" #include "d3dx10mesh.h" +#include "d3dx10async.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 0b7aca9c023..c932be91b01 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -76,4 +76,6 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor); + #endif

1 0

Zebediah Figura : wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d838cf70041863f6d316b15f89ceadf9a76d7c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d838cf70041863f6d316b15f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:07 2022 -0500 wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently. I.e. if ARB_buffer_storage is not supported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0d9f6953de3..05e8c112388 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5231,6 +5231,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->fences = wined3d_fence_supported(gl_info); d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); d3d_info->filling_convention_offset = gl_info->filling_convention_offset; + d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cd1748afe90..3b87ab63ee5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2351,6 +2351,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; + d3d_info->persistent_map = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0d6550bf613..9b0d98139ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,11 +1008,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (context->d3d_info->persistent_map) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e3888cd30d..7bfca0bcb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -243,6 +243,7 @@ struct wined3d_d3d_info uint32_t pbo : 1; uint32_t subpixel_viewport : 1; uint32_t fences : 1; + uint32_t persistent_map : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Zebediah Figura : wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: d67a9b5faa7ac9e67234eff93f4e4748b0dc19d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67a9b5faa7ac9e67234eff9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:08 2022 -0500 wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52663 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8da17c9aa94..5ae237db54b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2937,7 +2937,8 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + if (context_gl->c.d3d_info->persistent_map + && context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) { TRACE("Not unmapping BO %p.\n", bo); return; @@ -2960,6 +2961,7 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context if (bo->b.client_map_count) { wined3d_device_bo_map_unlock(context_gl->c.device); + assert(context_gl->c.d3d_info->persistent_map); TRACE("BO %p is still in use by a client thread; not unmapping.\n", bo); return; }

1 0

Andrew Eikum : xaudio2/tests: Remove failing legacy CLSID tests.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: c1e793f1119de0c0ef7d4bd6d9fefbafdb5dbbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e793f1119de0c0ef7d4bd6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:06:28 2022 -0500 xaudio2/tests: Remove failing legacy CLSID tests. Modern Windows fails these tests, and no application is known to need this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52998 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9d50944b8d3..f4f808c2656 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1067,10 +1067,6 @@ static void test_xapo_creation_modern(const char *module) /* CLSIDs are the same across all versions */ static const GUID *const_clsids[] = { - &CLSID_FXEQ27, - &CLSID_FXMasteringLimiter27, - &CLSID_FXReverb27, - &CLSID_FXEcho27, &CLSID_FXEQ, &CLSID_FXMasteringLimiter, &CLSID_FXReverb, @@ -1111,19 +1107,6 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08lx\n", module, hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %lu\n", rc); - } - pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module);

1 0

Alexandre Julliard : kernelbase: Fix typo in null pointer check.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: 9990dc11df7212c81d39d06a2d188623d4a048dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9990dc11df7212c81d39d06a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 10:26:36 2022 +0200 kernelbase: Fix typo in null pointer check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53080 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 6ec80596355..02532a7e10b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3884,7 +3884,7 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH if (found != -1) { if ((flags & FIND_ENDSWITH) && found + foundlen != srclen) found = -1; - else if (*reslen) *reslen = foundlen; + else if (reslen) *reslen = foundlen; } free_sortkey_state( &s ); free_sortkey_state( &val );

1 0

Alexandre Julliard : kernelbase: Fix checks for valid locale in LCMapStringW/Ex.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: c2a455a20d7b5124bab0086df75178d8c53f27ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a455a20d7b5124bab0086d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 1 11:19:24 2022 +0200 kernelbase: Fix checks for valid locale in LCMapStringW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 14 +++++--- dlls/kernelbase/locale.c | 86 +++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4aada71bbb0..125d0c1f2ca 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2669,10 +2669,13 @@ static void test_LCMapStringW(void) SetLastError(0xdeadbeef); ret = LCMapStringW((LCID)-1, LCMAP_LOWERCASE, upper_case, -1, buf, ARRAY_SIZE(buf)); - todo_wine { ok(!ret, "LCMapStringW should fail with bad lcid\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + ret = LCMapStringW((LCID)0xdead, LCMAP_HIRAGANA, upper_case, -1, buf, ARRAY_SIZE(buf)); + ok(!ret, "LCMapStringW should fail with bad lcid\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); test_lcmapstring_unicode(LCMapStringW_wrapper, "LCMapStringW:"); } @@ -2698,10 +2701,13 @@ static void test_LCMapStringEx(void) SetLastError(0xdeadbeef); ret = pLCMapStringEx(invalidW, LCMAP_LOWERCASE, upper_case, -1, buf, ARRAY_SIZE(buf), NULL, NULL, 0); - todo_wine { ok(!ret, "LCMapStringEx should fail with bad locale name\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %ld\n", GetLastError()); - } + + SetLastError(0xdeadbeef); + ret = pLCMapStringEx(invalidW, LCMAP_HIRAGANA, + upper_case, -1, buf, ARRAY_SIZE(buf), NULL, NULL, 0); + ok(ret, "LCMapStringEx should not fail with bad locale name\n"); /* test reserved parameters */ ret = pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, LCMAP_LOWERCASE, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 02532a7e10b..5a6022addc9 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -672,7 +672,12 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) name = locale_strings + user_locale->sname + 1; } - if (!(entry = find_lcname_entry( name ))) return NULL; + if (!(entry = find_lcname_entry( name ))) + { + WARN( "unknown locale %s\n", debugstr_w(name) ); + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } if ((ret = locale_sorts[entry - lcnames_index])) return ret; lcid = entry->id; @@ -686,22 +691,17 @@ static const struct sortguid *get_language_sort( const WCHAR *name ) if (!RegQueryValueExW( key, name, NULL, &type, (BYTE *)guidstr, &size ) && type == REG_SZ) { RtlInitUnicodeString( &str, guidstr ); - if (!RtlGUIDFromString( &str, &guid )) - { - ret = find_sortguid( &guid ); - goto done; - } + if (!RtlGUIDFromString( &str, &guid )) ret = find_sortguid( &guid ); break; } if (!name[0]) break; name = locale_strings + (SORTIDFROMLCID( lcid ) ? locale->sname : locale->sparent) + 1; if (!(locale = get_locale_by_name( name, &lcid ))) break; } + RegCloseKey( key ); } - ret = &sort.guids[0]; -done: - RegCloseKey( key ); - if (ret) locale_sorts[entry - lcnames_index] = ret; + if (!ret) ret = &sort.guids[0]; + locale_sorts[entry - lcnames_index] = ret; return ret; } @@ -4484,12 +4484,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, return 0; } - if (!(sortid = get_language_sort( locale ))) - { - FIXME( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } + if (!(sortid = get_language_sort( locale ))) return 0; if (!str1 || !str2) { @@ -4971,12 +4966,7 @@ INT WINAPI DECLSPEC_HOTPATCH FindNLSStringEx( const WCHAR *locale, DWORD flags, SetLastError( ERROR_INVALID_PARAMETER ); return -1; } - if (!(sortid = get_language_sort( locale ))) - { - WARN( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return -1; - } + if (!(sortid = get_language_sort( locale ))) return -1; if (srclen == -1) srclen = lstrlenW(src); if (valuelen == -1) valuelen = lstrlenW(value); @@ -5634,11 +5624,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetNLSVersionEx( NLS_FUNCTION func, const WCHAR *l SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } - if (!(sortid = get_language_sort( locale ))) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } + + if (!(sortid = get_language_sort( locale ))) return FALSE; info->dwNLSVersion = info->dwDefinedVersion = sort.version; if (info->dwNLSVersionInfoSize >= sizeof(*info)) @@ -6329,13 +6316,10 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co if (!dstlen) dst = NULL; - if (flags & (LCMAP_LINGUISTIC_CASING | LCMAP_SORTKEY) && !(sortid = get_language_sort( locale ))) + if (flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE | LCMAP_SORTKEY)) { - FIXME( "unknown locale %s\n", debugstr_w(locale) ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; + if (!(sortid = get_language_sort( locale ))) return 0; } - if (flags & LCMAP_SORTKEY) { if (src == dst) @@ -6574,31 +6558,27 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringW( LCID lcid, DWORD flags, const WCHAR * WCHAR *dst, int dstlen ) { const WCHAR *locale = LOCALE_NAME_USER_DEFAULT; + const NLS_LOCALE_LCID_INDEX *entry; - if (flags & (LCMAP_LINGUISTIC_CASING | LCMAP_SORTKEY)) + switch (lcid) { - const NLS_LOCALE_LCID_INDEX *entry; - - switch (lcid) + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_SYSTEM_DEFAULT: + case LOCALE_CUSTOM_DEFAULT: + case LOCALE_CUSTOM_UNSPECIFIED: + case LOCALE_CUSTOM_UI_DEFAULT: + break; + default: + if (lcid == user_lcid || lcid == system_lcid) break; + if (!(entry = find_lcid_entry( lcid ))) { - case LOCALE_NEUTRAL: - case LOCALE_USER_DEFAULT: - case LOCALE_SYSTEM_DEFAULT: - case LOCALE_CUSTOM_DEFAULT: - case LOCALE_CUSTOM_UNSPECIFIED: - case LOCALE_CUSTOM_UI_DEFAULT: - break; - default: - if (lcid == user_lcid || lcid == system_lcid) break; - if (!(entry = find_lcid_entry( lcid ))) - { - WARN( "unknown locale %04lx\n", lcid ); - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - locale = locale_strings + entry->name + 1; - break; + WARN( "unknown locale %04lx\n", lcid ); + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; } + locale = locale_strings + entry->name + 1; + break; } return LCMapStringEx( locale, flags, src, srclen, dst, dstlen, NULL, NULL, 0 );

1 0

Paul Gofman : winex11.drv: Avoid adding duplicate GPUs.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: wine Branch: master Commit: 0d5c6d55bf36cbc712cc3585c6b2e13fbf49996d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5c6d55bf36cbc712cc3585… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 31 19:28:28 2022 -0500 winex11.drv: Avoid adding duplicate GPUs. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 3fa6bad56c1..d3b96e3170b 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -633,7 +633,8 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) -static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info ) +static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProviderInfo *provider_info, + struct gdi_gpu *prev_gpus, int prev_gpu_count ) { static const char *extensions[] = { @@ -648,7 +649,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; - uint32_t device_count, device_idx, output_idx; + uint32_t device_count, device_idx, output_idx, i; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; VkInstanceCreateInfo create_info; @@ -703,6 +704,8 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid goto done; } + TRACE("provider name %s.\n", debugstr_a(provider_info->name)); + for (device_idx = 0; device_idx < device_count; ++device_idx) { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) @@ -720,7 +723,19 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid properties2.pNext = &id; pvkGetPhysicalDeviceProperties2KHR( vk_physical_devices[device_idx], &properties2 ); + for (i = 0; i < prev_gpu_count; ++i) + { + if (!memcmp( &prev_gpus[i].vulkan_uuid, &id.deviceUUID, sizeof(id.deviceUUID) )) + { + WARN( "device UUID %#x:%#x already assigned to GPU %u.\n", *((uint32_t *)id.deviceUUID + 1), + *(uint32_t *)id.deviceUUID, i ); + break; + } + } + if (i < prev_gpu_count) continue; + memcpy( &gpu->vulkan_uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + /* Ignore Khronos vendor IDs */ if (properties2.properties.vendorID < 0x10000) { @@ -808,7 +823,7 @@ static BOOL xrandr14_get_gpus2( struct gdi_gpu **new_gpus, int *count, BOOL get_ gpus[i].id = provider_resources->providers[i]; if (get_properties) { - if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info )) + if (!get_gpu_properties_from_vulkan( &gpus[i], provider_info, gpus, i )) RtlUTF8ToUnicodeN( gpus[i].name, sizeof(gpus[i].name), &len, provider_info->name, strlen( provider_info->name ) + 1 ); /* FIXME: Add an alternate method of getting PCI IDs, for systems that don't support Vulkan */

1 0

Francois Gouget : testbot/build: Fix passing the BuildWine() target list in Reconfig.
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: tools Branch: master Commit: 4eae017dd260871b8916671cd3000da7efb9c190 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4eae017dd260871b8916671… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 1 14:52:43 2022 +0200 testbot/build: Fix passing the BuildWine() target list in Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 9e1043a..4f07eee 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -57,9 +57,9 @@ sub UpdateWineBuilds($$) my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", - $Configure, "buildtests") && + $Configure, ["buildtests"]) && BuildWine($TaskMissions, $Flags, "exe64", - "$Configure --enable-win64", "buildtests"); + "$Configure --enable-win64", ["buildtests"]); }

1 0

Francois Gouget : testbot/orm: Take the filters into account in DBIBackend::DeleteAll().
by Alexandre Julliard 01 Jun '22

01 Jun '22

Module: tools Branch: master Commit: 8c1022c523acce29f077e52bbe4caa0cdcdd657e URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c1022c523acce29f077e52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 1 14:52:10 2022 +0200 testbot/orm: Take the filters into account in DBIBackend::DeleteAll(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 940d37f..07b838d 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -738,6 +738,22 @@ sub DeleteAll($$) push @Data, @{$MasterColValues}; } + my $Filter = $Collection->GetFilter(); + if ($Filter) + { + my ($Composite, $FilterWhere, $FilterData) = GetFilterWhere($self, $Collection, $Filter); + if ($Where ne "") + { + $Where .= ($Composite ? " AND ($FilterWhere)" : " AND $FilterWhere"); + push @Data, @$FilterData; + } + else + { + $Where = $FilterWhere; + @Data = @$FilterData; + } + } + my $Query = "DELETE FROM " . $Collection->GetTableName(); if ($Where ne "") {

1 0