Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 121/360: [WINESYNC] msi: Avoid connecting to the RPC server more than once.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfdb6d105098e693ddbbd… commit dfdb6d105098e693ddbbdc721f22e4244096c60e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 23:22:08 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:57 2022 +0100 [WINESYNC] msi: Avoid connecting to the RPC server more than once. This is a no-op as is, but is necessary as of the next patch in the case of nested custom actions. 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> wine commit id 6135b38d7d60e7bceb36a57630cad72d3e7e4b2e by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/custom.c | 27 ++++++++++++++------------- dll/win32/msi/package.c | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 216a9bece8f..4202f255973 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -537,19 +537,22 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) TRACE("%s\n", debugstr_guid( guid )); - status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); - if (status != RPC_S_OK) + if (!rpc_handle) { - ERR("RpcStringBindingCompose failed: %#x\n", status); - return status; - } - status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - if (status != RPC_S_OK) - { - ERR("RpcBindingFromStringBinding failed: %#x\n", status); - return status; + status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); + if (status != RPC_S_OK) + { + ERR("RpcStringBindingCompose failed: %#x\n", status); + return status; + } + status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + if (status != RPC_S_OK) + { + ERR("RpcBindingFromStringBinding failed: %#x\n", status); + return status; + } + RpcStringFreeW(&binding_str); } - RpcStringFreeW(&binding_str); r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) @@ -597,8 +600,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) midl_user_free(dll); midl_user_free(proc); - RpcBindingFree(&rpc_handle); - return r; } diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 7cc9444a0f0..03927046190 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -344,6 +344,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) CloseHandle( package->log_file ); if (package->rpc_server_started) RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); + if (rpc_handle) + RpcBindingFree(&rpc_handle); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile );

2 years, 6 months

[reactos] 120/360: [WINESYNC] msi: Create the custom action thread inside msiexec.exe.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fa71cf3c5b5db76e1bb4… commit 1fa71cf3c5b5db76e1bb4f6eefb98a8e3cbbdadf Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 23:22:07 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:57 2022 +0100 [WINESYNC] msi: Create the custom action thread inside msiexec.exe. This patch is effectively a no-op by itself, but makes the next patch architecturally much simpler. We need the main thread to be non-blocking to allow nested custom actions to work, so creating the thread inside of msiexec allows the custom action thread to write the result of the action to the server pipe while the main thread simply reads from it. 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> wine commit id 7908d6ee399f4ef556e194dfa5cdef746fc091b6 by Zebediah Figura <z.figura12(a)gmail.com> --- base/system/msiexec/msiexec.c | 21 ++++++++++++++++++- dll/win32/msi/custom.c | 47 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 5ebfea78ebf..74f6d515b95 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -395,11 +395,30 @@ static DWORD DoUnregServer(void) extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); +static DWORD CALLBACK custom_action_thread(void *arg) +{ + GUID *guid = arg; + return __wine_msi_call_dll_function(guid); +} + static int DoEmbedding(LPCWSTR key) { + HANDLE thread; GUID guid; + UINT r; + + /* We need this to unmarshal streams, and some apps expect it to be present. */ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + CLSIDFromString(key, &guid); - return __wine_msi_call_dll_function(&guid); + thread = CreateThread(NULL, 0, custom_action_thread, &guid, 0, NULL); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &r); + CloseHandle(thread); + + CoUninitialize(); + + return r; } /* diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index ffea24278d4..216a9bece8f 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -485,6 +485,43 @@ static void handle_msi_break(LPCSTR target) static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; +#if defined __i386__ && defined _MSC_VER +__declspec(naked) UINT custom_proc_wrapper(MsiCustomActionEntryPoint entry, MSIHANDLE hinst) +{ + __asm + { + push ebp + mov ebp, esp + sub esp, 4 + push [ebp+12] + call [ebp+8] + leave + ret + } +} +#elif defined __i386__ && defined __GNUC__ +/* wrapper for apps that don't declare the thread function correctly */ +extern UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hinst ); +__ASM_GLOBAL_FUNC(custom_proc_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hinst ) +{ + return entry(hinst); +} +#endif + UINT CDECL __wine_msi_call_dll_function(const GUID *guid) { MsiCustomActionEntryPoint fn; @@ -495,7 +532,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) LPWSTR dll = NULL; LPSTR proc = NULL; HANDLE hModule; - HANDLE thread; INT type; UINT r; @@ -515,9 +551,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) } RpcStringFreeW(&binding_str); - /* We need this to unmarshal streams, and some apps expect it to be present. */ - CoInitializeEx(NULL, COINIT_MULTITHREADED); - r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) return r; @@ -540,9 +573,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) __TRY { - thread = CreateThread(NULL, 0, (void *)fn, (void *)(ULONG_PTR) hPackage, 0, NULL); - WaitForSingleObject(thread, INFINITE); - GetExitCodeThread(thread, &r); + r = custom_proc_wrapper(fn, hPackage); } __EXCEPT_PAGE_FAULT { @@ -566,8 +597,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) midl_user_free(dll); midl_user_free(proc); - CoUninitialize(); - RpcBindingFree(&rpc_handle); return r;

