From: Etaash Mathamsetty <etaash.mathamsetty@gmail.com> --- dlls/win32u/driver.c | 2 +- dlls/win32u/opengl.c | 2 +- dlls/win32u/vulkan.c | 2 +- dlls/wineandroid.drv/android.h | 2 +- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 2 +- dlls/winewayland.drv/wayland_surface.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 6270d9bbe10..3a3f876b6f1 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -904,7 +904,7 @@ static const struct client_surface_funcs nulldrv_surface_funcs = .present = nulldrv_surface_present, }; -static struct client_surface *nulldrv_CreateClientSurface( HWND hwnd, int pixel_format ) +static struct client_surface *nulldrv_CreateClientSurface( HWND hwnd, int pixel_format, BOOL gl ) { return client_surface_create( sizeof(struct client_surface), &nulldrv_surface_funcs, hwnd ); } diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c index 02f85c4fe34..a62b68c9642 100644 --- a/dlls/win32u/opengl.c +++ b/dlls/win32u/opengl.c @@ -1463,7 +1463,7 @@ static struct opengl_drawable *get_window_unused_drawable( HWND hwnd, int format { struct client_surface *client; - if (!(client = user_driver->pCreateClientSurface( hwnd, format ))) + if (!(client = user_driver->pCreateClientSurface( hwnd, format, TRUE ))) WARN( "Failed to create a surface for window %p, format %d\n", hwnd, format ); else { diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 707cd82772a..f551b0d755d 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -1533,7 +1533,7 @@ static VkResult win32u_vkCreateWin32SurfaceKHR( VkInstance client_instance, cons surface->hwnd = dummy; } - if (!(surface->client = user_driver->pCreateClientSurface( surface->hwnd, 0 ))) res = VK_ERROR_OUT_OF_HOST_MEMORY; + if (!(surface->client = user_driver->pCreateClientSurface( surface->hwnd, 0, FALSE ))) res = VK_ERROR_OUT_OF_HOST_MEMORY; else res = driver_funcs->p_vulkan_surface_create( surface->client, instance, &host_surface ); if (res) { diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 3e69e52c736..0c916069f93 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -115,7 +115,7 @@ extern void ANDROID_SetCapture( HWND hwnd, UINT flags, HWND previous ); extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); extern LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL ANDROID_WindowPosChanging( HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects ); -extern struct client_surface *ANDROID_CreateClientSurface( HWND hwnd, int pixel_format ); +extern struct client_surface *ANDROID_CreateClientSurface( HWND hwnd, int pixel_format, BOOL gl ); extern BOOL ANDROID_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface ); extern void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, const struct window_rects *new_rects, struct window_surface *surface ); diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 12bae7fca29..77eea1ad5a4 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -189,7 +189,7 @@ static const struct client_surface_funcs android_client_surface_funcs = .present = android_client_surface_present, }; -struct client_surface *ANDROID_CreateClientSurface( HWND hwnd, int pixel_format ) +struct client_surface *ANDROID_CreateClientSurface( HWND hwnd, int pixel_format, BOOL gl ) { return client_surface_create( sizeof(struct client_surface), &android_client_surface_funcs, hwnd ); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index aeeadae122e..5c9a2676f4d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -150,7 +150,7 @@ extern void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alph extern LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); extern BOOL macdrv_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects); extern BOOL macdrv_GetWindowStyleMasks(HWND hwnd, UINT style, UINT ex_style, UINT *style_mask, UINT *ex_style_mask); -extern struct client_surface *macdrv_CreateClientSurface(HWND hwnd, int pixel_format); +extern struct client_surface *macdrv_CreateClientSurface(HWND hwnd, int pixel_format, BOOL gl); extern BOOL macdrv_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface); extern void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, const struct window_rects *new_rects, struct window_surface *surface); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c0384f3f0d5..fa4ac8858bb 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1145,7 +1145,7 @@ struct macdrv_client_surface *impl_from_client_surface(struct client_surface *cl return CONTAINING_RECORD(client, struct macdrv_client_surface, client); } -struct client_surface *macdrv_CreateClientSurface(HWND hwnd, int pixel_format) +struct client_surface *macdrv_CreateClientSurface(HWND hwnd, int pixel_format, BOOL gl) { struct macdrv_client_surface *surface; diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index c0c69c9fcab..644ad3b8559 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -1238,7 +1238,7 @@ struct wayland_client_surface *impl_from_client_surface(struct client_surface *c return CONTAINING_RECORD(client, struct wayland_client_surface, client); } -struct client_surface *WAYLAND_CreateClientSurface(HWND hwnd, int pixel_format) +struct client_surface *WAYLAND_CreateClientSurface(HWND hwnd, int pixel_format, BOOL gl) { struct wayland_client_surface *client; struct wl_region *empty_region; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0ffc15581c1..6e2f6ab5608 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -468,7 +468,7 @@ LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, const struct window_rects *new_rects, struct window_surface *surface); BOOL WAYLAND_WindowPosChanging(HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects); -struct client_surface *WAYLAND_CreateClientSurface(HWND hwnd, int pixel_format); +struct client_surface *WAYLAND_CreateClientSurface(HWND hwnd, int pixel_format, BOOL gl); BOOL WAYLAND_CreateWindowSurface(HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface); UINT WAYLAND_VulkanInit(UINT version, void *vulkan_handle, const struct vulkan_driver_funcs **driver_funcs); UINT WAYLAND_OpenGLInit(UINT version, const struct opengl_funcs *opengl_funcs, const struct opengl_driver_funcs **driver_funcs); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 754349f6892..4d2ef1379fa 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -433,7 +433,7 @@ struct x11drv_client_surface *impl_from_client_surface( struct client_surface *c return CONTAINING_RECORD( client, struct x11drv_client_surface, client ); } -struct client_surface *X11DRV_CreateClientSurface( HWND hwnd, int format ) +struct client_surface *X11DRV_CreateClientSurface( HWND hwnd, int format, BOOL gl ) { struct x11drv_client_surface *surface; XVisualInfo visual = default_visual; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fc59ac9f3b9..4414ac25608 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -251,7 +251,7 @@ extern LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) extern BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, BOOL shaped, const struct window_rects *rects ); extern BOOL X11DRV_GetWindowStyleMasks( HWND hwnd, UINT style, UINT ex_style, UINT *style_mask, UINT *ex_style_mask ); extern BOOL X11DRV_GetWindowStateUpdates( HWND hwnd, UINT *state_cmd, UINT *swp_flags, RECT *rect, HWND *foreground ); -extern struct client_surface *X11DRV_CreateClientSurface( HWND hwnd, int format ); +extern struct client_surface *X11DRV_CreateClientSurface( HWND hwnd, int format, BOOL gl ); extern BOOL X11DRV_CreateWindowSurface( HWND hwnd, BOOL layered, const RECT *surface_rect, struct window_surface **surface ); extern void X11DRV_MoveWindowBits( HWND hwnd, const struct window_rects *old_rects, const struct window_rects *new_rects, const RECT *valid_rects ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 38c61d0a80a..c17482c08a2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -435,7 +435,7 @@ struct user_driver_funcs BOOL (*pWindowPosChanging)(HWND,UINT,BOOL,const struct window_rects *); BOOL (*pGetWindowStyleMasks)(HWND,UINT,UINT,UINT*,UINT*); BOOL (*pGetWindowStateUpdates)(HWND,UINT*,UINT*,RECT*,HWND*); - struct client_surface *(*pCreateClientSurface)(HWND,int); + struct client_surface *(*pCreateClientSurface)(HWND,int,BOOL); BOOL (*pCreateWindowSurface)(HWND,BOOL,const RECT *,struct window_surface**); void (*pMoveWindowBits)(HWND,const struct window_rects *,const struct window_rects *,const RECT *); void (*pWindowPosChanged)(HWND,HWND,HWND,UINT,const struct window_rects*,struct window_surface*); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11342