November 2022 - Wine-commits

Alex Henrie : include: Annotate StrDup[AW] with __WINE_MALLOC and __WINE_DEALLOC.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 93a2fb604f925631d9d04048799f83bfe1b7539d URL: https://gitlab.winehq.org/wine/wine/-/commit/93a2fb604f925631d9d04048799f83… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 20:49:19 2022 -0700 include: Annotate StrDup[AW] with __WINE_MALLOC and __WINE_DEALLOC. --- include/shlwapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 6149c7081a3..cfebe238615 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -838,8 +838,8 @@ INT WINAPI StrCmpNIW(LPCWSTR,LPCWSTR,INT); #define StrCmpNI WINELIB_NAME_AW(StrCmpNI) #define StrNCmpI WINELIB_NAME_AW(StrCmpNI) -LPSTR WINAPI StrDupA(LPCSTR); -LPWSTR WINAPI StrDupW(LPCWSTR); +char * WINAPI StrDupA(const char *) __WINE_DEALLOC(LocalFree) __WINE_MALLOC; +WCHAR * WINAPI StrDupW(const WCHAR *) __WINE_DEALLOC(LocalFree) __WINE_MALLOC; #define StrDup WINELIB_NAME_AW(StrDup) HRESULT WINAPI SHStrDupA(LPCSTR,WCHAR**);

1 0

Brendan Shanks : include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: a0a4c2fb3f1f73dce48bef8bdb4a2cd3d1fbbde2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0a4c2fb3f1f73dce48bef8bdb4a2c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 28 09:00:10 2022 -0800 include: Add __WINE_(DEALLOC|MALLOC) attributes to wine_get_(dos|unix)_file_name. --- include/winbase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 7d7be1ae2a8..1d135a87fd7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2963,8 +2963,8 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); /* Wine internal functions */ -extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); -extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); +extern char * CDECL wine_get_unix_file_name( const WCHAR * ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC; +extern WCHAR * CDECL wine_get_dos_file_name( const char * ) __WINE_DEALLOC(HeapFree,3) __WINE_MALLOC; #ifdef WINE_UNIX_LIB

1 0

Brendan Shanks : mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 2d4b588afca00b3fafd3fb4509f577a85bd9588b URL: https://gitlab.winehq.org/wine/wine/-/commit/2d4b588afca00b3fafd3fb4509f577… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 28 09:02:26 2022 -0800 mountmgr.sys: Free wine_get_dos_file_name memory with HeapFree. --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 328b0b2f344..bc934e2f494 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -895,7 +895,7 @@ static BOOL get_volume_device_info( struct volume *volume ) } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - RtlFreeHeap( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError());

1 0

Brendan Shanks : wpcap: Free wine_get_unix_file_name memory with HeapFree.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 8a18836efce36fb33f94a02d97f0b2ff76260ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a18836efce36fb33f94a02d97f0b2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 28 09:03:22 2022 -0800 wpcap: Free wine_get_unix_file_name memory with HeapFree. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index c93c8540145..bc4cb63c623 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -135,7 +135,7 @@ void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) params.name = unix_path; params.ret = &dumper; PCAP_CALL( dump_open, &params ); - RtlFreeHeap( GetProcessHeap(), 0, unix_path ); + HeapFree( GetProcessHeap(), 0, unix_path ); return dumper; }

1 0

