April 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Implement LogicalToPhysicalPointForPerMonitorDPI() and PhysicalToLogicalPointForPerMonitorDPI().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 7fdf90e395e03e03226d9c3cb9679158d9baf8e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fdf90e395e03e03226d9c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 12:00:13 2018 +0200 user32: Implement LogicalToPhysicalPointForPerMonitorDPI() and PhysicalToLogicalPointForPerMonitorDPI(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 37 +++++++++++ dlls/user32/tests/sysparams.c | 141 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 + include/winuser.h | 2 + 4 files changed, 182 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fdf90e395e03e03226d…

1 0

Owen Rudge : wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 3cd8986e93c98713aae17d2493e1c0349c99e290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd8986e93c98713aae17d24… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:26 2018 +0100 wsdapi: Ensure text node parent is NULL before calling WSDXMLAddChild. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 8bd6b71..ad83a88 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -512,6 +512,7 @@ static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *n text_node = WSDAllocateLinkedMemory(new_element, sizeof(WSDXML_TEXT)); if (text_node == NULL) goto failed; + text_node->Node.Parent = NULL; text_node->Node.Next = NULL; text_node->Node.Type = TextType; text_node->Text = duplicate_string(text_node, ((WSDXML_TEXT *)cur_node)->Text);

1 0

Owen Rudge : wsdapi: Register default namespaces when creating publisher.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 1a7df56e562bf14e99cfb853e3a0a5ab17446240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7df56e562bf14e99cfb853… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:40 2018 +0100 wsdapi: Register default namespaces when creating publisher. 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/discovery.c | 20 +++++++++++++++++--- dlls/wsdapi/soap.c | 13 +++++++++++++ dlls/wsdapi/wsdapi_internal.h | 2 ++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 5136a24..fc8acfb 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -25,6 +25,7 @@ #include "wsdapi_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "guiddef.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); @@ -332,6 +333,7 @@ static const IWSDiscoveryPublisherVtbl publisher_vtbl = HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscoveryPublisher **ppPublisher) { IWSDiscoveryPublisherImpl *obj; + HRESULT ret; TRACE("(%p, %p)\n", pContext, ppPublisher); @@ -356,11 +358,13 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover if (pContext == NULL) { - if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + ret = WSDXMLCreateContext(&obj->xmlContext); + + if (FAILED(ret)) { WARN("Unable to create XML context\n"); - HeapFree (GetProcessHeap(), 0, obj); - return E_OUTOFMEMORY; + heap_free(obj); + return ret; } } else @@ -369,6 +373,16 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover IWSDXMLContext_AddRef(pContext); } + ret = register_namespaces(obj->xmlContext); + + if (FAILED(ret)) + { + WARN("Unable to register default namespaces\n"); + heap_free(obj); + + return ret; + } + list_init(&obj->notificationSinks); *ppPublisher = &obj->IWSDiscoveryPublisher_iface; diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index ad83a88..96efefd 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -286,6 +286,19 @@ static HRESULT add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *pa return ret; } +HRESULT register_namespaces(IWSDXMLContext *xml_context) +{ + HRESULT ret; + + ret = IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, NULL); + if (FAILED(ret)) return ret; + + ret = IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, NULL); + if (FAILED(ret)) return ret; + + return IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, NULL); +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index dd7931c..57bf58c 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -62,6 +62,8 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any); +HRESULT register_namespaces(IWSDXMLContext *xml_context); + /* xml.c */ LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value);

1 0

Owen Rudge : wsdapi: Create Body and Hello elements in Hello message.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 86515b390eace818af0897dce0fd943639c66801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86515b390eace818af0897dc… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:49 2018 +0100 wsdapi: Create Body and Hello elements in Hello 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/soap.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/wsdapi/tests/discovery.c | 6 ++++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 96efefd..a2a4223 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -73,6 +73,8 @@ static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d static const WCHAR messageNumberString[] = { 'M','e','s','s','a','g','e','N','u','m','b','e','r', 0 }; static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d', 0 }; static const WCHAR emptyString[] = { 0 }; +static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; +static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; struct discovered_namespace { @@ -732,6 +734,10 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER ret = write_xml_element(header_element, writer); if (FAILED(ret)) goto cleanup; + /* Write the body */ + ret = write_xml_element(body_element, writer); + if (FAILED(ret)) goto cleanup; + ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup; @@ -774,7 +780,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ char *full_xml; HRESULT ret; - ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, discovered_namespaces); + ret = create_soap_envelope(impl->xmlContext, header, body_element, &heap, &xml, &xml_length, discovered_namespaces); if (ret != S_OK) return ret; /* Prefix the XML header */ @@ -812,7 +818,9 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any) { + WSDXML_ELEMENT *body_element = NULL, *hello_element; struct list *discoveredNamespaces = NULL; + WSDXML_NAME *body_name = NULL; WSD_SOAP_HEADER soapHeader; WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; @@ -822,21 +830,42 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON sequence.MessageNumber = msg_num; sequence.SequenceId = session_id; - if (!create_guid(message_id)) goto cleanup; + if (!create_guid(message_id)) goto failed; discoveredNamespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); - if (!discoveredNamespaces) goto cleanup; + if (!discoveredNamespaces) goto failed; list_init(discoveredNamespaces); populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); - /* TODO: Populate message body */ + ret = IWSDXMLContext_AddNameToNamespace(impl->xmlContext, envelopeNsUri, bodyString, &body_name); + if (FAILED(ret)) goto cleanup; + + /* <soap:Body>, <wsd:Hello> */ + ret = WSDXMLBuildAnyForSingleElement(body_name, NULL, &body_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, body_element, discoveryNsUri, helloString, NULL, &hello_element); + if (FAILED(ret)) goto cleanup; + + /* Write any body elements */ + if (any != NULL) + { + ret = duplicate_element(hello_element, any, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + } /* Write and send the message */ - ret = write_and_send_message(impl, &soapHeader, NULL, discoveredNamespaces, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, body_element, discoveredNamespaces, NULL, APP_MAX_DELAY); + goto cleanup; + +failed: + ret = E_OUTOFMEMORY; cleanup: + WSDFreeLinkedMemory(body_name); + WSDFreeLinkedMemory(body_element); WSDFreeLinkedMemory(discoveredNamespaces); return ret; diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 20d3442..06bde89 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -507,7 +507,7 @@ static void Publish_tests(void) messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; - BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE; + BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -629,8 +629,9 @@ static void Publish_tests(void) metadata_version_seen = (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); any_header_seen = (strstr(msg, "<wine:Beer>PublishTest</wine:Beer>") != NULL); wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); + body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen; + any_header_seen && wine_ns_seen && body_hello_seen; if (messageOK) break; } @@ -649,6 +650,7 @@ static void Publish_tests(void) todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); ok(any_header_seen == TRUE, "Custom header not received\n"); ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); + ok(body_hello_seen == TRUE, "Body and Hello elements not received\n"); after_publish_test:

1 0

Owen Rudge : wsdapi/tests: Add test for Hello message Any body element.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 74fe8303fb012bc12a8e51b6b5ea9412588af551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74fe8303fb012bc12a8e51b6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 17 23:04:55 2018 +0100 wsdapi/tests: Add test for Hello message Any body element. 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 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 06bde89..608edb5 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -508,15 +508,17 @@ static void Publish_tests(void) WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; + BOOL any_body_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; char *msg; - WSDXML_ELEMENT *header_any_element; + WSDXML_ELEMENT *header_any_element, *body_any_element; WSDXML_NAME header_any_name; WSDXML_NAMESPACE ns; WCHAR header_any_name_text[] = {'B','e','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; + static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; @@ -590,11 +592,15 @@ static void Publish_tests(void) rc = WSDXMLBuildAnyForSingleElement(&header_any_name, header_any_text, &header_any_element); ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + rc = WSDXMLBuildAnyForSingleElement(&header_any_name, body_any_text, &body_any_element); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Publish the service */ rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, - header_any_element, NULL, NULL, NULL, NULL); + header_any_element, NULL, NULL, NULL, body_any_element); WSDFreeLinkedMemory(header_any_element); + WSDFreeLinkedMemory(body_any_element); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -630,8 +636,9 @@ static void Publish_tests(void) any_header_seen = (strstr(msg, "<wine:Beer>PublishTest</wine:Beer>") != NULL); wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); + any_body_seen = (strstr(msg, "<wine:Beer>BodyTest</wine:Beer>") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen && body_hello_seen; + any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen; if (messageOK) break; } @@ -651,6 +658,7 @@ static void Publish_tests(void) ok(any_header_seen == TRUE, "Custom header not received\n"); ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); ok(body_hello_seen == TRUE, "Body and Hello elements not received\n"); + ok(any_body_seen == TRUE, "Custom body element not received\n"); after_publish_test:

1 0

Piotr Caban : msi: Only mark non-registered features as absent if we haven 't done anything with them.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: b052fc3c893a0fa946c1dd6065047f4b5538cbe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b052fc3c893a0fa946c1dd60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 18 17:59:18 2018 +0200 msi: Only mark non-registered features as absent if we haven't done anything with them. 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 | 2 ++ dlls/msi/tests/package.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 71e45e8..67dfbe4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4931,6 +4931,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) MSIRECORD *uirow; if (feature->Level <= 0) continue; + if (feature->Action == INSTALLSTATE_UNKNOWN && + feature->Installed != INSTALLSTATE_ABSENT) continue; if (feature->Action != INSTALLSTATE_LOCAL && feature->Action != INSTALLSTATE_SOURCE && diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b85a3a8..e3a0894 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3704,9 +3704,12 @@ static void test_states(void) add_custom_action_entry( hdb, "'ConditionCheck6', 19, '', 'Condition check failed (6)'" ); add_custom_action_entry( hdb, "'ConditionCheck7', 19, '', 'Condition check failed (7)'" ); add_custom_action_entry( hdb, "'ConditionCheck8', 19, '', 'Condition check failed (8)'" ); + add_custom_action_entry( hdb, + "'VBFeatureRequest', 38, '', 'Session.FeatureRequestState(\"three\") = 3'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck1', 'REINSTALL', '798'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck2', 'NOT REMOVE AND Preselected', '799'" ); + add_install_execute_sequence_entry( hdb, "'VBFeatureRequest', 'NOT REMOVE', '1001'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck3', 'REINSTALL', '6598'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck4', 'NOT REMOVE AND Preselected', '6599'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck5', 'REINSTALL', '6601'" ); @@ -3773,6 +3776,8 @@ static void test_states(void) ok(state == INSTALLSTATE_SOURCE, "state = %d\n", state); state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "two"); ok(state == INSTALLSTATE_ABSENT, "state = %d\n", state); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "three"); + ok(state == INSTALLSTATE_LOCAL, "state = %d\n", state); /* uninstall the product */ r = MsiInstallProductA(msifile4, "REMOVE=ALL");

