October 2022 - wine-commits

Anton Baskanov : quartz/tests: Add tests for MPEG layer-3 decoder interfaces.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 773dea79b9bee52fa750b0dc13490f40d8d6aff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/773dea79b9bee52fa750b0dc13490f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 1 22:23:07 2022 +0700 quartz/tests: Add tests for MPEG layer-3 decoder interfaces. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/mpeglayer3.c | 119 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 8031a766295..1613907424c 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ filtermapper.c \ memallocator.c \ mpegaudio.c \ + mpeglayer3.c \ mpegsplit.c \ passthrough.c \ systemclock.c \ diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c new file mode 100644 index 00000000000..222d7c28d28 --- /dev/null +++ b/dlls/quartz/tests/mpeglayer3.c @@ -0,0 +1,119 @@ +/* + * Copyright 2022 Anton Baskanov + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(CLSID_mpeg_layer3_decoder, 0x38be3000, 0xdbf4, 0x11d0, 0x86, 0x0e, 0x00, 0xa0, 0x24, 0xcf, 0xef, 0x6d); + +static IBaseFilter *create_mpeg_layer3_decoder(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_mpeg_layer3_decoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_mpeg_layer3_decoder(); + IPin *pin; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IMpegAudioDecoder, FALSE); + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + + IBaseFilter_FindPin(filter, L"In", &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + + IBaseFilter_Release(filter); +} + +START_TEST(mpeglayer3) +{ + IBaseFilter *filter; + + CoInitialize(NULL); + + if (FAILED(CoCreateInstance(&CLSID_mpeg_layer3_decoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + skip("Failed to create MPEG layer-3 decoder instance.\n"); + return; + } + IBaseFilter_Release(filter); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Paul Gofman : wbemprox: Fix string length in get_value_bstr().
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5f42c9e39db998d4464b1916d8edf8132e915b42 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f42c9e39db998d4464b1916d8edf8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 20 19:14:29 2022 -0500 wbemprox: Fix string length in get_value_bstr(). --- dlls/wbemprox/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 34b09bc872f..ab386efa06b 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -178,7 +178,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) if (!val) return NULL; len = lstrlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - swprintf( ret, len, L"\"%s\"", (const WCHAR *)(INT_PTR)val ); + swprintf( ret, len + 1, L"\"%s\"", (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16:

1 0

Connor McAdams : uiautomationcore: Implement UiaRegisterProviderCallback.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 329664392e94e937ca788fcfc641a283fac97758 URL: https://gitlab.winehq.org/wine/wine/-/commit/329664392e94e937ca788fcfc641a2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Oct 13 12:45:57 2022 -0400 uiautomationcore: Implement UiaRegisterProviderCallback. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 845 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 149 ++++- dlls/uiautomationcore/uia_main.c | 5 - 3 files changed, 987 insertions(+), 12 deletions(-)

1 0

Connor McAdams : uiautomationcore/tests: Ignore UIA_NativeWindowHandlePropertyId in certain tests.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 59589e11964971864dcc17762c5e1c167ae224bb URL: https://gitlab.winehq.org/wine/wine/-/commit/59589e11964971864dcc17762c5e1c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 16 13:09:03 2022 -0400 uiautomationcore/tests: Ignore UIA_NativeWindowHandlePropertyId in certain tests. Windows versions 10v1507 and below classify a provider as an HWND provider if it returns a value for UIA_NativeWindowHandle. By ignoring this property, we get more consistent behavior in tests between all Windows versions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 84 +++++++++++------------------- 1 file changed, 30 insertions(+), 54 deletions(-)

1 0

Hans Leidekker : crypt32: Parse OCSP responder name.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: d393709fe42bf88a14c52a2f0c8779d73d1a6708 URL: https://gitlab.winehq.org/wine/wine/-/commit/d393709fe42bf88a14c52a2f0c8779… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 21 17:45:43 2022 +0200 crypt32: Parse OCSP responder name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53813 --- dlls/crypt32/decode.c | 102 ++++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/encode.c | 86 ++++++++++++++++++++++++++++++++++--- 2 files changed, 174 insertions(+), 14 deletions(-)

1 0

Eric Pouech : dbghelp: Realloc array of buckets inside struct vector.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 363f1f49a8eb3072455358e10dbf040e21e806b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/363f1f49a8eb3072455358e10dbf04… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 21 09:58:48 2022 +0200 dbghelp: Realloc array of buckets inside struct vector. Instead of silently leaking no longer used chunks. Be more robust to OOM conditions. Introducing pool_realloc(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/storage.c | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ceb92aabc4f..daf15732877 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -42,6 +42,7 @@ struct pool /* poor's man */ void pool_init(struct pool* a, size_t arena_size) DECLSPEC_HIDDEN; void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; void* pool_alloc(struct pool* a, size_t len) DECLSPEC_HIDDEN; +void* pool_realloc(struct pool* a, void* ptr, size_t len) DECLSPEC_HIDDEN; char* pool_strdup(struct pool* a, const char* str) DECLSPEC_HIDDEN; struct vector diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 735fb3bce7e..daed3aa8d99 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -43,6 +43,11 @@ void* pool_alloc(struct pool* pool, size_t len) return HeapAlloc(pool->heap, 0, len); } +void* pool_realloc(struct pool* pool, void* ptr, size_t len) +{ + return ptr ? HeapReAlloc(pool->heap, 0, ptr, len) : pool_alloc(pool, len); +} + char* pool_strdup(struct pool* pool, const char* str) { char* ret; @@ -90,32 +95,25 @@ void* vector_at(const struct vector* v, unsigned pos) void* vector_add(struct vector* v, struct pool* pool) { - unsigned ncurr = v->num_elts++; - - /* check that we don't wrap around */ - assert(v->num_elts > ncurr); - if (ncurr == (v->num_buckets << v->shift)) + if (v->num_elts == (v->num_buckets << v->shift)) { - if(v->num_buckets == v->buckets_allocated) + if (v->num_buckets == v->buckets_allocated) { /* Double the bucket cache, so it scales well with big vectors.*/ - unsigned new_reserved; + unsigned new_reserved = v->buckets_allocated ? v->buckets_allocated * 2 : 1; void* new; - new_reserved = 2*v->buckets_allocated; - if(new_reserved == 0) new_reserved = 1; - - /* Don't even try to resize memory. - Pool datastructure is very inefficient with reallocs. */ - new = pool_alloc(pool, new_reserved * sizeof(void*)); - memcpy(new, v->buckets, v->buckets_allocated * sizeof(void*)); + new = pool_realloc(pool, v->buckets, new_reserved * sizeof(void*)); + if (!new) return NULL; v->buckets = new; v->buckets_allocated = new_reserved; } v->buckets[v->num_buckets] = pool_alloc(pool, v->elt_size << v->shift); + if (!v->buckets[v->num_buckets]) return NULL; + v->num_elts++; return v->buckets[v->num_buckets++]; } - return vector_at(v, ncurr); + return vector_at(v, v->num_elts++); } /* We construct the sparse array as two vectors (of equal size)

1 0

Eric Pouech : dbghelp: Use heap functions for allocation.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: c5f4874e7b4a5a9e9d3d3ff0665ec25b5161ee8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c5f4874e7b4a5a9e9d3d3ff0665ec2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 21 09:58:47 2022 +0200 dbghelp: Use heap functions for allocation. Create a dedicated heap for each module (as it was done for the private home grown pools). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 6 +-- dlls/dbghelp/storage.c | 86 ++---------------------------------------- 2 files changed, 5 insertions(+), 87 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5e63d949a43..ceb92aabc4f 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -34,13 +34,9 @@ #include "cvconst.h" -/* #define USE_STATS */ - struct pool /* poor's man */ { - struct list arena_list; - struct list arena_full; - size_t arena_size; + HANDLE heap; }; void pool_init(struct pool* a, size_t arena_size) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 48a43e6bc3d..735fb3bce7e 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -25,100 +25,22 @@ #include "wine/debug.h" #include "dbghelp_private.h" -#ifdef USE_STATS -#include <math.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -struct pool_arena -{ - struct list entry; - char *current; - char *end; -}; - -void pool_init(struct pool* a, size_t arena_size) +void pool_init(struct pool* pool, size_t arena_size) { - list_init( &a->arena_list ); - list_init( &a->arena_full ); - a->arena_size = arena_size; + pool->heap = HeapCreate(HEAP_NO_SERIALIZE, arena_size, 0); } void pool_destroy(struct pool* pool) { - struct pool_arena* arena; - struct pool_arena* next; - -#ifdef USE_STATS - size_t alloc, used, num; - - alloc = used = num = 0; - LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) - { - alloc += arena->end - (char *)arena; - used += arena->current - (char*)arena; - num++; - } - LIST_FOR_EACH_ENTRY( arena, &pool->arena_full, struct pool_arena, entry ) - { - alloc += arena->end - (char *)arena; - used += arena->current - (char*)arena; - num++; - } - if (alloc == 0) alloc = 1; /* avoid division by zero */ - FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas, non-allocation ratio: %.2f%%\n", - pool, (unsigned)(alloc >> 10), (unsigned)(used >> 10), (unsigned)num, - 100.0 - (float)used / (float)alloc * 100.0); -#endif - - LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_list, struct pool_arena, entry ) - { - list_remove( &arena->entry ); - HeapFree(GetProcessHeap(), 0, arena); - } - LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_full, struct pool_arena, entry ) - { - list_remove( &arena->entry ); - HeapFree(GetProcessHeap(), 0, arena); - } + HeapDestroy(pool->heap); } void* pool_alloc(struct pool* pool, size_t len) { - struct pool_arena* arena; - void* ret; - size_t size; - - len = (len + 3) & ~3; /* round up size on DWORD boundary */ - - LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) - { - if (arena->end - arena->current >= len) - { - ret = arena->current; - arena->current += len; - if (arena->current + 16 >= arena->end) - { - list_remove( &arena->entry ); - list_add_tail( &pool->arena_full, &arena->entry ); - } - return ret; - } - } - - size = max( pool->arena_size, len ); - arena = HeapAlloc(GetProcessHeap(), 0, size + sizeof(struct pool_arena)); - if (!arena) return NULL; - - ret = arena + 1; - arena->current = (char*)ret + len; - arena->end = (char*)ret + size; - if (arena->current + 16 >= arena->end) - list_add_tail( &pool->arena_full, &arena->entry ); - else - list_add_head( &pool->arena_list, &arena->entry ); - return ret; + return HeapAlloc(pool->heap, 0, len); } char* pool_strdup(struct pool* pool, const char* str)

1 0

Piotr Caban : msvcrt: Fix _wputenv_s return value on error.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: f0e6447b7fc10c21bf6aa04f70a5094f16a294a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e6447b7fc10c21bf6aa04f70a509… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:30:19 2022 +0200 msvcrt: Fix _wputenv_s return value on error. --- dlls/msvcrt/environ.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index a35d0877891..9800a1b66b1 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -191,19 +191,24 @@ errno_t CDECL _putenv_s(const char *name, const char *value) /********************************************************************* * _wputenv_s (MSVCRT.@) */ -int CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) +errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Piotr Caban : msvcrt: Fix _putenv_s return value on error.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 53acb6e736d6feb10b19fd609771ecfa33f7d1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/53acb6e736d6feb10b19fd609771ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:28:23 2022 +0200 msvcrt: Fix _putenv_s return value on error. --- dlls/msvcrt/environ.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 83a493c1a9a..a35d0877891 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -165,17 +165,22 @@ finish: */ errno_t CDECL _putenv_s(const char *name, const char *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; - ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableA(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0

Brendan Shanks : sechost: Set the name of internal threads.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 8f6b8e97c2e7f01909df3ae77edef33fac026097 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f6b8e97c2e7f01909df3ae77edef3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 26 14:09:34 2022 -0700 sechost: Set the name of internal threads. --- dlls/sechost/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 1026f2df851..cb5e140b3cf 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1288,6 +1288,8 @@ static DWORD WINAPI notify_thread(void *user) SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; BOOL dummy; + SetThreadDescription(GetCurrentThread(), L"wine_sechost_notify_service_status"); + __TRY { /* GetNotifyResults blocks until there is an event */ @@ -1585,6 +1587,7 @@ static DWORD WINAPI service_thread( void *arg ) DWORD argc = 0, len = 0; TRACE("%p\n", arg); + SetThreadDescription(GetCurrentThread(), L"wine_sechost_service"); while (str[len]) { @@ -2021,6 +2024,8 @@ static DWORD WINAPI device_notify_proc( void *arg ) unsigned int i, size; BYTE *buf; + SetThreadDescription( GetCurrentThread(), L"wine_sechost_device_notify" ); + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) { ERR("RpcStringBindingCompose() failed, error %#lx\n", err);

1 0

Zebediah Figura : ntdll: Fill the IOSB in sock_transmit() only inside the "if (alerted)" block.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 0c848768c172d6ccf1893284600c1c3e8b83fdd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c848768c172d6ccf1893284600c1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:33:31 2022 -0500 ntdll: Fill the IOSB in sock_transmit() only inside the "if (alerted)" block. We can only get a successful status that way. This matches sock_recv(). Also combine the if (alerted) blocks. Unlike the previous commits, this cannot be separated, as it causes warnings with some versions of gcc. --- dlls/ntdll/unix/socket.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e53ad4b76be..b502d3a03cb 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1335,9 +1335,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, socklen_t addr_len; HANDLE wait_handle; NTSTATUS status; - ULONG_PTR information; ULONG options; - BOOL alerted; addr_len = sizeof(addr); if (getpeername( fd, &addr.addr, &addr_len ) != 0) @@ -1389,37 +1387,38 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, } SERVER_END_REQ; - alerted = status == STATUS_ALERTED; - if (alerted) + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_transmit( fd, file_fd, async ); if (status == STATUS_DEVICE_NOT_READY) status = STATUS_PENDING; - } - if (status != STATUS_PENDING) - { information = async->head_cursor + async->file_cursor + async->tail_cursor; - if (!NT_ERROR(status) || wait_handle) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); + + set_async_direct_result( &wait_handle, status, information, TRUE ); } - else information = 0; - if (alerted) + if (status != STATUS_PENDING) + release_fileio( &async->io ); + + if (!status && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) { - set_async_direct_result( &wait_handle, status, information, TRUE ); - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) - { - /* Pretend we always do async I/O. The client can always retrieve - * the actual I/O status via the IO_STATUS_BLOCK. - */ - status = STATUS_PENDING; - } + /* Pretend we always do async I/O. The client can always retrieve + * the actual I/O status via the IO_STATUS_BLOCK. + */ + status = STATUS_PENDING; } + if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ntdll: Combine the "if (alerted)" blocks in sock_send().
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 8bf295fd1a7aa4138baa9caa71d4f3cae5416add URL: https://gitlab.winehq.org/wine/wine/-/commit/8bf295fd1a7aa4138baa9caa71d4f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 22:04:51 2022 -0500 ntdll: Combine the "if (alerted)" blocks in sock_send(). There is no need to release the async_fileio structure before calling set_async_direct_result(). --- dlls/ntdll/unix/socket.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cc3c898d464..e53ad4b76be 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1099,9 +1099,8 @@ static void sock_save_icmp_id( struct async_send_ioctl *async ) static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, struct async_send_ioctl *async, int force_async ) { - BOOL nonblocking, alerted; - ULONG_PTR information; HANDLE wait_handle; + BOOL nonblocking; NTSTATUS status; ULONG options; @@ -1122,9 +1121,10 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (!NT_ERROR(status) && is_icmp_over_dgram( fd )) sock_save_icmp_id( async ); - alerted = status == STATUS_ALERTED; - if (alerted) + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_send( fd, async ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; @@ -1142,12 +1142,13 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi io->Status = status; io->Information = information; } + + set_async_direct_result( &wait_handle, status, information, FALSE ); } if (status != STATUS_PENDING) release_fileio( &async->io ); - if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ntdll: Fill the IOSB in sock_send() only inside the "if (alerted)" block.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: d3c8842a6ef539bde7bc8132343f82673235c83a URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c8842a6ef539bde7bc8132343f82… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:32:25 2022 -0500 ntdll: Fill the IOSB in sock_send() only inside the "if (alerted)" block. We can only get a successful status that way. This matches sock_recv(). --- dlls/ntdll/unix/socket.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 44694f8c404..cc3c898d464 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1116,6 +1116,9 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } SERVER_END_REQ; + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + if (!NT_ERROR(status) && is_icmp_over_dgram( fd )) sock_save_icmp_id( async ); @@ -1132,19 +1135,17 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi * and returns EWOULDBLOCK, but we have no way of doing that. */ if (status == STATUS_DEVICE_NOT_READY && async->sent_len) status = STATUS_SUCCESS; - } - if (status != STATUS_PENDING) - { information = async->sent_len; - if (!NT_ERROR(status) || (wait_handle && !alerted)) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); } - else information = 0; + + if (status != STATUS_PENDING) + release_fileio( &async->io ); if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT );

