November 2022 - Wine-commits

Jacek Caban : winevulkan: Use struct conversion functions for array conversion implementations.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 511a8bfa09f842cf3d5f6bca38f54c66ee3a66a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/511a8bfa09f842cf3d5f6bca38f54c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 00:38:52 2022 +0100 winevulkan: Use struct conversion functions for array conversion implementations. --- dlls/winevulkan/make_vulkan | 34 +- dlls/winevulkan/vulkan_thunks.c | 1117 +++++++++++++++++++++++++-------------- 2 files changed, 744 insertions(+), 407 deletions(-)

1 0

Jacek Caban : winevulkan: Don't declare host types for structs that don't need it.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 692625a36a3e09780919ac7396d9c460db486c01 URL: https://gitlab.winehq.org/wine/wine/-/commit/692625a36a3e09780919ac7396d9c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:36:10 2022 +0100 winevulkan: Don't declare host types for structs that don't need it. --- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan_thunks.h | 30 ------------------------------ 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 56f3db64389..2d506e031aa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2097,7 +2097,6 @@ class ArrayConversionFunction(object): def __init__(self, array, direction, conv, unwrap): self.array = array self.direction = direction - self.operand = array.struct if array.is_struct() else array.handle self.type = array.type self.conv = conv self.unwrap = unwrap or not array.needs_unwrapping() @@ -2302,7 +2301,7 @@ class VkGenerator(object): if not any(c == conv for c in self.conversions): self.conversions.append(conv) - if not isinstance(conv.operand, VkStruct): + if not isinstance(conv, StructConversionFunction) or not conv.operand.needs_host_type(): continue # Structs can be used in different ways by different conversions diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 43e43664bd3..d77a6c0c3be 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1762,23 +1762,6 @@ typedef struct VkBindSparseInfo_host typedef VkBindSparseInfo VkBindSparseInfo_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkSubmitInfo_host -{ - VkStructureType sType; - const void *pNext; - uint32_t waitSemaphoreCount; - const VkSemaphore *pWaitSemaphores; - const VkPipelineStageFlags *pWaitDstStageMask; - uint32_t commandBufferCount; - const VkCommandBuffer *pCommandBuffers; - uint32_t signalSemaphoreCount; - const VkSemaphore *pSignalSemaphores; -} VkSubmitInfo_host; -#else -typedef VkSubmitInfo VkSubmitInfo_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkSemaphoreSubmitInfo_host { @@ -1794,19 +1777,6 @@ typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfoKHR; typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfo_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkCommandBufferSubmitInfo_host -{ - VkStructureType sType; - const void *pNext; - VkCommandBuffer commandBuffer; - uint32_t deviceMask; -} VkCommandBufferSubmitInfo_host; -typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfoKHR; -#else -typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfo_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkSubmitInfo2_host {

1 0

