wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Zebediah Figura : hnetcfg: Store the UNC path in INetFwAuthorizedApplication_put_ProcessImageFileName ().
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: e6fc86e4a0a8396a345ae21fbe7be9210441d307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6fc86e4a0a8396a345ae21f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 17 11:27:47 2018 -0500 hnetcfg: Store the UNC path in INetFwAuthorizedApplication_put_ProcessImageFileName(). Fixes test failures when running from virtual drive. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/apps.c | 32 +++++++++++++++++++++++++++----- dlls/hnetcfg/tests/Makefile.in | 2 +- dlls/hnetcfg/tests/policy.c | 15 ++++++++++++++- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 3744368..44c9cb5 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,5 +1,5 @@ MODULE = hnetcfg.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 mpr C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index fda714e..34ef108 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -29,6 +29,7 @@ #include "netfw.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "hnetcfg_private.h" @@ -263,18 +264,39 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName( } static HRESULT WINAPI fw_app_put_ProcessImageFileName( - INetFwAuthorizedApplication *iface, - BSTR imageFileName ) + INetFwAuthorizedApplication *iface, BSTR image ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + UNIVERSAL_NAME_INFOW *info; + WCHAR *netpath; + DWORD res; + DWORD sz; - FIXME("%p, %s\n", This, debugstr_w(imageFileName)); + FIXME("%p, %s\n", This, debugstr_w(image)); - if (!imageFileName || !imageFileName[0]) + if (!image || !image[0]) return E_INVALIDARG; + sz = 0; + res = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, NULL, &sz); + if (res == WN_MORE_DATA) + { + if (!(netpath = heap_alloc(sz))) + return E_OUTOFMEMORY; + + info = (UNIVERSAL_NAME_INFOW *)&netpath; + res = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, &info, &sz); + if (res == NO_ERROR) + { + SysFreeString(This->filename); + This->filename = SysAllocString(info->lpUniversalName); + } + heap_free(netpath); + return HRESULT_FROM_WIN32(res); + } + SysFreeString( This->filename ); - This->filename = SysAllocString( imageFileName ); + This->filename = SysAllocString(image); return This->filename ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in index 8315b4b..922370a 100644 --- a/dlls/hnetcfg/tests/Makefile.in +++ b/dlls/hnetcfg/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = hnetcfg.dll -IMPORTS = ole32 uuid oleaut32 advapi32 +IMPORTS = ole32 uuid oleaut32 advapi32 mpr C_SRCS = \ policy.c diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 012bbcd..f2d1372 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -106,9 +106,12 @@ static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; static WCHAR empty[] = {0}; + UNIVERSAL_NAME_INFOW *info; + WCHAR netpath[MAX_PATH]; WCHAR image[MAX_PATH]; HRESULT hr; BSTR bstr; + DWORD sz; hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_INetFwAuthorizedApplication, (void**)&app); @@ -135,9 +138,19 @@ static void test_NetFwAuthorizedApplication(void) ok(hr == S_OK, "got: %08x\n", hr); SysFreeString(bstr); + info = (UNIVERSAL_NAME_INFOW *)&netpath; + sz = sizeof(netpath); + hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, &info, &sz); + if (hr != NO_ERROR) + { + info->lpUniversalName = netpath + sizeof(*info)/sizeof(WCHAR); + lstrcpyW(info->lpUniversalName, image); + } + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpW(bstr,info->lpUniversalName), "expected %s, got %s\n", + wine_dbgstr_w(info->lpUniversalName), wine_dbgstr_w(bstr)); SysFreeString(bstr); INetFwAuthorizedApplication_Release(app);

1 0

Zebediah Figura : hnetcfg/tests: Fix BSTR usage in test_NetFwAuthorizedApplication().
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 709cce6329b7d1c0e4fc333d0bfeb234384d8e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=709cce6329b7d1c0e4fc333d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 17 11:27:46 2018 -0500 hnetcfg/tests: Fix BSTR usage in test_NetFwAuthorizedApplication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 52 ++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 4ee19d8..012bbcd 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -105,48 +105,42 @@ static void test_interfaces(void) static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; + static WCHAR empty[] = {0}; + WCHAR image[MAX_PATH]; HRESULT hr; + BSTR bstr; hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_INetFwAuthorizedApplication, (void**)&app); ok(hr == S_OK, "got: %08x\n", hr); - if(hr == S_OK) - { - BSTR image = SysAllocStringLen( NULL, MAX_PATH ); - static WCHAR empty[] = {0}; - BSTR bstr; - if (!GetModuleFileNameW( NULL, image, MAX_PATH )) - { - ok(0, "Failed to get filename\n"); - SysFreeString( image ); - return; - } + hr = GetModuleFileNameW(NULL, image, sizeof(image)); + ok(hr, "GetModuleFileName failed: %u\n", GetLastError()); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); - ok(hr == E_POINTER, "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); + ok(hr == E_POINTER, "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); - ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); - ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); + ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); - ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); - ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, image); - ok(hr == S_OK, "got: %08x\n", hr); + bstr = SysAllocString(image); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, bstr); + ok(hr == S_OK, "got: %08x\n", hr); + SysFreeString(bstr); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); - ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); - SysFreeString( bstr ); + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK, "got: %08x\n", hr); + ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); - SysFreeString( image ); - INetFwAuthorizedApplication_Release(app); - } + INetFwAuthorizedApplication_Release(app); } START_TEST(policy)