2 years, 6 months

[reactos] 119/360: [WINESYNC] msi: Avoid starting the RPC server more than once for a given package.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a327bfe9499e308fb314… commit 0a327bfe9499e308fb314973e96d7dca154b1f89 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 17:01:10 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:56 2022 +0100 [WINESYNC] msi: Avoid starting the RPC server more than once for a given package. 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> wine commit id 5c7cf0a47d9d43b11f84914f5890eae3fd694592 by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/custom.c | 46 +++++++++++++++++++++------------------------- dll/win32/msi/msipriv.h | 1 + dll/win32/msi/package.c | 2 ++ 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index d444960c96f..ffea24278d4 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -573,16 +573,15 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) return r; } -static DWORD WINAPI DllThread( LPVOID arg ) +static DWORD WINAPI custom_client_thread(void *arg) { static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {' ','-','E','m','b','e','d','d','i','n','g',' ',0}; - msi_custom_action_info *info; + msi_custom_action_info *info = arg; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[MAX_PATH], cmdline[MAX_PATH + 60]; RPC_STATUS status; - GUID *guid = arg; void *cookie; BOOL wow64; DWORD arch; @@ -593,24 +592,28 @@ static DWORD WINAPI DllThread( LPVOID arg ) CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); - if (status != RPC_S_OK) + if (!info->package->rpc_server_started) { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return status; + } - status = RpcServerRegisterIfEx((RPC_IF_HANDLE)s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; + status = RpcServerRegisterIfEx((RPC_IF_HANDLE)s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return status; + } + + info->package->rpc_server_started = 1; } - info = find_action_by_guid(guid); ret = GetBinaryTypeW(info->source, &arch); - release_custom_action_data(info); if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); @@ -619,7 +622,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) strcatW(buffer, msiexecW); strcpyW(cmdline, buffer); strcatW(cmdline, argsW); - StringFromGUID2(guid, cmdline + strlenW(cmdline), 39); + StringFromGUID2(&info->guid, cmdline + strlenW(cmdline), 39); if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) { @@ -635,13 +638,6 @@ static DWORD WINAPI DllThread( LPVOID arg ) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - status = RpcServerUnregisterIf((RPC_IF_HANDLE)s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); - if (status != RPC_S_OK) - { - ERR("RpcServerUnregisterIf failed: %#x\n", status); - return status; - } - CoUninitialize(); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -672,7 +668,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { /* release both references */ diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index 3519d83f1c6..f701f91a866 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -449,6 +449,7 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; + unsigned char rpc_server_started : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 6b3f46353a3..7cc9444a0f0 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -342,6 +342,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) msiobj_release( &package->db->hdr ); free_package_structures(package); CloseHandle( package->log_file ); + if (package->rpc_server_started) + RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE); if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile );

2 years, 6 months

[reactos] 118/360: [WINESYNC] include: Add a generic available ARRAY_SIZE().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55dcc258b18fdb3607810… commit 55dcc258b18fdb36078102dc27e35f0eed3f1a27 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:59:15 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:56 2022 +0100 [WINESYNC] include: Add a generic available ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 962b31c80b74cfc479da386a8c76d55d26aed752 by Michael Stefaniuc <mstefani(a)winehq.org>

2 years, 6 months