Jacek Caban : winevulkan: Skip unsupported functions in a few more places.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 04576c156edaf6e610a37c7c366fd44490097983 URL: https://gitlab.winehq.org/wine/wine/-/commit/04576c156edaf6e610a37c7c366fd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:58:55 2022 +0100 winevulkan: Skip unsupported functions in a few more places. --- dlls/winevulkan/make_vulkan | 10 +++++----- dlls/winevulkan/vulkan_thunks.c | 12 ------------ dlls/winevulkan/vulkan_thunks.h | 16 ---------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2d506e031aa..2d9053f7c05 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2292,7 +2292,7 @@ class VkGenerator(object): self.struct_chain_conversions = [] self.host_structs = [] for func in self.registry.funcs.values(): - if not func.is_required(): + if not func.needs_exposing(): continue conversions = func.get_conversions() @@ -2517,7 +2517,7 @@ class VkGenerator(object): f.write("/* For use by vkDevice and children */\n") f.write("struct vulkan_device_funcs\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2530,7 +2530,7 @@ class VkGenerator(object): f.write("/* For use by vkInstance and children */\n") f.write("struct vulkan_instance_funcs\n{\n") for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2543,7 +2543,7 @@ class VkGenerator(object): f.write("#define ALL_VK_DEVICE_FUNCS() \\\n") first = True for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2560,7 +2560,7 @@ class VkGenerator(object): f.write("#define ALL_VK_INSTANCE_FUNCS() \\\n") first = True for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 7a04cfba6a7..4c87b807344 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2151,18 +2151,6 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV } #endif /* USE_STRUCT_CONVERSION */ -#if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkMemoryGetWin32HandleInfoKHR_win32_to_host(const VkMemoryGetWin32HandleInfoKHR *in, VkMemoryGetWin32HandleInfoKHR_host *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->memory = in->memory; - out->handleType = in->handleType; -} -#endif /* USE_STRUCT_CONVERSION */ - #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT *in, VkMicromapBuildSizesInfoEXT_host *out) { diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index d77a6c0c3be..13f2dcd21b0 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1409,18 +1409,6 @@ typedef struct VkImageViewHandleInfoNVX_host typedef VkImageViewHandleInfoNVX VkImageViewHandleInfoNVX_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkMemoryGetWin32HandleInfoKHR_host -{ - VkStructureType sType; - const void *pNext; - VkDeviceMemory memory; - VkExternalMemoryHandleTypeFlagBits handleType; -} VkMemoryGetWin32HandleInfoKHR_host; -#else -typedef VkMemoryGetWin32HandleInfoKHR VkMemoryGetWin32HandleInfoKHR_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkMicromapBuildSizesInfoEXT_host { @@ -2308,8 +2296,6 @@ struct vulkan_device_funcs VkResult (*p_vkGetImageViewAddressNVX)(VkDevice, VkImageView, VkImageViewAddressPropertiesNVX_host *); uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX_host *); VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); - VkResult (*p_vkGetMemoryWin32HandleKHR)(VkDevice, const VkMemoryGetWin32HandleInfoKHR_host *, HANDLE *); - VkResult (*p_vkGetMemoryWin32HandlePropertiesKHR)(VkDevice, VkExternalMemoryHandleTypeFlagBits, HANDLE, VkMemoryWin32HandlePropertiesKHR *); void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT_host *, VkMicromapBuildSizesInfoEXT_host *); VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL *); VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); @@ -2823,8 +2809,6 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetImageViewAddressNVX) \ USE_VK_FUNC(vkGetImageViewHandleNVX) \ USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \ - USE_VK_FUNC(vkGetMemoryWin32HandleKHR) \ - USE_VK_FUNC(vkGetMemoryWin32HandlePropertiesKHR) \ USE_VK_FUNC(vkGetMicromapBuildSizesEXT) \ USE_VK_FUNC(vkGetPerformanceParameterINTEL) \ USE_VK_FUNC(vkGetPipelineCacheData) \

1 0

Rémi Bernon : opengl32: Avoid using internal functions in wglUseFontBitmaps.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: c656fcf3098835dc93ed20e381e2f6a8599341a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c656fcf3098835dc93ed20e381e2f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:12:07 2022 +0200 opengl32: Avoid using internal functions in wglUseFontBitmaps. --- dlls/opengl32/wgl.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 7c8bbfa378f..d40e3b1c0ea 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1236,15 +1236,14 @@ BOOL WINAPI wglQueryPbufferARB( HPBUFFERARB handle, int attrib, int *value ) */ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD listBase, BOOL unicode ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; GLYPHMETRICS gm; unsigned int glyph, size = 0; void *bitmap = NULL, *gl_bitmap = NULL; int org_alignment; BOOL ret = TRUE; - funcs->gl.p_glGetIntegerv(GL_UNPACK_ALIGNMENT, &org_alignment); - funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + glGetIntegerv( GL_UNPACK_ALIGNMENT, &org_alignment ); + glPixelStorei( GL_UNPACK_ALIGNMENT, 4 ); for (glyph = first; glyph < first + count; glyph++) { unsigned int needed_size, height, width, width_int; @@ -1317,20 +1316,18 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l } } - funcs->gl.p_glNewList(listBase++, GL_COMPILE); + glNewList( listBase++, GL_COMPILE ); if (needed_size != 0) { - funcs->gl.p_glBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, - 0 - gm.gmptGlyphOrigin.x, (int) gm.gmBlackBoxY - gm.gmptGlyphOrigin.y, - gm.gmCellIncX, gm.gmCellIncY, - gl_bitmap); + glBitmap( gm.gmBlackBoxX, gm.gmBlackBoxY, 0 - gm.gmptGlyphOrigin.x, + (int)gm.gmBlackBoxY - gm.gmptGlyphOrigin.y, gm.gmCellIncX, gm.gmCellIncY, gl_bitmap ); } else { /* This is the case of 'empty' glyphs like the space character */ - funcs->gl.p_glBitmap(0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL); + glBitmap( 0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL ); } - funcs->gl.p_glEndList(); + glEndList(); } - funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, org_alignment); + glPixelStorei( GL_UNPACK_ALIGNMENT, org_alignment ); HeapFree(GetProcessHeap(), 0, bitmap); HeapFree(GetProcessHeap(), 0, gl_bitmap); return ret;

1 0

