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

Zebediah Figura : ole32: Allow unmarshalling objects into an implicit MTA.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: a4cf16db08a0cd07b05fbb32d578b81b0578509f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4cf16db08a0cd07b05fbb32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:51 2018 -0500 ole32: Allow unmarshalling objects into an implicit MTA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 2 +- dlls/ole32/compobj_private.h | 3 +- dlls/ole32/marshal.c | 32 ++++++++---- dlls/ole32/rpc.c | 12 +++-- dlls/ole32/tests/marshal.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4cf16db08a0cd07b05f…

1 0

Zebediah Figura : ole32: Report the implicit MTA in CoGetApartmentType().
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: a11951841c065ac5276877f99d3fa84d20b726b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11951841c065ac5276877f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:49 2018 -0500 ole32: Report the implicit MTA in CoGetApartmentType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 10 +++++++++- dlls/ole32/tests/compobj.c | 19 ++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dc31f41..d11fb24 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5108,8 +5108,9 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) { struct oletls *info = COM_CurrentInfo(); + APARTMENT *apt; - FIXME("(%p, %p): semi-stub\n", type, qualifier); + TRACE("(%p, %p)\n", type, qualifier); if (!type || !qualifier) return E_INVALIDARG; @@ -5128,6 +5129,13 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) *qualifier = APTTYPEQUALIFIER_NONE; + if (!info->apt && (apt = apartment_find_mta())) + { + apartment_release(apt); + *type = APTTYPE_MTA; + *qualifier = APTTYPEQUALIFIER_IMPLICIT_MTA; + } + return info->apt ? S_OK : CO_E_NOTINITIALIZED; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ecfbac8..b9b7be0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -602,9 +602,8 @@ static void test_StringFromGUID2(void) ok(len == 0, "len: %d (expected 0)\n", len); } -#define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) -static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, - BOOL todo_qualifier, int line) +#define test_apt_type(t, q) _test_apt_type(t, q, __LINE__) +static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, int line) { APTTYPEQUALIFIER qualifier = ~0u; APTTYPE type = ~0u; @@ -615,9 +614,7 @@ static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qual hr = pCoGetApartmentType(&type, &qualifier); ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); -todo_wine_if(todo_type) ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); -todo_wine_if(todo_qualifier) ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, expected_qualifier); } @@ -660,7 +657,7 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } static void test_CoGetClassObject(void) @@ -682,7 +679,7 @@ static void test_CoGetClassObject(void) broken(hr == CO_E_NOTINITIALIZED), /* win9x */ "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); if (!pRegOverridePredefKey) { @@ -1797,7 +1794,7 @@ static void test_CoGetObjectContext(void) pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok_ole_success(hr, "CoGetObjectContext"); @@ -1993,11 +1990,11 @@ static void test_CoGetContextToken(void) ok(hr == CO_E_NOTINITIALIZED, "Expected CO_E_NOTINITIALIZED, got 0x%08x\n", hr); ok(token == 0xdeadbeef, "Expected 0, got 0x%lx\n", token); - test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); CoInitialize(NULL); - test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); hr = pCoGetContextToken(NULL); ok(hr == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hr); @@ -3705,7 +3702,7 @@ static DWORD CALLBACK implicit_mta_proc(void *param) CLSID clsid; HRESULT hr; - test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA); hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok_ole_success(hr, "CoCreateInstance");

1 0

