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

[PATCH 1/2] wsdapi/tests: Ensure probe message is given unique GUID.
by Owen Rudge 30 May '18

30 May '18

This patch fixes a potential issue on the Wine test VMs where messages can be received by other VMs before they are ready to process them. wsdapi.dll then filters out the subsequent duplicate messages from the correct VM and the test fails. Avoid this by not using a hard-coded GUID. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-)

2 1

[PATCH v2 3/4] msi/tests: Test self-registration of a valid DLL.
by Hans Leidekker 30 May '18

30 May '18

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 | 2 ++ dlls/msi/tests/action.c | 83 ++++++++++++++++++++++++++++++--------------- dlls/msi/tests/selfreg.c | 38 +++++++++++++++++++++ dlls/msi/tests/selfreg.spec | 2 ++ 4 files changed, 97 insertions(+), 28 deletions(-) create mode 100644 dlls/msi/tests/selfreg.c create mode 100644 dlls/msi/tests/selfreg.spec diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 5f85d119fa..a0fdcaeb84 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -16,6 +16,8 @@ SOURCES = \ patch.c \ record.c \ rsrc.rc \ + selfreg.c \ + selfreg.spec \ source.c \ suminfo.c \ typelib.idl diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 306bfae6f8..9dfa623758 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -733,30 +733,55 @@ static const char cf_custom_action_dat[] = "rf_immediate\t1\tcustom.dll\tcf_present\n" "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; +static const char sr_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "selfreg.dll\tselfreg\tselfreg.dll\t1000\t\t\t8192\t1\n"; + +static const char sr_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "selfreg\t\t\tselfreg feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char sr_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "selfreg\tselfreg\n"; + +static const char sr_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "selfreg\t{BB4C26FD-89D8-4E49-AF1C-DB4DCB5BF1B0}\tMSITESTDIR\t0\t\tselfreg.dll\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" "SelfReg\tFile_\n" - "one.txt\t1\n"; + "selfreg.dll\t\n"; static const char sr_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" - "ResolveSource\t\t950\n" - "MoveFiles\t\t1700\n" - "SelfUnregModules\t\t3900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "SelfUnregModules\t\t3800\n" + "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" - "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" + "SelfRegModules\t\t4100\n" "CreateShortcuts\t\t4600\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100\n"; + "RegisterProduct\t\t5100\n" + "PublishFeatures\t\t5200\n" + "PublishProduct\t\t5300\n" + "InstallFinalize\t\t6600\n"; static const char font_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -2096,11 +2121,11 @@ static const msi_table sis_tables[] = static const msi_table sr_tables[] = { - ADD_TABLE(component), + ADD_TABLE(sr_component), ADD_TABLE(directory), - ADD_TABLE(feature), - ADD_TABLE(feature_comp), - ADD_TABLE(file), + ADD_TABLE(sr_feature), + ADD_TABLE(sr_feature_comp), + ADD_TABLE(sr_file), ADD_TABLE(sr_selfreg), ADD_TABLE(sr_install_exec_seq), ADD_TABLE(media), @@ -5395,6 +5420,7 @@ error: static void test_self_registration(void) { + HKEY key; UINT r; if (is_process_limited()) @@ -5404,6 +5430,7 @@ static void test_self_registration(void) } create_test_files(); + extract_resource("selfreg.dll", "TESTDLL", "msitest\\selfreg.dll"); create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -5416,21 +5443,21 @@ static void test_self_registration(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); - ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + r = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + ok(!r, "got %u\n", r); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(!r, "got %u\n", r); + + r = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + ok(r == ERROR_FILE_NOT_FOUND, "got %u\n", r); + + ok(!delete_pf("msitest\\selfreg.dll", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); error: + DeleteFileA("msitest\\selfreg.dll"); delete_test_files(); DeleteFileA(msifile); } diff --git a/dlls/msi/tests/selfreg.c b/dlls/msi/tests/selfreg.c new file mode 100644 index 0000000000..668e742e9b --- /dev/null +++ b/dlls/msi/tests/selfreg.c @@ -0,0 +1,38 @@ +/* + * DLL for testing self-registration + * + * 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 <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> + +HRESULT WINAPI DllRegisterServer(void) +{ + HKEY key; + RegCreateKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); + RegCloseKey(key); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + RegDeleteKeyA(HKEY_CLASSES_ROOT, "selfreg_test"); + return S_OK; +} diff --git a/dlls/msi/tests/selfreg.spec b/dlls/msi/tests/selfreg.spec new file mode 100644 index 0000000000..0f9b07355f --- /dev/null +++ b/dlls/msi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.11.0

1 0

[PATCH v2 2/4] msi/tests: Test deferral of RegisterTypeLibraries and UnregisterTypeLibraries.
by Hans Leidekker 30 May '18

30 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> v2: Fix compiler warning. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 29 +++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 5c7e81eeed..5f85d119fa 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 -custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 oleaut32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1cf9e9e741..306bfae6f8 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1006,14 +1006,27 @@ static const char tl_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "UnregisterTypeLibraries\t\t3100\n" + "ut_immediate\tREMOVE\t3101\n" + "ut_deferred\tREMOVE\t3102\n" "RemoveFiles\t\t3200\n" "InstallFiles\t\t3300\n" "RegisterTypeLibraries\t\t3400\n" + "rt_immediate\tNOT REMOVE\t3401\n" + "rt_deferred\tNOT REMOVE\t3402\n" "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const char tl_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "rt_immediate\t1\tcustom.dll\ttl_absent\n" + "rt_deferred\t1025\tcustom.dll\ttl_present\n" + "ut_immediate\t1\tcustom.dll\ttl_present\n" + "ut_deferred\t1025\tcustom.dll\ttl_absent\n"; + static const char crs_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2146,6 +2159,7 @@ static const msi_table tl_tables[] = ADD_TABLE(tl_file), ADD_TABLE(tl_typelib), ADD_TABLE(tl_install_exec_seq), + ADD_TABLE(tl_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 7a3f01ed29..b7da2b8fcc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1804,3 +1804,32 @@ todo_wine return ERROR_SUCCESS; } + +static const GUID LIBID_register_test = + {0xeac5166a, 0x9734, 0x4d91, {0x87,0x8f, 0x1d,0xd0,0x23,0x04,0xc6,0x6c}}; + +UINT WINAPI tl_present(MSIHANDLE hinst) +{ + ITypeLib *tlb; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, hr == S_OK, "got %#x\n", hr); + if (tlb) + ITypeLib_Release(tlb); + + return ERROR_SUCCESS; +} + +UINT WINAPI tl_absent(MSIHANDLE hinst) +{ + ITypeLib *tlb; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index eec6a43c0a..058a9172f1 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -45,3 +45,5 @@ @ stdcall sis_absent(long) @ stdcall sss_started(long) @ stdcall sss_stopped(long) +@ stdcall tl_present(long) +@ stdcall tl_absent(long) -- 2.11.0

1 0

[PATCH] widl: Prefer types defined in the same typelib to imported types.
by Zebediah Figura 30 May '18

30 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes the warnings reported by Alexandre Julliard in reply to 146588. tools/widl/write_msft.c | 56 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 52c68b4..f7e53e4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -993,7 +993,13 @@ static int encode_type( importinfo_t *importinfo; int typeinfo_offset; - if ((importinfo = find_importinfo(typelib, type->name))) + if (type->typelib_idx > -1) + { + chat("encode_type: VT_USERDEFINED - found already defined type %s at %d\n", + type->name, type->typelib_idx); + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } + else if ((importinfo = find_importinfo(typelib, type->name))) { chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", type->name, importinfo->importlib->name); @@ -1003,36 +1009,32 @@ static int encode_type( else { /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", + type->name, type_get_type(type)); - if (type->typelib_idx == -1) + switch (type_get_type(type)) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) - { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); - } + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); } typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; -- 2.7.4

2 1

[PATCH] shell32: Check the return value of DoPaste
by Alistair Leslie-Hughes 30 May '18

30 May '18

Based of patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e1..74270b5 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1142,7 +1142,8 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + bSuccess = TRUE; /* FIXME handle move ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); */ @@ -1195,6 +1196,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( IShellBrowser *browser; IShellView *view = NULL; HWND hWnd = NULL; + HRESULT hr = S_OK; TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", This, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); @@ -1239,7 +1241,8 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( break; case FCIDM_SHVIEW_INSERT: - DoPaste(This); + if (!DoPaste(This)) + hr = E_FAIL; break; case FCIDM_SHVIEW_PROPERTIES: @@ -1260,7 +1263,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( if (view) IShellView_Release(view); - return S_OK; + return hr; } static HRESULT WINAPI BackgroundMenu_GetCommandString( -- 1.9.1

2 1

[PATCH 1/4] msi/tests: Test registration of a valid typelib.
by Zebediah Figura 30 May '18

30 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- The test fails on 64-bit versions of Windows <= 7, so I must assume it to be a bug fixed in Windows 8. 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 18a6457..5c7e81e 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 ea8c0e8..1cf9e9e 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 0000000..eca1ae5 --- /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 0000000..f447c60 --- /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.7.4

2 5

[PATCH 1/2] testbot/build: Always rebuild the native tools.
by Francois Gouget 30 May '18

30 May '18

It does not take long and it is actually hard to really know when to rebuild them if taking into account their libs/ and include/ dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 20 ++++++++------------ testbot/lib/WineTestBot/PatchUtils.pm | 6 +----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 5e6b3700c..03733cef6 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -83,7 +83,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return -1; + return 0; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +96,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return -1; + return 0; } } @@ -109,11 +109,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return -1; + return 0; } } - return $Impacts->{Tools}; + return 1; } my $ncpus; @@ -249,21 +249,17 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -my $NeedBuildNative = ApplyPatch($PatchFile); -if ($NeedBuildNative < 0) +if (!ApplyPatch($PatchFile)) { exit(1); } CountCPUs(); -if ($NeedBuildNative) +InfoMsg "Building tools\n"; +if (!BuildNative()) { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - exit(1); - } + exit(1); } if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 2000c9009..6c72e1639 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -142,11 +142,7 @@ sub GetPatchImpact($;$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{Makefiles} = $Impacts->{Tools} = 1; - } - elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) - { - $Impacts->{Tools} = 1; + $Impacts->{Makefiles} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { -- 2.17.0

1 1

[PATCH] include: Add more definitions to wdm.h
by Alistair Leslie-Hughes 29 May '18

29 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/wdm.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d6b808f..5abe18b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1408,9 +1408,12 @@ void WINAPI IoReleaseCancelSpinLock(KIRQL); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); +void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +LONG WINAPI KeReleaseMutex(PRKMUTEX,BOOLEAN); LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); -- 1.9.1

