May 2024 - Wine-commits - list.winehq.org

Esme Povirk : gdiplus: Replace HDC check in GdipFlush.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: ab2931797cf03258df0b50717b03a5f7bad3c9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/ab2931797cf03258df0b50717b03a5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:54:34 2024 +0000 gdiplus: Replace HDC check in GdipFlush. --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4c12cc18f11..87971180d2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4907,7 +4907,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics *graphics, GpFlushIntention intention) /* We have no internal operation queue, so there's no need to clear it. */ - if (graphics->hdc) + if (has_gdi_dc(graphics)) GdiFlush(); return Ok;

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipMeasureCharacterRanges.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 8f20be4ab84c074b4130360c2f124e51cb8fbef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f20be4ab84c074b4130360c2f124e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:04:09 2024 +0000 gdiplus: Bracket HDC use in GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 87971180d2d..a16932a31ab 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5734,13 +5734,17 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; - if(!graphics->hdc) + if(!has_gdi_dc(graphics)) { hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } else - hdc = graphics->hdc; + { + stat = gdi_dc_acquire(graphics, &hdc); + if (stat != Ok) + return stat; + } if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); @@ -5787,6 +5791,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (temp_hdc) DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return stat; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipMeasureString.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 9d30cddf064d799697bfb76cc5002cdf874776b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d30cddf064d799697bfb76cc5002c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:13:28 2024 +0000 gdiplus: Bracket HDC use in GdipMeasureString. --- dlls/gdiplus/graphics.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a16932a31ab..b93b3f0c277 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5836,6 +5836,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, INT *codepointsfitted, INT *linesfilled) { + GpStatus status; HFONT oldfont, gdifont; struct measure_string_args args; HDC temp_hdc=NULL, hdc; @@ -5850,13 +5851,17 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect || !bounds) return InvalidParameter; - if(!graphics->hdc) + if(!has_gdi_dc(graphics)) { hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } else - hdc = graphics->hdc; + { + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; + } if(linesfilled) *linesfilled = 0; if(codepointsfitted) *codepointsfitted = 0; @@ -5909,6 +5914,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (temp_hdc) DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return Ok; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GdipDrawString.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: d9d7e8f39228a9c5ae6bce2a90641f45a8f7e404 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9d7e8f39228a9c5ae6bce2a90641f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:24:18 2024 +0000 gdiplus: Bracket HDC use in GdipDrawString. --- dlls/gdiplus/graphics.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b93b3f0c277..c089a984db7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5987,6 +5987,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush) { + GpStatus status; HRGN rgn = NULL; HFONT gdifont; GpPointF rectcpy[4]; @@ -6005,9 +6006,11 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; - if(graphics->hdc) + if(has_gdi_dc(graphics)) { - hdc = graphics->hdc; + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; } else { @@ -6097,7 +6100,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string RestoreDC(hdc, save_state); - DeleteDC(temp_hdc); + if (temp_hdc) + DeleteDC(temp_hdc); + else + gdi_dc_release(graphics, hdc); return Ok; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipDrawDriverString.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 8b55affe3e6f9e85893bc11a55e980e8aa6d976d URL: https://gitlab.winehq.org/wine/wine/-/commit/8b55affe3e6f9e85893bc11a55e980… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:32:57 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c089a984db7..83fca7a9bfa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7492,6 +7492,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 LOGFONTW lfw; UINT eto_flags=0; GpStatus status; + HDC hdc; HRGN hrgn; if (!(flags & DriverStringOptionsCmapLookup)) @@ -7509,15 +7510,23 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } } - save_state = SaveDC(graphics->hdc); - SetBkMode(graphics->hdc, TRANSPARENT); - SetTextColor(graphics->hdc, get_gdi_brush_color(brush)); + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + { + free(real_positions); + free(eto_positions); + return status; + } + + save_state = SaveDC(hdc); + SetBkMode(hdc, TRANSPARENT); + SetTextColor(hdc, get_gdi_brush_color(brush)); status = get_clip_hrgn(graphics, &hrgn); if (status == Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn); } @@ -7548,23 +7557,25 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } } - SelectObject(graphics->hdc, hfont); + SelectObject(hdc, hfont); - SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); + SetTextAlign(hdc, TA_BASELINE|TA_LEFT); gdi_transform_acquire(graphics); - ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); + ExtTextOutW(hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, eto_positions); gdi_transform_release(graphics); - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); DeleteObject(hfont); free(real_positions); free(eto_positions); + gdi_dc_release(graphics, hdc); + return Ok; }

1 0

Esme Povirk : gitlab: Add unzip to build image.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: d79eab977696545265df61115dbdce9fde4e6f26 URL: https://gitlab.winehq.org/wine/wine/-/commit/d79eab977696545265df61115dbdce… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 18 17:36:34 2024 +0000 gitlab: Add unzip to build image. I would like to reuse this build image for the Wine Mono CI process (so that I don't have to separately maintain an image that can run current Wine), but I need unzip to download and extract artifacts from Wine's CI process. --- tools/gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index 4a380dfb51b..5259d1a1ed4 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -54,7 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ unixodbc-dev:amd64 unixodbc-dev:i386 \ x11proto-dev && \ apt-get install -y ccache netbase curl ca-certificates xserver-xorg-video-dummy xserver-xorg xfonts-base xinit fvwm \ - winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio && \ + winbind fonts-liberation2 fonts-noto-core fonts-noto-cjk pulseaudio unzip && \ curl -O https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multi… && \ dpkg -i deb-multimedia-keyring_2016.8.1_all.deb && \ echo 'deb https://www.deb-multimedia.org bookworm main' >> /etc/apt/sources.list && \

1 0

Danyil Blyschak : win32u: Remove external fonts from the registry before writing to it.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: c8117e8b67d8154448a937047047c02b74e41ec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8117e8b67d8154448a937047047c0… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Fri May 17 13:37:22 2024 -0500 win32u: Remove external fonts from the registry before writing to it. In update_external_font_keys(), remove the fonts from the registry immediately after we mark them for deletion, and then proceed to add or update values in the registry. This prevents a font from being marked as deleted, then being updated in the registry, and then removed from the registry regardless. When this happened, the registry would not contain the value for this font that we intended to update it with. This function would need to run again for this value to be added to the registry, but since this function runs during initialization, this means that a subsequent launch of wine was necessary. By removing the old value from the registry first, and then adding the new one, the initialization process becomes idempotent starting from the first run. --- dlls/win32u/font.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 277849ac4d9..7e70cccf568 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6664,6 +6664,14 @@ static void update_external_font_keys(void) list_add_tail( &external_keys, &key->entry ); } + LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) + { + reg_delete_value( win9x_key, key->value ); + reg_delete_value( winnt_key, key->value ); + reg_delete_value( hkey, key->value ); + list_remove( &key->entry ); + free( key ); + } WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) @@ -6690,14 +6698,6 @@ static void update_external_font_keys(void) set_reg_value( hkey, value, REG_SZ, file, len ); } } - LIST_FOR_EACH_ENTRY_SAFE( key, next, &external_keys, struct external_key, entry ) - { - reg_delete_value( win9x_key, key->value ); - reg_delete_value( winnt_key, key->value ); - reg_delete_value( hkey, key->value ); - list_remove( &key->entry ); - free( key ); - } NtClose( win9x_key ); NtClose( winnt_key ); NtClose( hkey );

