- Wine-Commits - list.winehq.org

Alexandros Frantzis : user32/tests: Remove workaround for SendInput keyboard tests on zh_CN.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 59729e2d918eae194f2c24794962b72705193ee1 URL: https://gitlab.winehq.org/wine/wine/-/commit/59729e2d918eae194f2c24794962b7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 15 12:37:31 2024 +0300 user32/tests: Remove workaround for SendInput keyboard tests on zh_CN. The workaround was needed because the zh_CN Win10 testbot may spuriously change to the ru_RU keyboard layout during testing. We now detect such changes and skip the tests, so the workaround is not needed. --- dlls/user32/tests/input.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index af8483b8f0e..d84d543bed8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -705,13 +705,6 @@ static void get_test_scan( WORD vkey, WORD *scan, WCHAR *wch, WCHAR *wch_shift ) ok_ret( 1, ToUnicodeEx( vkey, *scan, state, wch, 1, 0, hkl ) ); state[VK_SHIFT] = 0x80; ok_ret( 1, ToUnicodeEx( vkey, *scan, state, wch_shift, 1, 0, hkl ) ); - - /* zh_CN returns a different WM_(SYS)CHAR, possibly coming from IME */ - if (HIWORD(hkl) == 0x0804) - { - *wch = 0x430; - *wch_shift = 0x410; - } } static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control, HKL hkl )

1 0

Nikolay Sivov : d2d1/effect: Implement SetPassthroughGraph().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: be646151b9cf966023beef2af3fb50ad2844d146 URL: https://gitlab.winehq.org/wine/wine/-/commit/be646151b9cf966023beef2af3fb50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 16 15:29:28 2024 +0200 d2d1/effect: Implement SetPassthroughGraph(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/effect.c | 17 +++++++++++++++-- dlls/d2d1/tests/d2d1.c | 7 +++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bd6ca55ea96..c3c5c6404ab 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -771,6 +771,9 @@ struct d2d_transform_graph struct d2d_transform_node *output; + bool passthrough; + unsigned int passthrough_input; + struct list nodes; }; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 25a75a31ecb..f32eba886bf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -659,6 +659,7 @@ static void d2d_transform_graph_clear(struct d2d_transform_graph *graph) { d2d_transform_graph_delete_node(graph, node); } + graph->passthrough = false; } static inline struct d2d_transform_graph *impl_from_ID2D1TransformGraph(ID2D1TransformGraph *iface) @@ -788,6 +789,7 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1Transfor return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); graph->output = node; + graph->passthrough = false; return S_OK; } @@ -821,6 +823,7 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1T graph->inputs[input_index].node = node; graph->inputs[input_index].index = node_index; + graph->passthrough = false; return S_OK; } @@ -836,9 +839,19 @@ static void STDMETHODCALLTYPE d2d_transform_graph_Clear(ID2D1TransformGraph *ifa static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetPassthroughGraph(ID2D1TransformGraph *iface, UINT32 index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= graph->input_count) + return E_INVALIDARG; + + d2d_transform_graph_clear(graph); + + graph->passthrough = true; + graph->passthrough_input = index; + + return S_OK; } static const ID2D1TransformGraphVtbl d2d_transform_graph_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2ec11c342ad..cfe44936864 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12914,6 +12914,13 @@ static void test_transform_graph(BOOL d3d11) todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + /* Passthrough graph. */ + hr = ID2D1TransformGraph_SetPassthroughGraph(graph, 100); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1TransformGraph_SetPassthroughGraph(graph, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID2D1BlendTransform_Release(blend_transform); ID2D1OffsetTransform_Release(offset_transform); ID2D1Effect_Release(effect);

1 0

