May 2018 - Wine-Devel - list.winehq.org

[PATCH 03/17] version/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 30, 2018

May 30, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b99a335d81..44e7511d8b 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -548,7 +548,7 @@ static void test_VerQueryValueA(void) ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); - for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(value_name); i++) { sprintf(buf, "\\StringFileInfo\\%08x\\%s", translation, value_name[i]); p = (char *)0xdeadbeef; @@ -692,7 +692,7 @@ static void test_GetFileVersionInfoEx(void) return; } - for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_flags); i++) { size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); -- 2.14.3

1 0

[PATCH 2/2] mshtml: Use proper document mode for document fragment objects.
by Jacek Caban May 30, 2018

May 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/tests/documentmode.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[PATCH 1/2] mshtml: Use case insensitive comparition in parse_ua_compatible.
by Jacek Caban May 30, 2018

May 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mutation.c | 3 ++- dlls/mshtml/tests/script.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] d3d10_1/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 30, 2018

May 30, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 7c2b3ba251..f6abea0ced 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -104,7 +104,7 @@ static void test_create_device(void) HWND window; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { if (SUCCEEDED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, d3d10_feature_levels[i], D3D10_1_SDK_VERSION, &device))) @@ -279,7 +279,7 @@ static void test_device_interfaces(void) unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -320,7 +320,7 @@ static void test_device_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } - for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_feature_levels); ++i) { struct device_desc device_desc; @@ -614,7 +614,7 @@ static void test_create_blend_state(void) refcount = ID3D10BlendState1_Release(blend_state2); ok(!refcount, "Blend state has %u references left.\n", refcount); - for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + for (i = 0; i < ARRAY_SIZE(desc_conversion_tests); ++i) { const D3D10_BLEND_DESC1 *current_desc = &desc_conversion_tests[i]; -- 2.14.3

2 1

[PATCH 1/9] dxgi: Add FIXME() for ignored output parameter in dxgi_factory_CreateSwapChainForHwnd().
by Józef Kucia May 30, 2018

May 30, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/factory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a3eb1085b309..4fe684b2a915 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -294,6 +294,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } + if (output) + FIXME("Ignoring output %p.\n", output); + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); -- 2.16.1

5 17

[PATCH] testbot: Fix error checking on a Steps::Save() call.
by Francois Gouget May 30, 2018

May 30, 2018

Collection::Save() returns three values, unlike Item::Save() which only returns two! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6be271ba3..ef0d98e24 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -98,7 +98,7 @@ sub OnDelete($) my $Steps = $self->Steps; map { $_->PreviousNo(undef) } @{$Steps->GetItems()}; - my ($_ErrProperty, $ErrMessage) = $Steps->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Steps->Save(); return $ErrMessage || $self->SUPER::OnDelete(); } -- 2.17.0

1 0

[PATCH v2 4/4] msi/tests: Test deferral of SelfRegModules and SelfUnregModules.
by Hans Leidekker May 30, 2018

May 30, 2018

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 25 +++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 41 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9dfa623758..ac94c38ed9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -774,15 +774,28 @@ static const char sr_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "SelfUnregModules\t\t3800\n" + "su_immediate\tREMOVE\t3801\n" + "su_deferred\tREMOVE\t3802\n" "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" "SelfRegModules\t\t4100\n" + "sr_immediate\tNOT REMOVE\t4101\n" + "sr_deferred\tNOT REMOVE\t4102\n" "CreateShortcuts\t\t4600\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" "InstallFinalize\t\t6600\n"; +static const char sr_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sr_immediate\t1\tcustom.dll\tsr_absent\n" + "sr_deferred\t1025\tcustom.dll\tsr_present\n" + "su_immediate\t1\tcustom.dll\tsr_present\n" + "su_deferred\t1025\tcustom.dll\tsr_absent\n"; + static const char font_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -2128,6 +2141,7 @@ static const msi_table sr_tables[] = ADD_TABLE(sr_file), ADD_TABLE(sr_selfreg), ADD_TABLE(sr_install_exec_seq), + ADD_TABLE(sr_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index b7da2b8fcc..3fb538203f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1833,3 +1833,28 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +UINT WINAPI sr_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !res, "got %u\n", res); + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI sr_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 058a9172f1..2ec5b6cc6d 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -43,6 +43,8 @@ @ stdcall sds_absent(long) @ stdcall sis_present(long) @ stdcall sis_absent(long) +@ stdcall sr_present(long) +@ stdcall sr_absent(long) @ stdcall sss_started(long) @ stdcall sss_stopped(long) @ stdcall tl_present(long) -- 2.11.0

