April 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Support multiple fallbacks for cursor names.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 508ad84bbef725676f2aab8fbf0e532fd97eb398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=508ad84bbef725676f2aab8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 12:01:40 2018 +0200 winex11: Support multiple fallbacks for cursor names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 78 ++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c3ec916..fdca083 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -819,58 +819,58 @@ cleanup: struct system_cursors { WORD id; - const char *name; + const char *names[8]; }; static const struct system_cursors user32_cursors[] = { - { OCR_NORMAL, "left_ptr" }, - { OCR_IBEAM, "xterm" }, - { OCR_WAIT, "watch" }, - { OCR_CROSS, "cross" }, - { OCR_UP, "center_ptr" }, - { OCR_SIZE, "fleur" }, - { OCR_SIZEALL, "fleur" }, - { OCR_ICON, "icon" }, - { OCR_SIZENWSE, "top_left_corner" }, - { OCR_SIZENESW, "top_right_corner" }, - { OCR_SIZEWE, "left_side" }, - { OCR_SIZENS, "top_side" }, - { OCR_NO, "not-allowed" }, - { OCR_HAND, "hand2" }, - { OCR_APPSTARTING, "left_ptr_watch" }, - { OCR_HELP, "question_arrow" }, + { OCR_NORMAL, { "left_ptr" }}, + { OCR_IBEAM, { "xterm", "text" }}, + { OCR_WAIT, { "watch", "wait" }}, + { OCR_CROSS, { "cross" }}, + { OCR_UP, { "center_ptr" }}, + { OCR_SIZE, { "fleur", "size_all" }}, + { OCR_SIZEALL, { "fleur", "size_all" }}, + { OCR_ICON, { "icon" }}, + { OCR_SIZENWSE, { "top_left_corner", "nw-resize" }}, + { OCR_SIZENESW, { "top_right_corner", "ne-resize" }}, + { OCR_SIZEWE, { "left_side", "size_hor", "h_double_arrow", "ew-resize" }}, + { OCR_SIZENS, { "top_side", "size_ver", "v_double_arrow", "ns-resize" }}, + { OCR_NO, { "not-allowed", "forbidden", "no-drop" }}, + { OCR_HAND, { "hand2", "pointer", "pointing-hand" }}, + { OCR_APPSTARTING, { "left_ptr_watch" }}, + { OCR_HELP, { "question_arrow", "help" }}, { 0 } }; static const struct system_cursors comctl32_cursors[] = { - { 102, "move" }, - { 104, "copy" }, - { 105, "left_ptr" }, - { 106, "col-resize" }, - { 107, "col-resize" }, - { 108, "hand2" }, - { 135, "row-resize" }, + { 102, { "move", "dnd-move" }}, + { 104, { "copy", "dnd-copy" }}, + { 105, { "left_ptr" }}, + { 106, { "col-resize", "split_v" }}, + { 107, { "col-resize", "split_v" }}, + { 108, { "hand2", "pointer", "pointing-hand" }}, + { 135, { "row-resize", "split_h" }}, { 0 } }; static const struct system_cursors ole32_cursors[] = { - { 1, "no-drop" }, - { 2, "move" }, - { 3, "copy" }, - { 4, "alias" }, + { 1, { "no-drop", "dnd-no-drop" }}, + { 2, { "move", "dnd-move" }}, + { 3, { "copy", "dnd-copy" }}, + { 4, { "alias", "dnd-link" }}, { 0 } }; static const struct system_cursors riched20_cursors[] = { - { 105, "hand2" }, - { 107, "right_ptr" }, - { 109, "copy" }, - { 110, "move" }, - { 111, "no-drop" }, + { 105, { "hand2", "pointer", "pointing-hand" }}, + { 107, { "right_ptr" }}, + { 109, { "copy", "dnd-copy" }}, + { 110, { "move", "dnd-move" }}, + { 111, { "no-drop", "dnd-no-drop" }}, { 0 } }; @@ -1004,6 +1004,7 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) Cursor cursor = 0; HMODULE module; HKEY key; + const char * const *names = NULL; WCHAR *p, name[MAX_PATH * 2], valueW[64]; char valueA[64]; DWORD ret; @@ -1044,7 +1045,8 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) for (i = 0; cursors[i].id; i++) if (cursors[i].id == info->wResID) { - strcpy( valueA, cursors[i].name ); + strcpy( valueA, cursors[i].names[0] ); + names = cursors[i].names; break; } @@ -1052,7 +1054,13 @@ done: if (valueA[0]) { #ifdef SONAME_LIBXCURSOR - if (pXcursorLibraryLoadCursor) cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); + if (pXcursorLibraryLoadCursor) + { + if (!names) + cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); + else + while (*names && !cursor) cursor = pXcursorLibraryLoadCursor( gdi_display, *names++ ); + } #endif if (!cursor) {

1 0

Valentin Gabriel Mitrea : d3d10: Implement D3D10CompileEffectFromMemory().
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 9dd88e31efd753ff0c6f0c5ac077773464519cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd88e31efd753ff0c6f0c5a… Author: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> Date: Sun Apr 22 23:27:20 2018 +0300 d3d10: Implement D3D10CompileEffectFromMemory(). Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f2fbb41..7c8bee7 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -253,17 +253,13 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," - " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - if (effect) - *effect = NULL; - if (errors) - *errors = NULL; - - return E_NOTIMPL; + return D3DCompile(data, data_size, filename, defines, include, + NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags,

1 0

Hugh McMaster : reg: Null terminate hex-formatted REG_SZ data if necessary.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 65717d67260fb6f723dcfe9bf9008d249348c2e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65717d67260fb6f723dcfe9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 23 13:37:28 2018 +0000 reg: Null terminate hex-formatted REG_SZ data if necessary. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 3 ++- programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f2ce80e..779ea28 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -409,7 +409,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5004414..aba71b7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4668,7 +4668,7 @@ static void test_export(void) err = RegQueryValueExA(hkey, "Wine4d", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_SZ, "got wrong type %u, expected %u\n", type, REG_SZ); - todo_wine ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); + ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); ok(memcmp(buffer, "\0abc", size) == 0, "got wrong data\n"); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0);