Rémi Bernon : opengl32: Avoid using internal functions in wglUseFontOutlines.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: df74066f47f7c6a3092918f3e87183403b2e109b URL: https://gitlab.winehq.org/wine/wine/-/commit/df74066f47f7c6a3092918f3e87183… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:12:07 2022 +0200 opengl32: Avoid using internal functions in wglUseFontOutlines. --- dlls/opengl32/wgl.c | 78 +++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d40e3b1c0ea..987fa36ce2a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1356,28 +1356,6 @@ static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) vertex[2] = 0.0; } -static void WINAPI tess_callback_vertex(GLvoid *vertex) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - GLdouble *dbl = vertex; - TRACE("%f, %f, %f\n", dbl[0], dbl[1], dbl[2]); - funcs->gl.p_glVertex3dv(vertex); -} - -static void WINAPI tess_callback_begin(GLenum which) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("%d\n", which); - funcs->gl.p_glBegin(which); -} - -static void WINAPI tess_callback_end(void) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("\n"); - funcs->gl.p_glEnd(); -} - typedef struct _bezier_vector { GLdouble x; GLdouble y; @@ -1459,7 +1437,6 @@ static BOOL wglUseFontOutlines_common(HDC hdc, LPGLYPHMETRICSFLOAT lpgmf, BOOL unicode) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; GLUtesselator *tess = NULL; LOGFONTW lf; @@ -1481,9 +1458,9 @@ static BOOL wglUseFontOutlines_common(HDC hdc, ERR("glu32 is required for this function but isn't available\n"); return FALSE; } - gluTessCallback(tess, GLU_TESS_VERTEX, (void *)tess_callback_vertex); - gluTessCallback(tess, GLU_TESS_BEGIN, (void *)tess_callback_begin); - gluTessCallback(tess, GLU_TESS_END, tess_callback_end); + gluTessCallback( tess, GLU_TESS_VERTEX, (void *)glVertex3dv ); + gluTessCallback( tess, GLU_TESS_BEGIN, (void *)glBegin ); + gluTessCallback( tess, GLU_TESS_END, glEnd ); } GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); @@ -1536,11 +1513,11 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf++; } - funcs->gl.p_glNewList(listBase++, GL_COMPILE); - funcs->gl.p_glFrontFace(GL_CCW); + glNewList( listBase++, GL_COMPILE ); + glFrontFace( GL_CCW ); if(format == WGL_FONT_POLYGONS) { - funcs->gl.p_glNormal3d(0.0, 0.0, 1.0); + glNormal3d( 0.0, 0.0, 1.0 ); gluTessNormal(tess, 0, 0, 1); gluTessBeginPolygon(tess, NULL); } @@ -1560,18 +1537,14 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(vertices) TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); - if(format == WGL_FONT_POLYGONS) - gluTessBeginContour(tess); - else - funcs->gl.p_glBegin(GL_LINE_LOOP); + if (format == WGL_FONT_POLYGONS) gluTessBeginContour( tess ); + else glBegin( GL_LINE_LOOP ); if(vertices) { fixed_to_double(pph->pfxStart, em_size, vertices); - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } vertex_total++; @@ -1591,10 +1564,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, TRACE("\t\tline to %d, %d\n", ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } fixed_to_double(ppc->apfx[i], em_size, previous); @@ -1639,10 +1610,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices[0] = points[j].x; vertices[1] = points[j].y; vertices[2] = 0.0; - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } } @@ -1653,29 +1622,24 @@ static BOOL wglUseFontOutlines_common(HDC hdc, break; default: ERR("\t\tcurve type = %d\n", ppc->wType); - if(format == WGL_FONT_POLYGONS) - gluTessEndContour(tess); - else - funcs->gl.p_glEnd(); + if (format == WGL_FONT_POLYGONS) gluTessEndContour( tess ); + else glEnd(); goto error_in_list; } ppc = (TTPOLYCURVE*)((char*)ppc + sizeof(*ppc) + (ppc->cpfx - 1) * sizeof(POINTFX)); } - if(format == WGL_FONT_POLYGONS) - gluTessEndContour(tess); - else - funcs->gl.p_glEnd(); + if (format == WGL_FONT_POLYGONS) gluTessEndContour( tess ); + else glEnd(); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); } } error_in_list: - if(format == WGL_FONT_POLYGONS) - gluTessEndPolygon(tess); - funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); - funcs->gl.p_glEndList(); + if (format == WGL_FONT_POLYGONS) gluTessEndPolygon( tess ); + glTranslated( (GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0 ); + glEndList(); HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, vertices); }

1 0

