Module: wine Branch: master Commit: f5da1902aa24433375fc3c99eaadad00917daa9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5da1902aa24433375fc3c99e...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed May 30 10:22:24 2018 +0200
msi/tests: Test registration of a valid typelib.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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(-)
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 +{ +}