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

Zebediah Figura : winedbg/gdbproxy: Store the register map inside the be_cpu struct.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 1244759036af68780f9d6b4d95d251a8d80ffe11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1244759036af68780f9d6b4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 13 16:34:01 2018 -0500 winedbg/gdbproxy: Store the register map inside the be_cpu struct. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 24 +++ programs/winedbg/be_arm64.c | 41 ++++++ programs/winedbg/be_cpu.h | 10 ++ programs/winedbg/be_i386.c | 48 ++++++ programs/winedbg/be_ppc.c | 80 ++++++++++ programs/winedbg/be_x86_64.c | 64 ++++++++ programs/winedbg/debugger.h | 2 + programs/winedbg/gdbproxy.c | 343 +++++-------------------------------------- 8 files changed, 306 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1244759036af68780f9d…

1 0

Zebediah Figura : winedbg: Always start the interactive debugger in 64-bit mode if in a 64-bit prefix.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 8b3294a4dd975eb44bda3ab581ee9958d300d5d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3294a4dd975eb44bda3ab5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 13 16:34:02 2018 -0500 winedbg: Always start the interactive debugger in 64-bit mode if in a 64-bit prefix. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 1ac4187..0e45186 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -632,6 +632,35 @@ static LONG CALLBACK top_filter( EXCEPTION_POINTERS *ptr ) return EXCEPTION_EXECUTE_HANDLER; } +static void restart_if_wow64(void) +{ + BOOL is_wow64; + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR filename[MAX_PATH]; + void *redir; + DWORD exit_code; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + GetModuleFileNameW( 0, filename, MAX_PATH ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); + } +} + int main(int argc, char** argv) { int retv = 0; @@ -654,6 +683,7 @@ int main(int argc, char** argv) if (argc && !strcmp(argv[0], "--gdb")) { + restart_if_wow64(); retv = gdb_main(argc, argv); if (retv == -1) dbg_winedbg_usage(FALSE); return retv; @@ -727,6 +757,8 @@ int main(int argc, char** argv) case start_error_init: return -1; } + restart_if_wow64(); + dbg_start_interactive(hFile); return 0;

1 0

Andrew Eikum : winex11.drv: Refcount the vulkan surface window.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: f74e8a29670f58ac419cc4d8426f659dffb4409b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74e8a29670f58ac419cc4d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 13 15:08:20 2018 -0500 winex11.drv: Refcount the vulkan surface window. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 61 ++++++++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 7e25232..7eca31b 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,11 +41,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN +static CRITICAL_SECTION context_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &context_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": context_section") } +}; +static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static XContext vulkan_hwnd_context; + typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 struct wine_vk_surface { + LONG ref; Window window; VkSurfaceKHR surface; /* native surface */ }; @@ -115,6 +127,8 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkQueuePresentKHR) #undef LOAD_FUNCPTR + vulkan_hwnd_context = XUniqueContext(); + return TRUE; fail: @@ -171,13 +185,16 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } -static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface *surface) +static struct wine_vk_surface *wine_vk_surface_grab(struct wine_vk_surface *surface) { - if (!surface) - return; + InterlockedIncrement(&surface->ref); + return surface; +} - /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ - pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); +static void wine_vk_surface_release(struct wine_vk_surface *surface) +{ + if (InterlockedDecrement(&surface->ref)) + return; if (surface->window) XDestroyWindow(gdi_display, surface->window); @@ -185,6 +202,18 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface heap_free(surface); } +void wine_vk_surface_destroy(HWND hwnd) +{ + struct wine_vk_surface *surface; + EnterCriticalSection(&context_section); + if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) + { + wine_vk_surface_release(surface); + } + XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); + LeaveCriticalSection(&context_section); +} + static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) { @@ -245,7 +274,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, { VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; - struct wine_vk_surface *x11_surface; + struct wine_vk_surface *x11_surface, *prev; TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); @@ -263,6 +292,8 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (!x11_surface) return VK_ERROR_OUT_OF_HOST_MEMORY; + x11_surface->ref = 1; + x11_surface->window = create_client_window(create_info->hwnd, &default_visual); if (!x11_surface->window) { @@ -286,13 +317,21 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + EnterCriticalSection(&context_section); + if (!XFindContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char **)&prev)) + { + wine_vk_surface_release(prev); + } + XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); + LeaveCriticalSection(&context_section); + *surface = (uintptr_t)x11_surface; TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); return VK_SUCCESS; err: - wine_vk_surface_destroy(instance, x11_surface); + wine_vk_surface_release(x11_surface); return res; } @@ -316,7 +355,13 @@ static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - wine_vk_surface_destroy(instance, x11_surface); + /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ + if (x11_surface) + { + pvkDestroySurfaceKHR(instance, x11_surface->surface, NULL /* allocator */); + + wine_vk_surface_release(x11_surface); + } } static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5fecd9a..a848dc6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1719,6 +1719,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); destroy_gl_drawable( hwnd ); + wine_vk_surface_destroy( hwnd ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 85a05a9..939c2e7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -586,6 +586,7 @@ extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; +extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ) DECLSPEC_HIDDEN; extern Window init_clip_window(void) DECLSPEC_HIDDEN;