1 0

Piotr Caban : msi: Support NULL value in INSERT query.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 63ccdfeaaab56aca42d21a884789eb5048064276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ccdfeaaab56aca42d21a88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 18 17:59:25 2018 +0200 msi: Support NULL value in INSERT query. 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/sql.y | 9 ++++++++- dlls/msi/tests/package.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 366764d..2101c68 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -658,6 +658,12 @@ const_val: if( !$$ ) YYABORT; } + | TK_NULL + { + $$ = EXPR_sval( info, NULL ); + if ( !$$ ) + YYABORT; + } ; column_val: @@ -921,7 +927,8 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str ) if( e ) { e->type = EXPR_SVAL; - if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) + if( !str) e->u.sval = NULL; + else if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) return NULL; /* e will be freed by query destructor */ } return e; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e3a0894..c2e2106 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3705,7 +3705,7 @@ static void test_states(void) add_custom_action_entry( hdb, "'ConditionCheck7', 19, '', 'Condition check failed (7)'" ); add_custom_action_entry( hdb, "'ConditionCheck8', 19, '', 'Condition check failed (8)'" ); add_custom_action_entry( hdb, - "'VBFeatureRequest', 38, '', 'Session.FeatureRequestState(\"three\") = 3'" ); + "'VBFeatureRequest', 38, NULL, 'Session.FeatureRequestState(\"three\") = 3'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck1', 'REINSTALL', '798'" ); add_install_execute_sequence_entry( hdb, "'ConditionCheck2', 'NOT REMOVE AND Preselected', '799'" );