1 0

Alexandros Frantzis : opengl32: Remove the wglDescribePixelFormat driver entry point.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 653f00cf3e81e691cb636d645eb91df3df5a9e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/653f00cf3e81e691cb636d645eb91d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon May 13 09:48:26 2024 +0300 opengl32: Remove the wglDescribePixelFormat driver entry point. All drivers have now switched to the get_pixel_formats entry point. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_thunks.c | 38 -------------------------------------- dlls/opengl32/unixlib.h | 11 ----------- dlls/opengl32/wgl.c | 19 ++++++------------- dlls/win32u/dibdrv/dc.c | 1 - dlls/wineandroid.drv/opengl.c | 1 - dlls/winemac.drv/opengl.c | 1 - dlls/winex11.drv/opengl.c | 1 - include/wine/wgl_driver.h | 3 +-- 9 files changed, 8 insertions(+), 69 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 215caad4639..f1fddb6dcfa 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -149,6 +149,7 @@ my %manual_win_functions = "wglChoosePixelFormat" => 1, "wglCreateLayerContext" => 1, "wglDescribeLayerPlane" => 1, + "wglDescribePixelFormat" => 1, "wglGetCurrentContext" => 1, "wglGetCurrentDC" => 1, "wglGetDefaultProcAddress" => 1, @@ -176,7 +177,6 @@ my %manual_win_thunks = "glUnmapBufferARB" => 1, "glUnmapNamedBuffer" => 1, "glUnmapNamedBufferEXT" => 1, - "wglDescribePixelFormat" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetExtensionsStringARB" => 1, "wglGetExtensionsStringEXT" => 1, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index abb436bdc05..ef14887461a 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -48,15 +48,6 @@ extern NTSTATUS ext_wglReleasePbufferDCARB( void *args ); extern NTSTATUS ext_wglReleaseTexImageARB( void *args ); extern NTSTATUS ext_wglSetPbufferAttribARB( void *args ); -static NTSTATUS wgl_wglDescribePixelFormat( void *args ) -{ - struct wglDescribePixelFormat_params *params = args; - const struct opengl_funcs *funcs = get_dc_funcs( params->hdc ); - if (!funcs || !funcs->wgl.p_wglDescribePixelFormat) return STATUS_NOT_IMPLEMENTED; - params->ret = funcs->wgl.p_wglDescribePixelFormat( params->hdc, params->ipfd, params->cjpfd, params->ppfd ); - return STATUS_SUCCESS; -} - static NTSTATUS wgl_wglGetPixelFormat( void *args ) { struct wglGetPixelFormat_params *params = args; @@ -24211,7 +24202,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = &wgl_wglCopyContext, &wgl_wglCreateContext, &wgl_wglDeleteContext, - &wgl_wglDescribePixelFormat, &wgl_wglGetPixelFormat, &wgl_wglGetProcAddress, &wgl_wglMakeCurrent, @@ -27281,31 +27271,6 @@ static NTSTATUS wow64_wgl_wglCopyContext( void *args ) return status; } -static NTSTATUS wow64_wgl_wglDescribePixelFormat( void *args ) -{ - struct - { - PTR32 teb; - PTR32 hdc; - int ipfd; - UINT cjpfd; - PTR32 ppfd; - int ret; - } *params32 = args; - struct wglDescribePixelFormat_params params = - { - .teb = get_teb64(params32->teb), - .hdc = ULongToPtr(params32->hdc), - .ipfd = params32->ipfd, - .cjpfd = params32->cjpfd, - .ppfd = ULongToPtr(params32->ppfd), - }; - NTSTATUS status; - status = wgl_wglDescribePixelFormat( &params ); - params32->ret = params.ret; - return status; -} - static NTSTATUS wow64_wgl_wglGetPixelFormat( void *args ) { struct @@ -92333,7 +92298,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_wgl_wglCopyContext, wow64_wgl_wglCreateContext, wow64_wgl_wglDeleteContext, - wow64_wgl_wglDescribePixelFormat, wow64_wgl_wglGetPixelFormat, wow64_wgl_wglGetProcAddress, wow64_wgl_wglMakeCurrent, @@ -95377,7 +95341,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = static BOOL null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; } static struct wgl_context * null_wglCreateContext( HDC hDc ) { return 0; } static BOOL null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; } -static int null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; } static int null_wglGetPixelFormat( HDC hdc ) { return 0; } static PROC null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; } static BOOL null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; } @@ -98421,7 +98384,6 @@ struct opengl_funcs null_opengl_funcs = null_wglCopyContext, null_wglCreateContext, null_wglDeleteContext, - null_wglDescribePixelFormat, null_wglGetPixelFormat, null_wglGetProcAddress, null_wglMakeCurrent, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index 3e1e6206478..301038ca102 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -39,16 +39,6 @@ struct wglDeleteContext_params BOOL ret; }; -struct wglDescribePixelFormat_params -{ - TEB *teb; - HDC hdc; - int ipfd; - UINT cjpfd; - PIXELFORMATDESCRIPTOR *ppfd; - int ret; -}; - struct wglGetPixelFormat_params { TEB *teb; @@ -25349,7 +25339,6 @@ enum unix_funcs unix_wglCopyContext, unix_wglCreateContext, unix_wglDeleteContext, - unix_wglDescribePixelFormat, unix_wglGetPixelFormat, unix_wglGetProcAddress, unix_wglMakeCurrent, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9d2ce4ea215..ff97d31b3eb 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -345,26 +345,19 @@ error: INT WINAPI wglDescribePixelFormat( HDC hdc, int index, UINT size, PIXELFORMATDESCRIPTOR *ppfd ) { - struct wglDescribePixelFormat_params args = { .teb = NtCurrentTeb(), .hdc = hdc, .ipfd = index, .cjpfd = size, .ppfd = ppfd }; - NTSTATUS status; struct wgl_pixel_format *formats; UINT num_formats, num_onscreen_formats; TRACE( "hdc %p, index %d, size %u, ppfd %p\n", hdc, index, index, ppfd ); - if ((formats = get_pixel_formats( hdc, &num_formats, &num_onscreen_formats ))) - { - if (!ppfd) return num_onscreen_formats; - if (size < sizeof(*ppfd)) return 0; - if (index <= 0 || index > num_onscreen_formats) return 0; + if (!(formats = get_pixel_formats( hdc, &num_formats, &num_onscreen_formats ))) return 0; + if (!ppfd) return num_onscreen_formats; + if (size < sizeof(*ppfd)) return 0; + if (index <= 0 || index > num_onscreen_formats) return 0; - *ppfd = formats[index - 1].pfd; + *ppfd = formats[index - 1].pfd; - return num_onscreen_formats; - } - - if ((status = UNIX_CALL( wglDescribePixelFormat, &args ))) WARN( "wglDescribePixelFormat returned %#lx\n", status ); - return args.ret; + return num_onscreen_formats; } /*********************************************************************** diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 0d53915b2ba..38039e7d6ae 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -600,7 +600,6 @@ static struct opengl_funcs opengl_funcs = dibdrv_wglCopyContext, /* p_wglCopyContext */ dibdrv_wglCreateContext, /* p_wglCreateContext */ dibdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ dibdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ dibdrv_wglGetProcAddress, /* p_wglGetProcAddress */ dibdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index f882c86b976..7981b9be9ee 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -1066,7 +1066,6 @@ static struct opengl_funcs egl_funcs = android_wglCopyContext, android_wglCreateContext, android_wglDeleteContext, - NULL, /* p_wglDescribePixelFormat */ android_wglGetPixelFormat, android_wglGetProcAddress, android_wglMakeCurrent, diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 1c0b87d694a..a614a5b076b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4614,7 +4614,6 @@ static struct opengl_funcs opengl_funcs = macdrv_wglCopyContext, /* p_wglCopyContext */ macdrv_wglCreateContext, /* p_wglCreateContext */ macdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ macdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ macdrv_wglGetProcAddress, /* p_wglGetProcAddress */ macdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 02a7980d911..8ab3e3474d3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3457,7 +3457,6 @@ static struct opengl_funcs opengl_funcs = glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ - NULL, /* p_wglDescribePixelFormat */ glxdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 5bf72a7f269..b08ab4befde 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif -#define WINE_WGL_DRIVER_VERSION 24 +#define WINE_WGL_DRIVER_VERSION 25 struct wgl_context; struct wgl_pbuffer; @@ -24,7 +24,6 @@ struct opengl_funcs BOOL (WINE_GLAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ); struct wgl_context * (WINE_GLAPI *p_wglCreateContext)( HDC hDc ); BOOL (WINE_GLAPI *p_wglDeleteContext)( struct wgl_context * oldContext ); - int (WINE_GLAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); int (WINE_GLAPI *p_wglGetPixelFormat)( HDC hdc ); PROC (WINE_GLAPI *p_wglGetProcAddress)( LPCSTR lpszProc ); BOOL (WINE_GLAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );

1 0

Fabian Maurer : oleaut32: Add test for invoking a dispatch get-only property with DISPATCH_PROPERTYPUT.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 82036f42f18739e42b28772e5f5a048fc94a329b URL: https://gitlab.winehq.org/wine/wine/-/commit/82036f42f18739e42b28772e5f5a04… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 01:05:04 2024 +0200 oleaut32: Add test for invoking a dispatch get-only property with DISPATCH_PROPERTYPUT. --- dlls/oleaut32/tests/test_reg.idl | 16 +++ dlls/oleaut32/tests/typelib.c | 206 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 220 insertions(+), 2 deletions(-)

1 0

Fabian Maurer : oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 033cf797607a8a21f0851fcef3d19a73c6d6d70e URL: https://gitlab.winehq.org/wine/wine/-/commit/033cf797607a8a21f0851fcef3d19a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 23:50:32 2024 +0200 oleaut32: Handle cases where invoking a get-only property with INVOKE_PROPERTYPUT returns DISP_E_BADPARAMCOUNT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56666 --- dlls/oleaut32/tests/typelib.c | 12 ------------ dlls/oleaut32/typelib.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ce60e99aa9d..eb5407f034f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1241,49 +1241,41 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 1 param */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int) - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on on HRESULT func(out int) - 1 params - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 5, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 params */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 0 params - NULL result passed */ dispparams.cArgs = 0; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func() - 1 param - NULL result passed */ dispparams.cArgs = 1; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 6, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 0 param - NULL result passed */ @@ -1299,7 +1291,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 7, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on int func(int) - 3 params - NULL result passed */ @@ -1320,7 +1311,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 2 params - NULL result passed */ dispparams.cArgs = 2; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 8, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on HRESULT func(out int, int) - 3 params - NULL result passed */ @@ -1346,7 +1336,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on int func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 9, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 0 params - NULL result passed */ @@ -1367,7 +1356,6 @@ static void test_TypeInfo(void) /* call propget with DISPATCH_PROPERTYPUT on void func(int, int) - 3 params - NULL result passed */ dispparams.cArgs = 3; hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 10, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, &i); - todo_wine ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08lx\n", hr); /* If there's get and put, the put must work */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b1fbcdfed0a..196f059a587 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7547,6 +7547,28 @@ func_fail: return E_NOTIMPL; } + /* not found, check for special error cases */ + for (fdc = 0; fdc < This->typeattr.cFuncs; ++fdc) + { + const FUNCDESC *func_desc = &This->funcdescs[fdc].funcdesc; + if (memid == func_desc->memid) + { + if ((wFlags & INVOKE_PROPERTYPUT) && (func_desc->invkind & INVOKE_PROPERTYGET)) + { + int count_inputs = 0; + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].paramdesc.wParamFlags; + if (!(wParamFlags & PARAMFLAG_FRETVAL)) + count_inputs++; + } + + if (count_inputs == 0 || pDispParams->cArgs == count_inputs + 1) + return DISP_E_BADPARAMCOUNT; + } + } + } + /* not found, look for it in inherited interfaces */ ITypeInfo2_GetTypeKind(iface, &type_kind); if(type_kind == TKIND_INTERFACE || type_kind == TKIND_DISPATCH) {

1 0