Zebediah Figura : ole32: Allow more functions to use the implicit MTA.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 878e15e25faa88a64df844489f15594b8fd293a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=878e15e25faa88a64df84448… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:48 2018 -0500 ole32: Allow more functions to use the implicit MTA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 43 ++++++++++++++++++++++++++++++------------- dlls/ole32/tests/compobj.c | 24 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2d7a850..dc31f41 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1089,8 +1089,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject( TRACE("(%08x)\n",dwRegister); - apt = COM_CurrentApt(); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) { ERR("COM was not initialized\n"); return CO_E_NOTINITIALIZED; @@ -1121,7 +1120,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject( } LeaveCriticalSection( &csRegisteredClassList ); - + apartment_release(apt); return hr; } @@ -2072,9 +2071,11 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return hr; } - apt = COM_CurrentApt(); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; + } manager = get_stub_manager_from_object(apt, lpUnk, FALSE); if (manager) { @@ -2089,6 +2090,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) * not found, making apps think that the object was disconnected, when * it actually wasn't */ + apartment_release(apt); return S_OK; } @@ -2596,7 +2598,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) static const WCHAR wszInterface[] = {'I','n','t','e','r','f','a','c','e','\\',0}; static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)]; - APARTMENT *apt = COM_CurrentApt(); + APARTMENT *apt; struct registered_psclsid *registered_psclsid; ACTCTX_SECTION_KEYED_DATA data; HRESULT hr; @@ -2605,11 +2607,12 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; } + apartment_release(apt); if (!pclsid) return E_INVALIDARG; @@ -2680,16 +2683,17 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) */ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) { - APARTMENT *apt = COM_CurrentApt(); + APARTMENT *apt; struct registered_psclsid *registered_psclsid; TRACE("(%s, %s)\n", debugstr_guid(riid), debugstr_guid(rclsid)); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; } + apartment_release(apt); EnterCriticalSection(&cs_registered_psclsid_list); @@ -2815,8 +2819,7 @@ HRESULT WINAPI CoRegisterClassObject( if ( (lpdwRegister==0) || (pUnk==0) ) return E_INVALIDARG; - apt = COM_CurrentApt(); - if (!apt) + if (!(apt = apartment_get_current_or_mta())) { ERR("COM was not initialized\n"); return CO_E_NOTINITIALIZED; @@ -2839,16 +2842,21 @@ HRESULT WINAPI CoRegisterClassObject( if (dwClsContext & CLSCTX_LOCAL_SERVER) hr = CoLockObjectExternal(foundObject, TRUE, FALSE); IUnknown_Release(foundObject); + apartment_release(apt); return hr; } IUnknown_Release(foundObject); ERR("object already registered for class %s\n", debugstr_guid(rclsid)); + apartment_release(apt); return CO_E_OBJISREG; } newClass = HeapAlloc(GetProcessHeap(), 0, sizeof(RegisteredClass)); if ( newClass == NULL ) + { + apartment_release(apt); return E_OUTOFMEMORY; + } newClass->classIdentifier = *rclsid; newClass->apartment_id = apt->oxid; @@ -2877,7 +2885,10 @@ HRESULT WINAPI CoRegisterClassObject( hr = get_local_server_stream(apt, &marshal_stream); if(FAILED(hr)) + { + apartment_release(apt); return hr; + } hr = RPC_StartLocalServer(&newClass->classIdentifier, marshal_stream, @@ -2885,6 +2896,7 @@ HRESULT WINAPI CoRegisterClassObject( &newClass->RpcRegistration); IStream_Release(marshal_stream); } + apartment_release(apt); return S_OK; } @@ -3645,8 +3657,11 @@ HRESULT WINAPI CoLockObjectExternal( TRACE("pUnk=%p, fLock=%s, fLastUnlockReleases=%s\n", pUnk, fLock ? "TRUE" : "FALSE", fLastUnlockReleases ? "TRUE" : "FALSE"); - apt = COM_CurrentApt(); - if (!apt) return CO_E_NOTINITIALIZED; + if (!(apt = apartment_get_current_or_mta())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } stubmgr = get_stub_manager_from_object(apt, pUnk, fLock); if (!stubmgr) @@ -3655,6 +3670,7 @@ HRESULT WINAPI CoLockObjectExternal( /* Note: native is pretty broken here because it just silently * fails, without returning an appropriate error code, making apps * think that the object was disconnected, when it actually wasn't */ + apartment_release(apt); return S_OK; } @@ -3664,6 +3680,7 @@ HRESULT WINAPI CoLockObjectExternal( stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); stub_manager_int_release(stubmgr); + apartment_release(apt); return S_OK; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0ce941b..ecfbac8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3701,6 +3701,8 @@ static DWORD CALLBACK implicit_mta_proc(void *param) IComThreadingInfo *threading_info; ULONG_PTR token; IUnknown *unk; + DWORD cookie; + CLSID clsid; HRESULT hr; test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); @@ -3720,6 +3722,28 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoGetContextToken(&token); ok_ole_success(hr, "CoGetContextToken"); + hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); + ok_ole_success(hr, "CoRegisterPSClsid"); + + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + hr = CoRegisterMessageFilter(NULL, NULL); + ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); + + hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + ok_ole_success(hr, "CoLockObjectExternal"); + + hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + ok_ole_success(hr, "CoDisconnectObject"); + return 0; }

1 0