1 0

Owen Rudge : wsdapi: Add support for listening for UDP multicast broadcasts.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: e69f09746ed67d35830abeea7461cbfd361b24d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69f09746ed67d35830abeea… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:18 2018 +0100 wsdapi: Add support for listening for UDP multicast broadcasts. 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 | 287 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 4 + 2 files changed, 290 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e69f09746ed67d35830a…

1 0

Owen Rudge : wsdapi: Add critical section around notification sinks.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: e4c79c13b2313db95fc00f2350fd1da49cf5d8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4c79c13b2313db95fc00f23… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:20 2018 +0100 wsdapi: Add critical section around notification sinks. 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 | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 9971219..7456f90 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -97,6 +97,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa HeapFree(GetProcessHeap(), 0, sink); } + DeleteCriticalSection(&This->notification_sink_critical_section); HeapFree(GetProcessHeap(), 0, This); } @@ -148,7 +149,9 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_RegisterNotificationSink(IWSDisc sink->notificationSink = pSink; IWSDiscoveryPublisherNotify_AddRef(pSink); + EnterCriticalSection(&impl->notification_sink_critical_section); list_add_tail(&impl->notificationSinks, &sink->entry); + LeaveCriticalSection(&impl->notification_sink_critical_section); if ((!impl->publisherStarted) && (!init_networking(impl))) return E_FAIL; @@ -168,6 +171,8 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi return E_INVALIDARG; } + EnterCriticalSection(&impl->notification_sink_critical_section); + LIST_FOR_EACH_ENTRY(sink, &impl->notificationSinks, struct notificationSink, entry) { if (sink->notificationSink == pSink) @@ -176,10 +181,13 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDi list_remove(&sink->entry); HeapFree(GetProcessHeap(), 0, sink); + LeaveCriticalSection(&impl->notification_sink_critical_section); return S_OK; } } + LeaveCriticalSection(&impl->notification_sink_critical_section); + /* Notification sink is not registered */ return E_FAIL; } @@ -391,6 +399,7 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover return ret; } + InitializeCriticalSection(&obj->notification_sink_critical_section); list_init(&obj->notificationSinks); *ppPublisher = &obj->IWSDiscoveryPublisher_iface; diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index f88822d..3e5e163 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -48,6 +48,7 @@ typedef struct IWSDiscoveryPublisherImpl { IWSDXMLContext *xmlContext; DWORD addressFamily; struct list notificationSinks; + CRITICAL_SECTION notification_sink_critical_section; BOOL publisherStarted; HANDLE thread_handles[MAX_WSD_THREADS]; int num_thread_handles;

1 0

Owen Rudge : wsdapi: Add stub for Probe message parsing, prepare notification sink message.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 023bbaa38417d715af37322c027b851e38ff15ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=023bbaa38417d715af37322c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:22 2018 +0100 wsdapi: Add stub for Probe message parsing, prepare notification sink 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/network.c | 60 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/soap.c | 6 +++++ dlls/wsdapi/wsdapi_internal.h | 5 ++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index e91ab76..e124a5d 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -292,6 +292,64 @@ typedef struct listener_thread_params BOOL ipv6; } listener_thread_params; +static HRESULT process_received_message(listener_thread_params *params, char *message, int message_len, + SOCKADDR_STORAGE *source_addr) +{ + IWSDUdpMessageParameters *msg_params = NULL; + IWSDUdpAddress *remote_addr = NULL; + struct notificationSink *sink; + WSD_SOAP_MESSAGE *msg = NULL; + int msg_type; + HRESULT ret; + + ret = read_message(message, message_len, &msg, &msg_type); + if (FAILED(ret)) return ret; + + switch (msg_type) + { + case MSGTYPE_PROBE: + TRACE("Received probe message\n"); + + ret = WSDCreateUdpMessageParameters(&msg_params); + + if (FAILED(ret)) + { + ERR("Unable to create IWSDUdpMessageParameters, not processing message.\n"); + goto cleanup; + } + + ret = WSDCreateUdpAddress(&remote_addr); + + if (FAILED(ret)) + { + ERR("Unable to create IWSDUdpAddress, not processing message.\n"); + goto cleanup; + } + + IWSDUdpAddress_SetSockaddr(remote_addr, source_addr); + IWSDUdpMessageParameters_SetRemoteAddress(msg_params, (IWSDAddress *)remote_addr); + + EnterCriticalSection(&params->impl->notification_sink_critical_section); + + LIST_FOR_EACH_ENTRY(sink, &params->impl->notificationSinks, struct notificationSink, entry) + { + IWSDiscoveryPublisherNotify_ProbeHandler(sink->notificationSink, msg, (IWSDMessageParameters *)msg_params); + } + + LeaveCriticalSection(&params->impl->notification_sink_critical_section); + + break; + } + +cleanup: + WSDFreeLinkedMemory(msg); + + if (remote_addr != NULL) IWSDUdpAddress_Release(remote_addr); + if (msg_params != NULL) IWSDUdpMessageParameters_Release(msg_params); + + return ret; +} + #define RECEIVE_BUFFER_SIZE 65536 static DWORD WINAPI listening_thread(LPVOID params) @@ -321,7 +379,7 @@ static DWORD WINAPI listening_thread(LPVOID params) } else { - /* TODO: Process received message */ + process_received_message(parameter, buffer, bytes_received, &source_addr); } } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index d0fb0af..0d4a4a6 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1080,3 +1080,9 @@ cleanup: return ret; } + +HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) +{ + /* TODO: Parse and read message */ + return E_NOTIMPL; +} diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 3e5e163..dc4fc4d 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -72,6 +72,11 @@ 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); + +#define MSGTYPE_UNKNOWN 0 +#define MSGTYPE_PROBE 1 + /* xml.c */ LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value);

