September 2018 - Wine-Commits

Owen Rudge : wsdapi: Implement matching of names in MatchProbeEx.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 2d1371001e4053b4d5a922a2f4af86a61ce3b4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d1371001e4053b4d5a922a2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:07 2018 +0100 wsdapi: Implement matching of names in MatchProbeEx. 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 | 58 ++++++++++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 +++++++ dlls/wsdapi/wsdapi_internal.h | 6 +++++ 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index a016e8d..fcbdfef 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -233,11 +233,13 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchProbe(IWSDiscoveryPublisher const WSD_NAME_LIST *pTypesList, const WSD_URI_LIST *pScopesList, const WSD_URI_LIST *pXAddrsList) { - FIXME("(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p, %p)\n", This, pProbeMessage, pMessageParameters, debugstr_w(pszId), + TRACE("(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p, %p)\n", This, pProbeMessage, pMessageParameters, debugstr_w(pszId), wine_dbgstr_longlong(ullMetadataVersion), wine_dbgstr_longlong(ullInstanceId), wine_dbgstr_longlong(ullMessageNumber), debugstr_w(pszSessionId), pTypesList, pScopesList, pXAddrsList); - return E_NOTIMPL; + return IWSDiscoveryPublisher_MatchProbeEx(This, pProbeMessage, pMessageParameters, pszId, ullMetadataVersion, + ullInstanceId, ullMessageNumber, pszSessionId, pTypesList, pScopesList, pXAddrsList, NULL, NULL, NULL, NULL, + NULL); } static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchResolve(IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pResolveMessage, @@ -276,6 +278,24 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_PublishEx(IWSDiscoveryPublisher pTypesList, pScopesList, pXAddrsList, pHeaderAny, pReferenceParameterAny, pEndpointReferenceAny, pAny); } +static BOOL is_name_in_list(WSDXML_NAME *name, const WSD_NAME_LIST *list) +{ + const WSD_NAME_LIST *next = list; + + while (next != NULL) + { + if ((lstrcmpW(next->Element->LocalName, name->LocalName) == 0) && + (lstrcmpW(next->Element->Space->PreferredPrefix, name->Space->PreferredPrefix) == 0)) + { + return TRUE; + } + + next = next->Next; + } + + return FALSE; +} + static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchProbeEx(IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pProbeMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, ULONGLONG ullMetadataVersion, ULONGLONG ullInstanceId, ULONGLONG ullMessageNumber, LPCWSTR pszSessionId, @@ -284,11 +304,41 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchProbeEx(IWSDiscoveryPublish const WSDXML_ELEMENT *pReferenceParameterAny, const WSDXML_ELEMENT *pPolicyAny, const WSDXML_ELEMENT *pEndpointReferenceAny, const WSDXML_ELEMENT *pAny) { - FIXME("(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, pProbeMessage, pMessageParameters, debugstr_w(pszId), + IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); + WSD_NAME_LIST *next_name; + WSD_PROBE *probe_msg; + + TRACE("(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, pProbeMessage, pMessageParameters, debugstr_w(pszId), wine_dbgstr_longlong(ullMetadataVersion), wine_dbgstr_longlong(ullInstanceId), wine_dbgstr_longlong(ullMessageNumber), debugstr_w(pszSessionId), pTypesList, pScopesList, pXAddrsList, pHeaderAny, pReferenceParameterAny, pPolicyAny, pEndpointReferenceAny, pAny); - return E_NOTIMPL; + if (!impl->publisherStarted) return E_ABORT; + + if ((pszId == NULL) || (lstrlenW(pszId) > WSD_MAX_TEXT_LENGTH) || + ((pszSessionId != NULL) && (lstrlenW(pszSessionId) > WSD_MAX_TEXT_LENGTH)) || (pProbeMessage == NULL) || + (pProbeMessage->Body == NULL)) + { + return E_INVALIDARG; + } + + probe_msg = (WSD_PROBE *) pProbeMessage->Body; + next_name = probe_msg->Types; + + /* Verify that all names in the probe message are present in the types list */ + while (next_name != NULL) + { + /* If a name isn't present, return success; we simply don't send a Probe Match message */ + if (!is_name_in_list(next_name->Element, pTypesList)) return S_OK; + + next_name = next_name->Next; + } + + if ((probe_msg->Scopes != NULL) && (probe_msg->Scopes->Scopes != NULL)) + FIXME("Scopes matching currently unimplemented\n"); + + return send_probe_matches_message(impl, pProbeMessage, pMessageParameters, pszId, ullMetadataVersion, ullInstanceId, + ullMessageNumber, pszSessionId, pTypesList, pScopesList, pXAddrsList, pHeaderAny, pReferenceParameterAny, + pEndpointReferenceAny, pAny); } static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchResolveEx(IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pResolveMessage, diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e2746b9..ef191a4 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1110,6 +1110,15 @@ cleanup: return ret; } +HRESULT send_probe_matches_message(IWSDiscoveryPublisherImpl *impl, const WSD_SOAP_MESSAGE *probe_msg, + IWSDMessageParameters *message_params, LPCWSTR id, ULONGLONG metadata_ver, ULONGLONG instance_id, + ULONGLONG msg_num, LPCWSTR session_id, const WSD_NAME_LIST *types_list, const WSD_URI_LIST *scopes_list, + 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; +} + static LPWSTR xml_text_to_wide_string(void *parent_memory, WS_XML_TEXT *text) { if (text->textType == WS_XML_TEXT_TYPE_UTF8) diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 3c9390a..a2b8902 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -78,6 +78,12 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON HRESULT send_bye_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG instance_id, ULONGLONG msg_num, LPCWSTR session_id, const WSDXML_ELEMENT *any); +HRESULT send_probe_matches_message(IWSDiscoveryPublisherImpl *impl, const WSD_SOAP_MESSAGE *probe_msg, + IWSDMessageParameters *message_params, LPCWSTR id, ULONGLONG metadata_ver, ULONGLONG instance_id, + ULONGLONG msg_num, LPCWSTR session_id, const WSD_NAME_LIST *types_list, const WSD_URI_LIST *scopes_list, + 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); + HRESULT register_namespaces(IWSDXMLContext *xml_context); HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg,

1 0

Owen Rudge : wsdapi: Ignore duplicate messages.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

Module: wine Branch: master Commit: 1a82fb88b29b58a41e7d985d8dfc981ca9d7246e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a82fb88b29b58a41e7d985d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 19 21:29:05 2018 +0100 wsdapi: Ignore duplicate 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/discovery.c | 13 ++++++++++++ dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 47 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 11 +++++++++- 4 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 7456f90..a016e8d 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -78,6 +78,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa IWSDiscoveryPublisherImpl *This = impl_from_IWSDiscoveryPublisher(iface); ULONG ref = InterlockedDecrement(&This->ref); struct notificationSink *sink, *cursor; + struct message_id *msg_id, *msg_id_cursor; TRACE("(%p) ref=%d\n", This, ref); @@ -98,6 +99,15 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa } DeleteCriticalSection(&This->notification_sink_critical_section); + + LIST_FOR_EACH_ENTRY_SAFE(msg_id, msg_id_cursor, &This->message_ids, struct message_id, entry) + { + heap_free(msg_id->id); + list_remove(&msg_id->entry); + heap_free(msg_id); + } + + DeleteCriticalSection(&This->message_ids_critical_section); HeapFree(GetProcessHeap(), 0, This); } @@ -402,6 +412,9 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover InitializeCriticalSection(&obj->notification_sink_critical_section); list_init(&obj->notificationSinks); + InitializeCriticalSection(&obj->message_ids_critical_section); + list_init(&obj->message_ids); + *ppPublisher = &obj->IWSDiscoveryPublisher_iface; TRACE("Returning iface %p\n", *ppPublisher); diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index c8f260c..c7af2c3 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -302,7 +302,7 @@ static HRESULT process_received_message(listener_thread_params *params, char *me int msg_type; HRESULT ret; - ret = read_message(message, message_len, &msg, &msg_type); + ret = read_message(params->impl, message, message_len, &msg, &msg_type); if (FAILED(ret)) return ret; switch (msg_type) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index bfa4f3b..e2746b9 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1488,7 +1488,44 @@ static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) return type; } -HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) +static BOOL is_duplicate_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id) +{ + struct message_id *msg_id, *msg_id_cursor; + BOOL ret = FALSE; + int len; + + EnterCriticalSection(&impl->message_ids_critical_section); + + LIST_FOR_EACH_ENTRY_SAFE(msg_id, msg_id_cursor, &impl->message_ids, struct message_id, entry) + { + if (lstrcmpW(msg_id->id, id) == 0) + { + ret = TRUE; + goto end; + } + } + + msg_id = heap_alloc(sizeof(*msg_id)); + if (!msg_id) goto end; + + len = (lstrlenW(id) + 1) * sizeof(WCHAR); + msg_id->id = heap_alloc(len); + + if (!msg_id->id) + { + heap_free(msg_id); + goto end; + } + + memcpy(msg_id->id, id, len); + list_add_tail(&impl->message_ids, &msg_id->entry); + +end: + LeaveCriticalSection(&impl->message_ids_critical_section); + return ret; +} + +HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) { WSDXML_ELEMENT *envelope = NULL, *header_element, *appsequence_element, *body_element; WS_XML_READER_TEXT_ENCODING encoding; @@ -1606,6 +1643,14 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg ret = WSDXMLGetValueFromAny(addressingNsUri, messageIdString, (WSDXML_ELEMENT *) header_element->FirstChild, &value); if (FAILED(ret)) goto cleanup; + + /* Detect duplicate messages */ + if (is_duplicate_message(impl, value)) + { + ret = E_FAIL; + goto cleanup; + } + soap_msg->Header.MessageID = duplicate_string(soap_msg, value); if (soap_msg->Header.MessageID == NULL) goto outofmemory; diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 7dd08f9..3c9390a 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -40,6 +40,12 @@ struct notificationSink IWSDiscoveryPublisherNotify *notificationSink; }; +struct message_id +{ + struct list entry; + LPWSTR id; +}; + #define MAX_WSD_THREADS 20 typedef struct IWSDiscoveryPublisherImpl { @@ -52,6 +58,8 @@ typedef struct IWSDiscoveryPublisherImpl { BOOL publisherStarted; HANDLE thread_handles[MAX_WSD_THREADS]; int num_thread_handles; + struct list message_ids; + CRITICAL_SECTION message_ids_critical_section; } IWSDiscoveryPublisherImpl; /* network.c */ @@ -72,7 +80,8 @@ HRESULT send_bye_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG HRESULT register_namespaces(IWSDXMLContext *xml_context); -HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type); +HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, + int *msg_type); #define MSGTYPE_UNKNOWN 0 #define MSGTYPE_PROBE 1