2 1

[PATCH] winex11: Get rid of unnecessary assignments.
by Józef Kucia May 30, 2018

May 30, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/xvidmode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f055c3a53d05..ba9cdf76642e 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -368,7 +368,7 @@ static void interpolate_gamma_ramp(WORD *dst_r, WORD *dst_g, WORD *dst_b, unsign static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -378,7 +378,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; @@ -397,7 +397,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -407,7 +407,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; -- 2.16.1

1 0

[PATCH v2 1/4] msi/tests: Test registration of a valid typelib.
by Hans Leidekker May 30, 2018

May 30, 2018

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/Makefile.in | 4 +++- dlls/msi/tests/action.c | 49 ++++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/rsrc.rc | 22 +++++++++++++++++++++ dlls/msi/tests/typelib.idl | 29 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 dlls/msi/tests/rsrc.rc create mode 100644 dlls/msi/tests/typelib.idl diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 18a6457e4a..5c7e81eeed 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -15,5 +15,7 @@ SOURCES = \ package.c \ patch.c \ record.c \ + rsrc.rc \ source.c \ - suminfo.c + suminfo.c \ + typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ea8c0e86c7..1cf9e9e741 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> +#define COBJMACROS #include <windows.h> #include <msiquery.h> #include <msidefs.h> @@ -36,6 +37,7 @@ #include "wine/test.h" #include "utils.h" +#include "typelib.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -1003,10 +1005,10 @@ static const char tl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "RemoveFiles\t\t1700\n" - "InstallFiles\t\t2000\n" - "RegisterTypeLibraries\tREGISTER_TYPELIB=1\t3000\n" "UnregisterTypeLibraries\t\t3100\n" + "RemoveFiles\t\t3200\n" + "InstallFiles\t\t3300\n" + "RegisterTypeLibraries\t\t3400\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" @@ -2647,6 +2649,24 @@ static DWORD get_estimated_size(void) return size; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_register_product(void) { UINT r; @@ -5594,6 +5614,8 @@ error: static void test_register_typelib(void) { + ITypeLib *tlb; + HRESULT hr; UINT r; if (is_process_limited()) @@ -5602,26 +5624,37 @@ static void test_register_typelib(void) return; } + /* UnregisterTypeLibraries action fails in 64-bit Windows <= 7 */ + if (sizeof(void *) == 8) + { + win_skip("broken on 64-bit Windows\n"); + return; + } + create_test_files(); - create_file("msitest\\typelib.dll", 1000); + extract_resource("typelib.tlb", "TYPELIB", "msitest\\typelib.dll"); create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); + r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(r == ERROR_SUCCESS, "got %u\n", r); - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == S_OK, "got %#x\n", hr); + ITypeLib_Release(tlb); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); diff --git a/dlls/msi/tests/rsrc.rc b/dlls/msi/tests/rsrc.rc new file mode 100644 index 0000000000..eca1ae5790 --- /dev/null +++ b/dlls/msi/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * 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 + */ + +#include "windef.h" + +/* @makedep: typelib.tlb */ +typelib.tlb TYPELIB typelib.tlb diff --git a/dlls/msi/tests/typelib.idl b/dlls/msi/tests/typelib.idl new file mode 100644 index 0000000000..f447c60ea0 --- /dev/null +++ b/dlls/msi/tests/typelib.idl @@ -0,0 +1,29 @@ +/* + * 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 + */ + +#pragma makedep ident +#pragma makedep typelib +#pragma makedep header + +[ + uuid(eac5166a-9734-4d91-878f-1dd02304c66c), + version(7.1) +] +library register_test +{ +} -- 2.11.0

2 1

[PATCH 2/2] wsdapi/tests: Expand ProbeHandler tests.
by Owen Rudge May 30, 2018

May 30, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 113 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 11 deletions(-)

2 1