wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Bartosz Kosiorek : gdiplus: Use GpPointF for drawing in widen_closed_figure.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: a8e8730769d3dc3c8c7ebb33386550a5f9b54626 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e8730769d3dc3c8c7ebb33386550… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 18 14:51:57 2022 +0100 gdiplus: Use GpPointF for drawing in widen_closed_figure. --- dlls/gdiplus/graphicspath.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5ddd96778db..e24053004e0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2129,7 +2129,7 @@ static void widen_open_figure(const GpPointF *points, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } -static void widen_closed_figure(GpPath *path, int start, int end, +static void widen_closed_figure(const GpPointF *points, int start, int end, GpPen *pen, REAL pen_width, path_list_node_t **last_point) { int i; @@ -2141,15 +2141,15 @@ static void widen_closed_figure(GpPath *path, int start, int end, /* left outline */ prev_point = *last_point; - widen_joint(&path->pathdata.Points[end], &path->pathdata.Points[start], - &path->pathdata.Points[start+1], pen, pen_width, last_point); + widen_joint(&points[end], &points[start], + &points[start+1], pen, pen_width, last_point); for (i=start+1; i<end; i++) - widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], - &path->pathdata.Points[i+1], pen, pen_width, last_point); + widen_joint(&points[i-1], &points[i], + &points[i+1], pen, pen_width, last_point); - widen_joint(&path->pathdata.Points[end-1], &path->pathdata.Points[end], - &path->pathdata.Points[start], pen, pen_width, last_point); + widen_joint(&points[end-1], &points[end], + &points[start], pen, pen_width, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2157,15 +2157,15 @@ static void widen_closed_figure(GpPath *path, int start, int end, /* right outline */ prev_point = *last_point; - widen_joint(&path->pathdata.Points[start], &path->pathdata.Points[end], - &path->pathdata.Points[end-1], pen, pen_width, last_point); + widen_joint(&points[start], &points[end], + &points[end-1], pen, pen_width, last_point); for (i=end-1; i>start; i--) - widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], - &path->pathdata.Points[i-1], pen, pen_width, last_point); + widen_joint(&points[i+1], &points[i], + &points[i-1], pen, pen_width, last_point); - widen_joint(&path->pathdata.Points[start+1], &path->pathdata.Points[start], - &path->pathdata.Points[end], pen, pen_width, last_point); + widen_joint(&points[start+1], &points[start], + &points[end], pen, pen_width, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2369,7 +2369,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, subpath_start, i, 1, pen, pen_width, &last_point); else - widen_closed_figure(flat_path, subpath_start, i, pen, pen_width, &last_point); + widen_closed_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, &last_point); } else if (i == flat_path->pathdata.Count-1 || (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart)

1 0

Bartosz Kosiorek : gdiplus: Add GdipSetCustomLineCapBaseInset implementation.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 200652075be4406ad1e104657e672849bab6c7c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/200652075be4406ad1e104657e6728… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:55 2022 +0100 gdiplus: Add GdipSetCustomLineCapBaseInset implementation. --- dlls/gdiplus/customlinecap.c | 10 +++++----- dlls/gdiplus/tests/customlinecap.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 2e7b000355e..c05aecae29a 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -220,14 +220,14 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, REAL inset) { - static int calls; - TRACE("(%p,%0.2f)\n", custom, inset); - if(!(calls++)) - FIXME("not implemented\n"); + if(!custom) + return InvalidParameter; - return NotImplemented; + custom->inset = inset; + + return Ok; } /*FIXME: LineJoin completely ignored now */ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index c475216ff21..89323040ad1 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -165,6 +165,14 @@ static void test_inset(void) expect(Ok, stat); expectf(0.0, inset); + stat = GdipSetCustomLineCapBaseInset(custom, 2.0); + expect(Ok, stat); + + inset = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapBaseInset(custom, &inset); + expect(Ok, stat); + ok(inset == 2.0, "Unexpected inset value %f\n", inset); + GdipDeleteCustomLineCap(custom); GdipDeletePath(path); }

1 0

