July 2023 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9/tests: Use test contexts in test_D3DXCreateRenderToEnvMap().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 321efd44414d7b5c21f4a539e229ebfbb433b917 URL: https://gitlab.winehq.org/wine/wine/-/commit/321efd44414d7b5c21f4a539e229eb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 6 03:45:02 2022 +0100 d3dx9/tests: Use test contexts in test_D3DXCreateRenderToEnvMap(). --- dlls/d3dx9_36/tests/core.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index a16a94e8e09..845e1c6e7cb 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1645,24 +1645,26 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } }; - for (i = 0; i < ARRAY_SIZE(tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; + winetest_push_context("Test %u", i); hr = D3DXCreateRenderToEnvMap(device, parameters->Size, parameters->MipLevels, parameters->Format, parameters->DepthStencil, parameters->DepthStencilFormat, &render); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = ID3DXRenderToEnvMap_GetDesc(render, &desc); - ok(hr == D3D_OK, "%d: GetDesc failed %#lx\n", i, hr); - ok(desc.Size == expected->Size, "%d: Got size %u, expected %u\n", i, desc.Size, expected->Size); - ok(desc.MipLevels == expected->MipLevels, "%d: Got miplevels %u, expected %u\n", i, desc.MipLevels, expected->MipLevels); - ok(desc.Format == expected->Format, "%d: Got format %#x, expected %#x\n", i, desc.Format, expected->Format); - ok(desc.DepthStencil == expected->DepthStencil, "%d: Got depth stencil %d, expected %d\n", - i, expected->DepthStencil, expected->DepthStencil); - ok(desc.DepthStencilFormat == expected->DepthStencilFormat, "%d: Got depth stencil format %#x, expected %#x\n", - i, expected->DepthStencilFormat, expected->DepthStencilFormat); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + ok(desc.Size == expected->Size, "Got size %u, expected %u.\n", desc.Size, expected->Size); + ok(desc.MipLevels == expected->MipLevels, "Got miplevels %u, expected %u.\n", desc.MipLevels, expected->MipLevels); + ok(desc.Format == expected->Format, "Got format %#x, expected %#x.\n", desc.Format, expected->Format); + ok(desc.DepthStencil == expected->DepthStencil, "Got depth stencil %d, expected %d.\n", + expected->DepthStencil, expected->DepthStencil); + ok(desc.DepthStencilFormat == expected->DepthStencilFormat, "Got depth stencil format %#x, expected %#x\n", + expected->DepthStencilFormat, expected->DepthStencilFormat); check_release((IUnknown *)render, 0); + winetest_pop_context(); } /* check device ref count */

1 0

Matteo Bruni : d3dx9/tests: Use test contexts in test_effect_parameter_value().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: f529c5db4d1ed9d2de805bf152c65b8e01b55362 URL: https://gitlab.winehq.org/wine/wine/-/commit/f529c5db4d1ed9d2de805bf152c65b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 9 03:20:43 2022 +0100 d3dx9/tests: Use test contexts in test_effect_parameter_value(). And give a good clean up to the test and all its helpers. --- dlls/d3dx9_36/tests/effect.c | 860 ++++++++++++++++++++----------------------- 1 file changed, 394 insertions(+), 466 deletions(-)

1 0

Matteo Bruni : d3dx9/tests: Get rid of unnecessary checks in test_effect_states().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: e39e904392223a4afef62e2b05d1d736ae9b9ab4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e39e904392223a4afef62e2b05d1d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 9 18:38:18 2022 +0100 d3dx9/tests: Get rid of unnecessary checks in test_effect_states(). --- dlls/d3dx9_36/tests/effect.c | 132 +++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 69 deletions(-)

1 0

