September 2018 - Wine-commits

Owen Rudge : wsdapi: Implement generation of ProbeMatches message.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 0ed2af4f121912a52edfb85bc9390e77bc22983e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed2af4f121912a52edfb85b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:09 2018 +0100 wsdapi: Implement generation of ProbeMatches 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 | 169 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index ef191a4..4469cef 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -38,6 +38,14 @@ static const WCHAR discoveryTo[] = { 'w','s',':','2','0','0','5',':','0','4',':', 'd','i','s','c','o','v','e','r','y', 0 }; +static const WCHAR anonymousTo[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','4','/','0','8','/', + 'a','d','d','r','e','s','s','i','n','g','/', + 'r','o','l','e','/', + 'a','n','o','n','y','m','o','u','s', 0 }; + static const WCHAR actionHello[] = { 'h','t','t','p',':','/','/', 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', @@ -52,6 +60,13 @@ static const WCHAR actionProbe[] = { 'd','i','s','c','o','v','e','r','y','/', 'P','r','o','b','e', 0 }; +static const WCHAR actionProbeMatches[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','5','/','0','4','/', + 'd','i','s','c','o','v','e','r','y','/', + 'P','r','o','b','e','M','a','t','c','h','e','s', 0 }; + static const WCHAR actionBye[] = { 'h','t','t','p',':','/','/', 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', @@ -90,6 +105,8 @@ static const WCHAR emptyString[] = { 0 }; static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; static const WCHAR probeString[] = { 'P','r','o','b','e', 0 }; +static const WCHAR probeMatchString[] = { 'P','r','o','b','e','M','a','t','c','h', 0 }; +static const WCHAR probeMatchesString[] = { 'P','r','o','b','e','M','a','t','c','h','e','s', 0 }; static const WCHAR byeString[] = { 'B','y','e', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; @@ -1116,7 +1133,157 @@ HRESULT send_probe_matches_message(IWSDiscoveryPublisherImpl *impl, const WSD_SO const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *header_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any) { - return E_NOTIMPL; + WSDXML_ELEMENT *body_element = NULL, *probe_matches_element, *probe_match_element, *endpoint_ref_element; + WSDXML_ELEMENT *ref_params_element = NULL; + struct list *discovered_namespaces = NULL; + IWSDUdpAddress *remote_udp_addr = NULL; + IWSDAddress *remote_addr = NULL; + WSDXML_NAME *body_name = NULL; + WSD_SOAP_HEADER soap_header; + WSD_APP_SEQUENCE sequence; + WCHAR msg_id[64]; + LPWSTR buffer; + HRESULT ret; + + ret = IWSDMessageParameters_GetRemoteAddress(message_params, &remote_addr); + + if (FAILED(ret)) + { + WARN("Unable to retrieve remote address from IWSDMessageParameters\n"); + return ret; + } + + ret = IWSDAddress_QueryInterface(remote_addr, &IID_IWSDUdpAddress, (LPVOID *) &remote_udp_addr); + + if (FAILED(ret)) + { + WARN("Remote address is not a UDP address\n"); + goto cleanup; + } + + sequence.InstanceId = instance_id; + sequence.MessageNumber = msg_num; + sequence.SequenceId = session_id; + + if (!create_guid(msg_id)) goto failed; + + discovered_namespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); + if (!discovered_namespaces) goto failed; + + list_init(discovered_namespaces); + + populate_soap_header(&soap_header, anonymousTo, actionProbeMatches, msg_id, &sequence, header_any); + soap_header.RelatesTo.MessageID = probe_msg->Header.MessageID; + + ret = IWSDXMLContext_AddNameToNamespace(impl->xmlContext, envelopeNsUri, bodyString, &body_name); + if (FAILED(ret)) goto cleanup; + + /* <soap:Body>, <wsd:ProbeMatches> */ + ret = WSDXMLBuildAnyForSingleElement(body_name, NULL, &body_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, body_element, discoveryNsUri, probeMatchesString, NULL, + &probe_matches_element); + if (FAILED(ret)) goto cleanup; + + /* <wsd:ProbeMatch> */ + ret = add_child_element(impl->xmlContext, probe_matches_element, discoveryNsUri, probeMatchString, NULL, + &probe_match_element); + if (FAILED(ret)) goto cleanup; + + /* <wsa:EndpointReference>, <wsa:Address> */ + ret = add_child_element(impl->xmlContext, probe_match_element, addressingNsUri, endpointReferenceString, NULL, + &endpoint_ref_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, endpoint_ref_element, addressingNsUri, addressString, id, NULL); + if (FAILED(ret)) goto cleanup; + + /* Write any reference parameters */ + if (ref_param_any != NULL) + { + ret = add_child_element(impl->xmlContext, endpoint_ref_element, addressingNsUri, referenceParametersString, + NULL, &ref_params_element); + if (FAILED(ret)) goto cleanup; + + ret = duplicate_element(ref_params_element, ref_param_any, discovered_namespaces); + if (FAILED(ret)) goto cleanup; + } + + /* Write any endpoint reference headers */ + if (endpoint_ref_any != NULL) + { + ret = duplicate_element(endpoint_ref_element, endpoint_ref_any, discovered_namespaces); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:Types> */ + if (types_list != NULL) + { + buffer = WSDAllocateLinkedMemory(probe_match_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_types_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), types_list, discovered_namespaces); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, probe_match_element, discoveryNsUri, typesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:Scopes> */ + if (scopes_list != NULL) + { + buffer = WSDAllocateLinkedMemory(probe_match_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), scopes_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, probe_match_element, discoveryNsUri, scopesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:XAddrs> */ + if (xaddrs_list != NULL) + { + buffer = WSDAllocateLinkedMemory(probe_match_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), xaddrs_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, probe_match_element, discoveryNsUri, xAddrsString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:MetadataVersion> */ + ret = add_child_element(impl->xmlContext, probe_match_element, discoveryNsUri, metadataVersionString, + ulonglong_to_string(probe_match_element, min(UINT_MAX, metadata_ver)), NULL); + if (FAILED(ret)) goto cleanup; + + /* Write any body elements */ + if (any != NULL) + { + ret = duplicate_element(probe_match_element, any, discovered_namespaces); + if (FAILED(ret)) goto cleanup; + } + + /* Write and send the message */ + ret = write_and_send_message(impl, &soap_header, body_element, discovered_namespaces, remote_udp_addr, APP_MAX_DELAY); + goto cleanup; + +failed: + ret = E_FAIL; + +cleanup: + WSDFreeLinkedMemory(body_name); + WSDFreeLinkedMemory(body_element); + WSDFreeLinkedMemory(discovered_namespaces); + + if (remote_udp_addr != NULL) IWSDUdpAddress_Release(remote_udp_addr); + if (remote_addr != NULL) IWSDAddress_Release(remote_addr); + + return ret; } static LPWSTR xml_text_to_wide_string(void *parent_memory, WS_XML_TEXT *text) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index f33f469..d231fd9 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -706,7 +706,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP rc = IWSDiscoveryPublisher_MatchProbeEx(publisher_instance, pSoap, pMessageParameters, publisherIdW, 1, 1, 1, sequenceIdW, probe_msg->Types, NULL, NULL, header_any_element, ref_param_any_element, NULL, endpoint_any_element, body_any_element); - todo_wine ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbe failed with %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbeEx failed with %08x\n", rc); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element);

1 0

Owen Rudge : wsdapi: Send Probe Matches message via UDP unicast.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: ed3670eef01ade33fe57f82ccfa962a0ed04c7ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3670eef01ade33fe57f82c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:10 2018 +0100 wsdapi: Send Probe Matches message via UDP unicast. 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/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index c7af2c3..ab29084 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -558,6 +558,38 @@ cleanup: return (ret == ERROR_SUCCESS) && (valid_listeners > 0); } +HRESULT send_udp_unicast(char *data, int length, IWSDUdpAddress *remote_addr, int max_initial_delay) +{ + SOCKADDR_STORAGE address; + HRESULT ret; + SOCKET s; + + ZeroMemory(&address, sizeof(SOCKADDR_STORAGE)); + + ret = IWSDUdpAddress_GetSockaddr(remote_addr, &address); + + if (FAILED(ret)) + { + WARN("No sockaddr specified in send_udp_unicast\n"); + return ret; + } + + /* Create a socket and bind to the adapter address */ + s = socket(address.ss_family, SOCK_DGRAM, IPPROTO_UDP); + + if (s == INVALID_SOCKET) + { + int error = WSAGetLastError(); + WARN("Unable to create socket: %d\n", error); + return HRESULT_FROM_WIN32(error); + } + + send_message(s, data, length, &address, max_initial_delay, UNICAST_UDP_REPEAT); + closesocket(s); + + return S_OK; +} + void terminate_networking(IWSDiscoveryPublisherImpl *impl) { BOOL needsCleanup = impl->publisherStarted; diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 4469cef..45f0da9 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -923,8 +923,8 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ } else { - /* TODO: Send the message via UDP unicast */ - FIXME("TODO: Send the message via UDP unicast\n"); + /* Send the message via UDP unicast */ + ret = send_udp_unicast(full_xml, xml_length + xml_header_len + 1, remote_address, max_initial_delay); } heap_free(full_xml); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index d231fd9..16cefd9 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -729,7 +729,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP DeleteCriticalSection(&msg_storage->criticalSection); /* Verify we've received a message */ - todo_wine ok(msg_storage->messageCount >= 1, "No messages received\n"); + ok(msg_storage->messageCount >= 1, "No messages received\n"); sprintf(endpoint_reference_string, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address>" "<wsa:ReferenceParameters><wine:Beer>RefPTest</wine:Beer></wsa:ReferenceParameters>" @@ -767,16 +767,16 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP heap_free(msg_storage->messages[i]); } - todo_wine ok(probe_matches_message_seen == TRUE, "Probe matches message not received\n"); - todo_wine ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); - todo_wine ok(app_sequence_seen == TRUE, "AppSequence not received\n"); - todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); - todo_wine ok(message_ok == TRUE, "ProbeMatches 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"); - todo_wine ok(body_probe_matches_seen == TRUE, "Body and Probe Matches elements not received\n"); - todo_wine ok(any_body_seen == TRUE, "Custom body element not received\n"); - todo_wine ok(types_seen == TRUE, "Types not received\n"); + ok(probe_matches_message_seen == TRUE, "Probe matches message not received\n"); + ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); + ok(app_sequence_seen == TRUE, "AppSequence not received\n"); + ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); + ok(message_ok == TRUE, "ProbeMatches 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_probe_matches_seen == TRUE, "Body and Probe Matches elements not received\n"); + ok(any_body_seen == TRUE, "Custom body element not received\n"); + ok(types_seen == TRUE, "Types not received\n"); after_matchprobe_test: heap_free(publisherIdW); diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index a2b8902..2bab54f 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -67,6 +67,7 @@ typedef struct IWSDiscoveryPublisherImpl { BOOL init_networking(IWSDiscoveryPublisherImpl *impl); void terminate_networking(IWSDiscoveryPublisherImpl *impl); BOOL send_udp_multicast(IWSDiscoveryPublisherImpl *impl, char *data, int length, int max_initial_delay); +HRESULT send_udp_unicast(char *data, int length, IWSDUdpAddress *remote_addr, int max_initial_delay); /* soap.c */

1 0

Owen Rudge : wsdapi: Don' t include null character at the end of sent messages.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: b5342b2543872c6a5e21dc09db763388bbce07c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5342b2543872c6a5e21dc09… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:12 2018 +0100 wsdapi: Don't include null character at the end of sent messages. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 45f0da9..e123398 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -919,12 +919,12 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ if (remote_address == NULL) { /* Send the message via UDP multicast */ - ret = send_udp_multicast(impl, full_xml, xml_length + xml_header_len + 1, max_initial_delay) ? S_OK : E_FAIL; + ret = send_udp_multicast(impl, full_xml, xml_length + xml_header_len, max_initial_delay) ? S_OK : E_FAIL; } else { /* Send the message via UDP unicast */ - ret = send_udp_unicast(full_xml, xml_length + xml_header_len + 1, remote_address, max_initial_delay); + ret = send_udp_unicast(full_xml, xml_length + xml_header_len, remote_address, max_initial_delay); } heap_free(full_xml);

1 0

Owen Rudge : wsdapi: Prefer Wine version.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: de2d53c6f25ca29cc52306695ebf556b106922cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=de2d53c6f25ca29cc5230669… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:14 2018 +0100 wsdapi: Prefer Wine version. 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/Makefile.in | 1 - dlls/wsdapi/main.c | 43 ------------------------------------------- 2 files changed, 44 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index f5eb0fd..dd7b350 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -5,7 +5,6 @@ IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 C_SRCS = \ address.c \ discovery.c \ - main.c \ memory.c \ msgparams.c \ network.c \ diff --git a/dlls/wsdapi/main.c b/dlls/wsdapi/main.c deleted file mode 100644 index ea0fef3..0000000 --- a/dlls/wsdapi/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Web Services on Devices - * - * Copyright 2017 Owen Rudge for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Henri Verbeet : wined3d: Rename "wined3d_adapter_opengl" to " wined3d_adapter_gl".
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 8f9a2165e9e85b2ef8831db7dda3f951ed737825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f9a2165e9e85b2ef8831db7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 02:48:46 2018 +0430 wined3d: Rename "wined3d_adapter_opengl" to "wined3d_adapter_gl". For consistency with the filename. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 ++++---- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e60383c..0948741 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4182,12 +4182,12 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static const struct wined3d_adapter_ops wined3d_adapter_opengl_ops = +static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { - wined3d_adapter_opengl_create_context, + wined3d_adapter_gl_create_context, }; -BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) +BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -4290,7 +4290,7 @@ BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_ wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); - adapter->adapter_ops = &wined3d_adapter_opengl_ops; + adapter->adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 34376ef..19f0fcb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1997,7 +1997,7 @@ out: return NULL; } -BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = context->device; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 81c3b5d..d1d80b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2525,7 +2525,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); - return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); + return wined3d_adapter_gl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89cf44b..f01ad17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2647,7 +2647,7 @@ struct wined3d_adapter_ops struct wined3d_texture *target, const struct wined3d_format *ds_format); }; -BOOL wined3d_adapter_opengl_create_context(struct wined3d_context *context, +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; /* The adapter structure */ @@ -2675,7 +2675,7 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; struct wined3d_caps_gl_ctx {

1 0

Henri Verbeet : wined3d: Disallow creating devices without adapters in wined3d_device_create().
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 859c1d26ce5ee52373ee3f0af63d65a4fff33b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=859c1d26ce5ee52373ee3f0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 20 02:48:47 2018 +0430 wined3d: Disallow creating devices without adapters in wined3d_device_create(). These days, we have an adapter even with WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1d80b8..b6c6ecb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2438,12 +2438,11 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", + TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, " + "flags %#x, surface_alignment %u, device_parent %p, device %p.\n", wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device); - /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter - * number and create a device without a 3D adapter for 2D only operation. */ - if (wined3d->adapter_count && adapter_idx >= wined3d->adapter_count) + if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; if (!(object = heap_alloc_zero(sizeof(*object))))

1 0

Alex Henrie : wmp/tests: Destroy the window before calling CoUninitialize.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: 6878cbf51ce032657801f21558e7b8df4bd886ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=6878cbf51ce032657801f215… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 19 22:17:00 2018 -0600 wmp/tests: Destroy the window before calling CoUninitialize. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 2250b75..deac5cd 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -1379,11 +1379,11 @@ static void create_container_window(void) START_TEST(oleobj) { - create_container_window(); CoInitialize(NULL); + create_container_window(); test_wmp(); - CoUninitialize(); DestroyWindow(container_hwnd); + CoUninitialize(); }

1 0

Nikolay Sivov : opcservices: Implement PartExists().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: c009967baeb44cfce39a45737f14f4bd88c7a946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c009967baeb44cfce39a4573… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:37 2018 +0300 opcservices: Implement PartExists(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 11 +++++++++-- dlls/opcservices/tests/opcservices.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 6e1a024..ae610ac 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1011,9 +1011,16 @@ static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *n static HRESULT WINAPI opc_part_set_PartExists(IOpcPartSet *iface, IOpcPartUri *name, BOOL *exists) { - FIXME("iface %p, name %p, exists %p stub!\n", iface, name, exists); + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); - return E_NOTIMPL; + TRACE("iface %p, name %p, exists %p.\n", iface, name, exists); + + if (!name || !exists) + return E_POINTER; + + *exists = opc_part_set_get_part(part_set, name) != NULL; + + return S_OK; } static HRESULT WINAPI opc_part_set_GetEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 2bcf46f..8bcd914 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -187,12 +187,19 @@ static void test_package(void) IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); + ret = 123; + hr = IOpcPartSet_PartExists(partset, NULL, &ret); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(ret == 123, "Unexpected return value.\n"); + + hr = IOpcPartSet_PartExists(partset, part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ret = FALSE; hr = IOpcPartSet_PartExists(partset, part_uri, &ret); -todo_wine { ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); ok(ret, "Expected part to exist.\n"); -} + IOpcPartUri_Release(part_uri); IOpcPart_Release(part);