Alexandros Frantzis : user32/tests: Skip affected keyboard tests if a spurious layout change is detected.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 275cced4f38ccd6df20ca0bb9decd49ef5ff9f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/275cced4f38ccd6df20ca0bb9decd4… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed May 15 12:30:26 2024 +0300 user32/tests: Skip affected keyboard tests if a spurious layout change is detected. In some Win10 testbot images (notably jp and cn), we can get a spurious layout change after creating the test window and also when explicitly activating the offending layout. Detect such behavior and skip tests whose assumptions are invalidate by this spurious change. --- dlls/user32/tests/input.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 81af2aa5f28..af8483b8f0e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -714,7 +714,7 @@ static void get_test_scan( WORD vkey, WORD *scan, WCHAR *wch, WCHAR *wch_shift ) } } -static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control ) +static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, WCHAR wch_shift, WCHAR wch_control, HKL hkl ) { #define WIN_MSG(m, w, l, ...) {.func = MSG_TEST_WIN, .message = {.msg = m, .wparam = w, .lparam = l}, ## __VA_ARGS__} #define KBD_HOOK(m, s, v, f, ...) {.func = LL_HOOK_KEYBD, .ll_hook_kbd = {.msg = m, .scan = s, .vkey = v, .flags = f}, ## __VA_ARGS__} @@ -1163,6 +1163,17 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W ok_ne( NULL, hwnd, HWND, "%p" ); wait_messages( 100, FALSE ); + /* If we have had a spurious layout change, wch(_shift) may be incorrect. */ + if (GetKeyboardLayout( 0 ) != hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + hkl, GetKeyboardLayout( 0 ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + return; + } + hook = SetWindowsHookExW( WH_KEYBOARD_LL, ll_hook_kbd_proc, GetModuleHandleW( NULL ), 0 ); ok_ne( NULL, hook, HHOOK, "%p" ); @@ -4918,7 +4929,7 @@ static void test_UnregisterDeviceNotification(void) ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); } -static void test_SendInput( WORD vkey, WCHAR wch ) +static void test_SendInput( WORD vkey, WCHAR wch, HKL hkl ) { const struct user_call broken_sequence[] = { @@ -4936,6 +4947,17 @@ static void test_SendInput( WORD vkey, WCHAR wch ) ok_ne( NULL, hwnd, HWND, "%p" ); wait_messages( 100, FALSE ); + /* If we have had a spurious layout change, wch may be incorrect. */ + if (GetKeyboardLayout( 0 ) != hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + hkl, GetKeyboardLayout( 0 ) ); + ok_ret( 1, DestroyWindow( hwnd ) ); + wait_messages( 100, FALSE ); + ok_seq( empty_sequence ); + return; + } + SetLastError( 0xdeadbeef ); ok_ret( 0, SendInput( 0, NULL, 0 ) ); ok_ret( ERROR_INVALID_PARAMETER, GetLastError() ); @@ -5649,7 +5671,7 @@ static void test_keyboard_ll_hook_blocking(void) ok_ret( 1, DestroyWindow( hwnd ) ); } -static void test_LoadKeyboardLayoutEx(void) +static void test_LoadKeyboardLayoutEx( HKL orig_hkl ) { static const WCHAR test_layout_name[] = L"00000429"; static const HKL test_hkl = (HKL)0x04290429; @@ -5661,6 +5683,16 @@ static void test_LoadKeyboardLayoutEx(void) old_hkl = GetKeyboardLayout( 0 ); ok_ne( 0, old_hkl, HKL, "%p" ); + /* If we are dealing with a testbot setup that is prone to spurious + * layout changes, layout activations in this test are likely to + * not have the expected effect, invalidating the test assumptions. */ + if (orig_hkl != old_hkl) + { + win_skip( "Spurious keyboard layout changed detected (expected: %p got: %p)\n", + orig_hkl, old_hkl ); + return; + } + hkl = pLoadKeyboardLayoutEx( NULL, test_layout_name, 0 ); ok_eq( 0, hkl, HKL, "%p" ); @@ -5758,8 +5790,8 @@ static void test_input_desktop( char **argv ) test_SetCursorPos(); get_test_scan( 'F', &scan, &wch, &wch_shift ); - test_SendInput( 'F', wch ); - test_SendInput_keyboard_messages( 'F', scan, wch, wch_shift, '\x06' ); + test_SendInput( 'F', wch, hkl ); + test_SendInput_keyboard_messages( 'F', scan, wch, wch_shift, '\x06', hkl ); test_SendInput_mouse_messages(); test_keyboard_ll_hook_blocking(); @@ -5768,7 +5800,7 @@ static void test_input_desktop( char **argv ) test_GetRawInputData(); test_GetRawInputBuffer(); - test_LoadKeyboardLayoutEx(); + test_LoadKeyboardLayoutEx( hkl ); ok_ret( 1, SetCursorPos( pos.x, pos.y ) ); }

1 0

Nikolay Sivov : d2d1/effect: Implement ConnectNode().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 4ad75a7ae83abf2d59f979cdaf755d9c5a5172ff URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad75a7ae83abf2d59f979cdaf755d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 16 16:21:44 2024 +0200 d2d1/effect: Implement ConnectNode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 3 +++ dlls/d2d1/effect.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 5 ----- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c3c5c6404ab..58507fd2c0b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -753,6 +753,9 @@ struct d2d_transform_node struct list entry; ID2D1TransformNode *object; struct d2d_render_info *render_info; + struct d2d_transform_node **inputs; + unsigned int input_count; + struct d2d_transform_node *output; }; struct d2d_transform_node_connection diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f32eba886bf..cebc492d895 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -620,6 +620,12 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph, if (!(node = calloc(1, sizeof(*node)))) return E_OUTOFMEMORY; + node->input_count = ID2D1TransformNode_GetInputCount(object); + if (!(node->inputs = calloc(node->input_count, sizeof(*node->inputs)))) + { + free(node); + return E_OUTOFMEMORY; + } node->object = object; ID2D1TransformNode_AddRef(node->object); @@ -628,6 +634,24 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph, return S_OK; } +static void d2d_transform_node_disconnect(struct d2d_transform_node *node) +{ + struct d2d_transform_node *output = node->output; + unsigned int i; + + if (!output) + return; + + for (i = 0; i < output->input_count; ++i) + { + if (output->inputs[i] == node) + { + output->inputs[i] = NULL; + break; + } + } +} + static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, struct d2d_transform_node *node) { @@ -648,6 +672,9 @@ static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, if (node->render_info) ID2D1DrawInfo_Release(&node->render_info->ID2D1DrawInfo_iface); + d2d_transform_node_disconnect(node); + + free(node->inputs); free(node); } @@ -797,9 +824,25 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1Transfor static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformGraph *iface, ID2D1TransformNode *from_node, ID2D1TransformNode *to_node, UINT32 index) { - FIXME("iface %p, from_node %p, to_node %p, index %u stub!\n", iface, from_node, to_node, index); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + struct d2d_transform_node *from, *to; - return E_NOTIMPL; + TRACE("iface %p, from_node %p, to_node %p, index %u.\n", iface, from_node, to_node, index); + + if (!(from = d2d_transform_graph_get_node(graph, from_node))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (!(to = d2d_transform_graph_get_node(graph, to_node))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (index >= to->input_count) + return E_INVALIDARG; + + d2d_transform_node_disconnect(from); + to->inputs[index] = from; + from->output = to; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1TransformGraph *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cfe44936864..ae0b6f51bdc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12873,7 +12873,6 @@ static void test_transform_graph(BOOL d3d11) ID2D1TransformGraph_Clear(graph); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect added node to un-added node */ @@ -12881,7 +12880,6 @@ static void test_transform_graph(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect un-added node to added node */ @@ -12890,7 +12888,6 @@ static void test_transform_graph(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, 0); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); /* Connect nodes */ @@ -12904,14 +12901,12 @@ static void test_transform_graph(BOOL d3d11) { hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, i); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } /* Connect node to out-of-bounds index */ hr = ID2D1TransformGraph_ConnectNode(graph, (ID2D1TransformNode *)offset_transform, (ID2D1TransformNode *)blend_transform, count); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); /* Passthrough graph. */

1 0

Alexandre Julliard : msvcrt: Update some mangled names on ARM.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: bb3733458168032efcf54e461fa284e62f544092 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb3733458168032efcf54e461fa284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 09:45:22 2024 +0200 msvcrt: Update some mangled names on ARM. --- dlls/msvcrt/msvcrt.spec | 56 +++++++++++++++++----------------- dlls/msvcrt/tests/cpp.c | 74 ++++++++++++++++++++++----------------------- dlls/msvcrt40/msvcrt40.spec | 4 +-- 3 files changed, 68 insertions(+), 66 deletions(-)

1 0

Alexandre Julliard : ntdll: Add default values for cache parameters.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: e4db1b39ea28d0cc1b20ef4eacbb237c2f6cb68b URL: https://gitlab.winehq.org/wine/wine/-/commit/e4db1b39ea28d0cc1b20ef4eacbb23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 19:01:09 2024 +0200 ntdll: Add default values for cache parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56653 --- dlls/ntdll/unix/system.c | 60 ++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index fc9dfa90355..b7c424b6548 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1030,7 +1030,7 @@ static NTSTATUS create_logical_proc_info(void) for (j = 0; j < 4; j++) { - CACHE_DESCRIPTOR cache; + CACHE_DESCRIPTOR cache = { .Associativity = 8, .LineSize = 64, .Type = CacheUnified, .Size = 64 * 1024 }; ULONG_PTR mask = 0; snprintf(name, sizeof(name), cache_info, i, j, "shared_cpu_map"); @@ -1044,39 +1044,43 @@ static NTSTATUS create_logical_proc_info(void) cache.Level = r; snprintf(name, sizeof(name), cache_info, i, j, "ways_of_associativity"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u", &r); - fclose(f); - cache.Associativity = r; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u", &r); + fclose(f); + cache.Associativity = r; + } snprintf(name, sizeof(name), cache_info, i, j, "coherency_line_size"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u", &r); - fclose(f); - cache.LineSize = r; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u", &r); + fclose(f); + cache.LineSize = r; + } snprintf(name, sizeof(name), cache_info, i, j, "size"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%u%c", &r, &op); - fclose(f); - if(op != 'K') - WARN("unknown cache size %u%c\n", r, op); - cache.Size = (op=='K' ? r*1024 : r); + if ((f = fopen(name, "r"))) + { + fscanf(f, "%u%c", &r, &op); + fclose(f); + if(op != 'K') + WARN("unknown cache size %u%c\n", r, op); + cache.Size = (op=='K' ? r*1024 : r); + } snprintf(name, sizeof(name), cache_info, i, j, "type"); - f = fopen(name, "r"); - if(!f) continue; - fscanf(f, "%s", name); - fclose(f); - if (!memcmp(name, "Data", 5)) - cache.Type = CacheData; - else if(!memcmp(name, "Instruction", 11)) - cache.Type = CacheInstruction; - else - cache.Type = CacheUnified; + if ((f = fopen(name, "r"))) + { + fscanf(f, "%s", name); + fclose(f); + if (!memcmp(name, "Data", 5)) + cache.Type = CacheData; + else if(!memcmp(name, "Instruction", 11)) + cache.Type = CacheInstruction; + else + cache.Type = CacheUnified; + } if (!logical_proc_info_add_cache( mask, &cache )) {

1 0

Alexandre Julliard : msvcrt/tests: Don't link to _setmaxstdio.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 11632fdc69e606ceb9e6df6c3244652055587145 URL: https://gitlab.winehq.org/wine/wine/-/commit/11632fdc69e606ceb9e6df6c324465… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 09:45:12 2024 +0200 msvcrt/tests: Don't link to _setmaxstdio. It's missing on some ARM platforms. --- dlls/msvcrt/tests/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9f85e2def69..b81469009cd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -67,6 +67,7 @@ static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); static errno_t (__cdecl *p__get_fmode)(int*); static errno_t (__cdecl *p__set_fmode)(int); +static int (__cdecl *p__setmaxstdio)(int); static const char* get_base_name(const char *path) { @@ -91,6 +92,7 @@ static void init(void) __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); p__get_fmode = (void*)GetProcAddress(hmod, "_get_fmode"); p__set_fmode = (void*)GetProcAddress(hmod, "_set_fmode"); + p__setmaxstdio = (void*)GetProcAddress(hmod, "_setmaxstdio"); } static void test_filbuf( void ) @@ -2349,8 +2351,12 @@ static void test_get_osfhandle(void) static void test_setmaxstdio(void) { - ok(2048 == _setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",_setmaxstdio(2048)); - ok(-1 == _setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",_setmaxstdio(2049)); + if (p__setmaxstdio) + { + ok(2048 == p__setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",p__setmaxstdio(2048)); + ok(-1 == p__setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",p__setmaxstdio(2049)); + } + else win_skip( "_setmaxstdio not supported\n" ); } static void test_stat(void)

1 0

Elizabeth Figura : wined3d: Fix inversion in shader_get_position_fixup().
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 5fa3e9b8298f89e636e1d167bae54aee6f7e0872 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa3e9b8298f89e636e1d167bae54a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 14 23:08:02 2024 -0500 wined3d: Fix inversion in shader_get_position_fixup(). Spotted by Matteo Bruni. Fixes: ba2f78922f84f0576694fef17be7bec2cc9da19b --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 510bc057d9f..757c6638645 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4340,7 +4340,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte for (i = 0; i < fixup_count; ++i) { position_fixup[4 * i ] = 1.0f; - position_fixup[4 * i + 1] = 1.0f; + position_fixup[4 * i + 1] = -1.0f; if (!context->d3d_info->subpixel_viewport) { double dummy; @@ -4348,7 +4348,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte y = modf(state->viewports[i].y, &dummy) * 2.0f; } position_fixup[4 * i + 2] = (center_offset + x) / state->viewports[i].width; - position_fixup[4 * i + 3] = -(center_offset + y) / state->viewports[i].height; + position_fixup[4 * i + 3] = (center_offset + y) / state->viewports[i].height; } }