1 0

Michael Stefaniuc : urlmon/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 1281a687c8e43f2fc4e22168f98b79aaed698dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1281a687c8e43f2fc4e22168… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 15 00:04:43 2018 +0200 urlmon/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 66 +++++++++++++++++--------------------- dlls/urlmon/tests/protocol.c | 26 +++++++-------- dlls/urlmon/tests/sec_mgr.c | 20 ++++++------ dlls/urlmon/tests/uri.c | 76 ++++++++++++++++++++++---------------------- dlls/urlmon/tests/url.c | 2 +- 5 files changed, 91 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1281a687c8e43f2fc4e2…

1 0

Józef Kucia : winedbg: Get rid of ifdefs.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: ff84b2f202add84cc3fdceb8e1adca885dea209e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff84b2f202add84cc3fdceb8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 19 14:31:29 2018 +0200 winedbg: Get rid of ifdefs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 4 ---- programs/winedbg/be_arm64.c | 4 ---- programs/winedbg/be_ppc.c | 4 ---- programs/winedbg/be_x86_64.c | 4 ---- 4 files changed, 16 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index e3c8f72..ad0e285 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1891,12 +1891,8 @@ static BOOL be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, static BOOL be_arm_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __arm__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an ARM process on this architecture.\n"); -#endif } static BOOL be_arm_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index a87921f..bca86b8 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -280,12 +280,8 @@ void be_arm64_disasm_one_insn(ADDRESS64 *addr, int display) static BOOL be_arm64_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __aarch64__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an ARM64 process on this architecture.\n"); -#endif } static BOOL be_arm64_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 54bcb59..ff6ece6 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -182,12 +182,8 @@ static BOOL be_ppc_store_integer(const struct dbg_lvalue* lvalue, unsigned size, static BOOL be_ppc_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __powerpc__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug a PowerPC process on this architecture.\n"); -#endif } static BOOL be_ppc_set_context(HANDLE thread, const dbg_ctx_t *ctx) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index b7f75c6..136229f 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -676,12 +676,8 @@ static BOOL be_x86_64_store_integer(const struct dbg_lvalue* lvalue, unsigned si static BOOL be_x86_64_get_context(HANDLE thread, dbg_ctx_t *ctx) { -#ifdef __x86_64__ ctx->ctx.ContextFlags = CONTEXT_ALL; return GetThreadContext(thread, &ctx->ctx); -#else - WINE_FIXME("Cannot debug an x86-64 process on this architecture.\n"); -#endif } static BOOL be_x86_64_set_context(HANDLE thread, const dbg_ctx_t *ctx)

1 0