1 0

Nikolay Sivov : opcservices: Write full content type stream.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: adccf12e3b68d9cd0a58e5a2ef34acbe87648c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adccf12e3b68d9cd0a58e5a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:38 2018 +0300 opcservices: Write full content type stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 + dlls/opcservices/package.c | 244 +++++++++++++++++++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 79 ++++++++++++ 3 files changed, 317 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adccf12e3b68d9cd0a58…

1 0

Nikolay Sivov : d2d1: Implement CreateBitmapFromDxgiSurface().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: bdd3f7b1eeb6f17c9da67ef4f7bf2d1c15bcf7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdd3f7b1eeb6f17c9da67ef4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:55:08 2018 +0300 d2d1: Implement CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d779fb0..d20377b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1825,9 +1825,33 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicCol static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { - FIXME("iface %p, surface %p, desc %p, bitmap %p stub!\n", iface, surface, desc, bitmap); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d_bitmap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, surface %p, desc %p, bitmap %p.\n", iface, surface, desc, bitmap); + + if (!desc) + { + DXGI_SURFACE_DESC surface_desc; + + if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) + { + WARN("Failed to get surface desc, hr %#x.\n", hr); + return hr; + } + + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat.format = surface_desc.Format; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + desc = &bitmap_desc; + } + + if (SUCCEEDED(hr = d2d_bitmap_create_shared(context, &IID_IDXGISurface, surface, desc, &object))) + *bitmap = &object->ID2D1Bitmap1_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface,

1 0