1 0

Zebediah Figura : ntdll: Combine the "if (alerted)" blocks in sock_recv().
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 3905af7c446ba201c7ebf15169c4c1fb52a67078 URL: https://gitlab.winehq.org/wine/wine/-/commit/3905af7c446ba201c7ebf15169c4c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 22:03:21 2022 -0500 ntdll: Combine the "if (alerted)" blocks in sock_recv(). There is no need to release the async_fileio structure before calling set_async_direct_result(). --- dlls/ntdll/unix/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8ff58f7566e..44694f8c404 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -852,9 +852,8 @@ static BOOL is_icmp_over_dgram( int fd ) static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, struct async_recv_ioctl *async, int force_async ) { - BOOL nonblocking, alerted; - ULONG_PTR information; HANDLE wait_handle; + BOOL nonblocking; NTSTATUS status; unsigned int i; ULONG options; @@ -883,9 +882,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi /* the server currently will never succeed immediately */ assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); - alerted = status == STATUS_ALERTED; - if (alerted) + if (status == STATUS_ALERTED) { + ULONG_PTR information; + status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; @@ -894,12 +894,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi io->Status = status; io->Information = information; } + set_async_direct_result( &wait_handle, status, information, FALSE ); } if (status != STATUS_PENDING) release_fileio( &async->io ); - if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; }