1 0

Alistair Leslie-Hughes : include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 849baece66e326bce255dfea0d6fb10df888bc55 URL: https://gitlab.winehq.org/wine/wine/-/commit/849baece66e326bce255dfea0d6fb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 15 20:52:06 2024 +1000 include: Add some D3D12_FEATURE_DATA_D3D12_OPTIONS* types. --- include/d3d12.idl | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 593a40a02a7..d7b283a2e02 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2446,6 +2446,36 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS13 BOOL AlphaBlendFactorSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS13; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS14 +{ + BOOL AdvancedTextureOpsSupported; + BOOL WriteableMSAATexturesSupported; + BOOL IndependentFrontAndBackStencilRefMaskSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS14; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 +{ + BOOL TriangleFanSupported; + BOOL DynamicIndexBufferStripCutSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS15; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 +{ + BOOL DynamicDepthBiasSupported; + BOOL GPUUploadHeapSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS16; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS17 +{ + BOOL NonNormalizedCoordinateSamplersSupported; + BOOL ManualWriteTrackingResourceSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS17; + +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS18 +{ + BOOL RenderPassesValid; +} D3D12_FEATURE_DATA_D3D12_OPTIONS18; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2481,6 +2511,11 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS11 = 40, D3D12_FEATURE_D3D12_OPTIONS12 = 41, D3D12_FEATURE_D3D12_OPTIONS13 = 42, + D3D12_FEATURE_D3D12_OPTIONS14 = 43, + D3D12_FEATURE_D3D12_OPTIONS15 = 44, + D3D12_FEATURE_D3D12_OPTIONS16 = 45, + D3D12_FEATURE_D3D12_OPTIONS17 = 46, + D3D12_FEATURE_D3D12_OPTIONS18 = 47, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelemcol.c.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 35dcdcf63ec89a409ec9870cd7e40e5fe1050fbb URL: https://gitlab.winehq.org/wine/wine/-/commit/35dcdcf63ec89a409ec9870cd7e40e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 14:09:44 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlelemcol.c. --- dlls/mshtml/htmlelemcol.c | 51 ++--------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8ebe741c309..8b69de72a17 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -210,55 +210,8 @@ static inline HTMLElementCollection *impl_from_IHTMLElementCollection(IHTMLEleme return CONTAINING_RECORD(iface, HTMLElementCollection, IHTMLElementCollection_iface); } -static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollection *iface, - REFIID riid, void **ppv) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollection *iface, - UINT *pctinfo) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLElementCollection, IHTMLElementCollection, + impl_from_IHTMLElementCollection(iface)->dispex) static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *iface, BSTR *String)

1 0