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

[PATCH 3/7] wsdapi: Add stub for Probe message parsing, prepare notification sink message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 60 ++++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/soap.c | 6 +++++ dlls/wsdapi/wsdapi_internal.h | 5 ++++ 3 files changed, 70 insertions(+), 1 deletion(-)

June 13, 2018

[PATCH 2/7] wsdapi: Add critical section around notification sinks.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 9 +++++++++ dlls/wsdapi/wsdapi_internal.h | 1 + 2 files changed, 10 insertions(+)

June 13, 2018

[PATCH 1/7] wsdapi: Add support for listening for UDP multicast broadcasts.

by Owen Rudge

v2: Ensure thread handles are closed in terminate_networking Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 287 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 4 + 2 files changed, 290 insertions(+), 1 deletion(-)

June 13, 2018

Re: [PATCH v2 1/4] kernel32: Return BIOS info from GetSystemFirmwareTable on Linux

by Alex Henrie

On Wed, Jun 13, 2018 at 9:36 AM Huw Davies <huw(a)codeweavers.com> wrote: > > On 13 Jun 2018, at 15:32, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > > On Thu, Jun 7, 2018 at 7:25 AM Huw Davies <huw(a)codeweavers.com> wrote: > >> > >> On Mon, May 28, 2018 at 10:05:26PM -0600, Alex Henrie wrote: > >>> /*********************************************************************** > >>> * GetSystemFirmwareTable (KERNEL32.@) > >>> */ > >>> UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) > >>> { > >>> - FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); > >>> + FIXME("(%08x %08x %p %d): semi-stub\n", provider, id, buffer, size); > >> > >> This should probably be forwarded to > >> NtQuerySystemInformation(SystemFirmwareTableInformation, ...). > > > > NtQuerySystemInformation(SystemFirmwareTableInformation, ...) just > > returns STATUS_NOT_IMPLEMENTED on Windows. > > You’re probably not calling it correctly. See: > https://testbot.winehq.org/JobDetails.pl?Key=39104 You're right, thanks for the example! I was getting STATUS_NOT_IMPLEMENTED because I had not filled in the _SYSTEM_FIRMWARE_TABLE_INFORMATION struct. In fact, I didn't even know that anyone had figured out that struct's definition. Looks like you got it from <http://www.exploit-monday.com/2013_06_16_archive.html>. I'll send a revised patch set tonight. -Alex

June 13, 2018

Re: [PATCH 1/2 v2] winex11.drv: Clean up client window pointer when destroying Vulkan surface

by Andrew Eikum