1 0

Owen Rudge : wsdapi: Implement generation of ProbeMatches message.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

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 Sept. 20, 2018

Sept. 20, 2018

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

Alex Henrie : wmp/tests: Destroy the window before calling CoUninitialize.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

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

Owen Rudge : wsdapi: Prefer Wine version.
by Alexandre Julliard Sept. 20, 2018

Sept. 20, 2018

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

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

Sept. 20, 2018

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

Józef Kucia : dxgi/tests: Avoid "skipping tests" in skip() messages.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 54e3a9963444978df8baa700974036ab27e39a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e3a9963444978df8baa700… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 19 16:55:31 2018 +0200 dxgi/tests: Avoid "skipping tests" in skip() messages. skip() prints "Tests skipped:". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 62070e0..d1908ac 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -643,7 +643,7 @@ static void test_adapter_desc(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -884,7 +884,7 @@ static void test_create_surface(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -922,7 +922,7 @@ static void test_parents(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -947,7 +947,7 @@ static void test_parents(void) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter has not outputs, skipping output tests.\n"); + skip("Adapter has not outputs.\n"); } else { @@ -990,7 +990,7 @@ static void test_output(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1000,7 +1000,7 @@ static void test_output(void) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter doesn't have any outputs, skipping tests.\n"); + skip("Adapter doesn't have any outputs.\n"); IDXGIAdapter_Release(adapter); IDXGIDevice_Release(device); return; @@ -1076,7 +1076,7 @@ static void test_output(void) } else { - skip("Not enough modes for test, skipping.\n"); + skip("Not enough modes for test.\n"); } heap_free(modes); @@ -1308,7 +1308,7 @@ static void test_create_swapchain(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2916,7 +2916,7 @@ static void test_private_data(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3489,7 +3489,7 @@ static void test_swapchain_parameters(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } window = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,

1 0

Józef Kucia : dxgi/tests: Add test for swapchain window messages.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 1d1f340c900cc74b468d947c0a46890dacc16b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1f340c900cc74b468d947c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 19 16:55:29 2018 +0200 dxgi/tests: Add test for swapchain window messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d1f340c900cc74b468d…

1 0

Józef Kucia : user32/tests: Add test for desktop window procedure.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 34700ae9381ae28e1ba5519b53ef62e6d04301dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=34700ae9381ae28e1ba5519b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:07:28 2018 +0200 user32/tests: Add test for desktop window procedure. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 55d8994..28b58b6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14963,6 +14963,67 @@ static void test_defwinproc(void) DestroyWindow( hwnd); } +static void test_desktop_winproc(void) +{ + HINSTANCE instance = GetModuleHandleA(NULL); + RECT rect, default_rect; + WNDPROC desktop_proc; + char buffer[256]; + WNDCLASSA cls; + LRESULT res; + HWND hwnd; + BOOL ret; + + ret = GetClassInfoA(instance, (const CHAR *)MAKEINTATOM(32769), &cls); + ok(ret, "Failed to get desktop class.\n"); + desktop_proc = cls.lpfnWndProc; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = desktop_proc; + cls.hInstance = instance; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestDesktopClass"; + ret = !!RegisterClassA(&cls); + ok(ret, "Failed to register class.\n"); + + hwnd = CreateWindowExA(0, cls.lpszClassName, "test_desktop_wndproc", + WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0, 0, 500, 100, 0, 0, 0, NULL); + if (!hwnd) /* win2003 */ + { + skip("Failed to create window with desktop window procedure.\n"); + goto out_unregister; + } + + memset(&cls, 0, sizeof(cls)); + ret = GetClassInfoA(instance, "TestDesktopClass", &cls); + ok(ret, "Failed to get class info.\n"); + ok(cls.lpfnWndProc == desktop_proc, "Got %p, expected %p.\n", cls.lpfnWndProc, desktop_proc); + + GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); + todo_wine ok(!strcmp(buffer, "test_desktop_wndproc"), "Got unexpected window text: %s.\n", buffer); + + res = CallWindowProcA(desktop_proc, hwnd, WM_SETTEXT, 0, (LPARAM)"test"); + ok(res == TRUE, "Failed to set text, %ld.\n", res); + GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); + ok(!strcmp(buffer, "test"), "Got unexpected window text: %s.\n", buffer); + + SetRect(&default_rect, 0, 0, 100, 100); + res = DefWindowProcW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&default_rect); + ok(!res, "Got unexpected result %ld.\n", res); + + SetRect(&rect, 0, 0, 100, 100); + res = CallWindowProcA(desktop_proc, hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&rect); + ok(!res, "Got unexpected result %ld.\n", res); + todo_wine ok(EqualRect(&rect, &default_rect), "rect Got %s, expected %s.\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&default_rect)); + + DestroyWindow(hwnd); + +out_unregister: + UnregisterClassA("TestDesktopClass", instance); +} + #define clear_clipboard(hwnd) clear_clipboard_(__LINE__, (hwnd)) static void clear_clipboard_(int line, HWND hWnd) { @@ -17108,6 +17169,7 @@ START_TEST(msg) test_menu_messages(); test_paintingloop(); test_defwinproc(); + test_desktop_winproc(); test_clipboard_viewers(); test_keyflags(); test_hotkey();

1 0