[reactos] 117/360: [WINESYNC] msi: Remove checks for negative value.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=306890e8c4be236743c62… commit 306890e8c4be236743c625ea971ed5079a994cd1 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:59:15 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:56 2022 +0100 [WINESYNC] msi: Remove checks for negative value. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 5bd1b6f41032d1e133a8d9a96fba711ee491d634 by Andrey Gusev <andrey.goosev(a)gmail.com> --- dll/win32/msi/format.c | 2 +- dll/win32/msi/string.c | 5 ++--- dll/win32/msi/table.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dll/win32/msi/format.c b/dll/win32/msi/format.c index 6165f0a5dfd..06addd84741 100644 --- a/dll/win32/msi/format.c +++ b/dll/win32/msi/format.c @@ -242,7 +242,7 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int * if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } - if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) + if (!(len = GetShortPathNameW(file->TargetPath, NULL, 0))) { if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; diff --git a/dll/win32/msi/string.c b/dll/win32/msi/string.c index f094a53c9e6..7383fddbed3 100644 --- a/dll/win32/msi/string.c +++ b/dll/win32/msi/string.c @@ -233,7 +233,7 @@ static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT static UINT string2id( const string_table *st, const char *buffer, UINT *id ) { - DWORD sz; + int sz; UINT r = ERROR_INVALID_PARAMETER; LPWSTR str; @@ -245,8 +245,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id ) return ERROR_SUCCESS; } - sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ); - if( sz <= 0 ) + if (!(sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ))) return r; str = msi_alloc( sz*sizeof(WCHAR) ); if( !str ) diff --git a/dll/win32/msi/table.c b/dll/win32/msi/table.c index 45a181445aa..e046c5c9e27 100644 --- a/dll/win32/msi/table.c +++ b/dll/win32/msi/table.c @@ -1279,9 +1279,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT UINT r; int ival; - if ( (iField <= 0) || - (iField > tv->num_cols) || - MSI_RecordIsNull( rec, iField ) ) + if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField )) return ERROR_FUNCTION_FAILED; columninfo = tv->columns[ iField - 1 ];

2 years, 6 months