1 0

Owen Rudge : wsdapi: Add initial support for reading messages; identify Probe message.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 254203a45e176cf800b7d7c7855deb6888add2ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=254203a45e176cf800b7d7c7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:24 2018 +0100 wsdapi: Add initial support for reading messages; identify Probe message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 388 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 6 +- 2 files changed, 389 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=254203a45e176cf800b7…

1 0

Owen Rudge : wsdapi: Return "any" headers in read_message.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 098a99fc4100a1f0d421f92cf9b902196320b74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=098a99fc4100a1f0d421f92c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:26 2018 +0100 wsdapi: Return "any" headers in read_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 | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index c701bb0..34b9490 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1317,6 +1317,35 @@ static WSDXML_ELEMENT *find_element(WSDXML_ELEMENT *parent, LPCWSTR name, LPCWST return NULL; } +static void remove_element(WSDXML_ELEMENT *element) +{ + WSDXML_NODE *cur; + + if (element == NULL) + return; + + if (element->Node.Parent->FirstChild == (WSDXML_NODE *) element) + element->Node.Parent->FirstChild = element->Node.Next; + else + { + cur = element->Node.Parent->FirstChild; + + while (cur != NULL) + { + if (cur->Next == (WSDXML_NODE *) element) + { + cur->Next = element->Node.Next; + break; + } + + cur = cur->Next; + } + } + + WSDDetachLinkedMemory(element); + WSDFreeLinkedMemory(element); +} + HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) { WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element; @@ -1438,6 +1467,17 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg soap_msg->Header.MessageID = duplicate_string(soap_msg, value); if (soap_msg->Header.MessageID == NULL) goto outofmemory; + /* Now detach and free known headers to leave the "any" elements */ + remove_element(find_element(header_element, actionString, addressingNsUri)); + remove_element(find_element(header_element, toString, addressingNsUri)); + remove_element(find_element(header_element, messageIdString, addressingNsUri)); + remove_element(find_element(header_element, appSequenceString, discoveryNsUri)); + + soap_msg->Header.AnyHeaders = (WSDXML_ELEMENT *) header_element->FirstChild; + + if (soap_msg->Header.AnyHeaders != NULL) + soap_msg->Header.AnyHeaders->Node.Parent = NULL; + /* Find the body element */ body_element = find_element(envelope, bodyString, envelopeNsUri); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 0599123..b7496ea 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -491,7 +491,7 @@ static void verify_wsdxml_any_text(const char *debug_prefix, WSDXML_ELEMENT *any { WSDXML_TEXT *child; - todo_wine ok(any != NULL, "%s: any == NULL\n", debug_prefix); + ok(any != NULL, "%s: any == NULL\n", debug_prefix); if (any == NULL) return; child = (WSDXML_TEXT *) any->FirstChild;

1 0

Owen Rudge : wsdapi: Implement probe message parsing.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: 767eeb7078bff703656635626ea5db165be23823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=767eeb7078bff70365663562… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:28 2018 +0100 wsdapi: Implement probe message parsing. 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 | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 34b9490..85a5fba 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -89,6 +89,7 @@ static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d 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 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 }; @@ -1346,6 +1347,19 @@ static void remove_element(WSDXML_ELEMENT *element) WSDFreeLinkedMemory(element); } +static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) +{ + WSDXML_TYPE *type = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_TYPE)); + + if (type == NULL) + return NULL; + + type->Uri = duplicate_string(parent, uri); + type->Table = NULL; + + return type; +} + HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg, int *msg_type) { WSDXML_ELEMENT *envelope = NULL, *header_element, *body_element; @@ -1491,7 +1505,31 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg /* Now figure out which message we've been sent */ if (lstrcmpW(soap_msg->Header.Action, actionProbe) == 0) { - /* TODO: Parse the Probe message */ + WSDXML_ELEMENT *probe_element; + WSD_PROBE *probe = NULL; + + probe_element = find_element(body_element, probeString, discoveryNsUri); + if (probe_element == NULL) goto cleanup; + + probe = WSDAllocateLinkedMemory(soap_msg, sizeof(WSD_PROBE)); + if (probe == NULL) goto cleanup; + + ZeroMemory(probe, sizeof(WSD_PROBE)); + + /* TODO: Check for the "types" element */ + + /* Now detach and free known headers to leave the "any" elements */ + remove_element(find_element(probe_element, typesString, discoveryNsUri)); + remove_element(find_element(probe_element, scopesString, discoveryNsUri)); + + probe->Any = (WSDXML_ELEMENT *) probe_element->FirstChild; + + if (probe->Any != NULL) + probe->Any->Node.Parent = NULL; + + soap_msg->Body = probe; + soap_msg->BodyType = generate_type(actionProbe, soap_msg); + if (soap_msg->BodyType == NULL) goto cleanup; *out_msg = soap_msg; soap_msg = NULL; /* caller will clean this up */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index b7496ea..94a5ebf 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -534,7 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; - todo_wine ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); + ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, "pSoap->Header.To == '%s'\n", wine_dbgstr_w(pSoap->Header.To)); ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, @@ -564,7 +564,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR lager[] = {'L','a','g','e','r',0}; static const WCHAR more_info[] = {'M','o','r','e','I','n','f','o',0}; - ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); + todo_wine ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); if (probe_msg->Types != NULL) {

1 0

Owen Rudge : wsdapi: Build types list when parsing Probe message.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: wine Branch: master Commit: c6a2afc8b24c89d7b2075d8d0da7a250978f1982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a2afc8b24c89d7b2075d8d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Jun 13 19:11:30 2018 +0100 wsdapi: Build types list when parsing Probe message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- dlls/wsdapi/wsdapi_internal.h | 1 + dlls/wsdapi/xml.c | 16 ++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 85a5fba..5b40cac 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1347,6 +1347,86 @@ static void remove_element(WSDXML_ELEMENT *element) WSDFreeLinkedMemory(element); } +static WSD_NAME_LIST *build_types_list_from_string(IWSDXMLContext *context, LPCWSTR buffer, void *parent) +{ + WSD_NAME_LIST *list = NULL, *cur_list = NULL, *prev_list = NULL; + LPWSTR name_start = NULL, temp_buffer = NULL; + LPCWSTR prefix_start = buffer; + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + int buffer_len, i; + + if (buffer == NULL) + return NULL; + + temp_buffer = duplicate_string(parent, buffer); + if (temp_buffer == NULL) goto cleanup; + + buffer_len = lstrlenW(temp_buffer); + + list = WSDAllocateLinkedMemory(parent, sizeof(WSD_NAME_LIST)); + if (list == NULL) goto cleanup; + + ZeroMemory(list, sizeof(WSD_NAME_LIST)); + prefix_start = temp_buffer; + + for (i = 0; i < buffer_len; i++) + { + if (temp_buffer[i] == ':') + { + temp_buffer[i] = 0; + name_start = &temp_buffer[i + 1]; + } + else if ((temp_buffer[i] == ' ') || (i == buffer_len - 1)) + { + WSDXML_NAMESPACE *known_ns; + + if (temp_buffer[i] == ' ') + temp_buffer[i] = 0; + + if (cur_list == NULL) + cur_list = list; + else + { + cur_list = WSDAllocateLinkedMemory(parent, sizeof(WSD_NAME_LIST)); + if (cur_list == NULL) goto cleanup; + + prev_list->Next = cur_list; + } + + name = WSDAllocateLinkedMemory(cur_list, sizeof(WSDXML_NAME)); + if (name == NULL) goto cleanup; + + ns = WSDAllocateLinkedMemory(cur_list, sizeof(WSDXML_NAMESPACE)); + if (ns == NULL) goto cleanup; + + ZeroMemory(ns, sizeof(WSDXML_NAMESPACE)); + ns->PreferredPrefix = duplicate_string(ns, prefix_start); + + known_ns = xml_context_find_namespace_by_prefix(context, ns->PreferredPrefix); + + if (known_ns != NULL) + ns->Uri = duplicate_string(ns, known_ns->Uri); + + name->Space = ns; + name->LocalName = duplicate_string(name, name_start); + + cur_list->Element = name; + prefix_start = &temp_buffer[i + 1]; + name_start = NULL; + } + } + + WSDFreeLinkedMemory(temp_buffer); + return list; + +cleanup: + WSDFreeLinkedMemory(list); + WSDFreeLinkedMemory(temp_buffer); + + return NULL; +} + static WSDXML_TYPE *generate_type(LPCWSTR uri, void *parent) { WSDXML_TYPE *type = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_TYPE)); @@ -1516,7 +1596,16 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg ZeroMemory(probe, sizeof(WSD_PROBE)); - /* TODO: Check for the "types" element */ + /* Check for the "types" element */ + ret = WSDXMLGetValueFromAny(discoveryNsUri, typesString, (WSDXML_ELEMENT *) probe_element->FirstChild, &value); + + if (FAILED(ret)) + { + WARN("Unable to find Types element in received Probe message\n"); + goto cleanup; + } + + probe->Types = build_types_list_from_string(context, value, probe); /* Now detach and free known headers to leave the "any" elements */ remove_element(find_element(probe_element, typesString, discoveryNsUri)); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 94a5ebf..84aa67d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -564,7 +564,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP static const WCHAR lager[] = {'L','a','g','e','r',0}; static const WCHAR more_info[] = {'M','o','r','e','I','n','f','o',0}; - todo_wine ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); + ok(probe_msg->Types != NULL, "Probe message Types == NULL\n"); if (probe_msg->Types != NULL) { diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index dc4fc4d..7dd08f9 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -81,5 +81,6 @@ HRESULT read_message(const char *xml, int xml_length, WSD_SOAP_MESSAGE **out_msg LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); WSDXML_NAME *duplicate_name(void *parentMemoryBlock, WSDXML_NAME *name); +WSDXML_NAMESPACE *xml_context_find_namespace_by_prefix(IWSDXMLContext *context, LPCWSTR prefix); #endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 968b217..98bdec6 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -672,3 +672,19 @@ HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) return S_OK; } + +WSDXML_NAMESPACE *xml_context_find_namespace_by_prefix(IWSDXMLContext *context, LPCWSTR prefix) +{ + IWSDXMLContextImpl *impl = impl_from_IWSDXMLContext(context); + struct xmlNamespace *ns; + + if (prefix == NULL) return NULL; + + LIST_FOR_EACH_ENTRY(ns, impl->namespaces, struct xmlNamespace, entry) + { + if (lstrcmpW(ns->namespace->PreferredPrefix, prefix) == 0) + return ns->namespace; + } + + return NULL; +}

1 0