Bartosz Kosiorek : gdiplus: Remove not used LineCustomCap parameter.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: bc8ced226abcd636eff3f22015c3f4a231a83deb URL: https://gitlab.winehq.org/wine/wine/-/commit/bc8ced226abcd636eff3f22015c3f4… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:53 2022 +0100 gdiplus: Remove not used LineCustomCap parameter. --- dlls/gdiplus/graphicspath.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d98a5ae4bf6..5ddd96778db 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1876,7 +1876,7 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * } static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, - REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, int add_first_points, + REAL pen_width, GpLineCap cap, int add_first_points, int add_last_point, path_list_node_t **last_point) { switch (cap) @@ -2097,8 +2097,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, } static void widen_open_figure(const GpPointF *points, int start, int end, - GpPen *pen, REAL pen_width, GpLineCap start_cap, GpCustomLineCap *start_custom, - GpLineCap end_cap, GpCustomLineCap *end_custom, path_list_node_t **last_point) + GpPen *pen, REAL pen_width, GpLineCap start_cap, + GpLineCap end_cap, path_list_node_t **last_point) { int i; path_list_node_t *prev_point; @@ -2109,21 +2109,21 @@ static void widen_open_figure(const GpPointF *points, int start, int end, prev_point = *last_point; widen_cap(&points[start], &points[start+1], - pen_width, start_cap, start_custom, FALSE, TRUE, last_point); + pen_width, start_cap, FALSE, TRUE, last_point); for (i=start+1; i<end; i++) widen_joint(&points[i-1], &points[i], &points[i+1], pen, pen_width, last_point); widen_cap(&points[end], &points[end-1], - pen_width, end_cap, end_custom, TRUE, TRUE, last_point); + pen_width, end_cap, TRUE, TRUE, last_point); for (i=end-1; i>start; i--) widen_joint(&points[i+1], &points[i], &points[i-1], pen, pen_width, last_point); widen_cap(&points[start], &points[start+1], - pen_width, start_cap, start_custom, TRUE, FALSE, last_point); + pen_width, start_cap, TRUE, FALSE, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2267,8 +2267,8 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, tmp_points[num_tmp_points].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; widen_open_figure(tmp_points, 0, num_tmp_points, pen, pen_width, - draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, - LineCapFlat, NULL, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, + LineCapFlat, last_point); draw_start_cap = 0; num_tmp_points = 0; } @@ -2301,8 +2301,8 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, { /* last dash overflows last segment */ widen_open_figure(tmp_points, 0, num_tmp_points-1, pen, pen_width, - draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, - closed ? LineCapFlat : pen->endcap, pen->customend, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, + closed ? LineCapFlat : pen->endcap, last_point); } heap_free(dash_pattern_scaled); @@ -2377,7 +2377,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, subpath_start, i, 0, pen, pen_width, &last_point); else - widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point); + widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, pen->startcap, pen->endcap, &last_point); } }

1 0

Bartosz Kosiorek : gdiplus: Add GdipSetCustomLineCapBaseCap implementation.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 742c315702016b4c4cec2a3195c462410796c7c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/742c315702016b4c4cec2a3195c462… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:50 2022 +0100 gdiplus: Add GdipSetCustomLineCapBaseCap implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/gdiplus/customlinecap.c | 17 ++++++++--------- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/tests/customlinecap.c | 5 +++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index c74928eeda6..2e7b000355e 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -96,7 +96,7 @@ static GpStatus init_custom_linecap(GpCustomLineCap *cap, GpPathData *pathdata, cap->pathdata.Count = pathdata->Count; cap->inset = base_inset; - cap->cap = basecap; + cap->basecap = basecap; cap->join = LineJoinMiter; cap->scale = 1.0; @@ -193,16 +193,15 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, } GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, - GpLineCap base) + GpLineCap basecap) { - static int calls; + TRACE("(%p,%u)\n", custom, basecap); + if(!custom || basecap > LineCapTriangle) + return InvalidParameter; - TRACE("(%p,%u)\n", custom, base); + custom->basecap = basecap; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, @@ -264,7 +263,7 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLi if(!customCap || !baseCap) return InvalidParameter; - *baseCap = customCap->cap; + *baseCap = customCap->basecap; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0c55af6614a..77b35659946 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -351,7 +351,7 @@ struct GpCustomLineCap{ CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ - GpLineCap cap; /* as far as I can tell, this value is ignored */ + GpLineCap basecap; /* cap used together with customLineCap */ REAL inset; /* how much to adjust the end of the line */ GpLineJoin join; REAL scale; diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 26175ca8f66..c475216ff21 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -283,14 +283,15 @@ static void test_create_adjustable_cap(void) ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); - todo_wine ok(stat == Ok, "Unexpected return code, %d\n", stat); stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); ok(stat == Ok, "Unexpected return code, %d\n", stat); - todo_wine ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquareAnchor); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + /* Base inset */ stat = GdipGetAdjustableArrowCapWidth(cap, &width); ok(stat == Ok, "Unexpected return code, %d\n", stat);

1 0