1 0

Zebediah Figura : ntdll: Fill the IOSB in sock_recv() only inside the "if (alerted)" block.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: f994e0a653f15bc19523d08cbf9aea93f577bc02 URL: https://gitlab.winehq.org/wine/wine/-/commit/f994e0a653f15bc19523d08cbf9aea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:29:27 2022 -0500 ntdll: Fill the IOSB in sock_recv() only inside the "if (alerted)" block. We can only get a successful status that way. This avoids an uninitialized variable warning with gcc 12.2. --- dlls/ntdll/unix/socket.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f8ed9f6f854..8ff58f7566e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,6 +23,7 @@ #endif #include "config.h" +#include <assert.h> #include <errno.h> #include <sys/types.h> #include <sys/socket.h> @@ -879,24 +880,25 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } SERVER_END_REQ; + /* the server currently will never succeed immediately */ + assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); + alerted = status == STATUS_ALERTED; if (alerted) { status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; - } - - if (status != STATUS_PENDING) - { - if (!NT_ERROR(status) || (wait_handle && !alerted)) + if (!NT_ERROR(status) && status != STATUS_PENDING) { io->Status = status; io->Information = information; } - release_fileio( &async->io ); } + if (status != STATUS_PENDING) + release_fileio( &async->io ); + if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status;

1 0

Zebediah Figura : ntdll: The async handle passed to set_async_direct_result() cannot be NULL.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: 6b16ead607ed9426ec38d3db123bc732c309b90e URL: https://gitlab.winehq.org/wine/wine/-/commit/6b16ead607ed9426ec38d3db123bc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 12:55:18 2022 -0500 ntdll: The async handle passed to set_async_direct_result() cannot be NULL. --- dlls/ntdll/unix/sync.c | 9 +++++---- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1194ee514b5..821a1f08311 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2533,21 +2533,22 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG /* Notify direct completion of async and close the wait handle if it is no longer needed. * This function is a no-op (returns status as-is) if the supplied handle is NULL. */ -void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) +void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) { NTSTATUS ret; - if (!*optional_handle) return; + /* if we got STATUS_ALERTED, we must have a valid async handle */ + assert( *async_handle ); SERVER_START_REQ( set_async_direct_result ) { - req->handle = wine_server_obj_handle( *optional_handle ); + req->handle = wine_server_obj_handle( *async_handle ); req->status = status; req->information = information; req->mark_pending = mark_pending; ret = wine_server_call( req ); if (ret == STATUS_SUCCESS) - *optional_handle = wine_server_ptr_handle( reply->handle ); + *async_handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 47f0f9c56a9..73b9ed76de0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -278,7 +278,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; -extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); +extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) DECLSPEC_HIDDEN; extern void dbg_init(void) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ws2_32/tests: Add more tests for iosb contents while a recv is pending.
by Alexandre Julliard 21 Oct '22

21 Oct '22

Module: wine Branch: master Commit: da8defe5df1558e5086a364a98e55a7fae1fb0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/da8defe5df1558e5086a364a98e55a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 12:51:22 2022 -0500 ws2_32/tests: Add more tests for iosb contents while a recv is pending. --- dlls/ws2_32/tests/afd.c | 7 ++++--- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 21e7a50aef3..3215ddaef62 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1466,13 +1466,14 @@ static void test_recv(void) IOCTL_AFD_RECV, &params, sizeof(params) - 1, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memset(&io, 0, sizeof(io)); + io.Status = 0xdeadbeef; + io.Information = 0xdeadbeef; memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - ok(!io.Status, "got status %#lx\n", io.Status); - ok(!io.Information, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadbeef, "got status %#lx\n", io.Status); + ok(io.Information == 0xdeadbeef, "got information %#Ix\n", io.Information); /* These structures need not remain valid. */ memset(&params, 0xcc, sizeof(params)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4f430a29d2..adf16012951 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12208,11 +12208,15 @@ static void test_nonblocking_async_recv(void) memset(buffer, 0, sizeof(buffer)); WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); ret = WaitForSingleObject((HANDLE)client, 0); ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + ok(overlapped.Internal == STATUS_PENDING, "got status %#lx\n", (NTSTATUS)overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); ret = send(server, "data", 4, 0); ok(ret == 4, "got %d\n", ret);

1 0

Jinoh Kang : win32u: Fix data race in NtUserGetProcessDpiAwarenessContext.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 25b05840d4fad5d12f308077925e3cf92bcebfb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/25b05840d4fad5d12f308077925e3c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Sep 19 00:13:24 2022 +0900 win32u: Fix data race in NtUserGetProcessDpiAwarenessContext. --- dlls/win32u/sysparams.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 498ed386386..9f0812b843e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5330,14 +5330,17 @@ BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown */ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) { + DPI_AWARENESS val; + if (process && process != GetCurrentProcess()) { WARN( "not supported on other process %p\n", process ); return NTUSER_DPI_UNAWARE; } - if (!dpi_awareness) return NTUSER_DPI_UNAWARE; - return dpi_awareness; + val = ReadNoFence( &dpi_awareness ); + if (!val) return NTUSER_DPI_UNAWARE; + return val; } BOOL message_beep( UINT i )

1 0

Francois Gouget : ddraw/tests: Mark tests failing randomly on Windows 8 as flaky.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: c2adce37f4b9d9cfc7fb0d08ff60344d4d4a0ff3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2adce37f4b9d9cfc7fb0d08ff6034… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 08:45:16 2022 +0200 ddraw/tests: Mark tests failing randomly on Windows 8 as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53134 --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 18 ++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 18 ++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+)

1 0