1 0

Zebediah Figura : d3dx10/tests: Remove todo_wine from succeeding tests.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 94756f24001adbbb79a16426f5c9dbf6c695f81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=94756f24001adbbb79a16426… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 21 14:48:25 2018 -0500 d3dx10/tests: Remove todo_wine from succeeding tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index ac0852b..0baba65 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -526,15 +526,14 @@ float4 main(float4 color : COLOR) : SV_TARGET wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetViewports(device, &count, tmp_viewport); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(i) - ok(tmp_viewport[i].TopLeftX == i * 3 + ok(tmp_viewport[i].TopLeftX == i * 3 && tmp_viewport[i].TopLeftY == i * 4 && tmp_viewport[i].Width == 3 && tmp_viewport[i].Height == 4

1 0

Francois Gouget : makefiles: Make it possible to only build the tests.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: f82b3e57448ee753b35aa42dbe3959a536d1aaae URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82b3e57448ee753b35aa42d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 18 03:22:27 2018 +0200 makefiles: Make it possible to only build the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4fc8435..2c5b40a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3577,7 +3577,7 @@ static void output_subdirs( struct makefile *make ) } if (winetest_deps.count) { - output( "programs/winetest:" ); + output( "buildtests programs/winetest:" ); output_filenames( winetest_deps ); output( "\n" ); output( "check test:" ); @@ -3588,6 +3588,7 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, target ); } output( "\n" ); + strarray_add( &make->phony_targets, "buildtests" ); strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); }

1 0

Alistair Leslie-Hughes : hnetcfg/tests: Add INetFwAuthorizedApplication tests.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 9e5145a7fe2d488299e6e69c375b8df531c9cb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e5145a7fe2d488299e6e69c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 23 02:24:06 2018 +0000 hnetcfg/tests: Add INetFwAuthorizedApplication tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/Makefile.in | 2 +- dlls/hnetcfg/tests/policy.c | 49 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in index aa4062a..8315b4b 100644 --- a/dlls/hnetcfg/tests/Makefile.in +++ b/dlls/hnetcfg/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = hnetcfg.dll -IMPORTS = ole32 uuid +IMPORTS = ole32 uuid oleaut32 advapi32 C_SRCS = \ policy.c diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 7b5bef0..4d70818 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -102,6 +102,53 @@ static void test_interfaces(void) INetFwMgr_Release(manager); } +static void test_NetFwAuthorizedApplication(void) +{ + INetFwAuthorizedApplication *app; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwAuthorizedApplication, (void**)&app); + ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK) + { + BSTR image = SysAllocStringLen( NULL, MAX_PATH ); + static WCHAR empty[] = {0}; + BSTR bstr; + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + ok(0, "Failed to get filename\n"); + SysFreeString( image ); + return; + } + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); + ok(hr == E_POINTER, "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); + ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, image); + ok(hr == S_OK, "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK, "got: %08x\n", hr); + ok(!lstrcmpW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + SysFreeString( bstr ); + + SysFreeString( image ); + INetFwAuthorizedApplication_Release(app); + } +} + START_TEST(policy) { INetFwMgr *manager; @@ -121,7 +168,7 @@ START_TEST(policy) INetFwMgr_Release(manager); test_interfaces(); - + test_NetFwAuthorizedApplication(); CoUninitialize(); }