Owen Rudge : wsdapi/tests: Add tests for AppSequence in Probe message.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 297570894b8cadef0a91abd11686c2ab2a65e66d URL: https://source.winehq.org/git/wine.git/?a=commit;h=297570894b8cadef0a91abd1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 19 09:59:24 2018 +0100 wsdapi/tests: Add tests for AppSequence in Probe message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 84aa67d..6303341 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -48,6 +48,7 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" "<wsa:MessageID>urn:uuid:%s</wsa:MessageID>" + "<wsd:AppSequence InstanceId=\"21\" SequenceId=\"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2\" MessageNumber=\"14\"></wsd:AppSequence>" "<grog:Perry>ExtraInfo</grog:Perry></soap:Header>" "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types><grog:Lager>MoreInfo</grog:Lager></wsd:Probe></soap:Body></soap:Envelope>"; @@ -533,6 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR perry[] = {'P','e','r','r','y',0}; static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; + WSD_APP_SEQUENCE *appseq = (WSD_APP_SEQUENCE *) pSoap->Header.AppSequence; ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, @@ -556,6 +558,22 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; } + ok(appseq != NULL, "pSoap->Header.AppSequence == NULL\n"); + + if (appseq != NULL) + { + static const WCHAR seq_id[] = {'u','r','n',':','u','u','i','d',':','6','3','8','a','b','e','e','8','-', + '1','2','4','d','-','4','b','6','a','-','8','b','8','5','-', + '8','c','f','2','8','3','7','a','2','f','d','2',0}; + + ok(appseq->InstanceId == 21, "pSoap->Header.AppSequence->InstanceId = %s\n", + wine_dbgstr_longlong(appseq->InstanceId)); + ok(lstrcmpW(appseq->SequenceId, seq_id) == 0, "pSoap->Header.AppSequence->SequenceId = '%s'\n", + wine_dbgstr_w(appseq->SequenceId)); + ok(appseq->MessageNumber == 14, "pSoap->Header.AppSequence->MessageNumber = %s\n", + wine_dbgstr_longlong(appseq->MessageNumber)); + } + verify_wsdxml_any_text("pSoap->Header.AnyHeaders", pSoap->Header.AnyHeaders, uri_more_tests_no_slash, prefix_grog, perry, extra_info);

1 0

Owen Rudge : wsdapi: Add support for parsing AppSequence header.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: afb19e07c4b5b38a51584a03812245e3a1f7fd27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb19e07c4b5b38a51584a03… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 19 09:58:48 2018 +0100 wsdapi: Add support for parsing AppSequence header. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 5b40cac..bfa4f3b 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1127,6 +1127,54 @@ static LPWSTR xml_text_to_wide_string(void *parent_memory, WS_XML_TEXT *text) return NULL; } +static inline BOOL read_isspace(unsigned int ch) +{ + return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; +} + +static HRESULT str_to_uint64(const unsigned char *str, ULONG len, UINT64 max, UINT64 *ret) +{ + const unsigned char *ptr = str; + + *ret = 0; + while (len && read_isspace(*ptr)) { ptr++; len--; } + while (len && read_isspace(ptr[len - 1])) { len--; } + if (!len) return WS_E_INVALID_FORMAT; + + while (len--) + { + unsigned int val; + + if (!isdigit(*ptr)) return WS_E_INVALID_FORMAT; + val = *ptr - '0'; + + if ((*ret > max / 10 || *ret * 10 > max - val)) return WS_E_NUMERIC_OVERFLOW; + *ret = *ret * 10 + val; + ptr++; + } + + return S_OK; +} + +#define MAX_UINT64 (((UINT64)0xffffffff << 32) | 0xffffffff) + +static HRESULT wide_text_to_ulonglong(LPCWSTR text, ULONGLONG *value) +{ + char *utf8_text; + int utf8_length; + HRESULT ret; + + utf8_text = wide_to_utf8(text, &utf8_length); + + if (utf8_text == NULL) return E_OUTOFMEMORY; + if (utf8_length == 1) return E_FAIL; + + ret = str_to_uint64((const unsigned char *) utf8_text, utf8_length - 1, MAX_UINT64, value); + heap_free(utf8_text); + + return ret; +} + static HRESULT move_to_element(WS_XML_READER *reader, const char *element_name, WS_XML_STRING *uri) { WS_XML_STRING envelope; @@ -1442,7 +1490,7 @@ static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) { - WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element; + WSDXML_ELEMENT *envelope = NULL, *header_element, *appsequence_element, *body_element; WS_XML_READER_TEXT_ENCODING encoding; WS_XML_ELEMENT_NODE *envelope_node; WSD_SOAP_MESSAGE *soap_msg = NULL; @@ -1561,6 +1609,48 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg soap_msg->Header.MessageID = duplicate_string(soap_msg, value); if (soap_msg->Header.MessageID == NULL) goto outofmemory; + /* Look for optional AppSequence element */ + appsequence_element = find_element(header_element, appSequenceString, discoveryNsUri); + + if (appsequence_element != NULL) + { + WSDXML_ATTRIBUTE *current_attrib; + + soap_msg->Header.AppSequence = WSDAllocateLinkedMemory(soap_msg, sizeof(WSD_APP_SEQUENCE)); + if (soap_msg->Header.AppSequence == NULL) goto outofmemory; + + ZeroMemory(soap_msg->Header.AppSequence, sizeof(WSD_APP_SEQUENCE)); + + current_attrib = appsequence_element->FirstAttribute; + + while (current_attrib != NULL) + { + if (lstrcmpW(current_attrib->Name->Space->Uri, discoveryNsUri) != 0) + { + current_attrib = current_attrib->Next; + continue; + } + + if (lstrcmpW(current_attrib->Name->LocalName, instanceIdString) == 0) + { + ret = wide_text_to_ulonglong(current_attrib->Value, &soap_msg->Header.AppSequence->InstanceId); + if (FAILED(ret)) goto cleanup; + } + else if (lstrcmpW(current_attrib->Name->LocalName, messageNumberString) == 0) + { + ret = wide_text_to_ulonglong(current_attrib->Value, &soap_msg->Header.AppSequence->MessageNumber); + if (FAILED(ret)) goto cleanup; + } + else if (lstrcmpW(current_attrib->Name->LocalName, sequenceIdString) == 0) + { + soap_msg->Header.AppSequence->SequenceId = duplicate_string(soap_msg, current_attrib->Value); + if (soap_msg->Header.AppSequence->SequenceId == NULL) goto outofmemory; + } + + current_attrib = current_attrib->Next; + } + } + /* Now detach and free known headers to leave the "any" elements */ remove_element(find_element(header_element, actionString, addressingNsUri)); remove_element(find_element(header_element, toString, addressingNsUri));