Bartosz Kosiorek : gdiplus: Add support for Custom Line Indent.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: be7db8457d3e766c456f875c61fa70fa6a3e0171 URL: https://gitlab.winehq.org/wine/wine/-/commit/be7db8457d3e766c456f875c61fa70… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Nov 24 19:49:24 2022 +0100 gdiplus: Add support for Custom Line Indent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/gdiplus/graphicspath.c | 53 +++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index fdb7dd24906..9194f6d42aa 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, int add_first_points, + REAL pen_width, GpLineCap cap, GpCustomLineCap* custom_cap, int add_first_points, int add_last_point, path_list_node_t **last_point) { switch (cap) @@ -1889,6 +1889,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, add_bevel_point(endpoint, nextpoint, pen_width, 0, last_point); break; case LineCapSquare: + case LineCapCustom: { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; @@ -1897,20 +1898,25 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, REAL bevel_dx, bevel_dy; REAL extend_dx, extend_dy; - extend_dx = -distance * segment_dx / segment_length; - extend_dy = -distance * segment_dy / segment_length; + extend_dx = distance * segment_dx / segment_length; + extend_dy = distance * segment_dy / segment_length; - bevel_dx = -distance * segment_dy / segment_length; - bevel_dy = distance * segment_dx / segment_length; + bevel_dx = -extend_dy; + bevel_dy = extend_dx; + + if (cap == LineCapCustom) + { + extend_dx = -2.0 * custom_cap->inset * extend_dx; + extend_dy = -2.0 * custom_cap->inset * extend_dy; + } if (add_first_points) - *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx + bevel_dx, - endpoint->Y + extend_dy + bevel_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X - extend_dx + bevel_dx, + endpoint->Y - extend_dy + bevel_dy, PathPointTypeLine); if (add_last_point) - *last_point = add_path_list_node(*last_point, endpoint->X + extend_dx - bevel_dx, - endpoint->Y + extend_dy - bevel_dy, PathPointTypeLine); - + *last_point = add_path_list_node(*last_point, endpoint->X - extend_dx - bevel_dx, + endpoint->Y - extend_dy - bevel_dy, PathPointTypeLine); break; } case LineCapRound: @@ -1983,8 +1989,8 @@ static void widen_cap(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, - GpLineCap end_cap, path_list_node_t **last_point); + GpPen *pen, REAL pen_width, GpLineCap start_cap, GpCustomLineCap* custom_start, + GpLineCap end_cap, GpCustomLineCap* custom_end, path_list_node_t **last_point); static void widen_closed_figure(const GpPointF *points, int start, int end, GpPen *pen, REAL pen_width, path_list_node_t **last_point); @@ -2145,7 +2151,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, if ((custom->pathdata.Types[custom->pathdata.Count - 1] & PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); else - widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, custom->strokeEndCap, custom->strokeStartCap, last_point); + widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, custom->strokeEndCap, NULL, custom->strokeStartCap, NULL, last_point); } else { @@ -2167,8 +2173,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, - GpLineCap end_cap, path_list_node_t **last_point) + GpPen *pen, REAL pen_width, GpLineCap start_cap, GpCustomLineCap* custom_start, + GpLineCap end_cap, GpCustomLineCap* custom_end, path_list_node_t **last_point) { int i; path_list_node_t *prev_point; @@ -2179,21 +2185,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, FALSE, TRUE, last_point); + pen_width, start_cap, custom_start, 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, TRUE, TRUE, last_point); + pen_width, end_cap, custom_end, 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, TRUE, FALSE, last_point); + pen_width, start_cap, custom_start, TRUE, FALSE, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2337,8 +2343,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, - LineCapFlat, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + LineCapFlat, NULL, last_point); draw_start_cap = 0; num_tmp_points = 0; } @@ -2371,8 +2377,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, - closed ? LineCapFlat : pen->endcap, last_point); + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + closed ? LineCapFlat : pen->endcap, pen->customend, last_point); } heap_free(dash_pattern_scaled); @@ -2446,7 +2452,8 @@ 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->endcap, &last_point); + widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, + pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point); } }

1 0