Rémi Bernon : opengl32: Introduce a new NtUserCallOpenGLDebugMessageCallback callback.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: dec91f063122ce08c25eade1d51f2e36a59326aa URL: https://gitlab.winehq.org/wine/wine/-/commit/dec91f063122ce08c25eade1d51f2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:55:54 2022 +0200 opengl32: Introduce a new NtUserCallOpenGLDebugMessageCallback callback. --- dlls/opengl32/wgl.c | 57 +++++++++++++++++++++++++++++++++++++++++++--------- dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 2 ++ 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 987fa36ce2a..cf0b8e0330f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -22,25 +22,19 @@ #include <stdarg.h> #include <stdlib.h> -#include <string.h> -#include <sys/types.h> #include <math.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winuser.h" #include "winreg.h" -#include "wingdi.h" -#include "winternl.h" -#include "winnt.h" +#include "ntuser.h" #include "opengl_ext.h" #include "unixlib.h" -#include "wine/gdi_driver.h" #include "wine/glu.h" #include "wine/debug.h" @@ -1714,12 +1708,50 @@ const GLubyte * WINAPI glGetString( GLenum name ) } /* wrapper for glDebugMessageCallback* functions */ +typedef void (WINAPI *gl_debug_cb)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void *); + +struct wine_gl_debug_message_params +{ + gl_debug_cb user_callback; + const void *user_data; + + GLenum source; + GLenum type; + GLuint id; + GLenum severity; + GLsizei length; + const GLchar *message; +}; + +static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_message_params *params, ULONG size ) +{ + params->user_callback( params->source, params->type, params->id, params->severity, + params->length, params->message, params->user_data ); + return TRUE; +} + static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GLenum severity, - GLsizei length, const GLchar *message,const void *userParam ) + GLsizei length, const GLchar *message, const void *userParam ) { + struct wine_gl_debug_message_params params = + { + .source = source, + .type = type, + .id = id, + .severity = severity, + .length = length, + .message = message, + }; + void **kernel_callback_table; + BOOL (WINAPI *callback)( struct wine_gl_debug_message_params *params, ULONG size ); + struct wgl_handle *ptr = (struct wgl_handle *)userParam; - if (!ptr->u.context->debug_callback) return; - ptr->u.context->debug_callback( source, type, id, severity, length, message, ptr->u.context->debug_user ); + if (!(params.user_callback = ptr->u.context->debug_callback)) return; + params.user_data = ptr->u.context->debug_user; + + kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + callback = kernel_callback_table[NtUserCallOpenGLDebugMessageCallback]; + callback( &params, sizeof(params) ); } /*********************************************************************** @@ -1772,10 +1804,15 @@ void WINAPI glDebugMessageCallbackARB( GLDEBUGPROCARB callback, const void *user */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { + void **kernel_callback_table; + switch(reason) { case DLL_PROCESS_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; + + kernel_callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; + kernel_callback_table[NtUserCallOpenGLDebugMessageCallback] = call_opengl_debug_message_callback; break; case DLL_THREAD_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index e1454347ecf..79f85d45834 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1008,6 +1008,12 @@ static NTSTATUS WINAPI wow64_NtUserCallVulkanDebugUtilsCallback( void *arg, ULON return 0; } +static NTSTATUS WINAPI wow64_NtUserCallOpenGLDebugMessageCallback( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst0( void *arg, ULONG size ) { return dispatch_callback( NtUserDriverCallbackFirst + 0, arg, size ); @@ -1085,6 +1091,8 @@ user_callback user_callbacks[] = /* Vulkan support */ wow64_NtUserCallVulkanDebugReportCallback, wow64_NtUserCallVulkanDebugUtilsCallback, + /* OpenGL support */ + wow64_NtUserCallOpenGLDebugMessageCallback, /* Driver-specific callbacks */ wow64_NtUserDriverCallbackFirst0, wow64_NtUserDriverCallbackFirst1, diff --git a/include/ntuser.h b/include/ntuser.h index 7759f2b3174..0e14ee3ccb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -52,6 +52,8 @@ enum /* Vulkan support */ NtUserCallVulkanDebugReportCallback, NtUserCallVulkanDebugUtilsCallback, + /* OpenGL support */ + NtUserCallOpenGLDebugMessageCallback, /* Driver-specific callbacks */ NtUserDriverCallbackFirst, NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 9,

1 0