1 0

[PATCH v2 1/3] widl: Try to import typedefs instead of redefining them.
by Huw Davies 29 May '18

29 May '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/widl/write_msft.c | 69 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4b09317acf..8ce34d9566 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -990,40 +990,53 @@ static int encode_type( case VT_USERDEFINED: { + importinfo_t *importinfo; int typeinfo_offset; - /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type_alias_get_aliasee(type); + if ((importinfo = find_importinfo(typelib, type->name))) + { + chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", + type->name, importinfo->importlib->name); + alloc_importinfo(typelib, importinfo); + typeinfo_offset = importinfo->offset | 0x1; + } + else + { + /* typedef'd types without public attribute aren't included in the typelib */ + while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, + type->name, type_get_type(type), type->typelib_idx); - if(type->typelib_idx == -1) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); + if (type->typelib_idx == -1) + { + chat("encode_type: trying to ref not added type\n"); + switch (type_get_type(type)) + { + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); + } } - } - typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; if ((typedata[0] == ((0x7fff << 16) | VT_USERDEFINED)) && (typedata[1] == typeinfo_offset)) break; -- 2.16.2

3 2

[PATCH] gameux/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 29 May '18

29 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 8 ++++---- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 05c2a1104f..0a235863bf 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -143,7 +143,7 @@ static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(gameInstanceId) { if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameInstanceId, sInstanceId, ARRAY_SIZE(sInstanceId)) ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { @@ -294,7 +294,7 @@ static void _validateGameRegistryValues(int line, HRESULT hr; WCHAR sGameApplicationId[40]; - hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, sizeof(sGameApplicationId)/sizeof(sGameApplicationId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, ARRAY_SIZE(sGameApplicationId)) ? S_OK : E_FAIL); ok_(__FILE__, line)(hr == S_OK, "cannot convert game application id to string\n"); /* these values exist up from Vista */ @@ -547,7 +547,7 @@ static void test_add_remove_game(void) if(ge) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); bstrExeName = SysAllocString(sExeName); @@ -625,7 +625,7 @@ static void test_install_uninstall_game(void) if(ge2) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index ff247fcb17..d823af1aab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -44,7 +44,7 @@ static void test_register_game(IGameExplorer **explorer) BSTR bstrExeName, bstrExePath; /* prepare path to binary */ - GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); lstrcpyW(pathW, sExeName); PathRemoveFileSpecW(pathW); @@ -101,7 +101,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) - hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); + hr = (StringFromGUID2(guidApplicationId, sGuid, ARRAY_SIZE(sGuid)) != 0 ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { -- 2.14.3

2 1