Bartosz Kosiorek : gdiplus: Fix position of Custom Cap when Scale is different that 1.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 0fd51346e10839b336dc7c80124b4f232e674645 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fd51346e10839b336dc7c80124b4f… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Nov 24 19:49:36 2022 +0100 gdiplus: Fix position of Custom Cap when Scale is different that 1. --- dlls/gdiplus/graphicspath.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 9194f6d42aa..10ffa85d6e3 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2128,13 +2128,13 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, TRACE("GpCustomLineCap fill: %d basecap: %d inset: %f join: %d scale: %f pen_width:%f\n", custom->fill, custom->basecap, custom->inset, custom->join, custom->scale, pen_width); - /* Coordination where cap needs to be drawn */ - posx = endpoint->X - pen_width * segment_dx / segment_length; - posy = endpoint->Y - pen_width * segment_dy / segment_length; - sina = -pen_width * custom->scale * segment_dx / segment_length; cosa = pen_width * custom->scale * segment_dy / segment_length; + /* Coordination where cap needs to be drawn */ + posx = endpoint->X + sina; + posy = endpoint->Y - cosa; + if (!custom->fill) { tmp_points = heap_alloc_zero(custom->pathdata.Count * sizeof(GpPoint));

1 0

Bartosz Kosiorek : gdiplus: Add support for LineCapArrowAnchor.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: edee5538e320e8e7af75d4ce1c675670b4e3c889 URL: https://gitlab.winehq.org/wine/wine/-/commit/edee5538e320e8e7af75d4ce1c6756… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 25 21:07:52 2022 +0100 gdiplus: Add support for LineCapArrowAnchor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42809 --- dlls/gdiplus/graphicspath.c | 32 ++++++++++++++++++++++++++------ dlls/gdiplus/tests/graphicspath.c | 7 +++---- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 10ffa85d6e3..2e30300e348 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +#define SQRT3 1.73205080757 + typedef struct path_list_node_t path_list_node_t; struct path_list_node_t { GpPointF pt; @@ -1890,6 +1892,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, break; case LineCapSquare: case LineCapCustom: + case LineCapArrowAnchor: { REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; @@ -1909,6 +1912,11 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, extend_dx = -2.0 * custom_cap->inset * extend_dx; extend_dy = -2.0 * custom_cap->inset * extend_dy; } + else if (cap == LineCapArrowAnchor) + { + extend_dx = -3.0 * extend_dx; + extend_dy = -3.0 * extend_dy; + } if (add_first_points) *last_point = add_path_list_node(*last_point, endpoint->X - extend_dx + bevel_dx, @@ -2105,6 +2113,24 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, endpoint->Y + perp_dy, PathPointTypeLine); break; } + case LineCapArrowAnchor: + { + REAL segment_dy = nextpoint->Y - endpoint->Y; + REAL segment_dx = nextpoint->X - endpoint->X; + REAL segment_length = sqrtf(segment_dy * segment_dy + segment_dx * segment_dx); + REAL par_dx = pen_width * segment_dx / segment_length; + REAL par_dy = pen_width * segment_dy / segment_length; + REAL perp_dx = -par_dy; + REAL perp_dy = par_dx; + + *last_point = add_path_list_node(*last_point, endpoint->X, + endpoint->Y, PathPointTypeStart); + *last_point = add_path_list_node(*last_point, endpoint->X + SQRT3 * par_dx - perp_dx, + endpoint->Y + SQRT3 * par_dy - perp_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X + SQRT3 * par_dx + perp_dx, + endpoint->Y + SQRT3 * par_dy + perp_dy, PathPointTypeLine); + break; + } case LineCapCustom: { REAL segment_dy = nextpoint->Y - endpoint->Y; @@ -2416,12 +2442,6 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, last_point = points; - if (pen->endcap > LineCapDiamondAnchor && pen->endcap != LineCapCustom) - FIXME("unimplemented end cap %x\n", pen->endcap); - - if (pen->startcap > LineCapDiamondAnchor && pen->startcap != LineCapCustom) - FIXME("unimplemented start cap %x\n", pen->startcap); - if (pen->dashcap != DashCapFlat) FIXME("unimplemented dash cap %d\n", pen->dashcap); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index ab1e7cb2fda..5082f0671d2 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -114,7 +114,7 @@ static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expect stringify_point_type(types[idx], name); todo_wine_if (expected[eidx].todo || numskip) - ok_(__FILE__,line)(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ok_(__FILE__,line)(match, "Expected #%d: %s (%.6f,%.6f) but got %s (%.6f,%.6f)\n", eidx, ename, expected[eidx].X, expected[eidx].Y, name, points[idx].X, points[idx].Y); @@ -1655,7 +1655,6 @@ static void test_widen_cap(void) const path_test_t *expected; INT expected_size; BOOL dashed; - BOOL todo_size; } caps[] = { @@ -1676,7 +1675,7 @@ static void test_widen_cap(void) { LineCapDiamondAnchor, 10.0, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path) }, { LineCapArrowAnchor, 10.0, widenline_caparrowanchor_path, - ARRAY_SIZE(widenline_caparrowanchor_path), FALSE, TRUE }, + ARRAY_SIZE(widenline_caparrowanchor_path) }, { LineCapSquareAnchor, 0.0, widenline_capsquareanchor_thin_path, ARRAY_SIZE(widenline_capsquareanchor_thin_path) }, { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_dashed_path, @@ -1729,7 +1728,7 @@ static void test_widen_cap(void) } } - ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, FALSE, 0.000005); GdipDeletePen(pen); }

1 0

Bernhard Kölbl : mfmediaengine: Pass volume changes to media session.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 12c28aa22f793de1ffa62dc269afb288fdf0526d URL: https://gitlab.winehq.org/wine/wine/-/commit/12c28aa22f793de1ffa62dc269afb2… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Nov 23 19:50:23 2022 +0100 mfmediaengine: Pass volume changes to media session. --- dlls/mfmediaengine/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b2ddc376db8..f2fae1cac3e 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -835,6 +835,23 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology IMFMediaType_Release(media_type); } +static void media_engine_apply_volume(const struct media_engine *engine) +{ + IMFSimpleAudioVolume *sa_volume; + HRESULT hr; + + if (!engine->session) + return; + + if (FAILED(MFGetService((IUnknown *)engine->session, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, (void **)&sa_volume))) + return; + + if (FAILED(hr = IMFSimpleAudioVolume_SetMasterVolume(sa_volume, engine->volume))) + WARN("Failed to set master volume, hr %#lx.\n", hr); + + IMFSimpleAudioVolume_Release(sa_volume); +} + static HRESULT WINAPI media_engine_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -918,6 +935,8 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface EnterCriticalSection(&engine->cs); + media_engine_apply_volume(engine); + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_METADATA; media_engine_get_frame_size(engine, topology); @@ -2009,6 +2028,7 @@ static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngineEx *iface, double vol else if (volume != engine->volume) { engine->volume = volume; + media_engine_apply_volume(engine); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0); } LeaveCriticalSection(&engine->cs);

1 0

Evan Tang : winebus.sys: Report unique serial numbers for SDL devices.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: b57f635f22091674d9e249cb5e919bda45e8afb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b57f635f22091674d9e249cb5e919b… Author: Evan Tang <etang(a)codeweavers.com> Date: Tue Nov 22 11:42:27 2022 -0600 winebus.sys: Report unique serial numbers for SDL devices. --- dlls/winebus.sys/bus_sdl.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1af029bed65..cd6166a91a8 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -120,6 +120,7 @@ static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); static SDL_JoystickType (*pSDL_JoystickGetType)(SDL_Joystick * joystick); +static const char *(*pSDL_JoystickGetSerial)(SDL_Joystick * joystick); /* internal bits for extended rumble support, SDL_Haptic types are 16-bits */ #define WINE_SDL_JOYSTICK_RUMBLE 0x40000000 /* using SDL_JoystickRumble API */ @@ -936,9 +937,8 @@ static void sdl_add_device(unsigned int index) SDL_Joystick* joystick; SDL_JoystickID id; - SDL_JoystickGUID guid; SDL_GameController *controller = NULL; - const char *product; + const char *product, *sdl_serial; char guid_str[33], buffer[ARRAY_SIZE(desc.product)]; int axis_count, axis_offset; @@ -969,9 +969,19 @@ static void sdl_add_device(unsigned int index) desc.version = 0; } - guid = pSDL_JoystickGetGUID(joystick); - pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); - ntdll_umbstowcs(guid_str, strlen(guid_str) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); + if (pSDL_JoystickGetSerial && (sdl_serial = pSDL_JoystickGetSerial(joystick))) + { + ntdll_umbstowcs(sdl_serial, strlen(sdl_serial) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); + } + else + { + /* Overcooked! All You Can Eat only adds controllers with unique serial numbers + * Prefer keeping serial numbers unique over keeping them consistent across runs */ + pSDL_JoystickGetGUIDString(pSDL_JoystickGetGUID(joystick), guid_str, sizeof(guid_str)); + snprintf(buffer, sizeof(buffer), "%s.%d", guid_str, index); + TRACE("Making up serial number for %s: %s\n", product, buffer); + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); + } if (controller) { @@ -1126,6 +1136,7 @@ NTSTATUS sdl_bus_init(void *args) pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); pSDL_JoystickGetType = dlsym(sdl_handle, "SDL_JoystickGetType"); + pSDL_JoystickGetSerial = dlsym(sdl_handle, "SDL_JoystickGetSerial"); if (pSDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0) {