[reactos] 116/360: [WINESYNC] msi: Add support for re-caching package.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a237138534221e4e07465… commit a237138534221e4e074657207110244d152b8f8f Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:57:00 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:56 2022 +0100 [WINESYNC] msi: Add support for re-caching package. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 5924321ad63edc1d3fabf22d7b047e4efacbce66 by Piotr Caban <piotr(a)codeweavers.com> --- dll/win32/msi/action.c | 42 +++++++++++++++++++++++++++++--- dll/win32/msi/msi.c | 27 +++++++++++++++----- dll/win32/msi/msipriv.h | 4 ++- dll/win32/msi/package.c | 14 +++++++++-- modules/rostests/winetests/msi/package.c | 6 ++--- 5 files changed, 77 insertions(+), 16 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index c33326af387..bfecf68f5cc 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -301,15 +301,18 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) default: break; } - if (!ignore) *out++ = *p; + if (!ignore && value) *out++ = *p; if (!count) in_quotes = FALSE; } done: - if (!len) *value = 0; - else *out = 0; + if (value) + { + if (!len) *value = 0; + else *out = 0; + } - *quotes = count; + if(quotes) *quotes = count; return p - str; } @@ -385,6 +388,37 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, return ERROR_SUCCESS; } +const WCHAR *msi_get_command_line_option(const WCHAR *cmd, const WCHAR *option, UINT *len) +{ + DWORD opt_len = strlenW(option); + + if (!cmd) + return NULL; + + while (*cmd) + { + BOOL found = FALSE; + + while (*cmd == ' ') cmd++; + if (!*cmd) break; + + if(!strncmpiW(cmd, option, opt_len)) + found = TRUE; + + cmd = strchrW( cmd, '=' ); + if(!cmd) break; + cmd++; + while (*cmd == ' ') cmd++; + if (!*cmd) break; + + *len = parse_prop( cmd, NULL, NULL); + if (found) return cmd; + cmd += *len; + } + + return NULL; +} + WCHAR **msi_split_string( const WCHAR *str, WCHAR sep ) { LPCWSTR pc; diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index 734246930ce..1043452388c 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -137,7 +137,7 @@ static UINT MSI_OpenProductW(LPCWSTR szProduct, MSIPACKAGE **package) goto done; } - r = MSI_OpenPackageW(path, package); + r = MSI_OpenPackageW(path, 0, package); done: RegCloseKey(props); @@ -236,7 +236,9 @@ end: UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine) { MSIPACKAGE *package = NULL; - UINT r; + const WCHAR *reinstallmode; + DWORD options = 0; + UINT r, len; TRACE("%s %s\n",debugstr_w(szPackagePath), debugstr_w(szCommandLine)); @@ -246,7 +248,20 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine) if (!*szPackagePath) return ERROR_PATH_NOT_FOUND; - r = MSI_OpenPackageW( szPackagePath, &package ); + reinstallmode = msi_get_command_line_option(szCommandLine, szReinstallMode, &len); + if (reinstallmode) + { + while (len > 0) + { + if (reinstallmode[--len] == 'v' || reinstallmode[len] == 'V') + { + options |= WINE_OPENPACKAGEFLAGS_RECACHE; + break; + } + } + } + + r = MSI_OpenPackageW( szPackagePath, options, &package ); if (r == ERROR_SUCCESS) { r = MSI_InstallPackage( package, szPackagePath, szCommandLine ); @@ -732,7 +747,7 @@ UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, TRACE("%s, %u, %p\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo); - r = MSI_OpenPackageW( szProductPackagePath, &package ); + r = MSI_OpenPackageW( szProductPackagePath, 0, &package ); if (r != ERROR_SUCCESS) { ERR("failed to open package %u\n", r); @@ -810,7 +825,7 @@ static UINT open_package( const WCHAR *product, const WCHAR *usersid, if (GetFileAttributesW( sourcepath ) == INVALID_FILE_ATTRIBUTES) return ERROR_INSTALL_SOURCE_ABSENT; - return MSI_OpenPackageW( sourcepath, package ); + return MSI_OpenPackageW( sourcepath, 0, package ); } UINT WINAPI MsiDeterminePatchSequenceW( LPCWSTR product, LPCWSTR usersid, @@ -4027,7 +4042,7 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dw strcatW( sourcepath, filename ); if (dwReinstallMode & REINSTALLMODE_PACKAGE) - r = MSI_OpenPackageW( sourcepath, &package ); + r = MSI_OpenPackageW( sourcepath, 0, &package ); else r = MSI_OpenProductW( szProduct, &package ); diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index 845b32b5d8a..3519d83f1c6 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -799,6 +799,7 @@ extern UINT ACTION_ForceReboot(MSIPACKAGE *package) DECLSPEC_HIDDEN; extern UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable ) DECLSPEC_HIDDEN; extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) DECLSPEC_HIDDEN; +extern const WCHAR *msi_get_command_line_option( const WCHAR *cmd, const WCHAR *option, UINT *len ) DECLSPEC_HIDDEN; extern UINT msi_schedule_action( MSIPACKAGE *package, UINT script, const WCHAR *action ) DECLSPEC_HIDDEN; extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) DECLSPEC_HIDDEN; extern INSTALLSTATE msi_get_feature_action( MSIPACKAGE *package, MSIFEATURE *feature ) DECLSPEC_HIDDEN; @@ -863,8 +864,9 @@ extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **) DECLS extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) DECLSPEC_HIDDEN; /* package internals */ +#define WINE_OPENPACKAGEFLAGS_RECACHE 0x80000000 extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ) DECLSPEC_HIDDEN; -extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage ) DECLSPEC_HIDDEN; +extern UINT MSI_OpenPackageW( LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage ) DECLSPEC_HIDDEN; extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; extern INT MSI_ProcessMessageVerbatim( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 0846ad76f84..6b3f46353a3 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1433,7 +1433,7 @@ UINT msi_set_original_database_property( MSIDATABASE *db, const WCHAR *package ) return r; } -UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) +UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) { static const WCHAR dotmsi[] = {'.','m','s','i',0}; MSIDATABASE *db; @@ -1516,6 +1516,16 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (localfile_attr & FILE_ATTRIBUTE_READONLY) SetFileAttributesW( localfile, localfile_attr & ~FILE_ATTRIBUTE_READONLY); } + else if (dwOptions & WINE_OPENPACKAGEFLAGS_RECACHE) + { + if (!CopyFileW( file, localfile, FALSE )) + { + r = GetLastError(); + WARN("unable to update cached package (%u)\n", r); + msiobj_release( &db->hdr ); + return r; + } + } else product_version = get_product_version( db ); msiobj_release( &db->hdr ); @@ -1669,7 +1679,7 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP if( dwOptions ) FIXME("dwOptions %08x not supported\n", dwOptions); - ret = MSI_OpenPackageW( szPackage, &package ); + ret = MSI_OpenPackageW( szPackage, 0, &package ); if( ret == ERROR_SUCCESS ) { *phPackage = alloc_msihandle( &package->hdr ); diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index b1c7a76783f..ace9b354f91 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -3840,15 +3840,15 @@ static void test_states(void) r = MsiInstallProductA(msifile2, ""); ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); - r = MsiInstallProductA(msifile2, "REINSTALLMODE=v"); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiInstallProductA(msifile2, "REINSTALLMODe=V"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiOpenProductA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", &hprod); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductVersion", value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); + ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); MsiCloseHandle(hprod); /* major upgrade test */

2 years, 6 months

[reactos] 115/360: [WINESYNC] msi: Report error when cached installer has different version.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7b9c0c4cb69ef3b40047… commit b7b9c0c4cb69ef3b4004793bdf2291b61acb918e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:34:12 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:56 2022 +0100 [WINESYNC] msi: Report error when cached installer has different version. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 0657d966ffb9afdcd7cf8bd0c2ac7289a8bfbe5e by Piotr Caban <piotr(a)codeweavers.com> --- dll/win32/msi/package.c | 114 ++++++++++++++++--------------- modules/rostests/winetests/msi/package.c | 6 +- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 9e1e2be4a28..0846ad76f84 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1310,17 +1310,19 @@ static UINT validate_package( MSIPACKAGE *package ) return ERROR_INSTALL_LANGUAGE_UNSUPPORTED; } -static WCHAR *get_product_code( MSIDATABASE *db ) +static WCHAR *get_property( MSIDATABASE *db, const WCHAR *prop ) { - static const WCHAR query[] = { + static const WCHAR select_query[] = { 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ', 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',' ', 'W','H','E','R','E',' ','`','P','r','o','p','e','r','t','y','`','=', - '\'','P','r','o','d','u','c','t','C','o','d','e','\'',0}; + '\'','%','s','\'',0}; + WCHAR query[MAX_PATH]; MSIQUERY *view; MSIRECORD *rec; WCHAR *ret = NULL; + sprintfW(query, select_query, prop); if (MSI_DatabaseOpenViewW( db, query, &view ) != ERROR_SUCCESS) { return NULL; @@ -1341,48 +1343,39 @@ static WCHAR *get_product_code( MSIDATABASE *db ) return ret; } -static UINT get_registered_local_package( const WCHAR *product, const WCHAR *package, WCHAR *localfile ) +static WCHAR *get_product_code( MSIDATABASE *db ) +{ + return get_property( db, szProductCode ); +} + +static WCHAR *get_product_version( MSIDATABASE *db ) +{ + return get_property( db, szProductVersion ); +} + +static UINT get_registered_local_package( const WCHAR *product, WCHAR *localfile ) { MSIINSTALLCONTEXT context; - HKEY product_key, props_key; - WCHAR *registered_package = NULL, unsquashed[GUID_SIZE]; + WCHAR *filename; + HKEY props_key; UINT r; r = msi_locate_product( product, &context ); if (r != ERROR_SUCCESS) return r; - r = MSIREG_OpenProductKey( product, NULL, context, &product_key, FALSE ); - if (r != ERROR_SUCCESS) - return r; - r = MSIREG_OpenInstallProps( product, context, NULL, &props_key, FALSE ); if (r != ERROR_SUCCESS) - { - RegCloseKey( product_key ); return r; - } - r = ERROR_FUNCTION_FAILED; - registered_package = msi_reg_get_val_str( product_key, INSTALLPROPERTY_PACKAGECODEW ); - if (!registered_package) - goto done; - - unsquash_guid( registered_package, unsquashed ); - if (!strcmpiW( package, unsquashed )) - { - WCHAR *filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); - if (!filename) - goto done; - strcpyW( localfile, filename ); - msi_free( filename ); - r = ERROR_SUCCESS; - } -done: - msi_free( registered_package ); + filename = msi_reg_get_val_str( props_key, INSTALLPROPERTY_LOCALPACKAGEW ); RegCloseKey( props_key ); - RegCloseKey( product_key ); - return r; + if (!filename) + return ERROR_FUNCTION_FAILED; + + strcpyW( localfile, filename ); + msi_free( filename ); + return ERROR_SUCCESS; } WCHAR *msi_get_package_code( MSIDATABASE *db ) @@ -1406,33 +1399,15 @@ WCHAR *msi_get_package_code( MSIDATABASE *db ) return ret; } -static UINT get_local_package( const WCHAR *filename, WCHAR *localfile ) +static UINT get_local_package( MSIDATABASE *db, WCHAR *localfile ) { - WCHAR *product_code, *package_code; - MSIDATABASE *db; + WCHAR *product_code; UINT r; - if ((r = MSI_OpenDatabaseW( filename, MSIDBOPEN_READONLY, &db )) != ERROR_SUCCESS) - { - if (GetFileAttributesW( filename ) == INVALID_FILE_ATTRIBUTES) - return ERROR_FILE_NOT_FOUND; - return r; - } if (!(product_code = get_product_code( db ))) - { - msiobj_release( &db->hdr ); - return ERROR_INSTALL_PACKAGE_INVALID; - } - if (!(package_code = msi_get_package_code( db ))) - { - msi_free( product_code ); - msiobj_release( &db->hdr ); return ERROR_INSTALL_PACKAGE_INVALID; - } - r = get_registered_local_package( product_code, package_code, localfile ); - msi_free( package_code ); + r = get_registered_local_package( product_code, localfile ); msi_free( product_code ); - msiobj_release( &db->hdr ); return r; } @@ -1497,6 +1472,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) } else { + WCHAR *product_version = NULL; + if ( UrlIsW( szPackage, URLIS_URL ) ) { r = msi_download_file( szPackage, cachefile ); @@ -1505,20 +1482,31 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) file = cachefile; } - r = get_local_package( file, localfile ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); + if (r != ERROR_SUCCESS) + { + if (GetFileAttributesW( file ) == INVALID_FILE_ATTRIBUTES) + return ERROR_FILE_NOT_FOUND; + return r; + } + r = get_local_package( db, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { DWORD localfile_attr; r = msi_create_empty_local_file( localfile, dotmsi ); if (r != ERROR_SUCCESS) + { + msiobj_release( &db->hdr ); return r; + } if (!CopyFileW( file, localfile, FALSE )) { r = GetLastError(); WARN("unable to copy package %s to %s (%u)\n", debugstr_w(file), debugstr_w(localfile), r); DeleteFileW( localfile ); + msiobj_release( &db->hdr ); return r; } delete_on_close = TRUE; @@ -1528,10 +1516,28 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if (localfile_attr & FILE_ATTRIBUTE_READONLY) SetFileAttributesW( localfile, localfile_attr & ~FILE_ATTRIBUTE_READONLY); } + else + product_version = get_product_version( db ); + msiobj_release( &db->hdr ); TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db ); if (r != ERROR_SUCCESS) return r; + + if (product_version) + { + WCHAR *cache_version = get_product_version( db ); + if (!product_version != !cache_version || + (product_version && strcmpW(product_version, cache_version))) + { + msiobj_release( &db->hdr ); + msi_free(product_version); + msi_free(cache_version); + return ERROR_PRODUCT_VERSION; + } + msi_free(product_version); + msi_free(cache_version); + } } package = MSI_CreatePackage( db ); msiobj_release( &db->hdr ); diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 52a4bfd2f75..b1c7a76783f 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -3838,17 +3838,17 @@ static void test_states(void) MsiCloseHandle(hdb); r = MsiInstallProductA(msifile2, ""); - todo_wine ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); + ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); r = MsiInstallProductA(msifile2, "REINSTALLMODE=v"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiOpenProductA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", &hprod); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductVersion", value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); + todo_wine ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); MsiCloseHandle(hprod); /* major upgrade test */