1 0

Anton Romanov : wmp: Add seeking and duration.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: bb2d13b44c5268f62356a39c52ddd70a8acb56f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2d13b44c5268f62356a39c… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Apr 18 22:01:46 2018 -0700 wmp: Add seeking and duration. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 65 ++++++++++++++++++++++++++++++++++++++++-------- dlls/wmp/tests/media.c | 39 ++++++++++++++++++++++++++++- dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 24494 bytes dlls/wmp/wmp_private.h | 3 +++ 5 files changed, 97 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb2d13b44c5268f62356…

1 0

Zebediah Figura : msi/tests: Improve COM test.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: fdb9bdc88b27ffdaea5ad31256f250b66bdf6b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb9bdc88b27ffdaea5ad312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:01 2018 -0500 msi/tests: Improve COM test. Test for a class that Wine actually supports, and also make sure our apartment is uninitialized. 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/tests/custom.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9cf90dc..8d32348 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,8 +24,7 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS -#include <objbase.h> -#include <unknwn.h> +#include <msxml.h> #include <msi.h> #include <msiquery.h> @@ -248,14 +247,19 @@ UINT WINAPI main_test(MSIHANDLE hinst) { UINT res; IUnknown *unk = NULL; - HRESULT hres; + HRESULT hr; /* Test for an MTA apartment */ - hres = CoCreateInstance(&CLSID_Picture_Metafile, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine_ok(hinst, hres == S_OK, "CoCreateInstance failed with %08x\n", hres); + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + todo_wine_ok(hinst, hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (unk) IUnknown_Release(unk); + /* but ours is uninitialized */ + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hinst, hr == S_OK, "got %#x\n", hr); + CoUninitialize(); + /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res);