Owen Rudge : wsdapi: Add support for custom elements in SOAP header.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 21fe96a82053d5f4e8e4ad28cb3b9a919869a4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fe96a82053d5f4e8e4ad28… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 9 22:43:46 2018 +0100 wsdapi: Add support for custom elements in SOAP 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 | 94 +++++++++++++++++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 4 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 2 +- 4 files changed, 95 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index fb7aa48..8bd6b71 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -482,8 +482,91 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * return TRUE; } +static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *node, struct list *namespaces) +{ + WSDXML_ATTRIBUTE *cur_attribute, *new_attribute, *last_attribute = NULL; + WSDXML_ELEMENT *new_element; + WSDXML_TEXT *text_node; + WSDXML_NODE *cur_node; + HRESULT ret; + + /* First record the namespace in the discovered namespaces list */ + if (!add_discovered_namespace(namespaces, node->Name->Space)) + return E_FAIL; + + ret = WSDXMLBuildAnyForSingleElement(node->Name, NULL, &new_element); + if (FAILED(ret)) return ret; + + /* Duplicate the nodes */ + cur_node = node->FirstChild; + + while (cur_node != NULL) + { + if (cur_node->Type == ElementType) + { + ret = duplicate_element(new_element, (WSDXML_ELEMENT *)cur_node, namespaces); + if (FAILED(ret)) goto cleanup; + } + else if (cur_node->Type == TextType) + { + text_node = WSDAllocateLinkedMemory(new_element, sizeof(WSDXML_TEXT)); + if (text_node == NULL) goto failed; + + text_node->Node.Next = NULL; + text_node->Node.Type = TextType; + text_node->Text = duplicate_string(text_node, ((WSDXML_TEXT *)cur_node)->Text); + + if (text_node->Text == NULL) goto failed; + + ret = WSDXMLAddChild(new_element, (WSDXML_ELEMENT *)text_node); + if (FAILED(ret)) goto cleanup; + } + + cur_node = cur_node->Next; + } + + /* Duplicate the attributes */ + cur_attribute = node->FirstAttribute; + + while (cur_attribute != NULL) + { + if ((cur_attribute->Name->Space != NULL) && (!add_discovered_namespace(namespaces, cur_attribute->Name->Space))) + goto failed; + + new_attribute = WSDAllocateLinkedMemory(new_element, sizeof(WSDXML_ATTRIBUTE)); + if (new_attribute == NULL) goto failed; + + new_attribute->Element = new_element; + new_attribute->Name = duplicate_name(new_attribute, cur_attribute->Name); + new_attribute->Value = duplicate_string(new_attribute, cur_attribute->Value); + new_attribute->Next = NULL; + + if ((new_attribute->Name == NULL) || (new_attribute->Value == NULL)) goto failed; + + if (last_attribute == NULL) + new_element->FirstAttribute = new_attribute; + else + last_attribute->Next = new_attribute; + + last_attribute = new_attribute; + cur_attribute = cur_attribute->Next; + } + + ret = WSDXMLAddChild(parent, new_element); + if (FAILED(ret)) goto cleanup; + + return ret; + +failed: + ret = E_FAIL; + +cleanup: + WSDXMLCleanupElement(new_element); + return ret; +} + static HRESULT create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, - WSDXML_ELEMENT **out_element) + struct list *discovered_namespaces, WSDXML_ELEMENT **out_element) { WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL, *temp_element; WSDXML_NAME *header_name = NULL; @@ -541,7 +624,12 @@ static HRESULT create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_ /* </d:AppSequence> */ - /* TODO: Write any headers */ + /* Write any headers */ + if (header->AnyHeaders != NULL) + { + ret = duplicate_element(header_element, header->AnyHeaders, discovered_namespaces); + if (FAILED(ret)) goto cleanup; + } /* </s:Header> */ @@ -602,7 +690,7 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER if (FAILED(ret)) goto cleanup; /* Create the header XML elements */ - ret = create_soap_header_xml_elements(xml_context, header, &header_element); + ret = create_soap_header_xml_elements(xml_context, header, discovered_namespaces, &header_element); if (FAILED(ret)) goto cleanup; /* <s:Envelope> */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 0f346aa..20d3442 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -647,8 +647,8 @@ static void Publish_tests(void) ok(app_sequence_seen == TRUE, "AppSequence not received\n"); todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); - todo_wine ok(any_header_seen == TRUE, "Custom header not received\n"); - todo_wine ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); + ok(any_header_seen == TRUE, "Custom header not received\n"); + ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); after_publish_test: diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 47dde6b..dd7931c 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -65,5 +65,6 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON /* xml.c */ LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); +WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name); #endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index fc02d8b..968b217 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -63,7 +63,7 @@ static WSDXML_NAMESPACE *duplicate_namespace(void *parentMemoryBlock, WSDXML_NAM return newNs; } -static WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name) +WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name) { WSDXML_NAME *dup;