2 years, 6 months

[reactos] 114/360: [WINESYNC] msi: Add ProductToBeRegistered property tests.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbdb719be0df30656d8a0… commit fbdb719be0df30656d8a0eccfdca6b70f30e845b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:34:12 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:55 2022 +0100 [WINESYNC] msi: Add ProductToBeRegistered property tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4c5d24ae20a51f4ddf3fde6a57417a442282ed67 by Piotr Caban <piotr(a)codeweavers.com> --- modules/rostests/winetests/msi/package.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index b0dc9126a1e..52a4bfd2f75 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -3327,6 +3327,12 @@ static void test_states(void) CopyFileA(msifile, msifile3, FALSE); CopyFileA(msifile, msifile4, FALSE); + size = sizeof(value); + memset(value, 0, sizeof(value)); + r = MsiGetPropertyA(hpkg, "ProductToBeRegistered", value, &size); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok(!value[0], "ProductToBeRegistered = %s\n", value); + test_feature_states( __LINE__, hpkg, "one", ERROR_UNKNOWN_FEATURE, 0, 0, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_UNKNOWN_COMPONENT, 0, 0, FALSE ); @@ -3407,6 +3413,12 @@ static void test_states(void) MsiCloseHandle(hdb); + size = sizeof(value); + memset(value, 0, sizeof(value)); + r = MsiGetPropertyA(hpkg, "ProductToBeRegistered", value, &size); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok(value[0]=='1' && !value[1], "ProductToBeRegistered = %s\n", value); + test_feature_states( __LINE__, hpkg, "one", ERROR_UNKNOWN_FEATURE, 0, 0, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_UNKNOWN_COMPONENT, 0, 0, FALSE );