Rémi Bernon : opengl32: Move some WGL functions to unix_wgl.c.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 494251add7da73496311936b54f5c1a4383e95d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/494251add7da73496311936b54f5c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 11:31:05 2022 +0200 opengl32: Move some WGL functions to unix_wgl.c. --- dlls/opengl32/Makefile.in | 1 + dlls/opengl32/make_opengl | 14 ++ dlls/opengl32/opengl_ext.h | 56 +++++ dlls/opengl32/unix_wgl.c | 459 +++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 14 ++ dlls/opengl32/wgl.c | 588 +-------------------------------------------- 6 files changed, 550 insertions(+), 582 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib interface for more WGL functions.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 077c46261a3abb55648adc8b753d1f40ccfdd83e URL: https://gitlab.winehq.org/wine/wine/-/commit/077c46261a3abb55648adc8b753d1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:34:09 2022 +0200 opengl32: Use the unixlib interface for more WGL functions. --- dlls/opengl32/make_opengl | 90 +++++++++++++---------- dlls/opengl32/thunks.c | 172 ++++++++++++++++++++++++++++++++++++++++---- dlls/opengl32/unix_thunks.c | 166 +++++------------------------------------- dlls/opengl32/unix_wgl.c | 168 +++++++++++++++++++++++++++++++++++++------ 4 files changed, 374 insertions(+), 222 deletions(-)

1 0

Zhiyi Zhang : user32: Hook drawing menu buttons.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: c196d2462dc306fb427c3e61e570011480b30dab URL: https://gitlab.winehq.org/wine/wine/-/commit/c196d2462dc306fb427c3e61e57001… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Oct 23 17:58:41 2022 +0800 user32: Hook drawing menu buttons. --- dlls/user32/hook.c | 1 + dlls/user32/nonclient.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user_main.c | 8 ++++++++ dlls/user32/user_private.h | 1 + dlls/uxtheme/Makefile.in | 3 ++- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 2 ++ dlls/uxtheme/window.c | 32 +++++++++++++++++++++++++++++ dlls/win32u/defwnd.c | 16 +++++++++++++++ dlls/win32u/menu.c | 25 +++++++++++++---------- dlls/win32u/win32u_private.h | 2 +- dlls/wow64win/user.c | 23 +++++++++++++++++++++ include/ntuser.h | 12 +++++++++++ include/winuser.h | 10 +++++++++ 14 files changed, 171 insertions(+), 13 deletions(-)

1 0

Zhiyi Zhang : uxtheme: Support drawing themed menu buttons.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 736ae290c93fc933ca9707b59e973777b49d8424 URL: https://gitlab.winehq.org/wine/wine/-/commit/736ae290c93fc933ca9707b59e9737… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Oct 23 22:36:47 2022 +0800 uxtheme: Support drawing themed menu buttons. --- dlls/uxtheme/window.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/window.c b/dlls/uxtheme/window.c index d94bd8425c7..d059a85b297 100644 --- a/dlls/uxtheme/window.c +++ b/dlls/uxtheme/window.c @@ -22,11 +22,70 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "uxthemedll.h" +#include "vssym32.h" + +static void uxtheme_draw_menu_button(HTHEME theme, HWND hwnd, HDC hdc, enum NONCLIENT_BUTTON_TYPE type, + RECT rect, BOOL down, BOOL grayed) +{ + int part, state; + + switch (type) + { + case MENU_CLOSE_BUTTON: + part = WP_MDICLOSEBUTTON; + break; + case MENU_MIN_BUTTON: + part = WP_MDIMINBUTTON; + break; + case MENU_RESTORE_BUTTON: + part = WP_MDIRESTOREBUTTON; + break; + case MENU_HELP_BUTTON: + part = WP_MDIHELPBUTTON; + break; + /* There is no WP_MDIMAXBUTTON */ + default: + user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + return; + } + + if (grayed) + state = MINBS_DISABLED; + else if (down) + state = MINBS_PUSHED; + else + state = MINBS_NORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) + DrawThemeParentBackground(hwnd, hdc, &rect); + DrawThemeBackground(theme, hdc, part, state, &rect, NULL); +} void WINAPI UXTHEME_NonClientButtonDraw(HWND hwnd, HDC hdc, enum NONCLIENT_BUTTON_TYPE type, RECT rect, BOOL down, BOOL grayed) { - user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + HTHEME theme; + + theme = OpenThemeDataForDpi(NULL, L"Window", GetDpiForWindow(hwnd)); + if (!theme) + { + user_api.pNonClientButtonDraw(hwnd, hdc, type, rect, down, grayed); + return; + } + + switch (type) + { + case MENU_CLOSE_BUTTON: + case MENU_MIN_BUTTON: + case MENU_MAX_BUTTON: + case MENU_RESTORE_BUTTON: + case MENU_HELP_BUTTON: + uxtheme_draw_menu_button(theme, hwnd, hdc, type, rect, down, grayed); + break; + } + + CloseThemeData(theme); }

1 0