1 0

Zebediah Figura : msi: Make MsiGetActiveDatabase() RPC-compatible.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: a6934768d1070d91c764d5c88fe276a9d6163683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6934768d1070d91c764d5c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 18 18:40:02 2018 -0500 msi: Make MsiGetActiveDatabase() RPC-compatible. 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/package.c | 9 ++++----- dlls/msi/tests/custom.c | 13 +++++++++++++ dlls/msi/winemsi.idl | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e7f51a6..d18736b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1686,7 +1686,8 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) } else if ((remote = msi_get_remote(hInstall))) { - remote_GetActiveDatabase(remote, &handle); + handle = remote_GetActiveDatabase(remote); + handle = alloc_msi_remote_handle(handle); } return handle; @@ -2420,11 +2421,9 @@ UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, return MSI_GetProperty( hInstall, szName, &val, pchValueBuf ); } -HRESULT __cdecl remote_GetActiveDatabase(MSIHANDLE hinst, MSIHANDLE *handle) +MSIHANDLE __cdecl remote_GetActiveDatabase(MSIHANDLE hinst) { - *handle = MsiGetActiveDatabase(hinst); - - return S_OK; + return MsiGetActiveDatabase(hinst); } UINT __cdecl remote_GetProperty(MSIHANDLE hinst, LPCWSTR property, LPWSTR *value, DWORD *size) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 8d32348..00dcab3 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -241,6 +241,18 @@ static void test_props(MSIHANDLE hinst) ok(hinst, !memcmp(buffer, "a\0\0\0\xcc", 5), "wrong data\n"); } +static void test_db(MSIHANDLE hinst) +{ + MSIHANDLE hdb; + UINT r; + + hdb = MsiGetActiveDatabase(hinst); + ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); + + r = MsiCloseHandle(hdb); + ok(hinst, !r, "got %u\n", r); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) @@ -265,6 +277,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); + test_db(hinst); return ERROR_SUCCESS; } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index d97db4c..c158583 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -61,7 +61,7 @@ interface IWineMsiRemote HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); HRESULT remote_DatabaseOpenView( [in] MSIHANDLE db, [in] LPCWSTR query, [out] MSIHANDLE *view ); - HRESULT remote_GetActiveDatabase( [in] MSIHANDLE hinst, [out] MSIHANDLE *handle ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); int remote_ProcessMessage( [in] MSIHANDLE hinst, [in] INSTALLMESSAGE message, [in] struct wire_record *record );

1 0