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

Zebediah Figura : msi: Create the custom action thread inside msiexec.exe.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 7908d6ee399f4ef556e194dfa5cdef746fc091b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7908d6ee399f4ef556e194df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:45 2018 +0200 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> --- dlls/msi/custom.c | 33 ++++++++++++++++++++++++--------- programs/msiexec/msiexec.c | 21 ++++++++++++++++++++- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index af6e9f7..55294d0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -484,6 +484,29 @@ 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}; +#ifdef __i386__ +/* 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; @@ -494,7 +517,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; @@ -514,9 +536,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; @@ -539,9 +558,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 { @@ -565,8 +582,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; diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5ebfea7..74f6d51 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/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; } /*

1 0

Mark Jansen : ntdll/tests: Add tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 5ae2b885e70bc5c0cf007731f096d4d0febe4483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ae2b885e70bc5c0cf007731… Author: Mark Jansen <learn0more(a)gmail.com> Date: Wed Jul 11 05:36:27 2018 +0000 ntdll/tests: Add tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ae2b885e70bc5c0cf00…

1 0

Nikolay Sivov : crypt32: Fix key buffer leak (Coverity).
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 568673282c9d727de7f6cb3ca2423eb8579aa1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=568673282c9d727de7f6cb3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 11 08:42:01 2018 +0300 crypt32: Fix key buffer leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1667b42..4a7a1fe 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2553,6 +2553,7 @@ static BOOL CNG_ImportECCPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HAN memcpy(ecckey + 1, pubKeyInfo->PublicKey.pbData + 1, pubKeyInfo->PublicKey.cbData - 1); status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, key, (BYTE*)ecckey, ecckey_len, 0); + CryptMemFree(ecckey); done: if (alg) BCryptCloseAlgorithmProvider(alg, 0);

1 0

Zebediah Figura : msi: Reuse the custom action server process where possible.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 457431ab5bc1dd10c4957f145de85c4ba6d0ef72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457431ab5bc1dd10c4957f14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:47 2018 +0200 msi: Reuse the custom action server process where possible. We use a named pipe to communicate between the client (i.e. the process that called MsiInstallProduct() and the custom action server. The naïve approach has the client send custom action GUIDs to the server and the server send back the results of executing the action, but this fails in the case of nested custom actions, so instead we send back handles of threads for the client to wait on. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 133 +++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 6 ++ dlls/msi/package.c | 4 ++ dlls/msi/tests/custom.c | 19 +++++++ dlls/msi/tests/custom.spec | 3 + dlls/msi/tests/install.c | 14 ++++- programs/msiexec/msiexec.c | 59 ++++++++++++++++---- 7 files changed, 198 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=457431ab5bc1dd10c495…

1 0

Mark Jansen : ntdll/tests: Tests for RtlIpv4StringToAddressEx.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: bf6d38258ee819126249f8f722e80578f7f8c2f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6d38258ee819126249f8f7… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Wed Jul 11 05:36:25 2018 +0000 ntdll/tests: Tests for RtlIpv4StringToAddressEx. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 369 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 246 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6d38258ee819126249…

1 0

Dmitry Timoshkov : include: Add more definitions for performance counters.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 8de2464cf0d528981d5c6e2bb3dab34b4d873ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de2464cf0d528981d5c6e2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:03 2018 +0800 include: Add more definitions for performance counters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winperf.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/include/winperf.h b/include/winperf.h index dce1a6d..113bfba 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,25 +67,106 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +#include <pshpack8.h> + /* Performance data structure header * returned in answer to HKEY_PERFORMANCE_DATA request */ -typedef struct _PERF_DATA_BLOCK { - WCHAR Signature[4]; - DWORD LittleEndian; - DWORD Version; - DWORD Revision; - DWORD TotalByteLength; - DWORD HeaderLength; - DWORD NumObjectTypes; - DWORD DefaultObject; - SYSTEMTIME SystemTime; - LARGE_INTEGER PerfTime; - LARGE_INTEGER PerfFreq; - LARGE_INTEGER PerfTime100nSec; - DWORD SystemNameLength; - DWORD SystemNameOffset; -} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; +#define PERF_DATA_VERSION 1 +#define PERF_DATA_REVISION 1 + +typedef struct _PERF_DATA_BLOCK +{ + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK; + +#define PERF_NO_INSTANCES -1 + +typedef struct _PERF_OBJECT_TYPE +{ + DWORD TotalByteLength; + DWORD DefinitionLength; + DWORD HeaderLength; + DWORD ObjectNameTitleIndex; +#ifdef _WIN64 + DWORD ObjectNameTitle; +#else + LPWSTR ObjectNameTitle; +#endif + DWORD ObjectHelpTitleIndex; +#ifdef _WIN64 + DWORD ObjectHelpTitle; +#else + LPWSTR ObjectHelpTitle; +#endif + DWORD DetailLevel; + DWORD NumCounters; + LONG DefaultCounter; + LONG NumInstances; + DWORD CodePage; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; +} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE; + +typedef struct _PERF_COUNTER_DEFINITION +{ + DWORD ByteLength; + DWORD CounterNameTitleIndex; +#ifdef _WIN64 + DWORD CounterNameTitle; +#else + LPWSTR CounterNameTitle; +#endif + DWORD CounterHelpTitleIndex; +#ifdef _WIN64 + DWORD CounterHelpTitle; +#else + LPWSTR CounterHelpTitle; +#endif + LONG DefaultScale; + DWORD DetailLevel; + DWORD CounterType; + DWORD CounterSize; + DWORD CounterOffset; +} PERF_COUNTER_DEFINITION, *PPERF_COUNTER_DEFINITION; + +#define PERF_NO_UNIQUE_ID -1 + +typedef struct _PERF_INSTANCE_DEFINITION +{ + DWORD ByteLength; + DWORD ParentObjectTitleIndex; + DWORD ParentObjectInstance; + LONG UniqueID; + DWORD NameOffset; + DWORD NameLength; +} PERF_INSTANCE_DEFINITION, *PPERF_INSTANCE_DEFINITION; + +typedef struct _PERF_COUNTER_BLOCK +{ + DWORD ByteLength; +} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK; + + +#include <poppack.h> + +typedef DWORD (APIENTRY PM_OPEN_PROC)(LPWSTR); +typedef DWORD (APIENTRY PM_COLLECT_PROC)(LPWSTR,LPVOID *,LPDWORD,LPDWORD); +typedef DWORD (APIENTRY PM_CLOSE_PROC)(void); +typedef DWORD (APIENTRY PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD); #endif /* _WINPERF_ */

1 0

Michael Müller : browseui: Implement IProgressDialog: :SetAnimation.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: ff529f46459f375bcb2de545da7348337a1f7159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff529f46459f375bcb2de545… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 10 00:52:20 2018 +0000 browseui: Implement IProgressDialog::SetAnimation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139..4c612e9 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996..7cba7d6 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, %u)\n", iface, hInstance, uiResourceId); + + if (IS_INTRESOURCE(uiResourceId)) + { + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + } + return S_OK; }