1 0

Owen Rudge : wsdapi: Return HRESULT from add_child_element and create_soap_header_xml_elements.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: ad97d5c182bc3e871221483233a91de7f63ec0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad97d5c182bc3e8712214832… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 9 22:43:44 2018 +0100 wsdapi: Return HRESULT from add_child_element and create_soap_header_xml_elements. 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 | 101 +++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 970bc4f..fb7aa48 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -258,31 +258,32 @@ cleanup: return ret; } -static WSDXML_ELEMENT *add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, - LPCWSTR name, LPCWSTR text) +static HRESULT add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, + LPCWSTR name, LPCWSTR text, WSDXML_ELEMENT **out) { WSDXML_ELEMENT *element_obj; WSDXML_NAME *name_obj; + HRESULT ret; - if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, ns_uri, name, &name_obj))) - return NULL; - - if (FAILED(WSDXMLBuildAnyForSingleElement(name_obj, text, &element_obj))) - { - WSDFreeLinkedMemory(name_obj); - return NULL; - } + ret = IWSDXMLContext_AddNameToNamespace(xml_context, ns_uri, name, &name_obj); + if (FAILED(ret)) return ret; + ret = WSDXMLBuildAnyForSingleElement(name_obj, text, &element_obj); WSDFreeLinkedMemory(name_obj); + if (FAILED(ret)) return ret; + /* Add the element as a child - this will link the element's memory allocation to the parent's */ - if (FAILED(WSDXMLAddChild(parent, element_obj))) + ret = WSDXMLAddChild(parent, element_obj); + + if (FAILED(ret)) { WSDFreeLinkedMemory(element_obj); - return NULL; + return ret; } - return element_obj; + *out = element_obj; + return ret; } static BOOL create_guid(LPWSTR buffer) @@ -418,42 +419,42 @@ static void remove_attribute(WSDXML_ELEMENT *parent, WSDXML_ATTRIBUTE *attribute WSDFreeLinkedMemory(attribute); } -static BOOL add_ulonglong_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, +static HRESULT add_ulonglong_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, ULONGLONG value) { WSDXML_ATTRIBUTE *attribute = add_attribute(xml_context, parent, ns_uri, name); if (attribute == NULL) - return FALSE; + return E_FAIL; attribute->Value = ulonglong_to_string(attribute, value); if (attribute->Value == NULL) { remove_attribute(parent, attribute); - return FALSE; + return E_FAIL; } - return TRUE; + return S_OK; } -static BOOL add_string_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, +static HRESULT add_string_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, LPCWSTR value) { WSDXML_ATTRIBUTE *attribute = add_attribute(xml_context, parent, ns_uri, name); if (attribute == NULL) - return FALSE; + return E_FAIL; attribute->Value = duplicate_string(attribute, value); if (attribute->Value == NULL) { remove_attribute(parent, attribute); - return FALSE; + return E_FAIL; } - return TRUE; + return S_OK; } static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE *discovered_ns) @@ -481,53 +482,62 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * return TRUE; } -static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) +static HRESULT create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, + WSDXML_ELEMENT **out_element) { - WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL; + WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL, *temp_element; WSDXML_NAME *header_name = NULL; + HRESULT ret; /* <s:Header> */ - if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, envelopeNsUri, headerString, &header_name))) goto cleanup; - if (FAILED(WSDXMLBuildAnyForSingleElement(header_name, NULL, &header_element))) goto cleanup; + ret = IWSDXMLContext_AddNameToNamespace(xml_context, envelopeNsUri, headerString, &header_name); + if (FAILED(ret)) goto cleanup; + + ret = WSDXMLBuildAnyForSingleElement(header_name, NULL, &header_element); + if (FAILED(ret)) goto cleanup; + WSDFreeLinkedMemory(header_name); /* <a:Action> */ - if (add_child_element(xml_context, header_element, addressingNsUri, actionString, header->Action) == NULL) - goto cleanup; + ret = add_child_element(xml_context, header_element, addressingNsUri, actionString, header->Action, &temp_element); + if (FAILED(ret)) goto cleanup; /* <a:MessageId> */ - if (add_child_element(xml_context, header_element, addressingNsUri, messageIdString, header->MessageID) == NULL) - goto cleanup; + ret = add_child_element(xml_context, header_element, addressingNsUri, messageIdString, header->MessageID, &temp_element); + if (FAILED(ret)) goto cleanup; /* <a:To> */ - if (add_child_element(xml_context, header_element, addressingNsUri, toString, header->To) == NULL) - goto cleanup; + ret = add_child_element(xml_context, header_element, addressingNsUri, toString, header->To, &temp_element); + if (FAILED(ret)) goto cleanup; /* <a:RelatesTo> */ if (header->RelatesTo.MessageID != NULL) { - if (add_child_element(xml_context, header_element, addressingNsUri, relatesToString, - header->RelatesTo.MessageID) == NULL) goto cleanup; + ret = add_child_element(xml_context, header_element, addressingNsUri, relatesToString, + header->RelatesTo.MessageID, &temp_element); + if (FAILED(ret)) goto cleanup; } /* <d:AppSequence> */ - app_sequence_element = add_child_element(xml_context, header_element, discoveryNsUri, appSequenceString, emptyString); - if (app_sequence_element == NULL) goto cleanup; + ret = add_child_element(xml_context, header_element, discoveryNsUri, appSequenceString, emptyString, &app_sequence_element); + if (FAILED(ret)) goto cleanup; /* InstanceId attribute */ - if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, instanceIdString, min(UINT_MAX, - header->AppSequence->InstanceId))) goto cleanup; + ret = add_ulonglong_attribute(xml_context, app_sequence_element, NULL, instanceIdString, min(UINT_MAX, + header->AppSequence->InstanceId)); + if (FAILED(ret)) goto cleanup; /* SequenceID attribute */ if (header->AppSequence->SequenceId != NULL) { - if (!add_string_attribute(xml_context, app_sequence_element, NULL, sequenceIdString, header->AppSequence->SequenceId)) - goto cleanup; + ret = add_string_attribute(xml_context, app_sequence_element, NULL, sequenceIdString, header->AppSequence->SequenceId); + if (FAILED(ret)) goto cleanup; } /* MessageNumber attribute */ - if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, messageNumberString, min(UINT_MAX, - header->AppSequence->MessageNumber))) goto cleanup; + ret = add_ulonglong_attribute(xml_context, app_sequence_element, NULL, messageNumberString, min(UINT_MAX, + header->AppSequence->MessageNumber)); + if (FAILED(ret)) goto cleanup; /* </d:AppSequence> */ @@ -535,13 +545,14 @@ static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_conte /* </s:Header> */ - return header_element; + *out_element = header_element; + return ret; cleanup: if (header_name != NULL) WSDFreeLinkedMemory(header_name); WSDXMLCleanupElement(header_element); - return NULL; + return ret; } static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, @@ -591,8 +602,8 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER if (FAILED(ret)) goto cleanup; /* Create the header XML elements */ - header_element = create_soap_header_xml_elements(xml_context, header); - if (header_element == NULL) goto cleanup; + ret = create_soap_header_xml_elements(xml_context, header, &header_element); + if (FAILED(ret)) goto cleanup; /* <s:Envelope> */ ret = WsWriteStartElement(writer, actual_envelope_prefix, &envelope, envelope_uri_xmlstr, NULL);