Francois Gouget : msdasql: Fix a typo in the is_fixed_length() function name.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: a00a64b9c092a39d26e2016e98b358c1c29553f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a00a64b9c092a39d26e2016e98b358… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 16:23:53 2022 +0200 msdasql: Fix a typo in the is_fixed_length() function name. --- dlls/msdasql/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 27d952276e5..67dc30bf09e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -263,7 +263,7 @@ static BOOL is_variable_length(SQLSMALLINT type) return FALSE; } -static BOOL is_fixed_legnth(SQLSMALLINT type) +static BOOL is_fixed_length(SQLSMALLINT type) { switch(type) { @@ -1059,7 +1059,7 @@ static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDIN if (ColumnDataNullable) dbcolumn[i].dwFlags |= DBCOLUMNFLAGS_ISNULLABLE | DBCOLUMNFLAGS_MAYBENULL; - if (is_fixed_legnth(ColumnDataType)) + if (is_fixed_length(ColumnDataType)) dbcolumn[i].dwFlags |= DBCOLUMNFLAGS_ISFIXEDLENGTH; ret = SQLColAttribute(rowset->hstmt, i+1, SQL_DESC_SCALE, NULL, 0, NULL, &length);

1 0

Francois Gouget : rpcrt4/tests: Fix the spelling of a couple of comments.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: e7be6ae2f1d85c380098350cff3ed1c2fb25e5bc URL: https://gitlab.winehq.org/wine/wine/-/commit/e7be6ae2f1d85c380098350cff3ed1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 16:23:31 2022 +0200 rpcrt4/tests: Fix the spelling of a couple of comments. --- dlls/rpcrt4/tests/cstub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d44ee36088c..794d85744ef 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1534,7 +1534,7 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) * so it's possible these are freed out from under it. * E.g. an event sink might unadvise upon receiving the event it was waiting for; * this unadvise could be reentrant to Invoke because SendReceive pumps STA messages. - * The source would then erase that conection point entry and Release the proxy. */ + * The source would then erase that connection point entry and Release the proxy. */ IRpcProxyBuffer_Disconnect(proxy_buffer); ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); IRpcProxyBuffer_Release(proxy_buffer); @@ -1542,7 +1542,7 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) ok(refs == 0, "got %ld\n", refs); ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); - /* NdrProxyFreeBuffer must not dereference the the now-freed proxy_if1, + /* NdrProxyFreeBuffer must not dereference the now-freed proxy_if1, * yet should still free the remaining reference on test_chanbuf */ NdrProxyFreeBuffer(proxy_if1, &stubMessage); ok(test_chanbuf.RefCount == 0, "got %ld\n", test_chanbuf.RefCount);

1 0

Francois Gouget : dbghelp: Fix the spelling of a couple of comments.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 0eb40cdbd07c51a70d54e3ebbd624769964a69ea URL: https://gitlab.winehq.org/wine/wine/-/commit/0eb40cdbd07c51a70d54e3ebbd6247… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 16:23:05 2022 +0200 dbghelp: Fix the spelling of a couple of comments. --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/dwarf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a5ea41ae014..5e63d949a43 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -271,11 +271,11 @@ struct symt_data * address in one of its ranges * * Notes: - * (A): shall evolve but storage is native is awkward: from PGO testing, the + * (A): shall evolve but storage in native is awkward: from PGO testing, the * top function is stored with its first range of address; all the others * are stored as blocks, children of compiland, but which lexical parent * is the top function. This breaks the natural assumption that - * children <> lexical parent is symetrical. + * children <> lexical parent is symmetrical. * (B): see dwarf.c for some gory discrepancies between native & builtin * DbgHelp. */ diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f8b3f8d717c..f9ffa374dbc 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2201,7 +2201,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, } /* Dwarf tends to keep the structure of the C/C++ program, and emits DW_TAG_lexical_block - * for every block in source program. + * for every block the in source program. * With inlining and other optimizations, code for a block no longer lies in a contiguous * chunk of memory. It's hence described with (potentially) multiple chunks of memory. * Then each variable of each block is attached to its block. (A) @@ -2217,7 +2217,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, * * DbgHelp only exposes a contiguous chunk of memory for a block. * - * => Store internaly all the ranges of addresses in a block, but only expose the size + * => Store internally all the ranges of addresses in a block, but only expose the size * of the first chunk of memory. * Otherwise, it would break the rule: blocks' chunks don't overlap. * Note: This could mislead some programs using the blocks' address and size information.

1 0

Francois Gouget : d3d10core/tests: Fix the spelling of a comment.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 5f0b7390e99fb5b26a78ee5d99266d75c810baad URL: https://gitlab.winehq.org/wine/wine/-/commit/5f0b7390e99fb5b26a78ee5d99266d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 16:22:23 2022 +0200 d3d10core/tests: Fix the spelling of a comment. --- dlls/d3d10core/tests/d3d10core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 74f689630eb..cd14371197f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4813,7 +4813,7 @@ static void test_pipeline_statistics_query(void) get_query_data(query, &data, sizeof(data)); /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and - * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * sleeping a second before ending the query reduces the likelihood of hitting the bug a lot, but * does not eliminate it entirely. To make things work reliably ignore such broken results. */ if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) {

1 0

Francois Gouget : dbghelp: Fix the trailing linefeed of a WARN() message.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 5bd74d0e58ef29da225d02a3cd0eca0da426229d URL: https://gitlab.winehq.org/wine/wine/-/commit/5bd74d0e58ef29da225d02a3cd0eca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 17:35:12 2022 +0200 dbghelp: Fix the trailing linefeed of a WARN() message. --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4671174d3bb..f8b3f8d717c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1953,7 +1953,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, loc.offset += subpgm->ctx->module_ctx->load_offset; if (subpgm->top_func) { - if (ext.u.uvalue) WARN("unexpected global inside a functionn"); + if (ext.u.uvalue) WARN("unexpected global inside a function\n"); symt_add_func_local(subpgm->ctx->module_ctx->module, subpgm->current_func, DataIsStaticLocal, &loc, subpgm->current_block, param_type, dwarf2_get_cpp_name(di, name.u.string));

1 0

Brendan Shanks : xinput1_3: Set thread name for hid_update_thread_proc.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 480da372b25b9a432129859b9facacc6436a5a30 URL: https://gitlab.winehq.org/wine/wine/-/commit/480da372b25b9a432129859b9facac… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 11:01:34 2022 -0700 xinput1_3: Set thread name for hid_update_thread_proc. --- dlls/xinput1_3/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 112fa5b436d..2abf33a8d45 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -707,6 +707,8 @@ static DWORD WINAPI hid_update_thread_proc(void *param) HWND hwnd; MSG msg; + SetThreadDescription(GetCurrentThread(), L"wine_xinput_hid_update"); + RegisterClassExW(&cls); hwnd = CreateWindowExW(0, cls.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);

1 0

Zhiyi Zhang : comctl32/tests: Use a toolbar with TBSTYLE_FLAT in toolbar visual tests.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 4277b47f3e4446517817da6927f0744767b7f202 URL: https://gitlab.winehq.org/wine/wine/-/commit/4277b47f3e4446517817da6927f074… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 19 23:46:06 2022 +0800 comctl32/tests: Use a toolbar with TBSTYLE_FLAT in toolbar visual tests. Fix a test failure when theming is off. A toolbar without TBSTYLE_FLAT will fill its checked button background rectangle when theming is inactive, overwriting the checked pattern required for the test. --- dlls/comctl32/tests/toolbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f66094a0b3a..7c886e1f88f 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2646,7 +2646,8 @@ static void test_visual(void) RECT rect; BOOL ret; - toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hMainWnd, 0, 0, NULL); + toolbar = CreateWindowA(TOOLBARCLASSNAMEA, "", WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT, 0, 0, 50, + 50, hMainWnd, 0, 0, NULL); ok(!!toolbar, "Failed to create a toolbar window.\n"); /* Test that the comctl32 55AA pattern brush is not used to draw checked background when theming is on */

1 0

Eric Pouech : ntdll/tests: Force alignment of output structures.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: c28a749f660f251da26d3d8cf163d2ee72bc8af6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c28a749f660f251da26d3d8cf163d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 20 10:54:18 2022 +0200 ntdll/tests: Force alignment of output structures. Some Windows version expect output to be aligned on 4 bytes. Notes (from i386 and x86_64 tests): - MSVC and Mingw/gcc don't layout the two variables (sdki, sdki_ex) the same way. - MSVC aligns each variable on 4-byte boundary, - MingW/GCC stores them in a 8-byte chunk, but starting from the end of the buffer: hence none of them is on a 4-byte boundary. So, fixing the alignment of variables is not sufficient to workaround the compilers' discrepancy on all source code. I didn't find a generic way to align on 4 bytes structures of size smaller than 4 bytes (apart from adding the DECLSPEC_ALIGN to each of the offending structures, likely not that many though). Ideas welcomed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53684 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/info.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 0af4259b85d..bef982b20b0 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1066,8 +1066,9 @@ static void test_query_kerndebug(void) { NTSTATUS status; ULONG ReturnLength; - SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi_ex; - SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; + /* some Windows version expect alignment */ + SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX DECLSPEC_ALIGN(4) skdi_ex; + SYSTEM_KERNEL_DEBUGGER_INFORMATION DECLSPEC_ALIGN(4) skdi; status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);

1 0

Alex Henrie : include: Add _putenv_s.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 7d85693750b2eae2828c5c62f9da1a3751df0184 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d85693750b2eae2828c5c62f9da1a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 08:56:25 2022 -0600 include: Add _putenv_s. Needed to compile Tera Term. --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index a6e1c7eee02..c608344b115 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -178,6 +178,7 @@ _ACRTIMP int __cdecl _makepath_s(char*,size_t,const char*,const char*, _ACRTIMP size_t __cdecl _mbstrlen(const char*); _ACRTIMP _onexit_t __cdecl _onexit(_onexit_t); _ACRTIMP int __cdecl _putenv(const char*); +_ACRTIMP errno_t __cdecl _putenv_s(const char*,const char*); #ifndef _rotl _ACRTIMP unsigned int __cdecl _rotl(unsigned int,int); #endif

1 0

Alex Henrie : msvcrt: Change return type of _putenv_s to errno_t.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 1f657729e5ef6b38a6368afd462105cd9c0e2715 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f657729e5ef6b38a6368afd462105… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 20 08:56:25 2022 -0600 msvcrt: Change return type of _putenv_s to errno_t. --- dlls/msvcrt/environ.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 698dc761381..83a493c1a9a 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -163,7 +163,7 @@ finish: /********************************************************************* * _putenv_s (MSVCRT.@) */ -int CDECL _putenv_s(const char *name, const char *value) +errno_t CDECL _putenv_s(const char *name, const char *value) { int ret;

1 0

Francois Gouget : winetest: Let the get_subtests() caller report errors.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 75e8f4edb7725d60c20ba8eeb2c637ceede2c4e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75e8f4edb7725d60c20ba8eeb2c637… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 20 15:19:51 2022 +0200 winetest: Let the get_subtests() caller report errors. The caller already analyses get_subtests() errors and provides a detailed error message in the information section of the report so the report(R_ERROR) pop up / stderr message is redundant. --- programs/winetest/main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c24af4952c7..74b596b237b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -815,12 +815,8 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) if (status) { - if (status == -2) - report (R_ERROR, "Cannot run %s error %u", test->exename, err); - else - err = status; close_temp_file( subname, subfile ); - return err; + return status == -2 ? err : status; } buffer = flush_temp_file( subname, subfile, &total );

1 0

Francois Gouget : wintrust: Add a trailing linefeed to an ERR() message.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: caf83eb8027c43646e37b7f694d354d2a28c5204 URL: https://gitlab.winehq.org/wine/wine/-/commit/caf83eb8027c43646e37b7f694d354… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 20 17:31:49 2022 +0200 wintrust: Add a trailing linefeed to an ERR() message. Also add a full stop to match the other ERR() messages in load_secondary_signatures(). --- dlls/wintrust/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 06b178a98b9..48fd78682b1 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -855,7 +855,7 @@ static void load_secondary_signatures(CRYPT_PROVIDER_DATA *data, HCRYPTMSG msg) if (!(s->rhSecondarySigs = data->psPfns->pfnAlloc(attrs->rgAttr[i].cValue * sizeof(*s->rhSecondarySigs)))) { - ERR("No memory"); + ERR("No memory.\n"); goto done; } s->cSecondarySigs = 0;

1 0

Brendan Shanks : mmdevapi: Set the name of internal threads.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 7a87da8fab964065731b8e581a2527778d3d67ac URL: https://gitlab.winehq.org/wine/wine/-/commit/7a87da8fab964065731b8e581a2527… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 11:37:29 2022 -0700 mmdevapi: Set the name of internal threads. --- dlls/mmdevapi/devenum.c | 2 ++ dlls/mmdevapi/main.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index bfeb3f3ecd8..69e13a498cf 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1163,6 +1163,8 @@ static DWORD WINAPI notif_thread_proc(void *user) WCHAR out_name[64], vout_name[64], in_name[64], vin_name[64]; DWORD size; + SetThreadDescription(GetCurrentThread(), L"wine_mmdevapi_notification"); + lstrcpyW(reg_key, drv_keyW); lstrcatW(reg_key, L"\\"); lstrcatW(reg_key, drvs.module_name); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 5e0e6728763..c792661af33 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -381,6 +381,8 @@ static DWORD WINAPI activate_async_threadproc(void *user) { struct activate_async_op *op = user; + SetThreadDescription(GetCurrentThread(), L"wine_mmdevapi_activate_async"); + IActivateAudioInterfaceCompletionHandler_ActivateCompleted(op->callback, &op->IActivateAudioInterfaceAsyncOperation_iface); IActivateAudioInterfaceAsyncOperation_Release(&op->IActivateAudioInterfaceAsyncOperation_iface);

1 0

Eric Pouech : oleaut32/tests: Fix test failing on UTF-8 locale.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: fe5989bbd26c43c04948dd29bbd67bd1ec8c250f URL: https://gitlab.winehq.org/wine/wine/-/commit/fe5989bbd26c43c04948dd29bbd67b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 20 16:14:38 2022 +0200 oleaut32/tests: Fix test failing on UTF-8 locale. Method decriptor's strings are internally stored in ANSI, and potentially converted from Unicode using current code page. Test was expecting loss in Unicode to ANSI conversion. Adapt test to also support loss-less conversion (that's the case when code page is UTF-8). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52873 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2e926a5bc36..e0ad9719f1c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -104,6 +104,19 @@ static const BOOL abi_supports_stdcall = TRUE; static const BOOL abi_supports_stdcall = FALSE; #endif +static BOOL compare_wstr(const WCHAR* wstr, const WCHAR* ref) +{ + char nameA[16]; + WCHAR nameW[16]; + + if (!wcscmp(wstr, ref)) return TRUE; /* for UTF code pages */ + + WideCharToMultiByte(CP_ACP, 0, ref, -1, nameA, sizeof(nameA), NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, ARRAY_SIZE(nameW)); + + return !wcscmp(wstr, nameW); +} + static HRESULT WINAPI collection_QueryInterface(ICollection *iface, REFIID riid, void **ret) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -1975,8 +1988,6 @@ static void test_CreateTypeLib(SYSKIND sys) { TYPEKIND kind; DESCKIND desckind; BINDPTR bindptr; - char nameA[16]; - WCHAR nameW[16]; switch(sys){ case SYS_WIN32: @@ -2484,9 +2495,6 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08lx\n", hres); SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); - WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL); - MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, ARRAY_SIZE(nameW)); - hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08lx\n", hres); @@ -2511,7 +2519,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2523,7 +2531,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3311,7 +3319,7 @@ todo_wine { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3323,7 +3331,7 @@ todo_wine { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)));

1 0

Ziqing Hui : win32u: Add font links for MS Gothic.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 7afdc11cd2bd0955394246e737c7c02617c9ddf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7afdc11cd2bd0955394246e737c7c0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 18 17:33:54 2022 +0800 win32u: Add font links for MS Gothic. --- dlls/win32u/font.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 5ba111436d7..9ead47e1983 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1500,6 +1500,10 @@ static const WCHAR microsoft_sans_serifW[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR ms_gothicW[] = + {'M','S',' ','G','o','t','h','i','c',0}; +static const WCHAR ms_p_gothicW[] = + {'M','S',' ','P','G','o','t','h','i','c',0}; static const WCHAR ms_ui_gothicW[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; static const WCHAR sim_sunW[] = @@ -1626,9 +1630,30 @@ static const char system_link_tahoma_non_cjk[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_ms_gothic[] = + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,GulimChe\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ms_p_gothic[] = + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const char system_link_ms_ui_gothic[] = "MICROSS.TTF,Microsoft Sans Serif\0" - "MINGLIU.TTC,PMingLiU\0""SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" "GULIM.TTC,Gulim\0" "YUGOTHM.TTC,Yu Gothic UI\0" "MSJH.TTC,Microsoft JhengHei UI\0" @@ -1793,6 +1818,8 @@ default_system_link[] = system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), }, + { ms_gothicW, FALSE, system_link_ms_gothic, sizeof(system_link_ms_gothic) }, + { ms_p_gothicW, FALSE, system_link_ms_p_gothic, sizeof(system_link_ms_p_gothic) }, { ms_ui_gothicW, FALSE, system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic) }, { microsoft_jheng_heiW, FALSE, system_link_microsoft_jheng_hei, sizeof(system_link_microsoft_jheng_hei) }, { microsoft_jheng_hei_boldW, FALSE, system_link_microsoft_jheng_hei_bold, sizeof(system_link_microsoft_jheng_hei_bold) },

1 0

Ziqing Hui : win32u: Add font links for MingLiU.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: edecac8afdd04701314381b6386e0f7ac862e066 URL: https://gitlab.winehq.org/wine/wine/-/commit/edecac8afdd04701314381b6386e0f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 18 13:38:56 2022 +0800 win32u: Add font links for MingLiU. --- dlls/win32u/font.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 97c9153c006..5ba111436d7 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1506,8 +1506,18 @@ static const WCHAR sim_sunW[] = {'S','i','m','S','u','n',0}; static const WCHAR gulimW[] = {'G','u','l','i','m',0}; +static const WCHAR ming_li_uW[] = + {'M','i','n','g','L','i','U',0}; static const WCHAR p_ming_li_uW[] = {'P','M','i','n','g','L','i','U',0}; +static const WCHAR ming_li_u_hkscsW[] = + {'M','i','n','g','L','i','U','_','H','K','S','C','S',0}; +static const WCHAR ming_li_u_ext_bW[] = + {'M','i','n','g','L','i','U','-','E','x','t','B',0}; +static const WCHAR p_ming_li_u_ext_bW[] = + {'P','M','i','n','g','L','i','U','-','E','x','t','B',0}; +static const WCHAR ming_li_u_hkscs_ext_bW[] = + {'M','i','n','g','L','i','U','_','H','K','S','C','S','-','E','x','t','B',0}; static const WCHAR batangW[] = {'B','a','t','a','n','g',0}; static const WCHAR microsoft_jheng_heiW[] = @@ -1671,6 +1681,77 @@ static const char system_link_microsoft_jheng_hei_ui_light[] = "YUGOTHL.TTC,Yu Gothic UI Light\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_ming_li_u[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS Mincho\0" + "BATANG.TTC,BatangChe\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_p_ming_li_u[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS PMincho\0" + "BATANG.TTC,Batang\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ming_li_u_hkscs[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS Mincho\0" + "BATANG.TTC,BatangChe\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ming_li_u_ext_b[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS Mincho\0" + "BATANG.TTC,BatangChe\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_p_ming_li_u_ext_b[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS PMincho\0" + "BATANG.TTC,Batang\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ming_li_u_hkscs_ext_b[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,MingLiU_HKSCS\0" + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "MSMINCHO.TTC,MS Mincho\0" + "BATANG.TTC,BatangChe\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1718,6 +1799,12 @@ default_system_link[] = { microsoft_jheng_hei_uiW, FALSE, system_link_microsoft_jheng_hei_ui, sizeof(system_link_microsoft_jheng_hei_ui) }, { microsoft_jheng_hei_ui_boldW, FALSE, system_link_microsoft_jheng_hei_ui_bold, sizeof(system_link_microsoft_jheng_hei_ui_bold) }, { microsoft_jheng_hei_ui_lightW, FALSE, system_link_microsoft_jheng_hei_ui_light, sizeof(system_link_microsoft_jheng_hei_ui_light) }, + { ming_li_uW, FALSE, system_link_ming_li_u, sizeof(system_link_ming_li_u) }, + { p_ming_li_uW, FALSE, system_link_p_ming_li_u, sizeof(system_link_p_ming_li_u) }, + { ming_li_u_hkscsW, FALSE, system_link_ming_li_u_hkscs, sizeof(system_link_ming_li_u_hkscs) }, + { ming_li_u_ext_bW, FALSE, system_link_ming_li_u_ext_b, sizeof(system_link_ming_li_u_ext_b) }, + { p_ming_li_u_ext_bW, FALSE, system_link_p_ming_li_u_ext_b, sizeof(system_link_p_ming_li_u_ext_b) }, + { ming_li_u_hkscs_ext_bW, FALSE, system_link_ming_li_u_hkscs_ext_b, sizeof(system_link_ming_li_u_hkscs_ext_b) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add font links for Microsoft JhengHei.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: a528dd2f8fdbb669da150b9ee71fc38c02ce6314 URL: https://gitlab.winehq.org/wine/wine/-/commit/a528dd2f8fdbb669da150b9ee71fc3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 18 13:53:09 2022 +0800 win32u: Add font links for Microsoft JhengHei. --- dlls/win32u/font.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index eddee9968f4..97c9153c006 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1510,6 +1510,16 @@ static const WCHAR p_ming_li_uW[] = {'P','M','i','n','g','L','i','U',0}; static const WCHAR batangW[] = {'B','a','t','a','n','g',0}; +static const WCHAR microsoft_jheng_heiW[] = + {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',0}; +static const WCHAR microsoft_jheng_hei_boldW[] = + {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','B','o','l','d',0}; +static const WCHAR microsoft_jheng_hei_uiW[] = + {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',0}; +static const WCHAR microsoft_jheng_hei_ui_boldW[] = + {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','B','o','l','d',0}; +static const WCHAR microsoft_jheng_hei_ui_lightW[] = + {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','L','i','g','h','t',0}; static const WCHAR * const font_links_list[] = { @@ -1616,6 +1626,51 @@ static const char system_link_ms_ui_gothic[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_microsoft_jheng_hei[] = + "SEGOEUI.TTF,Segoe UI\0" + "MINGLIU.TTC,MingLiU\0" + "MSYH.TTC,Microsoft YaHei\0" + "MEIRYO.TTC,Meiryo\0" + "MALGUN.TTF,Malgun Gothic\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_microsoft_jheng_hei_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "MINGLIU.TTC,MingLiU\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MEIRYOB.TTC,Meiryo Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_microsoft_jheng_hei_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "MINGLIU.TTC,MingLiU\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MEIRYO.TTC,Meiryo UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_microsoft_jheng_hei_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "MINGLIU.TTC,MingLiU\0" + "MSYHBD.TTC,Microsoft YaHei UI Bold\0" + "MEIRYOB.TTC,Meiryo UI Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_microsoft_jheng_hei_ui_light[] = + "SEGOEUIL.TTF,Segoe UI Light\0" + "MINGLIU.TTC,MingLiU\0" + "MSYHL.TTC,Microsoft YaHei UI Light\0" + "MEIRYO.TTC,Meiryo UI\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "YUGOTHL.TTC,Yu Gothic UI Light\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1657,7 +1712,12 @@ default_system_link[] = system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), }, - { ms_ui_gothicW, FALSE, system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic) }, + { ms_ui_gothicW, FALSE, system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic) }, + { microsoft_jheng_heiW, FALSE, system_link_microsoft_jheng_hei, sizeof(system_link_microsoft_jheng_hei) }, + { microsoft_jheng_hei_boldW, FALSE, system_link_microsoft_jheng_hei_bold, sizeof(system_link_microsoft_jheng_hei_bold) }, + { microsoft_jheng_hei_uiW, FALSE, system_link_microsoft_jheng_hei_ui, sizeof(system_link_microsoft_jheng_hei_ui) }, + { microsoft_jheng_hei_ui_boldW, FALSE, system_link_microsoft_jheng_hei_ui_bold, sizeof(system_link_microsoft_jheng_hei_ui_bold) }, + { microsoft_jheng_hei_ui_lightW, FALSE, system_link_microsoft_jheng_hei_ui_light, sizeof(system_link_microsoft_jheng_hei_ui_light) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add locale_dependent member to struct system_link_reg.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 71173030933178afd496dc18e117cd4f283c54e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/71173030933178afd496dc18e117cd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 18 13:20:54 2022 +0800 win32u: Add locale_dependent member to struct system_link_reg. --- dlls/win32u/font.c | 69 ++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 5762d55eab5..eddee9968f4 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1619,6 +1619,9 @@ static const char system_link_ms_ui_gothic[] = static const struct system_link_reg { const WCHAR *font_name; + BOOL locale_dependent; + const char *link_non_cjk; + DWORD link_non_cjk_len; const char *link_sc; DWORD link_sc_len; const char *link_tc; @@ -1627,43 +1630,34 @@ static const struct system_link_reg DWORD link_jp_len; const char *link_kr; DWORD link_kr_len; - const char *link_non_cjk; - DWORD link_non_cjk_len; } default_system_link[] = { { - tahomaW, + tahomaW, TRUE, + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), system_link_tahoma_sc, sizeof(system_link_tahoma_sc), system_link_tahoma_tc, sizeof(system_link_tahoma_tc), system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), - system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), }, { - microsoft_sans_serifW, + microsoft_sans_serifW, TRUE, + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), system_link_tahoma_sc, sizeof(system_link_tahoma_sc), system_link_tahoma_tc, sizeof(system_link_tahoma_tc), system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), - system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), }, { - lucida_sans_unicodeW, + lucida_sans_unicodeW, TRUE, + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), system_link_tahoma_sc, sizeof(system_link_tahoma_sc), system_link_tahoma_tc, sizeof(system_link_tahoma_tc), system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), - system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), - }, - { - ms_ui_gothicW, - system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), - system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), - system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), - system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), - system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), }, + { ms_ui_gothicW, FALSE, system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) @@ -2772,27 +2766,30 @@ static void update_font_system_link_info(void) { const struct system_link_reg *link_reg = &default_system_link[i]; - switch (ansi_cp.CodePage) + link = link_reg->link_non_cjk; + len = link_reg->link_non_cjk_len; + + if (link_reg->locale_dependent) { - case 932: - link = link_reg->link_jp; - len = link_reg->link_jp_len; - break; - case 936: - link = link_reg->link_sc; - len = link_reg->link_sc_len; - break; - case 949: - link = link_reg->link_kr; - len = link_reg->link_kr_len; - break; - case 950: - link = link_reg->link_tc; - len = link_reg->link_tc_len; - break; - default: - link = link_reg->link_non_cjk; - len = link_reg->link_non_cjk_len; + switch (ansi_cp.CodePage) + { + case 932: + link = link_reg->link_jp; + len = link_reg->link_jp_len; + break; + case 936: + link = link_reg->link_sc; + len = link_reg->link_sc_len; + break; + case 949: + link = link_reg->link_kr; + len = link_reg->link_kr_len; + break; + case 950: + link = link_reg->link_tc; + len = link_reg->link_tc_len; + break; + } } set_multi_value_key(hkey, link_reg->font_name, link, len); }

1 0

Rémi Bernon : schedsvc/tests: Add dummy flaky test count.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 5e106da9f14697ccb26cf2a9b9f4155495a6b5f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e106da9f14697ccb26cf2a9b9f415… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 20 12:35:11 2022 +0200 schedsvc/tests: Add dummy flaky test count. Fixes "Use of uninitialized value $Flaky" message in testbot reports. --- dlls/schedsvc/tests/atsvcapi.c | 2 +- dlls/schedsvc/tests/rpcapi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 3aaad8b5cfe..fb70c346654 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -42,7 +42,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) if (winetest_debug) { - fprintf(stdout, "%04lx:atsvcapi: 1 tests executed (0 marked as todo, %d %s), %d skipped.\n", + fprintf(stdout, "%04lx:atsvcapi: 1 tests executed (0 marked as todo, 0 as flaky, %d %s), %d skipped.\n", GetCurrentProcessId(), test_failures, test_failures != 1 ? "failures" : "failure", test_skipped); fflush(stdout); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 56e3f836a17..41182bb4fbe 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -33,7 +33,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) if (winetest_debug) { - fprintf(stdout, "%04lx:rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n", GetCurrentProcessId()); + fprintf(stdout, "%04lx:rpcapi: 0 tests executed (0 marked as todo, 0 as flaky, 0 failures), 1 skipped.\n", GetCurrentProcessId()); fflush(stdout); } ExitProcess(0);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add dummy flaky test count.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 1c05faaa71c0c2bbe4459c4b5b082af5deed0afe URL: https://gitlab.winehq.org/wine/wine/-/commit/1c05faaa71c0c2bbe4459c4b5b082a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 20 12:34:51 2022 +0200 ntoskrnl.exe/tests: Add dummy flaky test count. Fixes "Use of uninitialized value $Flaky" message in testbot reports. --- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index aaf96fab616..28fbe10c8e1 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -189,7 +189,7 @@ static inline void winetest_cleanup(void) if (winetest_debug) { - kprintf("%04lx:ntoskrnl: %ld tests executed (%ld marked as todo, %ld %s), %ld skipped.\n", + kprintf("%04lx:ntoskrnl: %ld tests executed (%ld marked as todo, 0 as flaky, %ld %s), %ld skipped.\n", (DWORD)(DWORD_PTR)PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped );

1 0

Rémi Bernon : dinput/tests: Add dummy flaky test count.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 245297d5cfbcc6585bf1aa0b11ded00151474430 URL: https://gitlab.winehq.org/wine/wine/-/commit/245297d5cfbcc6585bf1aa0b11ded0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 20 12:33:58 2022 +0200 dinput/tests: Add dummy flaky test count. Fixes "Use of uninitialized value $Flaky" message in testbot reports. --- dlls/dinput/tests/driver_hid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 3633cbdfd44..10a5c4c90cf 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -348,7 +348,7 @@ static inline void winetest_cleanup_( const char *file ) if (winetest_debug) { - kprintf( "%04lx:%s: %ld tests executed (%ld marked as todo, %ld %s), %ld skipped.\n", + kprintf( "%04lx:%s: %ld tests executed (%ld marked as todo, 0 as flaky, %ld %s), %ld skipped.\n", (DWORD)(DWORD_PTR)PsGetCurrentProcessId(), test_name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped );

1 0

Florian Kübler : ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64).
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: d573c8d4d8d08e9e66e8b7c6dd74096b8c594965 URL: https://gitlab.winehq.org/wine/wine/-/commit/d573c8d4d8d08e9e66e8b7c6dd7409… Author: Florian Kübler <kuebler(a)google.com> Date: Fri Oct 14 12:52:03 2022 +0000 ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64). This change is adding DWARF (CFI) unwind information to the hand-written assembly of the `__wine_syscall_dispatcher` function. This enables unwinding through the dispatcher from the Linux stack into (and through) the Windows stack. The general idea is that the `syscall_frame` struct contains the content of the callee-save registers before the function call (in particular the stack pointer and the return address). At any point of the execution, we have a pointer into the `syscall_frame` in $rcx, $rbp or $rsp. For the CFI codes the general idea is that we are defining the computations of the callee-save registers based on the `syscall_frame` using DWARF’s `breg` instruction, rather than relative to CFA. This change adds a bunch of convenience macros, to (hopefully) improve readability of the CFI instructions. Note: Those change was used with great success for unwinding through the dispatcher using a modified LLDB shown in the “how-wine-works-101” (https://werat.dev/blog/how-wine-works-101/) blog post as well as for in the Orbit profiler (https://github.com/google/orbit), that has mixed-callstack unwinding support. Test: Inspect callstacks reported by the Orbit profiler while running some Windows targets using the modified wine, as well as verify debugging reports correct callstacks when stepping with our modified LLDB through the dispatcher itself (so that we are able to unwind through the dispatcher at any instruction). --- dlls/ntdll/unix/signal_x86_64.c | 466 ++++++++++++++++++++++++---------------- 1 file changed, 275 insertions(+), 191 deletions(-)

1 0

Etaash Mathamsetty : ntoskrnl.exe: Use LoadLibraryW for MmGetSystemRoutineAddress.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 42c0ec8a1f685447beac9a4f9eb1a1f67e236ddd URL: https://gitlab.winehq.org/wine/wine/-/commit/42c0ec8a1f685447beac9a4f9eb1a1… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Wed Oct 19 23:04:14 2022 -0400 ntoskrnl.exe: Use LoadLibraryW for MmGetSystemRoutineAddress. --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2c080eaf9f6..9320e02dca9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3319,8 +3319,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); if (!pFunc) { - hMod = GetModuleHandleW( halW ); - + hMod = LoadLibraryW( halW ); if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA );

1 0

Etaash Mathamsetty : ntoskrnl.exe: Fix formatting in IoCreateSynchronizationEvent.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: f58c48b85e4e1379223b1a51df7c4ed483a745db URL: https://gitlab.winehq.org/wine/wine/-/commit/f58c48b85e4e1379223b1a51df7c4e… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Thu Oct 13 19:44:54 2022 -0400 ntoskrnl.exe: Fix formatting in IoCreateSynchronizationEvent. --- dlls/ntoskrnl.exe/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 409d5752547..ada468c73dc 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -215,7 +215,7 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h KEVENT *event; NTSTATUS ret; - TRACE( "(%p %p)\n", name, ret_handle ); + TRACE( "(%s %p)\n", debugstr_us(name), ret_handle ); InitializeObjectAttributes( &attr, name, 0, 0, NULL ); ret = NtCreateEvent( &handle, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, TRUE ); @@ -223,7 +223,7 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h if (kernel_object_from_handle( handle, ExEventObjectType, (void**)&event )) { - NtClose( handle); + NtClose( handle ); return NULL; }

1 0

Etaash Mathamsetty : ntoskrnl.exe: Implement IoCreateNotificationEvent.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: e740eaee08479c71f2d3021fef620a99ea7fd7d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e740eaee08479c71f2d3021fef620a… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Thu Oct 13 19:42:22 2022 -0400 ntoskrnl.exe: Implement IoCreateNotificationEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6f5564042a6..2c080eaf9f6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4075,16 +4075,6 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT create_options, ea_buffer, ea_length, file_type, parameters, options, NULL); } -/*********************************************************************** - * IoCreateNotificationEvent (NTOSKRNL.EXE.@) - */ -PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) -{ - FIXME( "stub: %s %p\n", debugstr_us(name), handle ); - return NULL; -} - - /************************************************************************** * __chkstk (NTOSKRNL.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index b8239b0cd7d..409d5752547 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -231,6 +231,32 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h return event; } +/*********************************************************************** + * IoCreateNotificationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateNotificationEvent( UNICODE_STRING *name, HANDLE *ret_handle ) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + KEVENT *event; + NTSTATUS ret; + + TRACE( "(%s %p)\n", debugstr_us(name), ret_handle ); + + InitializeObjectAttributes( &attr, name, 0, 0, NULL ); + ret = NtCreateEvent( &handle, EVENT_ALL_ACCESS, &attr, NotificationEvent, TRUE ); + if (ret) return NULL; + + if (kernel_object_from_handle( handle, ExEventObjectType, (void**)&event )) + { + NtClose(handle); + return NULL; + } + + *ret_handle = handle; + return event; +} + /*********************************************************************** * KeSetEvent (NTOSKRNL.EXE.@) */