Hm, I guess this breaks the case where the whole window is destroyed before the client window, since the HWND is no longer valid. I'll keep working on it. Andrew On Wed, Jun 13, 2018 at 10:05:18AM -0500, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > v2: Use gdi_display during XDestroyWindow to mirror the XCreateWindow > in create_client_window. Patch 2/2 is unchanged. > > Without this, we destroy the client_window but leave the client_window > pointer dangling in the win_data struct. Later, during > destroy_whole_window, we try to re-parent the destroyed client_window, > causing a BadWindow X error. > > We do store the HWND for the client_window with XSaveContext, but it > is saved on the per-thread win_data->display handle. Since we might > not be on that same thread during destroy_client_window, we can't use > it to look up the HWND for the given client_window. So instead we have > to store the HWND in the Vulkan struct, unfortunately. The same goes > for OpenGL in the next patch. > > dlls/winex11.drv/vulkan.c | 15 +++++++++------ > dlls/winex11.drv/window.c | 16 ++++++++++++++++ > dlls/winex11.drv/x11drv.h | 1 + > 3 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c > index 7e252326b5..d67ad1a564 100644 > --- a/dlls/winex11.drv/vulkan.c > +++ b/dlls/winex11.drv/vulkan.c > @@ -46,7 +46,7 @@ typedef VkFlags VkXlibSurfaceCreateFlagsKHR; > > struct wine_vk_surface > { > - Window window; > + HWND hwnd; > VkSurfaceKHR surface; /* native surface */ > }; > > @@ -179,8 +179,8 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface > /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ > pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); > > - if (surface->window) > - XDestroyWindow(gdi_display, surface->window); > + if (surface->hwnd) > + destroy_client_window(surface->hwnd); > > heap_free(surface); > } > @@ -246,6 +246,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, > VkResult res; > VkXlibSurfaceCreateInfoKHR create_info_host; > struct wine_vk_surface *x11_surface; > + Window window; > > TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); > > @@ -263,8 +264,8 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, > if (!x11_surface) > return VK_ERROR_OUT_OF_HOST_MEMORY; > > - x11_surface->window = create_client_window(create_info->hwnd, &default_visual); > - if (!x11_surface->window) > + window = create_client_window(create_info->hwnd, &default_visual); > + if (!window) > { > ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); > > @@ -273,11 +274,13 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, > goto err; > } > > + x11_surface->hwnd = create_info->hwnd; > + > create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; > create_info_host.pNext = NULL; > create_info_host.flags = 0; /* reserved */ > create_info_host.dpy = gdi_display; > - create_info_host.window = x11_surface->window; > + create_info_host.window = window; > > res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); > if (res != VK_SUCCESS) > diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c > index 5fecd9a17b..f16964cdac 100644 > --- a/dlls/winex11.drv/window.c > +++ b/dlls/winex11.drv/window.c > @@ -1497,6 +1497,22 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) > } > > > +/********************************************************************** > + * destroy_client_window > + */ > +void destroy_client_window( HWND hwnd ) > +{ > + struct x11drv_win_data *data = get_win_data( hwnd ); > + if (data) > + { > + XDeleteContext( data->display, data->client_window, winContext ); > + XDestroyWindow( gdi_display, data->client_window ); > + data->client_window = 0; > + release_win_data( data ); > + } > +} > + > + > /********************************************************************** > * create_whole_window > * > diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h > index 85a05a904a..a4df2b2fab 100644 > --- a/dlls/winex11.drv/x11drv.h > +++ b/dlls/winex11.drv/x11drv.h > @@ -594,6 +594,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) > extern void update_net_wm_states( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; > extern void make_window_embedded( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; > extern Window create_client_window( HWND hwnd, const XVisualInfo *visual ) DECLSPEC_HIDDEN; > +extern void destroy_client_window( HWND hwnd ) DECLSPEC_HIDDEN; > extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; > extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; > extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; > -- > 2.17.1 > > > >

June 13, 2018

Re: [PATCH v2 1/4] kernel32: Return BIOS info from GetSystemFirmwareTable on Linux

by Huw Davies

On 13 Jun 2018, at 15:32, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > On Thu, Jun 7, 2018 at 7:25 AM Huw Davies <huw(a)codeweavers.com> wrote: >> >> On Mon, May 28, 2018 at 10:05:26PM -0600, Alex Henrie wrote: >>> /*********************************************************************** >>> * GetSystemFirmwareTable (KERNEL32.@) >>> */ >>> UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) >>> { >>> - FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); >>> + FIXME("(%08x %08x %p %d): semi-stub\n", provider, id, buffer, size); >> >> This should probably be forwarded to >> NtQuerySystemInformation(SystemFirmwareTableInformation, ...). > > NtQuerySystemInformation(SystemFirmwareTableInformation, ...) just > returns STATUS_NOT_IMPLEMENTED on Windows. You’re probably not calling it correctly. See: https://testbot.winehq.org/JobDetails.pl?Key=39104 (for some reason the 32-bit tests crash before my change, but you should get the idea). Huw.

June 13, 2018

[PATCH 1/2 v2] winex11.drv: Clean up client window pointer when destroying Vulkan surface

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Use gdi_display during XDestroyWindow to mirror the XCreateWindow in create_client_window. Patch 2/2 is unchanged. Without this, we destroy the client_window but leave the client_window pointer dangling in the win_data struct. Later, during destroy_whole_window, we try to re-parent the destroyed client_window, causing a BadWindow X error. We do store the HWND for the client_window with XSaveContext, but it is saved on the per-thread win_data->display handle. Since we might not be on that same thread during destroy_client_window, we can't use it to look up the HWND for the given client_window. So instead we have to store the HWND in the Vulkan struct, unfortunately. The same goes for OpenGL in the next patch. dlls/winex11.drv/vulkan.c | 15 +++++++++------ dlls/winex11.drv/window.c | 16 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 7e252326b5..d67ad1a564 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -46,7 +46,7 @@ typedef VkFlags VkXlibSurfaceCreateFlagsKHR; struct wine_vk_surface { - Window window; + HWND hwnd; VkSurfaceKHR surface; /* native surface */ }; @@ -179,8 +179,8 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); - if (surface->window) - XDestroyWindow(gdi_display, surface->window); + if (surface->hwnd) + destroy_client_window(surface->hwnd); heap_free(surface); } @@ -246,6 +246,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *x11_surface; + Window window; TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); @@ -263,8 +264,8 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (!x11_surface) return VK_ERROR_OUT_OF_HOST_MEMORY; - x11_surface->window = create_client_window(create_info->hwnd, &default_visual); - if (!x11_surface->window) + window = create_client_window(create_info->hwnd, &default_visual); + if (!window) { ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); @@ -273,11 +274,13 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + x11_surface->hwnd = create_info->hwnd; + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ create_info_host.dpy = gdi_display; - create_info_host.window = x11_surface->window; + create_info_host.window = window; res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); if (res != VK_SUCCESS) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5fecd9a17b..f16964cdac 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1497,6 +1497,22 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) } +/********************************************************************** + * destroy_client_window + */ +void destroy_client_window( HWND hwnd ) +{ + struct x11drv_win_data *data = get_win_data( hwnd ); + if (data) + { + XDeleteContext( data->display, data->client_window, winContext ); + XDestroyWindow( gdi_display, data->client_window ); + data->client_window = 0; + release_win_data( data ); + } +} + + /********************************************************************** * create_whole_window * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 85a05a904a..a4df2b2fab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -594,6 +594,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern void make_window_embedded( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window create_client_window( HWND hwnd, const XVisualInfo *visual ) DECLSPEC_HIDDEN; +extern void destroy_client_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; -- 2.17.1

