February 2022 - Wine-Commits

Jacek Caban : win32u: Move NtUserClipCursor implementation from user32.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 91c095cd46fa5158764b5d70c02196f45bf8271c URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c095cd46fa5158764b5d70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:25 2022 +0100 win32u: Move NtUserClipCursor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 49 -------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/cursoricon.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 11 files changed, 73 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91c095cd46fa5158764b…

1 0

Jacek Caban : win32u: Move GetClipCursor implementation from user32.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 1af4919a3f161c66c16feb6ab1ebeda9dfb7f287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af4919a3f161c66c16feb6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:34 2022 +0100 win32u: Move GetClipCursor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 27 +-------------------------- dlls/win32u/cursoricon.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 32c04852bf9..59c50ae53d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1947,32 +1947,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu */ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { - DPI_AWARENESS_CONTEXT context; - UINT dpi; - BOOL ret; - - if (!rect) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - if ((ret = !wine_server_call( req ))) - { - rect->left = reply->new_clip.left; - rect->top = reply->new_clip.top; - rect->right = reply->new_clip.right; - rect->bottom = reply->new_clip.bottom; - } - } - SERVER_END_REQ; - - if (ret && (dpi = get_thread_dpi())) - { - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - *rect = map_dpi_rect( *rect, get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY )), dpi ); - SetThreadDpiAwarenessContext( context ); - } - return ret; + return NtUserCallOneParam( (UINT_PTR)rect, NtUserGetClipCursor ); } diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 7b23dfb7d0b..cafea198809 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -127,3 +127,31 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect ) if (ret) user_driver->pClipCursor( &new_rect ); return ret; } + +BOOL get_clip_cursor( RECT *rect ) +{ + UINT dpi; + BOOL ret; + + if (!rect) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + if ((ret = !wine_server_call( req ))) + { + rect->left = reply->new_clip.left; + rect->top = reply->new_clip.top; + rect->right = reply->new_clip.right; + rect->bottom = reply->new_clip.bottom; + } + } + SERVER_END_REQ; + + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); + *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d57203e330c..f409921785f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4462,6 +4462,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { switch(code) { + case NtUserGetClipCursor: + return get_clip_cursor( (RECT *)arg ); case NtUserGetSysColor: return get_sys_color( arg ); case NtUserRealizePalette: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ee26d4af52a..6594d7b10b7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -241,6 +241,10 @@ struct unix_funcs struct window_surface *surface ); }; +/* cursoricon.c */ +extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; + +/* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index b2aa11f90fd..11bc0bbcb44 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -52,6 +52,7 @@ struct enum_display_monitor_params /* NtUserCallOneParam codes, not compatible with Windows */ enum { + NtUserGetClipCursor, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0

Eric Pouech : msacm.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: c9bff72bce96a8ce344b646c043da5f54eb38178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9bff72bce96a8ce344b646c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:49 2022 +0100 msacm.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm.dll16/Makefile.in | 1 - dlls/msacm.dll16/msacm.c | 48 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in index c4991005de1..dccaf17c721 100644 --- a/dlls/msacm.dll16/Makefile.in +++ b/dlls/msacm.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm.dll16 IMPORTS = msacm32 EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll diff --git a/dlls/msacm.dll16/msacm.c b/dlls/msacm.dll16/msacm.c index 48729f9608c..30182c92b2f 100644 --- a/dlls/msacm.dll16/msacm.c +++ b/dlls/msacm.dll16/msacm.c @@ -73,7 +73,7 @@ MMRESULT16 WINAPI acmMetrics16( MMRESULT16 WINAPI acmDriverEnum16( ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(%p, %d, %d): stub\n", + FIXME("(%p, %ld, %ld): stub\n", fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -87,7 +87,7 @@ MMRESULT16 WINAPI acmDriverEnum16( MMRESULT16 WINAPI acmDriverDetails16( HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", hadid, padd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -99,7 +99,7 @@ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) { - FIXME("(%p, 0x%04x, %ld, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", phadid, hinstModule, lParam, dwPriority, fdwAdd ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -112,7 +112,7 @@ MMRESULT16 WINAPI acmDriverAdd16( MMRESULT16 WINAPI acmDriverRemove16( HACMDRIVERID16 hadid, DWORD fdwRemove) { - FIXME("(0x%04x, %d): stub\n", hadid, fdwRemove); + FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -123,7 +123,7 @@ MMRESULT16 WINAPI acmDriverRemove16( MMRESULT16 WINAPI acmDriverOpen16( LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %d): stub\n", phad, hadid, fdwOpen); + FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -134,7 +134,7 @@ MMRESULT16 WINAPI acmDriverOpen16( MMRESULT16 WINAPI acmDriverClose16( HACMDRIVER16 had, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", had, fdwClose); + FIXME("(0x%04x, %ld): stub\n", had, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ LRESULT WINAPI acmDriverMessage16( MMRESULT16 WINAPI acmDriverID16( HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) { - FIXME("(0x%04x, %p, %d): stub\n", hao, phadid, fdwDriverID); + FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -169,7 +169,7 @@ MMRESULT16 WINAPI acmDriverID16( MMRESULT16 WINAPI acmDriverPriority16( HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) { - FIXME("(0x%04x, %d, %d): stub\n", + FIXME("(0x%04x, %ld, %ld): stub\n", hadid, dwPriority, fdwPriority ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -182,7 +182,7 @@ MMRESULT16 WINAPI acmDriverPriority16( MMRESULT16 WINAPI acmFormatTagDetails16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -194,7 +194,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -218,7 +218,7 @@ MMRESULT16 WINAPI acmFormatChoose16( MMRESULT16 WINAPI acmFormatDetails16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -230,7 +230,7 @@ MMRESULT16 WINAPI acmFormatEnum16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -244,7 +244,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -257,7 +257,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -269,7 +269,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -293,7 +293,7 @@ MMRESULT16 WINAPI acmFilterChoose16( MMRESULT16 WINAPI acmFilterDetails16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -305,7 +305,7 @@ MMRESULT16 WINAPI acmFilterEnum16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -321,7 +321,7 @@ MMRESULT16 WINAPI acmStreamOpen16( LPWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %p, %p, %p, %d, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen ); @@ -335,7 +335,7 @@ MMRESULT16 WINAPI acmStreamOpen16( MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", has, fdwClose); + FIXME("(0x%04x, %ld): stub\n", has, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -347,7 +347,7 @@ MMRESULT16 WINAPI acmStreamSize16( HACMSTREAM16 has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize) { - FIXME("(0x%04x, %d, %p, %d): stub\n", + FIXME("(0x%04x, %ld, %p, %ld): stub\n", has, cbInput, pdwOutputBytes, fdwSize ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -360,7 +360,7 @@ MMRESULT16 WINAPI acmStreamSize16( MMRESULT16 WINAPI acmStreamConvert16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwConvert); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -371,7 +371,7 @@ MMRESULT16 WINAPI acmStreamConvert16( MMRESULT16 WINAPI acmStreamReset16( HACMSTREAM16 has, DWORD fdwReset) { - FIXME("(0x%04x, %d): stub\n", has, fdwReset); + FIXME("(0x%04x, %ld): stub\n", has, fdwReset); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -382,7 +382,7 @@ MMRESULT16 WINAPI acmStreamReset16( MMRESULT16 WINAPI acmStreamPrepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwPrepare); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -393,7 +393,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader16( MMRESULT16 WINAPI acmStreamUnprepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) { - FIXME("(0x%04x, %p, %d): stub\n", + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwUnprepare ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

Eric Pouech : mlang: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 7af1a3808c7f782544de12370ca60f29a92c7a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af1a3808c7f782544de1237… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:44 2022 +0100 mlang: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/Makefile.in | 1 - dlls/mlang/mlang.c | 116 ++++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7af1a3808c7f782544de…

1 0

Eric Pouech : msacm32.drv: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 4b59776e86b77cce34be3e121ebe4962081533b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b59776e86b77cce34be3e12… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:28:38 2022 +0100 msacm32.drv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/Makefile.in | 1 - dlls/msacm32.drv/wavemap.c | 76 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b59776e86b77cce34be…

1 0

Zebediah Figura : kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME for file URLs.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 05e82ba113a4f8cc7fbb87c42ab556cd028d6eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e82ba113a4f8cc7fbb87c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:01 2022 -0600 kernelbase: Ignore URL_PARTFLAG_KEEPSCHEME for file URLs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- dlls/shlwapi/tests/url.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e716351b0bc..c3d3e734cf7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4420,7 +4420,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p return E_INVALIDARG; } - if (flags == URL_PARTFLAG_KEEPSCHEME) + if (flags == URL_PARTFLAG_KEEPSCHEME && scheme != URL_SCHEME_FILE) { if (!pl.scheme || !pl.scheme_len) { diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b2b20b94b1b..4fb4e36c3b6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -683,7 +683,7 @@ static void test_UrlGetPart(void) {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:", .todo_hr = TRUE}, {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, 0, S_OK, "h o s t"}, - {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t", .todo_result = TRUE}, + {"file://h o s t/c:/windows/file", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "h o s t"}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, {"file://foo:bar(a)localhost:21/file?query=x", URL_PART_HOSTNAME, 0, S_OK, "foo:bar(a)localhost:21", .todo_result = TRUE}, @@ -737,7 +737,7 @@ static void test_UrlGetPart(void) {"vbscript://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"wais://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"file://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "hostname", .todo_result = TRUE}, + {"file://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "hostname"}, {"ftp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "ftp:hostname"}, {"gopher://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "gopher:hostname"}, {"http://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:hostname"},

1 0

Zebediah Figura : kernelbase: Do not initialize output params on failure in UrlGetPart().
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 1747b0b1d5958ae6f51cb5293d975cafa8a04412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1747b0b1d5958ae6f51cb529… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:03 2022 -0600 kernelbase: Do not initialize output params on failure in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 14 +++++++------- dlls/shlwapi/tests/url.c | 13 ++++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7d145e5198e..b753ce3dd2e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4321,8 +4321,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p if (!url || !out || !out_len || !*out_len) return E_INVALIDARG; - *out = '\0'; - addr = wcschr(url, ':'); if (!addr) scheme = URL_SCHEME_UNKNOWN; @@ -4337,6 +4335,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.scheme_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4358,18 +4357,19 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_SCHEME_SNEWS: break; default: - *out_len = 0; return E_FAIL; } if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { + *out = '\0'; *out_len = 0; return S_FALSE; } if (!pl.hostname_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4380,6 +4380,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_USERNAME: if (!pl.username_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4390,6 +4391,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PASSWORD: if (!pl.password_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4400,6 +4402,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_PORT: if (!pl.port_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4411,6 +4414,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p flags &= ~URL_PARTFLAG_KEEPSCHEME; if (!pl.query_len) { + *out = '\0'; *out_len = 0; return S_FALSE; } @@ -4419,17 +4423,13 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; default: - *out_len = 0; return E_INVALIDARG; } if (flags == URL_PARTFLAG_KEEPSCHEME && scheme != URL_SCHEME_FILE) { if (!pl.scheme || !pl.scheme_len) - { - *out_len = 0; return E_FAIL; - } schaddr = pl.scheme; schsize = pl.scheme_len; if (*out_len < schsize + size + 2) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 6a312ecff87..729b069a772 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -845,7 +845,7 @@ static void test_UrlGetPart(void) ok(hr == (tests[i].hr == S_FALSE ? S_OK : tests[i].hr), "Got hr %#x.\n", hr); } - if (hr == S_OK) + if (SUCCEEDED(hr)) { ok(!size, "Got size %u.\n", size); ok(!buffer[0], "Got result %s.\n", debugstr_a(buffer)); @@ -862,9 +862,9 @@ static void test_UrlGetPart(void) } else { - todo_wine ok(size == 1, "Got size %u.\n", size); + ok(size == 1, "Got size %u.\n", size); } - todo_wine ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); + ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); } size = ARRAY_SIZE(bufferW); @@ -880,8 +880,11 @@ static void test_UrlGetPart(void) } else { - todo_wine ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); - todo_wine ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); + todo_wine_if (strchr(url, '"') && part == URL_PART_USERNAME) + { + ok(size == ARRAY_SIZE(bufferW), "Got size %u.\n", size); + ok(!wcscmp(bufferW, L"x"), "Got result %s.\n", debugstr_w(bufferW)); + } } winetest_pop_context();

1 0

Zebediah Figura : kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA().
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 149b6869a26d0efd0c272566d050f392ebd3952c URL: https://source.winehq.org/git/wine.git/?a=commit;h=149b6869a26d0efd0c272566… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:43:59 2022 -0600 kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- dlls/shlwapi/tests/url.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7cfff358fdb..15280a7ea4b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4148,10 +4148,10 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } - len2 = WideCharToMultiByte(CP_ACP, 0, outW, len, NULL, 0, NULL, NULL); + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, NULL, 0, NULL, NULL); if (len2 > *out_len) { - *out_len = len2 + 1; + *out_len = len2; heap_free(inW); return E_POINTER; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 212ee039a0b..b4b66aec2f1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -782,7 +782,7 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr || !strcmp(url, "http://host?a:b(a)c:d")) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -807,11 +807,9 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (hr == S_OK) - ok(size == 1, "Got size %u.\n", size); + ok(size == 1, "Got size %u.\n", size); } - todo_wine_if (hr == S_OK) - ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer);

1 0

Eric Pouech : mmdevldr.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 9226337192a36f429b431d52b2fa59c47cbb63a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9226337192a36f429b431d52… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 09:27:56 2022 +0100 mmdevldr.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevldr.vxd/Makefile.in | 1 - dlls/mmdevldr.vxd/mmdevldr.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in index 934a68048d1..096ae7c598d 100644 --- a/dlls/mmdevldr.vxd/Makefile.in +++ b/dlls/mmdevldr.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevldr.vxd C_SRCS = \ diff --git a/dlls/mmdevldr.vxd/mmdevldr.c b/dlls/mmdevldr.vxd/mmdevldr.c index 1396861e88f..98ab2217b00 100644 --- a/dlls/mmdevldr.vxd/mmdevldr.c +++ b/dlls/mmdevldr.vxd/mmdevldr.c @@ -37,7 +37,7 @@ BOOL WINAPI MMDEVLDR_DeviceIoControl(DWORD dwIoControlCode, LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped) { - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,

1 0

Zebediah Figura : kernelbase: Also parse hostnames for news schemes in UrlGetPart().
by Alexandre Julliard Feb. 14, 2022

Feb. 14, 2022

Module: wine Branch: master Commit: 0df41c35357ba9eef4324c1f05f3e07d69ffa57b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df41c35357ba9eef4324c1f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 13 12:44:02 2022 -0600 kernelbase: Also parse hostnames for news schemes in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 9 ++++++--- dlls/shlwapi/tests/url.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index c3d3e734cf7..7d145e5198e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4347,12 +4347,15 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p case URL_PART_HOSTNAME: switch (scheme) { + case URL_SCHEME_FILE: case URL_SCHEME_FTP: - case URL_SCHEME_HTTP: case URL_SCHEME_GOPHER: - case URL_SCHEME_TELNET: - case URL_SCHEME_FILE: + case URL_SCHEME_HTTP: case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: break; default: *out_len = 0; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 4fb4e36c3b6..6a312ecff87 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -728,11 +728,11 @@ static void test_UrlGetPart(void) {"local://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"mailto://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"mk://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, - {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, + {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, + {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"res://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"shell://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, - {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE}, + {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"telnet://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"}, {"vbscript://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, {"wais://hostname/", URL_PART_HOSTNAME, 0, E_FAIL}, @@ -742,9 +742,9 @@ static void test_UrlGetPart(void) {"gopher://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "gopher:hostname"}, {"http://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:hostname"}, {"https://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "https:hostname"}, - {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname", .todo_hr = TRUE}, - {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname", .todo_hr = TRUE}, - {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname", .todo_hr = TRUE}, + {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname"}, + {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname"}, + {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname"}, {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"}, }; @@ -876,8 +876,7 @@ static void test_UrlGetPart(void) { ok(size == wcslen(bufferW), "Got size %u.\n", size); MultiByteToWideChar(CP_ACP, 0, buffer, -1, expectW, ARRAY_SIZE(expectW)); - todo_wine_if (strstr(url, "news") || strstr(url, "nntp")) - ok(!wcscmp(bufferW, expectW), "Got result %s.\n", debugstr_w(bufferW)); + ok(!wcscmp(bufferW, expectW), "Got result %s.\n", debugstr_w(bufferW)); } else {

1 0