2 years, 6 months

[reactos] 113/360: [WINESYNC] msi: Add REINSTALLMODE=v installation mode test.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=366dd26e41c4c7bff7fa0… commit 366dd26e41c4c7bff7fa0bba3a6cc26756368924 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:34:11 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:55 2022 +0100 [WINESYNC] msi: Add REINSTALLMODE=v installation mode test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id cecff8a353652606924f152c26d25ea89a25cb90 by Piotr Caban <piotr(a)codeweavers.com> --- modules/rostests/winetests/msi/package.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 6671ca13195..b0dc9126a1e 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -3819,10 +3819,6 @@ static void test_states(void) r = MsiOpenDatabaseA(msifile2, (const char*)MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r); - add_install_execute_sequence_entry( hdb, "'FindRelatedProducts', '', '100'" ); - add_install_execute_sequence_entry( hdb, "'RemoveExistingProducts', '', '1401'" ); - create_upgrade_table( hdb ); - add_upgrade_entry( hdb, "'{3494EEEA-4221-4A66-802E-DED8916BC5C5}', NULL, '1.1.2', NULL, 0, NULL, 'OLDERVERSIONBEINGUPGRADED'"); update_ProductVersion_property( hdb, "1.1.2" ); set_summary_str(hdb, PID_REVNUMBER, "{A219A62A-D931-4F1B-89DB-FF1C300A8D43}"); r = MsiDatabaseCommit(hdb); @@ -3832,16 +3828,33 @@ static void test_states(void) r = MsiInstallProductA(msifile2, ""); todo_wine ok(r == ERROR_PRODUCT_VERSION, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); + r = MsiInstallProductA(msifile2, "REINSTALLMODE=v"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiOpenProductA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", &hprod); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + size = MAX_PATH; + r = MsiGetProductPropertyA(hprod, "ProductVersion", value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); + MsiCloseHandle(hprod); + /* major upgrade test */ r = MsiOpenDatabaseA(msifile2, (const char*)MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r); + add_install_execute_sequence_entry( hdb, "'FindRelatedProducts', '', '100'" ); + add_install_execute_sequence_entry( hdb, "'RemoveExistingProducts', '', '1401'" ); + create_upgrade_table( hdb ); + add_upgrade_entry( hdb, "'{3494EEEA-4221-4A66-802E-DED8916BC5C5}', NULL, '1.1.3', NULL, 0, NULL, 'OLDERVERSIONBEINGUPGRADED'"); update_ProductCode_property( hdb, "{333DB27A-C25E-4EBC-9BEC-0F49546C19A6}" ); + update_ProductVersion_property( hdb, "1.1.3" ); + set_summary_str(hdb, PID_REVNUMBER, "{5F99011C-02E6-48BD-8B8D-DE7CFABC7A09}"); r = MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed: %d\n", r); MsiCloseHandle(hdb); r = MsiInstallProductA(msifile2, ""); - ok(r == S_OK, "Expected ERROR_PRODUCT_VERSION, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiOpenProductA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", &hprod); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); @@ -3850,7 +3863,7 @@ static void test_states(void) size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductVersion", value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!strcmp(value, "1.1.2"), "ProductVersion = %s\n", value); + ok(!strcmp(value, "1.1.3"), "ProductVersion = %s\n", value); MsiCloseHandle(hprod); /* uninstall the product */