June 13, 2018

[PATCH 2/2] winex11.drv: Clean up client window pointer when destroying GL drawable

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7aa6448fed..8e74ad4114 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -242,6 +242,7 @@ struct gl_drawable LONG ref; /* reference count */ enum dc_gl_type type; /* type of GL surface */ GLXDrawable drawable; /* drawable for rendering with GL */ + HWND hwnd; Window window; /* window if drawable is a GLXWindow */ Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ @@ -1207,9 +1208,9 @@ static void release_gl_drawable( struct gl_drawable *gl ) { case DC_GL_WINDOW: case DC_GL_CHILD_WIN: - TRACE( "destroying %lx drawable %lx\n", gl->window, gl->drawable ); + TRACE( "destroying %p/%lx drawable %lx\n", gl->hwnd, gl->window, gl->drawable ); pglXDestroyWindow( gdi_display, gl->drawable ); - XDestroyWindow( gdi_display, gl->window ); + destroy_client_window( gl->hwnd ); break; case DC_GL_PIXMAP_WIN: TRACE( "destroying pixmap %lx drawable %lx\n", gl->pixmap, gl->drawable ); @@ -1370,6 +1371,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->refresh_swap_interval = TRUE; gl->format = format; gl->ref = 1; + gl->hwnd = hwnd; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { -- 2.17.1

June 13, 2018

[PATCH 1/2] winex11.drv: Clean up client window pointer when destroying Vulkan surface

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Without this, we destroy the client_window but leave the client_window pointer dangling in the win_data struct. Later, during destroy_whole_window, we try to re-parent the destroyed client_window, causing a BadWindow X error. We do store the HWND for the client_window with XSaveContext, but it is saved on the per-thread win_data->display handle. Since we might not be on that same thread during destroy_client_window, we can't use it to look up the HWND for the given client_window. So instead we have to store the HWND in the Vulkan struct, unfortunately. The same goes for OpenGL in the next patch. dlls/winex11.drv/vulkan.c | 15 +++++++++------ dlls/winex11.drv/window.c | 16 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 7e252326b5..d67ad1a564 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -46,7 +46,7 @@ typedef VkFlags VkXlibSurfaceCreateFlagsKHR; struct wine_vk_surface { - Window window; + HWND hwnd; VkSurfaceKHR surface; /* native surface */ }; @@ -179,8 +179,8 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); - if (surface->window) - XDestroyWindow(gdi_display, surface->window); + if (surface->hwnd) + destroy_client_window(surface->hwnd); heap_free(surface); } @@ -246,6 +246,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; struct wine_vk_surface *x11_surface; + Window window; TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); @@ -263,8 +264,8 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (!x11_surface) return VK_ERROR_OUT_OF_HOST_MEMORY; - x11_surface->window = create_client_window(create_info->hwnd, &default_visual); - if (!x11_surface->window) + window = create_client_window(create_info->hwnd, &default_visual); + if (!window) { ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); @@ -273,11 +274,13 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + x11_surface->hwnd = create_info->hwnd; + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ create_info_host.dpy = gdi_display; - create_info_host.window = x11_surface->window; + create_info_host.window = window; res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); if (res != VK_SUCCESS) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5fecd9a17b..58a5bd7c5f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1497,6 +1497,22 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) } +/********************************************************************** + * destroy_client_window + */ +void destroy_client_window( HWND hwnd ) +{ + struct x11drv_win_data *data = get_win_data( hwnd ); + if (data) + { + XDeleteContext( data->display, data->client_window, winContext ); + XDestroyWindow( data->display, data->client_window ); + data->client_window = 0; + release_win_data( data ); + } +} + + /********************************************************************** * create_whole_window * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 85a05a904a..a4df2b2fab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -594,6 +594,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern void make_window_embedded( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window create_client_window( HWND hwnd, const XVisualInfo *visual ) DECLSPEC_HIDDEN; +extern void destroy_client_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; -- 2.17.1

June 13, 2018

Re: [PATCH v2 1/4] kernel32: Return BIOS info from GetSystemFirmwareTable on Linux

by Alex Henrie

On Thu, Jun 7, 2018 at 7:25 AM Huw Davies <huw(a)codeweavers.com> wrote: > > On Mon, May 28, 2018 at 10:05:26PM -0600, Alex Henrie wrote: > > /*********************************************************************** > > * GetSystemFirmwareTable (KERNEL32.@) > > */ > > UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) > > { > > - FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); > > + FIXME("(%08x %08x %p %d): semi-stub\n", provider, id, buffer, size); > > This should probably be forwarded to > NtQuerySystemInformation(SystemFirmwareTableInformation, ...). NtQuerySystemInformation(SystemFirmwareTableInformation, ...) just returns STATUS_NOT_IMPLEMENTED on Windows. -Alex

June 13, 2018