1 0

Piotr Caban : winspool: Don't translate port name to path in StartDocDlgW.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: d9a80adc234854fb0d00165ae25c9afee51b66a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9a80adc234854fb0d00165ae25c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 29 12:53:46 2022 +0100 winspool: Don't translate port name to path in StartDocDlgW. --- dlls/winspool.drv/info.c | 52 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1434a5c1e2b..2cf8ab076dc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8033,6 +8033,28 @@ failed: return ret; } +static BOOL is_port(const WCHAR *port_list, const WCHAR *output) +{ + size_t len; + + if (!output) + return FALSE; + + if (wcschr(output, ':')) + return TRUE; + + len = wcslen(output); + while (port_list && *port_list) + { + if (!wcsncmp(output, port_list, len) && (!port_list[len] || port_list[len] == ',')) + return TRUE; + + port_list = wcschr(port_list, ','); + if (port_list) port_list++; + } + return FALSE; +} + /***************************************************************************** * StartDocDlgW [WINSPOOL.@] * @@ -8044,24 +8066,24 @@ failed: */ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) { + PRINTER_INFO_5W *pi5; LPWSTR ret = NULL; DWORD len, attr; + BOOL b; - if(doc->lpszOutput == NULL) /* Check whether default port is FILE: */ - { - PRINTER_INFO_5W *pi5; - GetPrinterW(hPrinter, 5, NULL, 0, &len); - if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return NULL; - pi5 = malloc(len); - GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); - if(!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )) - { - free(pi5); - return NULL; - } - free(pi5); - } + GetPrinterW(hPrinter, 5, NULL, 0, &len); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + pi5 = malloc(len); + GetPrinterW(hPrinter, 5, (LPBYTE)pi5, len, &len); + + /* Check whether default port is FILE: */ + b = !doc->lpszOutput && (!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )); + if (!b) + b = is_port(pi5->pPortName, doc->lpszOutput); + free(pi5); + if (b) + return NULL; if(doc->lpszOutput == NULL || !wcscmp( doc->lpszOutput, L"FILE:" )) {

1 0