1 0

Alex Henrie : uuid: Add devguid.h.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e72a16b57f66b63a16bb3d1619ac4d42632cb141 URL: https://gitlab.winehq.org/wine/wine/-/commit/e72a16b57f66b63a16bb3d1619ac4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 18 22:51:52 2022 -0600 uuid: Add devguid.h. Needed to compile Tera Term. --- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/tests/hid.c | 2 +- dlls/setupapi/tests/devinst.c | 2 +- libs/uuid/uuid.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9738397ef5a..d3db22c70b5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -43,8 +43,8 @@ #include "winerror.h" #include "objbase.h" #include "rpcproxy.h" -#include "initguid.h" #include "devguid.h" +#include "initguid.h" #include "dinputd.h" #include "dinput_private.h" diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 6a0d7a52fab..5467af32493 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -40,6 +40,7 @@ #include "cfgmgr32.h" #include "newdev.h" #include "dbt.h" +#include "devguid.h" #include "objbase.h" @@ -51,7 +52,6 @@ #include "ddk/hidsdi.h" #include "ddk/hidpi.h" #include "ddk/hidport.h" -#include "devguid.h" #include "dinput.h" #include "dinputd.h" #include "hidusage.h" diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfa564fe746..c4eebdf0ab8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -26,8 +26,8 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "initguid.h" #include "devguid.h" +#include "initguid.h" #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c index aa7ad3dd678..1ba0397414e 100644 --- a/libs/uuid/uuid.c +++ b/libs/uuid/uuid.c @@ -91,6 +91,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "shimgdata.h" #include "comsvcs.h" #include "directmanipulation.h" +#include "devguid.h" #define __WINE_INIT_NPI_MODULEID #include "netiodef.h"

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse UAV types.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 0ef04659c747724a8612de9afb16306f12746b35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ef04659c747724a8612de9afb163… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 21:03:26 2021 -0500 vkd3d-shader/hlsl: Parse UAV types. --- libs/vkd3d-shader/hlsl.c | 25 ++++++++++++++++++++++++- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.l | 3 +++ libs/vkd3d-shader/hlsl.y | 33 ++++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_sm4.c | 2 ++ 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3edbb978..8591fe31 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -525,6 +525,23 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ return type; } +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_UAV; + type->dimx = format->dimx; + type->dimy = 1; + type->sampler_dim = dim; + type->e.resource_format = format; + hlsl_type_calculate_reg_size(ctx, type); + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -596,7 +613,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE + || t1->base_type == HLSL_TYPE_UAV) { if (t1->sampler_dim != t2->sampler_dim) return false; @@ -1411,6 +1429,11 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); return string; + case HLSL_TYPE_UAV: + vkd3d_string_buffer_printf(string, "RWTexture%s<%s%u>", dimensions[type->sampler_dim], + base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); + return string; + default: vkd3d_string_buffer_printf(string, "<unexpected type>"); return string; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e8f01f2b..f237d6c4 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -85,6 +85,7 @@ enum hlsl_base_type HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, HLSL_TYPE_SAMPLER, HLSL_TYPE_TEXTURE, + HLSL_TYPE_UAV, HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_STRING, @@ -787,6 +788,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index ff7b712f..69ed9d9d 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -102,6 +102,9 @@ RasterizerState {return KW_RASTERIZERSTATE; } RenderTargetView {return KW_RENDERTARGETVIEW; } return {return KW_RETURN; } register {return KW_REGISTER; } +RWTexture1D {return KW_RWTEXTURE1D; } +RWTexture2D {return KW_RWTEXTURE2D; } +RWTexture3D {return KW_RWTEXTURE3D; } sampler {return KW_SAMPLER; } sampler1D {return KW_SAMPLER1D; } sampler2D {return KW_SAMPLER2D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index aee12b83..62d86b9d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3031,6 +3031,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %token KW_RETURN %token KW_REGISTER %token KW_ROW_MAJOR +%token KW_RWTEXTURE1D +%token KW_RWTEXTURE2D +%token KW_RWTEXTURE3D %token KW_SAMPLER %token KW_SAMPLER1D %token KW_SAMPLER2D @@ -3168,7 +3171,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <reg_reservation> register_opt -%type <sampler_dim> texture_type +%type <sampler_dim> texture_type uav_type %type <semantic> semantic @@ -3592,6 +3595,20 @@ texture_type: $$ = HLSL_SAMPLER_DIM_CUBEARRAY; } +uav_type: + KW_RWTEXTURE1D + { + $$ = HLSL_SAMPLER_DIM_1D; + } + | KW_RWTEXTURE2D + { + $$ = HLSL_SAMPLER_DIM_2D; + } + | KW_RWTEXTURE3D + { + $$ = HLSL_SAMPLER_DIM_3D; + } + type: KW_VECTOR '<' type ',' C_INTEGER '>' { @@ -3697,6 +3714,20 @@ type: } $$ = hlsl_new_texture_type(ctx, $1, $3); } + | uav_type '<' type '>' + { + if ($3->type > HLSL_CLASS_VECTOR) + { + struct vkd3d_string_buffer *string; + + string = hlsl_type_to_string(ctx, $3); + if (string) + hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "UAV data type %s is not scalar or vector.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + $$ = hlsl_new_uav_type(ctx, $1, $3); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 4118ce88..8ca37f3f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -410,6 +410,8 @@ static D3D_SHADER_INPUT_TYPE sm4_resource_type(const struct hlsl_type *type) return D3D_SIT_SAMPLER; case HLSL_TYPE_TEXTURE: return D3D_SIT_TEXTURE; + case HLSL_TYPE_UAV: + return D3D_SIT_UAV_RWTYPED; default: vkd3d_unreachable(); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse texture index expressions.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: fea50d243ccd16df18a448e8475ae120a725ebee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fea50d243ccd16df18a448e8475ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 18:26:53 2021 -0500 vkd3d-shader/hlsl: Parse texture index expressions. --- libs/vkd3d-shader/hlsl.y | 74 ++++++++++++++++++++++++++++++++++++++++-- tests/texture-load.shader_test | 15 +++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dbb9571d..aee12b83 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -747,13 +747,83 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, return true; } +static struct hlsl_ir_node *add_zero_mipmap_level(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *index, unsigned int dim_count, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_load *coords_load; + struct hlsl_deref coords_deref; + struct hlsl_ir_constant *zero; + struct hlsl_ir_store *store; + struct hlsl_ir_var *coords; + + if (!(coords = hlsl_new_synthetic_var(ctx, "coords", + hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count + 1), loc))) + return NULL; + + hlsl_init_simple_deref_from_var(&coords_deref, coords); + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, index, (1u << dim_count) - 1, loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + + if (!(zero = hlsl_new_uint_constant(ctx, 0, loc))) + return NULL; + list_add_tail(instrs, &zero->node.entry); + + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, &zero->node, 1u << dim_count, loc))) + return NULL; + list_add_tail(instrs, &store->node.entry); + + if (!(coords_load = hlsl_new_var_load(ctx, coords, *loc))) + return NULL; + list_add_tail(instrs, &coords_load->node.entry); + + return &coords_load->node; +} + static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { - const struct hlsl_type *expr_type = array->data_type; + const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; struct hlsl_ir_expr *cast; - if (index->data_type->type != HLSL_CLASS_SCALAR) + if (expr_type->type == HLSL_CLASS_OBJECT && expr_type->base_type == HLSL_TYPE_TEXTURE + && expr_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; + unsigned int dim_count = hlsl_sampler_dim_count(expr_type->sampler_dim); + /* Only HLSL_IR_LOAD can return an object. */ + struct hlsl_ir_load *object_load = hlsl_ir_load(array); + struct hlsl_ir_resource_load *resource_load; + + if (index_type->type > HLSL_CLASS_VECTOR || index_type->dimx != dim_count) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, expr_type))) + hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Array index of type '%s' must be of type 'uint%u'.", string->buffer, dim_count); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (!(index = add_implicit_conversion(ctx, instrs, index, + hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) + return false; + + if (!(index = add_zero_mipmap_level(ctx, instrs, index, dim_count, loc))) + return false; + + load_params.format = expr_type->e.resource_format; + load_params.resource = object_load->src; + load_params.coords = index; + + if (!(resource_load = hlsl_new_resource_load(ctx, &load_params, loc))) + return false; + list_add_tail(instrs, &resource_load->node.entry); + return true; + } + + if (index_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); return false; diff --git a/tests/texture-load.shader_test b/tests/texture-load.shader_test index 81d06305..7d39fb65 100644 --- a/tests/texture-load.shader_test +++ b/tests/texture-load.shader_test @@ -20,3 +20,18 @@ probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.5, 0.7, 0.6, 0.8) probe (0, 1) rgba (0.6, 0.5, 0.2, 0.1) probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0) + +[pixel shader] +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return t[pos.yx]; +} + +[test] +draw quad +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) +probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) +probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) +probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Cast array indices inside of add_array_load().
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 7115a94063e91151d4c3a89ef067a9bd275ccdd0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7115a94063e91151d4c3a89ef067a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 13 22:33:08 2022 -0500 vkd3d-shader/hlsl: Cast array indices inside of add_array_load(). Mostly in the interest of keeping the yacc code as simple as possible. --- libs/vkd3d-shader/hlsl.y | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 03004c60..dbb9571d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -748,23 +748,35 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, } static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, - struct hlsl_ir_node *index, const struct vkd3d_shader_location loc) + struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { const struct hlsl_type *expr_type = array->data_type; + struct hlsl_ir_expr *cast; + + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); + return false; + } + + if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) + return false; + list_add_tail(instrs, &cast->node.entry); + index = &cast->node; if (expr_type->type == HLSL_CLASS_MATRIX) - return add_matrix_index(ctx, instrs, array, index, &loc); + return add_matrix_index(ctx, instrs, array, index, loc); if (expr_type->type != HLSL_CLASS_ARRAY && expr_type->type != HLSL_CLASS_VECTOR) { if (expr_type->type == HLSL_CLASS_SCALAR) - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); else - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); return false; } - if (!add_load_index(ctx, instrs, array, index, &loc)) + if (!add_load_index(ctx, instrs, array, index, loc)) return false; return true; @@ -4209,26 +4221,11 @@ postfix_expr: | postfix_expr '[' expr ']' { struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); - struct hlsl_ir_expr *cast; list_move_tail($1, $3); vkd3d_free($3); - if (index->data_type->type != HLSL_CLASS_SCALAR) - { - hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - destroy_instr_list($1); - YYABORT; - } - - if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) - { - destroy_instr_list($1); - YYABORT; - } - list_add_tail($1, &cast->node.entry); - - if (!add_array_load(ctx, $1, array, &cast->node, @2)) + if (!add_array_load(ctx, $1, array, index, &@2)) { destroy_instr_list($1); YYABORT;

1 0

Zebediah Figura : tests: Add a basic shader test for typed UAV loads.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 62fd13059b9d62832ed51a6bfa926c3b6f0e98d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62fd13059b9d62832ed51a6bfa926… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:51:10 2021 -0500 tests: Add a basic shader test for typed UAV loads. --- Makefile.am | 1 + tests/uav-load.shader_test | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index 66a93ab4..1340be10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,6 +146,7 @@ vkd3d_shader_tests = \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ tests/uav.shader_test \ + tests/uav-load.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/uav-load.shader_test b/tests/uav-load.shader_test new file mode 100644 index 00000000..88adb6d5 --- /dev/null +++ b/tests/uav-load.shader_test @@ -0,0 +1,30 @@ +[require] +shader model >= 5.0 + +[uav 0] +format r32 float +size (3, 1) + +0.1 0.2 0.3 + +[uav 1] +format r32 float +size (1, 1) + +0.5 + +[compute shader] +RWTexture2D<float> u, v; + [numthreads(1, 1, 1)] +void main() +{ + u[uint2(1, 0)] = (u[uint2(0, 0)] += v[uint2(0, 0)]); + u[uint2(2, 0)] = u[uint2(0, 0)]; +} + +[test] +todo dispatch 1 1 1 +probe uav 0 (0, 0) r (0.6) +probe uav 0 (1, 0) r (0.6) +probe uav 0 (2, 0) r (0.6) +probe uav 1 (0, 0) r (0.5)

1 0

Zebediah Figura : tests: Add a basic shader test for compute shaders.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 75494a4ae697583b246223c215f18b8a1e96c133 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75494a4ae697583b246223c215f18… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:37:31 2021 -0500 tests: Add a basic shader test for compute shaders. --- Makefile.am | 1 + tests/compute.shader_test | 21 +++++ tests/d3d12.c | 20 ---- tests/d3d12_test_utils.h | 20 ++++ tests/shader_runner.c | 31 +++++- tests/shader_runner.h | 2 + tests/shader_runner_d3d11.c | 101 +++++++++++++++++--- tests/shader_runner_d3d12.c | 220 +++++++++++++++++++++++++++++++++---------- tests/shader_runner_d3d9.c | 6 ++ tests/shader_runner_vulkan.c | 75 +++++++++++++-- tests/vulkan_procs.h | 2 + 11 files changed, 406 insertions(+), 93 deletions(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022