2 years, 6 months

[reactos] 112/360: [WINESYNC] msi: Re-publish product if previous installation with different package is detected.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74196b80005cc1f990000… commit 74196b80005cc1f990000447d53c4b08fcc7deb4 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Mar 12 16:34:11 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:27:55 2022 +0100 [WINESYNC] msi: Re-publish product if previous installation with different package is detected. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 21836b79dd0acbd16f802f7364c070e1004e48ea by Piotr Caban <piotr(a)codeweavers.com> --- dll/win32/msi/action.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dll/win32/msi/msipriv.h | 1 + dll/win32/msi/package.c | 4 ++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index cd0f38a0469..c33326af387 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -4480,6 +4480,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) UINT rc; HKEY hukey = NULL, hudkey = NULL; MSIRECORD *uirow; + BOOL republish = FALSE; if (!list_empty(&package->patches)) { @@ -4488,14 +4489,49 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) goto end; } + rc = MSIREG_OpenProductKey(package->ProductCode, NULL, package->Context, + &hukey, FALSE); + if (rc == ERROR_SUCCESS) + { + WCHAR *package_code; + + package_code = msi_reg_get_val_str(hukey, INSTALLPROPERTY_PACKAGECODEW); + if (package_code) + { + WCHAR *guid; + + guid = msi_get_package_code(package->db); + if (guid) + { + WCHAR packed[SQUASHED_GUID_SIZE]; + + squash_guid(guid, packed); + msi_free(guid); + if (!strcmpW(packed, package_code)) + { + TRACE("re-publishing product - new package\n"); + republish = TRUE; + } + } + msi_free(package_code); + } + } + /* FIXME: also need to publish if the product is in advertise mode */ - if (!msi_check_publish(package)) + if (!republish && !msi_check_publish(package)) + { + if (hukey) + RegCloseKey(hukey); return ERROR_SUCCESS; + } - rc = MSIREG_OpenProductKey(package->ProductCode, NULL, package->Context, - &hukey, TRUE); - if (rc != ERROR_SUCCESS) - goto end; + if (!hukey) + { + rc = MSIREG_OpenProductKey(package->ProductCode, NULL, package->Context, + &hukey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } rc = MSIREG_OpenUserDataProductKey(package->ProductCode, package->Context, NULL, &hudkey, TRUE); diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index 1ddae28aaea..845b32b5d8a 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -1049,6 +1049,7 @@ extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DEC extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; extern UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_package_code(MSIDATABASE *db) DECLSPEC_HIDDEN; /* media */ diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 04ea2a75993..9e1e2be4a28 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1385,7 +1385,7 @@ done: return r; } -static WCHAR *get_package_code( MSIDATABASE *db ) +WCHAR *msi_get_package_code( MSIDATABASE *db ) { WCHAR *ret; MSISUMMARYINFO *si; @@ -1423,7 +1423,7 @@ static UINT get_local_package( const WCHAR *filename, WCHAR *localfile ) msiobj_release( &db->hdr ); return ERROR_INSTALL_PACKAGE_INVALID; } - if (!(package_code = get_package_code( db ))) + if (!(package_code = msi_get_package_code( db ))) { msi_free( product_code ); msiobj_release( &db->hdr );

2 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022