1 0

Zebediah Figura : ole32: Add a helper for grabbing the current apartment or MTA.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 5e752db1baf5dfe50e4c61c9082118f578dd6a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e752db1baf5dfe50e4c61c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:47 2018 -0500 ole32: Add a helper for grabbing the current apartment or MTA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 50ac6d3..2d7a850 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -734,6 +734,19 @@ static APARTMENT *apartment_find_mta(void) return apt; } +/* Return the current apartment if it exists, or, failing that, the MTA. Caller + * must free the returned apartment in either case. */ +static APARTMENT *apartment_get_current_or_mta(void) +{ + APARTMENT *apt = COM_CurrentApt(); + if (apt) + { + apartment_addref(apt); + return apt; + } + return apartment_find_mta(); +} + static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) { list_remove(&curClass->entry); @@ -2997,15 +3010,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( *ppv = NULL; - if ((apt = COM_CurrentApt())) - apartment_addref(apt); - else + if (!(apt = apartment_get_current_or_mta())) { - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } if (pServerInfo) { @@ -3298,15 +3306,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( if(FAILED(hres)) clsid = *rclsid; - if (!(apt = COM_CurrentApt())) + if (!(apt = apartment_get_current_or_mta())) { - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } + apartment_release(apt); /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. @@ -4998,22 +5003,19 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) { struct oletls *info = COM_CurrentInfo(); + APARTMENT *apt; TRACE("(%p)\n", token); if (!info) return E_OUTOFMEMORY; - if (!info->apt) + if (!(apt = apartment_get_current_or_mta())) { - APARTMENT *apt; - if (!(apt = apartment_find_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; } + apartment_release(apt); if (!token) return E_POINTER;

1 0

Zebediah Figura : ole32/tests: Test CoWaitForMultipleHandles() in an uninitialized or MTA apartment.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: 084559fe853bcbe1ea1315ce2049618de0366233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=084559fe853bcbe1ea1315ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 9 21:15:50 2018 -0500 ole32/tests: Test CoWaitForMultipleHandles() in an uninitialized or MTA apartment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b9b7be0..c43e86c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2998,14 +2998,36 @@ static void test_CoWaitForMultipleHandles(void) ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); + CoUninitialize(); + + /* If COM was not initialized, messages are neither pumped nor peeked at */ + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "got %#x\n", hr); + success = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(success == 0, "MsgWaitForMultipleObjects returned %x\n", success); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessage failed: %u\n", GetLastError()); + + /* same in an MTA */ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "got %#x\n", hr); + success = MsgWaitForMultipleObjectsEx(0, NULL, 2, QS_ALLPOSTMESSAGE, MWMO_ALERTABLE); + ok(success == 0, "MsgWaitForMultipleObjects returned %x\n", success); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(success, "PeekMessage failed: %u\n", GetLastError()); + + CoUninitialize(); + CloseHandle(handles[0]); CloseHandle(handles[1]); DestroyWindow(hWnd); success = UnregisterClassA(cls_name, GetModuleHandleA(0)); ok(success, "UnregisterClass failed %u\n", GetLastError()); - - CoUninitialize(); } static void test_CoGetMalloc(void)

1 0

Sergio Gómez Del Real : kernel32/ tests: Add tests for NormalizeString API function.
by Alexandre Julliard April 10, 2018

April 10, 2018

Module: wine Branch: master Commit: d6a218d64db38e2508dd5a0e4a081a9a8c6cc0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a218d64db38e2508dd5a0e… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Mon Apr 9 13:38:00 2018 -0500 kernel32/tests: Add tests for NormalizeString API function. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 184 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a99763d..b9b36d8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -106,6 +106,7 @@ static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMT static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); +static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -141,6 +142,7 @@ static void InitFunctionPointers(void) X(FindNLSStringEx); X(SetThreadUILanguage); X(GetThreadUILanguage); + X(NormalizeString); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5470,6 +5472,187 @@ static void test_SetThreadUILanguage(void) "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); } +static void test_NormalizeString(void) +{ + /* part 0: specific cases */ + /* LATIN CAPITAL LETTER D WITH DOT ABOVE */ + static const WCHAR part0_str1[] = {0x1e0a,0}; + static const WCHAR part0_nfd1[] = {0x0044,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str2[] = {0x0044,0x0323,0x0307,0}; + static const WCHAR part0_nfc2[] = {0x1e0c,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str3[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc3[] = {0x1e0c,0x031b,0x0307,0}; + + /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str4[] = {0x0044,0x031b,0x0323,0x0307,0}; + static const WCHAR part0_nfc4[] = {0x1e0c,0x031b,0x0307,0}; + + /* + * HEBREW ACCENT SEGOL, HEBREW POINT PATAH, HEBREW POINT DAGESH OR MAPIQ, + * HEBREW ACCENT MERKHA, HEBREW POINT SHEVA, HEBREW PUNCTUATION PASEQ, + * HEBREW MARK UPPER DOT, HEBREW ACCENT DEHI + */ + static const WCHAR part0_str5[] = {0x0592,0x05B7,0x05BC,0x05A5,0x05B0,0x05C0,0x05C4,0x05AD,0}; + static const WCHAR part0_nfc5[] = {0x05B0,0x05B7,0x05BC,0x05A5,0x0592,0x05C0,0x05AD,0x05C4,0}; + + /* + * HEBREW POINT QAMATS, HEBREW POINT HOLAM, HEBREW POINT HATAF SEGOL, + * HEBREW ACCENT ETNAHTA, HEBREW PUNCTUATION SOF PASUQ, HEBREW POINT SHEVA, + * HEBREW ACCENT ILUY, HEBREW ACCENT QARNEY PARA + */ + static const WCHAR part0_str6[] = {0x05B8,0x05B9,0x05B1,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + static const WCHAR part0_nfc6[] = {0x05B1,0x05B8,0x05B9,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW */ + static const WCHAR part0_str8[] = {0x1E0C,0}; + static const WCHAR part0_nfd8[] = {0x0044,0x0323,0}; + + /* LATIN CAPITAL LETTER D WITH DOT ABOVE, COMBINING DOT BELOW */ + static const WCHAR part0_str9[] = {0x1E0A,0x0323,0}; + static const WCHAR part0_nfc9[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd9[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER D WITH DOT BELOW, COMBINING DOT ABOVE */ + static const WCHAR part0_str10[] = {0x1E0C,0x0307,0}; + static const WCHAR part0_nfd10[] = {0x0044,0x0323,0x0307,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE, COMBINING MACRON */ + static const WCHAR part0_str11[] = {0x1E14,0x0304,0}; + static const WCHAR part0_nfd11[] = {0x0045,0x0304,0x0300,0x0304,0}; + + /* LATIN CAPITAL LETTER E WITH MACRON, COMBINING GRAVE ACCENT */ + static const WCHAR part0_str12[] = {0x0112,0x0300,0}; + static const WCHAR part0_nfc12[] = {0x1E14,0}; + static const WCHAR part0_nfd12[] = {0x0045,0x0304,0x0300,0}; + + /* part 1: character by character */ + /* DIAERESIS */ + static const WCHAR part1_str1[] = {0x00a8,0}; + static const WCHAR part1_nfkc1[] = {0x0020,0x0308,0}; + + /* VULGAR FRACTION ONE QUARTER */ + static const WCHAR part1_str2[] = {0x00bc,0}; + static const WCHAR part1_nfkc2[] = {0x0031,0x2044,0x0034,0}; + + /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ + static const WCHAR part1_str3[] = {0x00ca,0}; + static const WCHAR part1_nfd3[] = {0x0045,0x0302,0}; + + /* MODIFIER LETTER SMALL GAMMA */ + static const WCHAR part1_str4[] = {0x02e0,0}; + static const WCHAR part1_nfkc4[] = {0x0263,0}; + + /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */ + static const WCHAR part1_str5[] = {0x0400,0}; + static const WCHAR part1_nfd5[] = {0x0415,0x0300,0}; + + /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */ + static const WCHAR part1_str6[] = {0x0476,0}; + static const WCHAR part1_nfd6[] = {0x0474,0x030F,0}; + + /* ARABIC LIGATURE HAH WITH JEEM INITIAL FORM */ + static const WCHAR part1_str7[] = {0xFCA9,0}; + static const WCHAR part1_nfkc7[] = {0x062D,0x062C,0}; + + /* GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA */ + static const WCHAR part1_str8[] = {0x1F42,0}; + static const WCHAR part1_nfd8[] = {0x03BF,0x0313,0x0300,0}; + + /* QUADRUPLE PRIME */ + static const WCHAR part1_str9[] = {0x2057,0}; + static const WCHAR part1_nfkc9[] = {0x2032,0x2032,0x2032,0x2032,0}; + + /* KATAKANA-HIRAGANA VOICED SOUND MARK */ + static const WCHAR part1_str10[] = {0x309B,0}; + static const WCHAR part1_nfkc10[] = {0x20,0x3099,0}; + + struct test_data_normal { + const WCHAR *str; + const WCHAR *expected[4]; + }; + static const struct test_data_normal test_arr[] = + { + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { 0 } + }; + const struct test_data_normal *ptest = test_arr; + const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD }; + WCHAR dst[80]; + int dstlen; + + if (!pNormalizeString) + { + win_skip("NormalizeString is not available.\n"); + return; + } + + todo_wine { + dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + } + + /* + * For each string, first test passing -1 as srclen to NormalizeString, + * thereby assuming a null-terminating string in src, and then test passing + * explicitly the string length. + * Do that for all 4 normalization forms. + */ + while (ptest->str) + { + int str_cmp, i; + + for (i = 0; i < 4; i++) + { + todo_wine { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] )+1, "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )+1); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); + ok(dstlen == strlenW( ptest->expected[i] ), "Copied length differed: was %d, should be %d\n", + dstlen, strlenW( ptest->expected[i] )); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); + } + } + } + ptest++; + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -5518,6 +5701,7 @@ START_TEST(locale) test_GetUserPreferredUILanguages(); test_FindNLSStringEx(); test_SetThreadUILanguage(); + test_NormalizeString(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Dmitry Timoshkov : services: Add a 3000 ms timeout to StartService.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: b5c1a8f635f2f8f8ccf7c85ad52c40a632711a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c1a8f635f2f8f8ccf7c85a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 19:29:02 2018 +0800 services: Add a 3000 ms timeout to StartService. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 ++-- programs/services/services.c | 15 ++++++++++++--- programs/services/services.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 5ecd660..efbcd76 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1212,7 +1212,7 @@ DWORD __cdecl svcctl_StartServiceW( if (service->service_entry->config.dwStartType == SERVICE_DISABLED) return ERROR_SERVICE_DISABLED; - if (!scmdatabase_lock_startup(service->service_entry->db)) + if (!scmdatabase_lock_startup(service->service_entry->db, 3000)) return ERROR_SERVICE_DATABASE_LOCKED; err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); @@ -1374,7 +1374,7 @@ DWORD __cdecl svcctl_LockServiceDatabase( if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) return err; - if (!scmdatabase_lock_startup(manager->db)) + if (!scmdatabase_lock_startup(manager->db, 0)) return ERROR_SERVICE_DATABASE_LOCKED; lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); diff --git a/programs/services/services.c b/programs/services/services.c index f7c47b5..eba98d6 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -361,7 +361,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) scmdatabase_unlock(db); qsort(services_list, size, sizeof(services_list[0]), compare_tags); - while (!scmdatabase_lock_startup(db)) Sleep(10); + scmdatabase_lock_startup(db, INFINITE); for (i = 0; i < size; i++) { @@ -619,9 +619,18 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) return ERROR_SUCCESS; } -BOOL scmdatabase_lock_startup(struct scmdatabase *db) +BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout) { - return !InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE); + while (InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE)) + { + if (timeout != INFINITE) + { + timeout -= 10; + if (timeout <= 0) return FALSE; + } + Sleep(10); + } + return TRUE; } void scmdatabase_unlock_startup(struct scmdatabase *db) diff --git a/programs/services/services.h b/programs/services/services.h index fd19ed3..5a79c35 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -77,7 +77,7 @@ struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR n struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -BOOL scmdatabase_lock_startup(struct scmdatabase *db); +BOOL scmdatabase_lock_startup(struct scmdatabase *db, int timeout); void scmdatabase_unlock_startup(struct scmdatabase *db); void scmdatabase_lock(struct scmdatabase *db);