Rémi Bernon : winex11.drv: Reposition windows on desktop resize only when useful.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: aeb43dce75f45e44ebf08d73ddf9a66f043e4fbe URL: https://gitlab.winehq.org/wine/wine/-/commit/aeb43dce75f45e44ebf08d73ddf9a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 23 17:24:28 2022 +0100 winex11.drv: Reposition windows on desktop resize only when useful. This will end up moving window around only if the old virtual screen origin is different from the new one. Don't send unnecessary messages if it didn't change. This helps speeding up D3D tests on the testbot VMs with multiple displays and hopefully solve the timeout problems. --- dlls/winex11.drv/desktop.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2950c663bb9..bb998543ae7 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -470,8 +470,10 @@ void X11DRV_resize_desktop(void) virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); - send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, - old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); + + if (old_virtual_rect.left != virtual_rect.left || old_virtual_rect.top != virtual_rect.top) + send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, + old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); /* forward clip_fullscreen_window request to the foreground window */ send_notify_message( NtUserGetForegroundWindow(), WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE );

1 0

Martin Storsjö : ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: d6829bdcbabd5e1a32a2585604eb0aa96b2a6271 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6829bdcbabd5e1a32a2585604eb0a… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Nov 23 14:41:14 2022 +0200 ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs. When f7332ab4a6e199d03e4318d82c0b16a0396b935c switched load_so_dll over to a proper Unix syscall, ntdll.so started providing the symbol __wine_unix_call_funcs. When a DLL calls NtQueryVirtualMemory(MemoryWineUnixFuncs), it can do so speculatively, not knowing whether the corresponding unix lib actually does provide anything. When ntdll.so started providing this symbol, then such speculative calls to NtQueryVirtualMemory(MemoryWineUnixFuncs) would end up returning ntdll's __wine_unix_call_funcs if the intended DLL's unix library lacked one. This is the case with bcrypt, where the unix library doesn't provide __wine_unix_call_funcs if gnutls is unavailable. This fixes crashes after f7332ab4a6e199d03e4318d82c0b16a0396b935c, in builds without gnutls. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/unix_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a7fae7ab7ab..aad472faff8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -43,8 +43,8 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; extern WORD native_machine DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; -extern const unixlib_entry_t __wine_unix_call_funcs[]; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int));

1 0

Jacek Caban : win32u: Don't use CDECL for __wine_get_wgl_driver.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: c2a43defec3efca05d38cd83ffa53412766fdc80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a43defec3efca05d38cd83ffa534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:46:14 2022 +0100 win32u: Don't use CDECL for __wine_get_wgl_driver. --- dlls/opengl32/make_opengl | 2 +- dlls/win32u/dc.c | 2 +- include/wine/gdi_driver.h | 2 -- include/wine/wgl_driver.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5654ddfa824..5d995495abd 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -925,7 +925,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 2e59dc8dc9c..8379cd353ef 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1491,7 +1491,7 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index edde473b4d1..d074c09cceb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,4 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT #endif /* WINE_UNIX_LIB */ -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); - #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 36b1f384ddf..c35847ff2e4 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 21 +#define WINE_WGL_DRIVER_VERSION 22 struct wgl_context; struct wgl_pbuffer; @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); +extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Jacek Caban : win32u: Remove __wine_get_wgl_driver PE entry point.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 65835e4b74f76f8e74e94c50558224993349bca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/65835e4b74f76f8e74e94c50558224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:43:24 2022 +0100 win32u: Remove __wine_get_wgl_driver PE entry point. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ 4 files changed, 11 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 81451399902..f88efbaa679 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 3771dafcf76..c9c126ec2f3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1323,9 +1323,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -# OpenGL -@ cdecl __wine_get_wgl_driver(long long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f77a56d6d58..8fc00cf3296 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index c5078c8a7f7..e128705ef37 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); } -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_wgl_driver( hdc, version ); -} - BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { if (!unix_funcs) return FALSE;

1 0