1 0

Piotr Caban : msi: Add ProductToBeRegistered property tests.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 4c5d24ae20a51f4ddf3fde6a57417a442282ed67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5d24ae20a51f4ddf3fde6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 18 20:13:40 2018 +0200 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> --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b0dc912..52a4bfd 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/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 );

1 0

Piotr Caban : msi: Add REINSTALLMODE=v installation mode test.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: cecff8a353652606924f152c26d25ea89a25cb90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cecff8a353652606924f152c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 18 20:13:30 2018 +0200 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> --- dlls/msi/tests/package.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6671ca1..b0dc912 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/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 */

1 0

Piotr Caban : msi: Re-publish product if previous installation with different package is detected.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 21836b79dd0acbd16f802f7364c070e1004e48ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=21836b79dd0acbd16f802f73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 19 12:02:48 2018 +0200 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> --- dlls/msi/action.c | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 4 ++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 74917af..9d216ab 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4473,6 +4473,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) UINT rc; HKEY hukey = NULL, hudkey = NULL; MSIRECORD *uirow; + BOOL republish = FALSE; if (!list_empty(&package->patches)) { @@ -4481,14 +4482,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/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c88f1d9..8043d0a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1048,6 +1048,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/dlls/msi/package.c b/dlls/msi/package.c index c50f9e3..c423bbf 100644 --- a/dlls/msi/package.c +++ b/dlls/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 );

1 0

Piotr Caban : msi: Add support for ProductToBeRegistered property.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 6dc49e4b685850a76a35b1d1d102903a0231c5cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc49e4b685850a76a35b1d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 18 20:13:14 2018 +0200 msi: Add support for ProductToBeRegistered property. 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> --- dlls/msi/action.c | 3 ++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7c71800..74917af 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5222,7 +5222,8 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) UINT rc; /* FIXME: also need to publish if the product is in advertise mode */ - if (!msi_check_publish(package)) + if (!msi_get_property_int( package->db, szProductToBeRegistered, 0 ) + && !msi_check_publish(package)) return ERROR_SUCCESS; rc = MSIREG_OpenUninstallKey(package->ProductCode, package->platform, &hkey, TRUE); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8acace3..c88f1d9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1200,6 +1200,7 @@ static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; static const WCHAR szUninstallable[] = {'U','n','i','n','s','t','a','l','l','a','b','l','e',0}; static const WCHAR szEXECUTEACTION[] = {'E','X','E','C','U','T','E','A','C','T','I','O','N',0}; +static const WCHAR szProductToBeRegistered[] = {'P','r','o','d','u','c','t','T','o','B','e','R','e','g','i','s','t','e','r','e','d',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 840e4a7..c50f9e3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1471,7 +1471,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) DWORD index = 0; MSISUMMARYINFO *si; BOOL delete_on_close = FALSE; - WCHAR *info_template, *productname; + WCHAR *info_template, *productname, *product_code; + MSIINSTALLCONTEXT context; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1560,6 +1561,14 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) set_installed_prop( package ); msi_set_context( package ); + product_code = get_product_code( db ); + if (msi_locate_product( product_code, &context ) == ERROR_SUCCESS) + { + TRACE("product already registered\n"); + msi_set_property( package->db, szProductToBeRegistered, szOne, -1 ); + } + msi_free(product_code); + while (1) { WCHAR patch_code[GUID_SIZE];

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2018