Matteo Bruni : d3dx9/tests: Use test contexts in test_effect_preshader_ops().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 4acb858fc6cee42a91b1ec0f8589afbefb5875e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4acb858fc6cee42a91b1ec0f8589af… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 9 19:30:39 2022 +0100 d3dx9/tests: Use test contexts in test_effect_preshader_ops(). --- dlls/d3dx9_36/tests/effect.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1065d7ea8da..8f8b87220ea 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5030,40 +5030,44 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) hr = D3DXCreateEffect(device, test_effect_preshader_ops_blob, sizeof(test_effect_preshader_ops_blob), NULL, NULL, 0, NULL, &effect, NULL); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->Begin(effect, &passes_count, 0); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(op_tests); ++i) { const float *result = op_tests[i].result; const float *expected_float = (float *)op_tests[i].expected_result; + winetest_push_context("Test %u", i); hr = effect->lpVtbl->SetVector(effect, "opvect1", &op_tests[i].opvect1); - ok(hr == D3D_OK, "SetVector failed, hr %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->SetVector(effect, "opvect2", &op_tests[i].opvect2); - ok(hr == D3D_OK, "SetVector failed, hr %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->SetVector(effect, "opvect3", &op_tests[i].opvect3); - ok(hr == D3D_OK, "SetVector failed, hr %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_GetLight(device, op_tests[i].result_index, &light); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); for (j = 0; j < 4; ++j) { + winetest_push_context("Light %u", j); todo_wine_if(op_tests[i].todo[j]) ok(compare_float(result[j], expected_float[j], op_tests[i].ulps), "Operation %s, component %u, expected %#x (%.8e), got %#x (%.8e).\n", op_tests[i].mnem, j, op_tests[i].expected_result[j], expected_float[j], ((unsigned int *)result)[j], result[j]); + winetest_pop_context(); } + winetest_pop_context(); } hr = effect->lpVtbl->End(effect); - ok(hr == D3D_OK, "Got result %#lx.\n", hr); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); }

1 0

Matteo Bruni : d3dx9/tests: Use test contexts in test_effect_commitchanges().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 3149d84502ab2986c63cf37d4f48d4f52d83dc82 URL: https://gitlab.winehq.org/wine/wine/-/commit/3149d84502ab2986c63cf37d4f48d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 9 19:32:55 2022 +0100 d3dx9/tests: Use test contexts in test_effect_commitchanges(). And do some mandatory cleanup while at it. --- dlls/d3dx9_36/tests/effect.c | 196 ++++++++++++++++++++++--------------------- 1 file changed, 101 insertions(+), 95 deletions(-)

1 0

Vladislav Timonin : comdlg32: Return E_UNEXPECTED if IFileDialog is already shown.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 5bc5d360652c9f97053afc05e0e58a5a75b399d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bc5d360652c9f97053afc05e0e58a… Author: Vladislav Timonin <timoninvlad(a)yandex.ru> Date: Tue Jan 31 00:27:11 2023 +0700 comdlg32: Return E_UNEXPECTED if IFileDialog is already shown. --- dlls/comdlg32/itemdlg.c | 3 +++ dlls/comdlg32/tests/itemdlg.c | 46 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1feb1deda00..b483193d76b 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2246,6 +2246,9 @@ static HRESULT create_dialog(FileDialogImpl *This, HWND parent) { INT_PTR res; + if (This->dlg_hwnd) + return E_UNEXPECTED; + SetLastError(0); res = DialogBoxParamW(COMDLG32_hInstance, MAKEINTRESOURCEW(NEWFILEOPENV3ORD), diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 8ce0ea806b9..ddb2dc30fe7 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -27,12 +27,14 @@ #define IDT_CHANGEFILETYPE 500 #define IDT_CLOSEDIALOG 501 +#define IDT_SHOWDIALOG 502 typedef enum { IFDEVENT_TEST_NONE = 0, IFDEVENT_TEST1 = 0x1, IFDEVENT_TEST2 = 0x2, - IFDEVENT_TEST3 = 0x3 + IFDEVENT_TEST3 = 0x3, + IFDEVENT_TEST4 = 0x4, } FileDialogEventsTest; static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); @@ -193,6 +195,15 @@ static LRESULT CALLBACK test_customize_dlgproc(HWND hwnd, UINT message, WPARAM w br = PostMessageW(hwnd, WM_COMMAND, IDCANCEL, 0); ok(br, "Failed\n"); return TRUE; + case IDT_SHOWDIALOG: + { + HRESULT hr; + KillTimer(hwnd, IDT_SHOWDIALOG); + hr = IFileDialog_Show(pfd, NULL); + ok(hr == E_UNEXPECTED, "got 0x%08lx.\n", hr); + SetTimer(hwnd, IDT_CLOSEDIALOG, 100, 0); + return TRUE; + } } } @@ -249,6 +260,9 @@ static HRESULT WINAPI IFileDialogEvents_fnOnFolderChange(IFileDialogEvents *ifac case IFDEVENT_TEST3: SetTimer(dlg_hwnd, IDT_CHANGEFILETYPE, 100, 0); break; + case IFDEVENT_TEST4: + SetTimer(dlg_hwnd, IDT_SHOWDIALOG, 100, 0); + break; default: ok(FALSE, "Should not happen (%d)\n", This->events_test); } @@ -2496,6 +2510,35 @@ static void test_customize_remove_from_empty_combobox(void) IFileDialog_Release(pfod); } +static void test_double_show(void) +{ + IFileDialogEventsImpl *pfdeimpl; + IFileDialogEvents *pfde; + IFileDialog *pfd; + DWORD cookie; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileDialog, (void**)&pfd); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + + pfde = IFileDialogEvents_Constructor(); + pfdeimpl = impl_from_IFileDialogEvents(pfde); + pfdeimpl->events_test = IFDEVENT_TEST4; + + hr = IFileDialog_Advise(pfd, pfde, &cookie); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + + hr = IFileDialog_Show(pfd, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "got 0x%08lx.\n", hr); + + hr = IFileDialog_Unadvise(pfd, cookie); + ok(hr == S_OK, "got 0x%08lx.\n", hr); + + IFileDialogEvents_Release(pfde); + IFileDialog_Release(pfd); +} + START_TEST(itemdlg) { OleInitialize(NULL); @@ -2521,6 +2564,7 @@ START_TEST(itemdlg) test_persistent_state(); test_overwrite(); test_customize_remove_from_empty_combobox(); + test_double_show(); } else skip("Skipping all Item Dialog tests.\n");

1 0

Vladislav Timonin : comdlg32: Enable visual styles when showing IFileDialog.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: a0534afab094d7e3ec27e033329a4e3080193199 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0534afab094d7e3ec27e033329a4e… Author: Vladislav Timonin <timoninvlad(a)yandex.ru> Date: Sat Jan 28 02:34:43 2023 +0700 comdlg32: Enable visual styles when showing IFileDialog. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/cdlg32.c | 16 +++++++- dlls/comdlg32/comdlg32.manifest | 16 ++++++++ dlls/comdlg32/comdlg32.rc | 3 ++ dlls/comdlg32/itemdlg.c | 91 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 1 deletion(-)

1 0

Billy Laws : ntdll: Avoid using SOL_IPX to detect whether IPX is supported.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 954bf9e0505a7368c34047b311d613cff04393a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/954bf9e0505a7368c34047b311d613… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:57:42 2023 +0100 ntdll: Avoid using SOL_IPX to detect whether IPX is supported. 4.18+ Linux kernels remove support for IPX but keep SOL_IPX defined, which causes compilation errors as wine unconditionally uses IPX structures if this is the case. Instead check for IPX_MTU to determine IPX support as it is defined within the ipx.h header itself. --- dlls/ntdll/unix/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index bc5bc84fdf8..80105eda0c9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -45,6 +45,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -53,8 +54,6 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -#endif -#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif @@ -2406,6 +2405,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } +#ifdef HAS_IPX #ifdef SOL_IPX case IOCTL_AFD_WINE_GET_IPX_PTYPE: return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); @@ -2444,6 +2444,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, 0, SO_DEFAULT_HEADERS, &value, sizeof(value) ); } #endif +#endif #ifdef HAS_IRDA #define MAX_IRDA_DEVICES 10

1 0

Billy Laws : ws2_32: Avoid using SOL_IPX to detect whether IPX is supported.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: da4e359a700209c840490483f5337a14aa1d448f URL: https://gitlab.winehq.org/wine/wine/-/commit/da4e359a700209c840490483f5337a… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:57:42 2023 +0100 ws2_32: Avoid using SOL_IPX to detect whether IPX is supported. --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 4646e8ff26f..5cb64aad258 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -66,6 +66,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -74,8 +75,6 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -#endif -#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif

1 0

Billy Laws : server: Avoid using SOL_IPX to detect whether IPX is supported.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b URL: https://gitlab.winehq.org/wine/wine/-/commit/41cc117b3f37ab4b9b4ac8a815cd2a… Author: Billy Laws <blaws05(a)gmail.com> Date: Sat Jun 3 21:57:42 2023 +0100 server: Avoid using SOL_IPX to detect whether IPX is supported. --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 088e6d63079..34be6ea22ef 100644 --- a/server/sock.c +++ b/server/sock.c @@ -62,6 +62,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -70,8 +71,6 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -#endif -#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif

1 0