Alex Henrie : dnsapi: Use the strdup and wcsdup functions instead of reimplementing them.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: b81a5718492f498b6b88dd927ba6dbf53f6db5c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b81a5718492f498b6b88dd927ba6db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 22:16:47 2022 -0700 dnsapi: Use the strdup and wcsdup functions instead of reimplementing them. --- dlls/dnsapi/dnsapi.h | 27 --------------------------- dlls/dnsapi/query.c | 2 +- dlls/dnsapi/record.c | 6 +++--- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index a81cb712f3e..250b0a1b4c3 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -25,33 +25,6 @@ #include "winternl.h" #include "wine/unixlib.h" -static inline char *strdup_a( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (lstrlenA( src ) + 1) * sizeof(char) ); - if (dst) lstrcpyA( dst, src ); - return dst; -} - -static inline char *strdup_u( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (strlen( src ) + 1) * sizeof(char) ); - if (dst) strcpy( dst, src ); - return dst; -} - -static inline WCHAR *strdup_w( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *strdup_aw( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 0e2f1b39ece..90a3a3e9950 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -73,7 +73,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) } else { - record->pName = strdup_u( name ); + record->pName = strdup( name ); if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 04694fc575c..01786842b73 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -455,7 +455,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (out) { - case DnsCharSetUnicode: return strdup_w( src ); + case DnsCharSetUnicode: return wcsdup( src ); case DnsCharSetUtf8: return strdup_wu( src ); case DnsCharSetAnsi: return strdup_wa( src ); default: @@ -468,7 +468,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) switch (out) { case DnsCharSetUnicode: return strdup_uw( src ); - case DnsCharSetUtf8: return strdup_u( src ); + case DnsCharSetUtf8: return strdup( src ); case DnsCharSetAnsi: return strdup_ua( src ); default: WARN( "unhandled target charset: %d\n", out ); @@ -480,7 +480,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { case DnsCharSetUnicode: return strdup_aw( src ); case DnsCharSetUtf8: return strdup_au( src ); - case DnsCharSetAnsi: return strdup_a( src ); + case DnsCharSetAnsi: return strdup( src ); default: WARN( "unhandled target charset: %d\n", out ); break;

1 0

Nikolay Sivov : oleaut32/safearray: Fix an error code when trying to redim fixed arrays.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 7f01fdb6d4600308d811213323c579b838f649fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7f01fdb6d4600308d811213323c579… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 07:11:05 2022 +0300 oleaut32/safearray: Fix an error code when trying to redim fixed arrays. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/safearray.c | 4 +- dlls/oleaut32/tests/safearray.c | 102 ++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 92d55752e8a..92a73c768da 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1460,10 +1460,10 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) TRACE("(%p,%p)\n", psa, psabound); - if (!psa || psa->fFeatures & FADF_FIXEDSIZE || !psabound) + if (!psa || !psabound) return E_INVALIDARG; - if (psa->cLocks > 0) + if (psa->fFeatures & FADF_FIXEDSIZE || psa->cLocks) return DISP_E_ARRAYISLOCKED; hr = SafeArrayLock(psa); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index dbbe86994f5..9bbb59193e4 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1291,35 +1291,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) ok(xtunk.ref == 2,"Failed to decrement refcount of iface.\n"); } -static void test_SafeArrayRedim_IUnknown(void) -{ - SAFEARRAYBOUND sab; - LONG indices[1]; - SAFEARRAY *sa; - HRESULT hres; - - sab.lLbound = 1; - sab.cElements = 2; - sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); - ok(sa != NULL, "UNKNOWN test couldn't create array\n"); - if (!sa) - return; - - ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - - indices[0] = 2; - xtunk.ref = 1; - hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); - ok(hres == S_OK, "Failed to put IUnknown element hres 0x%lx\n", hres); - ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); - sab.cElements = 1; - hres = SafeArrayRedim(sa, &sab); - ok(hres == S_OK, "Failed to shrink array hres 0x%lx\n", hres); - ok(xtunk.ref == 1, "Failed to decrement refcount\n"); - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08lx\n", hres); -} - static void test_SafeArrayGetPutElement_VARIANT(void) { SAFEARRAYBOUND sab; @@ -2063,6 +2034,77 @@ static void test_safearray_layout(void) IRecordInfo_Release(&irec->IRecordInfo_iface); } +static void test_SafeArrayRedim(void) +{ + SAFEARRAYBOUND sab; + LONG indices[1]; + SAFEARRAY *sa; + HRESULT hres; + + sab.lLbound = 1; + sab.cElements = 2; + hres = SafeArrayRedim(NULL, &sab); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayRedim(sa, NULL); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* VT_UNKNOWN */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + ok(sa->cbElements == sizeof(IUnknown *), "Unexpected element size.\n"); + + indices[0] = 2; + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); + sab.cElements = 1; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 1, "Failed to decrement refcount\n"); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* FADF_FIXEDSIZE */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 4; + sa->fFeatures |= FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + sa->fFeatures &= ~FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* Locked array */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayLock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayUnlock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); +} + START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -2089,7 +2131,7 @@ START_TEST(safearray) test_SafeArrayGetPutElement(); test_SafeArrayGetPutElement_BSTR(); test_SafeArrayGetPutElement_IUnknown(); - test_SafeArrayRedim_IUnknown(); + test_SafeArrayRedim(); test_SafeArrayGetPutElement_VARIANT(); test_safearray_layout(); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022