1 0

Piotr Caban : msvcp120: Fix concurrent_vector_int_dtor helper.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: c217dd36cb783fb9debd479c616da7d8280432fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c217dd36cb783fb9debd479c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 11 12:32:25 2018 +0200 msvcp120: Fix concurrent_vector_int_dtor helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 959f7a8..cd8a514 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2576,10 +2576,14 @@ static void concurrent_vector_int_dtor(vector_base_v4 *this) blocks = (size_t)call_func2(p_vector_base_v4__Internal_clear, this, concurrent_vector_int_destroy); - while(this->first_block && blocks >= this->first_block) { + for(blocks--; blocks >= this->first_block; blocks--) { vector_alloc_count--; - free(this->segment[blocks - this->first_block]); - blocks--; + free(this->segment[blocks]); + } + + if(this->first_block) { + vector_alloc_count--; + free(this->segment[0]); } call_func1(p_vector_base_v4_dtor, this);

1 0

Dmitry Timoshkov : advapi32/tests: Add more tests for performance counters.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 72a7de1a0fb85e436351a1f5cddd6e1035ba18bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a7de1a0fb85e436351a1f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:15:58 2018 +0800 advapi32/tests: Add more tests for performance counters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 181 ++++++++++++++++++++++++++++++++++++++++- include/winreg.h | 2 + 2 files changed, 179 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72a7de1a0fb85e436351…

1 0

Zebediah Figura : msi: Avoid connecting to the RPC server more than once.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 6135b38d7d60e7bceb36a57630cad72d3e7e4b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6135b38d7d60e7bceb36a576… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 10 12:08:46 2018 +0200 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> --- dlls/msi/custom.c | 27 ++++++++++++++------------- dlls/msi/package.c | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 55294d0..cf30ac3 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -522,19 +522,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) @@ -582,8 +585,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/dlls/msi/package.c b/dlls/msi/package.c index 9569c4f..1ab52ea 100644 --- a/dlls/msi/package.c +++ b/dlls/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 );

1 0