1 0

Józef Kucia : winevulkan: Get rid of unused "phys_dev " field from VkDevice_T.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 9451a42cf72ba0ba62fb98340d467e028a5c5042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9451a42cf72ba0ba62fb9834… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 9 10:25:56 2018 +0200 winevulkan: Get rid of unused "phys_dev" field from VkDevice_T. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 -- dlls/winevulkan/vulkan_private.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c507e37..8f67483 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -532,8 +532,6 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, return res; } - object->phys_dev = phys_dev; - /* Just load all function pointers we are aware off. The loader takes care of filtering. * We use vkGetDeviceProcAddr as opposed to vkGetInstanceProcAddr for efficiency reasons * as functions pass through fewer dispatch tables within the loader. diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce13b1a..86b8e31 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -64,7 +64,7 @@ struct wine_vk_base struct VkCommandBuffer_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ }; @@ -72,7 +72,6 @@ struct VkDevice_T { struct wine_vk_base base; struct vulkan_device_funcs funcs; - struct VkPhysicalDevice_T *phys_dev; /* parent */ uint32_t max_queue_families; struct VkQueue_T **queues; @@ -112,7 +111,7 @@ struct VkPhysicalDevice_T struct VkQueue_T { struct wine_vk_base base; - VkDevice device; /* parent */ + struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ };

1 0