1 0

Martin Storsjo : makedep: Remove an incorrect -b when creating cross import libraries.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 54d3e48448963a0ba598dd4d29bdecf59290e627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d3e48448963a0ba598dd4d… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Apr 23 00:38:16 2018 +0300 makedep: Remove an incorrect -b when creating cross import libraries. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index c9ab24d..4fc8435 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3480,7 +3480,6 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filename( "--implib" ); - output_filenames( target_flags ); output_filename( "--export" ); output_filename( spec_file ); output( "\n" );

1 0

Hugh McMaster : regedit: Null terminate hex-formatted REG_SZ data if necessary.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 829c0ced694df890b7770a40ada9bcab4d1e17c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=829c0ced694df890b7770a40… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 23 13:37:27 2018 +0000 regedit: Null terminate hex-formatted REG_SZ data if necessary. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 3 ++- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 35b0322..84a16f9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -507,7 +507,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 41712a1..845ab00 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3679,7 +3679,7 @@ static void test_export(void) verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); - verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, 0); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0);

1 0

Zebediah Figura : msi: Avoid returning an uninitialized variable.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 859f455cb95a37e11f1187731be530fc9b48da8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=859f455cb95a37e11f118773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 22 09:53:10 2018 -0500 msi: Avoid returning an uninitialized variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 5804046..a7d5588 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1059,7 +1059,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) { MSIRECORD *rec; unsigned int i; - UINT r; + UINT r = ERROR_SUCCESS; if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE;

1 0

Nikolay Sivov : uxtheme/tests: Remove some trace messages.
by Alexandre Julliard April 23, 2018

April 23, 2018

Module: wine Branch: master Commit: 16ab42f94dae69c60db3bfa6779713a20dca1bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ab42f94dae69c60db3bfa6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 10:45:13 2018 +0300 uxtheme/tests: Remove some trace messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 6989f44..c71eaa2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -77,7 +77,6 @@ static void test_GetWindowTheme(void) { HTHEME hTheme; HWND hWnd; - BOOL bDestroyed; SetLastError(0xdeadbeef); hTheme = GetWindowTheme(NULL); @@ -89,7 +88,7 @@ static void test_GetWindowTheme(void) /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); - if (!hWnd) return; + ok(hWnd != NULL, "Failed to create a test window.\n"); SetLastError(0xdeadbeef); hTheme = GetWindowTheme(hWnd); @@ -98,17 +97,13 @@ static void test_GetWindowTheme(void) "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_SetWindowTheme(void) { HRESULT hRes; HWND hWnd; - BOOL bDestroyed; hRes = SetWindowTheme(NULL, NULL, NULL); todo_wine @@ -116,15 +111,12 @@ todo_wine /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); - if (!hWnd) return; + ok(hWnd != NULL, "Failed to create a test window.\n"); hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_OpenThemeData(void) @@ -133,7 +125,6 @@ static void test_OpenThemeData(void) HWND hWnd; BOOL bThemeActive; HRESULT hRes; - BOOL bDestroyed; BOOL bTPDefined; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; @@ -274,10 +265,7 @@ static void test_OpenThemeData(void) GetLastError()); } - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_OpenThemeDataEx(void) @@ -285,7 +273,6 @@ static void test_OpenThemeDataEx(void) HTHEME hTheme; HWND hWnd; BOOL bThemeActive; - BOOL bDestroyed; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; @@ -419,10 +406,7 @@ static void test_OpenThemeDataEx(void) "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError()); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_GetCurrentThemeName(void)

1 0