wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Jacek Caban : ntdll: Export RtlNtStatusToDosError from Unix lib.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 8f31eb1edb06edc1efc81d3c39426aab3b31cbb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f31eb1edb06edc1efc81d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:32:12 2021 +0200 ntdll: Export RtlNtStatusToDosError from Unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 13bf85d2eb6..24f4fa5a588 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -59,6 +59,7 @@ #include "wine/condrv.h" #include "wine/debug.h" #include "unix_private.h" +#include "error.h" WINE_DEFAULT_DEBUG_CHANNEL(environ); @@ -2461,16 +2462,25 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) return STATUS_SUCCESS; } +/********************************************************************** + * RtlUpcaseUnicodeChar (ntdll.so) + */ WCHAR WINAPI RtlUpcaseUnicodeChar( WCHAR wch ) { return ntdll_towupper( wch ); } +/********************************************************************** + * RtlDowncaseUnicodeChar (ntdll.so) + */ WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) { return ntdll_towlower( wch ); } +/********************************************************************** + * RtlUTF8ToUnicodeN (ntdll.so) + */ NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) { unsigned int res, len; @@ -2527,3 +2537,20 @@ NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, cons *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); return status; } + +/********************************************************************** + * RtlNtStatusToDosError (ntdll.so) + */ +ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) +{ + NtCurrentTeb()->LastStatusValue = status; + + if (!status || (status & 0x20000000)) return status; + if ((status & 0xf0000000) == 0xd0000000) status &= ~0x10000000; + + /* now some special cases */ + if (HIWORD(status) == 0xc001 || HIWORD(status) == 0x8007 || HIWORD(status) == 0xc007) + return LOWORD( status ); + + return map_status( status ); +}

1 0

Jacek Caban : ntdll: Move error mapping to a header file.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 116cf7dfcbc2957f46c860f66b86243f2ab4426a URL: https://source.winehq.org/git/wine.git/?a=commit;h=116cf7dfcbc2957f46c860f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:30:48 2021 +0200 ntdll: Move error mapping to a header file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 1656 +---------------------------------------------- dlls/ntdll/error.h | 1672 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/make_errors | 2 +- 3 files changed, 1674 insertions(+), 1656 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=116cf7dfcbc2957f46c8…

1 0

Jacek Caban : win32u: Use syscall interface for spooler functions.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: d169d131342d7784777d428ac901e033c89800ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d169d131342d7784777d428a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:30:00 2021 +0200 win32u: Use syscall interface for spooler functions. 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/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/wrappers.c | 10 ---------- dlls/wow64win/gdi.c | 15 +++++++++++++++ dlls/wow64win/syscall.h | 2 ++ 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 1223644e4e9..a661cefe0bd 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1127,13 +1127,11 @@ static struct unix_funcs unix_funcs = NtGdiGetRandomRgn, NtGdiGetRasterizerCaps, NtGdiGetRealizationInfo, - NtGdiGetSpoolMessage, NtGdiGetTextCharsetInfo, NtGdiGetTextExtentExW, NtGdiGetTextFaceW, NtGdiGetTextMetricsW, NtGdiGradientFill, - NtGdiInitSpool, NtGdiIntersectClipRect, NtGdiInvertRgn, NtGdiLineTo, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index c4f9edeead8..eaff8cb639a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -69,9 +69,11 @@ static void * const syscalls[] = NtGdiGetPath, NtGdiGetRegionData, NtGdiGetRgnBox, + NtGdiGetSpoolMessage, NtGdiGetSystemPaletteUse, NtGdiGetTransform, NtGdiHfontCreate, + NtGdiInitSpool, NtGdiOffsetRgn, NtGdiPathToRegion, NtGdiPtInRegion, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d9570fc5a89..396b67ede5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -510,7 +510,7 @@ @ stdcall -syscall NtGdiGetRegionData(long long ptr) @ stdcall -syscall NtGdiGetRgnBox(long ptr) @ stub NtGdiGetServerMetaFileBits -@ stdcall NtGdiGetSpoolMessage(ptr long ptr long) +@ stdcall -syscall NtGdiGetSpoolMessage(ptr long ptr long) @ stub NtGdiGetStats @ stub NtGdiGetStringBitmapW @ stub NtGdiGetSuggestedOPMProtectedOutputArraySize @@ -532,7 +532,7 @@ @ stdcall -syscall NtGdiHfontCreate(ptr long long long ptr) @ stub NtGdiIcmBrushInfo @ stub NtGdiInit -@ stdcall NtGdiInitSpool() +@ stdcall -syscall NtGdiInitSpool() @ stdcall NtGdiIntersectClipRect(long long long long long) @ stdcall NtGdiInvertRgn(long long) @ stdcall NtGdiLineTo(long long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 0fad351766d..3b2623e1ed9 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -124,7 +124,6 @@ struct unix_funcs INT (WINAPI *pNtGdiGetRandomRgn)( HDC hdc, HRGN region, INT code ); BOOL (WINAPI *pNtGdiGetRasterizerCaps)( RASTERIZER_STATUS *status, UINT size ); BOOL (WINAPI *pNtGdiGetRealizationInfo)( HDC hdc, struct font_realization_info *info ); - DWORD (WINAPI *pNtGdiGetSpoolMessage)( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ); UINT (WINAPI *pNtGdiGetTextCharsetInfo)( HDC hdc, FONTSIGNATURE *fs, DWORD flags ); BOOL (WINAPI *pNtGdiGetTextExtentExW)( HDC hdc, const WCHAR *str, INT count, INT max_ext, INT *nfit, INT *dxs, SIZE *size, UINT flags ); @@ -132,7 +131,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiGetTextMetricsW)( HDC hdc, TEXTMETRICW *metrics, ULONG flags ); BOOL (WINAPI *pNtGdiGradientFill)( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ); - DWORD (WINAPI *pNtGdiInitSpool)(void); INT (WINAPI *pNtGdiIntersectClipRect)( HDC hdc, INT left, INT top, INT right, INT bottom ); BOOL (WINAPI *pNtGdiInvertRgn)( HDC hdc, HRGN hrgn ); BOOL (WINAPI *pNtGdiLineTo)( HDC hdc, INT x, INT y ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e0521d8a03b..55abc39abd3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -300,11 +300,6 @@ BOOL WINAPI NtGdiGetRealizationInfo( HDC hdc, struct font_realization_info *info return unix_funcs->pNtGdiGetRealizationInfo( hdc, info ); } -DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ) -{ - return unix_funcs->pNtGdiGetSpoolMessage( ptr1, data2, ptr3, data4 ); -} - UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags ) { return unix_funcs->pNtGdiGetTextCharsetInfo( hdc, fs, flags ); @@ -332,11 +327,6 @@ BOOL WINAPI NtGdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, return unix_funcs->pNtGdiGradientFill( hdc, vert_array, nvert, grad_array, ngrad, mode ); } -DWORD WINAPI NtGdiInitSpool(void) -{ - return unix_funcs->pNtGdiInitSpool(); -} - INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) { return unix_funcs->pNtGdiIntersectClipRect( hdc, left, top, right, bottom ); diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 9462945d88f..c3746cb0088 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -564,6 +564,21 @@ NTSTATUS WINAPI wow64_NtGdiFlattenPath( UINT *args ) return NtGdiFlattenPath( hdc ); } +NTSTATUS WINAPI wow64_NtGdiGetSpoolMessage( UINT *args ) +{ + void *ptr1 = get_ptr( &args ); + DWORD data2 = get_ulong( &args ); + void *ptr3 = get_ptr( &args ); + DWORD data4 = get_ulong( &args ); + + return NtGdiGetSpoolMessage( ptr1, data2, ptr3, data4 ); +} + +NTSTATUS WINAPI wow64_NtGdiInitSpool( UINT *args ) +{ + return NtGdiInitSpool(); +} + NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) { return NtGdiFlush(); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 5c43ce63a21..880c840ea02 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -57,9 +57,11 @@ SYSCALL_ENTRY( NtGdiGetPath ) \ SYSCALL_ENTRY( NtGdiGetRegionData ) \ SYSCALL_ENTRY( NtGdiGetRgnBox ) \ + SYSCALL_ENTRY( NtGdiGetSpoolMessage ) \ SYSCALL_ENTRY( NtGdiGetSystemPaletteUse ) \ SYSCALL_ENTRY( NtGdiGetTransform ) \ SYSCALL_ENTRY( NtGdiHfontCreate ) \ + SYSCALL_ENTRY( NtGdiInitSpool ) \ SYSCALL_ENTRY( NtGdiOffsetRgn ) \ SYSCALL_ENTRY( NtGdiPathToRegion ) \ SYSCALL_ENTRY( NtGdiPtInRegion ) \

1 0

Jacek Caban : win32u: Use syscall interface for pen constructors.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 6c7dff2a0012f30f50a054f7ea0e11b016266899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c7dff2a0012f30f50a054f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:29:19 2021 +0200 win32u: Use syscall interface for pen constructors. 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/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 14 -------------- dlls/wow64win/gdi.c | 29 +++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 2 ++ 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4f6304ad883..1223644e4e9 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1078,7 +1078,6 @@ static struct unix_funcs unix_funcs = NtGdiCreateCompatibleDC, NtGdiCreateDIBitmapInternal, NtGdiCreateMetafileDC, - NtGdiCreatePen, NtGdiDdDDICheckVidPnExclusiveOwnership, NtGdiDdDDICloseAdapter, NtGdiDdDDICreateDCFromMemory, @@ -1100,7 +1099,6 @@ static struct unix_funcs unix_funcs = NtGdiEndPage, NtGdiEnumFonts, NtGdiExcludeClipRect, - NtGdiExtCreatePen, NtGdiExtEscape, NtGdiExtFloodFill, NtGdiExtTextOutW, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e1c94b0c210..c4f9edeead8 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -46,6 +46,7 @@ static void * const syscalls[] = NtGdiCreateHatchBrushInternal, NtGdiCreatePaletteInternal, NtGdiCreatePatternBrushInternal, + NtGdiCreatePen, NtGdiCreateRectRgn, NtGdiCreateRoundRectRgn, NtGdiCreateSolidBrush, @@ -53,6 +54,7 @@ static void * const syscalls[] = NtGdiDescribePixelFormat, NtGdiDrawStream, NtGdiEqualRgn, + NtGdiExtCreatePen, NtGdiExtCreateRegion, NtGdiExtGetObjectW, NtGdiFlattenPath, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index a2b864f65bb..d9570fc5a89 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -158,7 +158,7 @@ @ stub NtGdiCreateOPMProtectedOutputs @ stdcall -syscall NtGdiCreatePaletteInternal(ptr long) @ stdcall -syscall NtGdiCreatePatternBrushInternal(long long long) -@ stdcall NtGdiCreatePen(long long long long) +@ stdcall -syscall NtGdiCreatePen(long long long long) @ stdcall -syscall NtGdiCreateRectRgn(long long long long) @ stdcall -syscall NtGdiCreateRoundRectRgn(long long long long long long) @ stub NtGdiCreateServerMetaFile @@ -418,7 +418,7 @@ @ stdcall -syscall NtGdiEqualRgn(long long) @ stub NtGdiEudcLoadUnloadLink @ stdcall NtGdiExcludeClipRect(long long long long long) -@ stdcall NtGdiExtCreatePen(long long long long long long long ptr long long long) +@ stdcall -syscall NtGdiExtCreatePen(long long long long long long long ptr long long long) @ stdcall -syscall NtGdiExtCreateRegion(ptr long ptr) @ stdcall NtGdiExtEscape(long wstr long long long ptr long ptr) @ stdcall NtGdiExtFloodFill(long long long long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e7bfe13b2df..0fad351766d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -63,7 +63,6 @@ struct unix_funcs UINT coloruse, UINT max_info, UINT max_bits, ULONG flags, HANDLE xform ); HDC (WINAPI *pNtGdiCreateMetafileDC)( HDC hdc ); - HPEN (WINAPI *pNtGdiCreatePen)( INT style, INT width, COLORREF color, HBRUSH brush ); NTSTATUS (WINAPI *pNtGdiDdDDICheckVidPnExclusiveOwnership)( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); NTSTATUS (WINAPI *pNtGdiDdDDICloseAdapter)( const D3DKMT_CLOSEADAPTER *desc ); NTSTATUS (WINAPI *pNtGdiDdDDICreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY *desc ); @@ -87,10 +86,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiEnumFonts)( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, const WCHAR *face_name, ULONG charset, ULONG *count, void *buf ); INT (WINAPI *pNtGdiExcludeClipRect)( HDC hdc, INT left, INT top, INT right, INT bottom ); - HPEN (WINAPI *pNtGdiExtCreatePen)( DWORD style, DWORD width, ULONG brush_style, ULONG color, - ULONG_PTR client_hatch, ULONG_PTR hatch, DWORD style_count, - const DWORD *style_bits, ULONG dib_size, BOOL old_style, - HBRUSH brush ); INT (WINAPI *pNtGdiExtEscape)( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size, const char *input, INT output_size, char *output ); BOOL (WINAPI *pNtGdiExtFloodFill)( HDC hdc, INT x, INT y, COLORREF color, UINT type ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 957646dc7c3..e0521d8a03b 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -105,11 +105,6 @@ HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ) return unix_funcs->pNtGdiCreateMetafileDC( hdc ); } -HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) -{ - return unix_funcs->pNtGdiCreatePen( style, width, color, brush ); -} - BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) { return unix_funcs->pNtGdiDeleteObjectApp( obj ); @@ -153,15 +148,6 @@ INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bott return unix_funcs->pNtGdiExcludeClipRect( hdc, left, top, right, bottom ); } -HPEN WINAPI NtGdiExtCreatePen( DWORD style, DWORD width, ULONG brush_style, ULONG color, - ULONG_PTR client_hatch, ULONG_PTR hatch, DWORD style_count, - const DWORD *style_bits, ULONG dib_size, BOOL old_style, - HBRUSH brush ) -{ - return unix_funcs->pNtGdiExtCreatePen( style, width, brush_style, color, client_hatch, hatch, style_count, - style_bits, dib_size, old_style, brush ); -} - INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size, const char *input, INT output_size, char *output ) { diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index daba653f214..9462945d88f 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -164,6 +164,35 @@ NTSTATUS WINAPI wow64_NtGdiCreateSolidBrush( UINT *args ) return HandleToUlong( NtGdiCreateSolidBrush( color, brush )); } +NTSTATUS WINAPI wow64_NtGdiCreatePen( UINT *args ) +{ + INT style = get_ulong( &args ); + INT width = get_ulong( &args ); + COLORREF color = get_ulong( &args ); + HBRUSH brush = get_handle( &args ); + + return HandleToUlong( NtGdiCreatePen( style, width, color, brush )); +} + +NTSTATUS WINAPI wow64_NtGdiExtCreatePen( UINT *args ) +{ + DWORD style = get_ulong( &args ); + DWORD width = get_ulong( &args ); + ULONG brush_style = get_ulong( &args ); + ULONG color = get_ulong( &args ); + ULONG_PTR client_hatch = get_ulong( &args ); + ULONG_PTR hatch = get_ulong( &args ); + DWORD style_count = get_ulong( &args ); + const DWORD *style_bits = get_ptr( &args ); + ULONG dib_size = get_ulong( &args ); + BOOL old_style = get_ulong( &args ); + HBRUSH brush = get_handle( &args ); + + return HandleToUlong( NtGdiExtCreatePen( style, width, brush_style, color, client_hatch, + hatch, style_count, style_bits, dib_size, + old_style, brush )); +} + NTSTATUS WINAPI wow64_NtGdiCreateRectRgn( UINT *args ) { INT left = get_ulong( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index a5a38548f5e..5c43ce63a21 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -34,6 +34,7 @@ SYSCALL_ENTRY( NtGdiCreateHatchBrushInternal ) \ SYSCALL_ENTRY( NtGdiCreatePaletteInternal ) \ SYSCALL_ENTRY( NtGdiCreatePatternBrushInternal ) \ + SYSCALL_ENTRY( NtGdiCreatePen ) \ SYSCALL_ENTRY( NtGdiCreateRectRgn ) \ SYSCALL_ENTRY( NtGdiCreateRoundRectRgn ) \ SYSCALL_ENTRY( NtGdiCreateSolidBrush ) \ @@ -41,6 +42,7 @@ SYSCALL_ENTRY( NtGdiDescribePixelFormat ) \ SYSCALL_ENTRY( NtGdiDrawStream ) \ SYSCALL_ENTRY( NtGdiEqualRgn ) \ + SYSCALL_ENTRY( NtGdiExtCreatePen ) \ SYSCALL_ENTRY( NtGdiExtCreateRegion ) \ SYSCALL_ENTRY( NtGdiExtGetObjectW ) \ SYSCALL_ENTRY( NtGdiFlattenPath ) \

1 0

Jacek Caban : win32u: Use syscall interface for some path functions.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 3d978e4c4e2d39cac7ad1fa1221548fe4cd3c492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d978e4c4e2d39cac7ad1fa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 12 15:28:52 2021 +0200 win32u: Use syscall interface for some path functions. 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/win32u/gdiobj.c | 3 --- dlls/win32u/syscall.c | 3 +++ dlls/win32u/win32u.spec | 6 +++--- dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 15 --------------- dlls/wow64win/gdi.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 3 +++ 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4a6af99c94a..4f6304ad883 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1107,7 +1107,6 @@ static struct unix_funcs unix_funcs = NtGdiExtSelectClipRgn, NtGdiFillPath, NtGdiFillRgn, - NtGdiFlattenPath, NtGdiFontIsLinked, NtGdiFrameRgn, NtGdiGetAndSetDCDword, @@ -1126,7 +1125,6 @@ static struct unix_funcs unix_funcs = NtGdiGetKerningPairs, NtGdiGetNearestColor, NtGdiGetOutlineTextMetricsInternalW, - NtGdiGetPath, NtGdiGetPixel, NtGdiGetRandomRgn, NtGdiGetRasterizerCaps, @@ -1147,7 +1145,6 @@ static struct unix_funcs unix_funcs = NtGdiOffsetClipRgn, NtGdiOpenDCW, NtGdiPatBlt, - NtGdiPathToRegion, NtGdiPlgBlt, NtGdiPolyDraw, NtGdiPolyPolyDraw, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 99db48f27ec..e1c94b0c210 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -55,6 +55,7 @@ static void * const syscalls[] = NtGdiEqualRgn, NtGdiExtCreateRegion, NtGdiExtGetObjectW, + NtGdiFlattenPath, NtGdiFlush, NtGdiGetBitmapBits, NtGdiGetBitmapDimension, @@ -63,12 +64,14 @@ static void * const syscalls[] = NtGdiGetFontFileData, NtGdiGetFontFileInfo, NtGdiGetNearestPaletteIndex, + NtGdiGetPath, NtGdiGetRegionData, NtGdiGetRgnBox, NtGdiGetSystemPaletteUse, NtGdiGetTransform, NtGdiHfontCreate, NtGdiOffsetRgn, + NtGdiPathToRegion, NtGdiPtInRegion, NtGdiRectInRegion, NtGdiRemoveFontMemResourceEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8bd29d33f8b..a2b864f65bb 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -435,7 +435,7 @@ @ stub NtGdiFONTOBJ_vGetInfo @ stdcall NtGdiFillPath(long) @ stdcall NtGdiFillRgn(long long long) -@ stdcall NtGdiFlattenPath(long) +@ stdcall -syscall NtGdiFlattenPath(long) @ stdcall -syscall NtGdiFlush() @ stdcall NtGdiFontIsLinked(long) @ stub NtGdiForceUFIMapping @@ -497,7 +497,7 @@ @ stub NtGdiGetOPMRandomNumber @ stub NtGdiGetObjectBitmapHandle @ stdcall NtGdiGetOutlineTextMetricsInternalW(long long ptr long) -@ stdcall NtGdiGetPath(long ptr ptr long) +@ stdcall -syscall NtGdiGetPath(long ptr ptr long) @ stub NtGdiGetPerBandInfo @ stub NtGdiGetPhysicalMonitorDescription @ stub NtGdiGetPhysicalMonitors @@ -554,7 +554,7 @@ @ stub NtGdiPATHOBJ_vEnumStartClipLines @ stub NtGdiPATHOBJ_vGetBounds @ stdcall NtGdiPatBlt(long long long long long long) -@ stdcall NtGdiPathToRegion(long) +@ stdcall -syscall NtGdiPathToRegion(long) @ stdcall NtGdiPlgBlt(long ptr long long long long long long long long long) @ stdcall NtGdiPolyDraw(long ptr ptr long) @ stub NtGdiPolyPatBlt diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 1cf7c66b1b0..e7bfe13b2df 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -99,7 +99,6 @@ struct unix_funcs INT (WINAPI *pNtGdiExtSelectClipRgn)( HDC hdc, HRGN region, INT mode ); BOOL (WINAPI *pNtGdiFillPath)( HDC hdc ); BOOL (WINAPI *pNtGdiFillRgn)( HDC hdc, HRGN hrgn, HBRUSH hbrush ); - BOOL (WINAPI *pNtGdiFlattenPath)( HDC hdc ); BOOL (WINAPI *pNtGdiFontIsLinked)( HDC hdc ); BOOL (WINAPI *pNtGdiFrameRgn)( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height ); BOOL (WINAPI *pNtGdiGetAndSetDCDword)( HDC hdc, UINT method, DWORD value, DWORD *result ); @@ -126,7 +125,6 @@ struct unix_funcs COLORREF (WINAPI *pNtGdiGetNearestColor)( HDC hdc, COLORREF color ); UINT (WINAPI *pNtGdiGetOutlineTextMetricsInternalW)( HDC hdc, UINT cbData, OUTLINETEXTMETRICW *otm, ULONG opts ); - INT (WINAPI *pNtGdiGetPath)( HDC hdc, POINT *points, BYTE *types, INT size ); COLORREF (WINAPI *pNtGdiGetPixel)( HDC hdc, INT x, INT y ); INT (WINAPI *pNtGdiGetRandomRgn)( HDC hdc, HRGN region, INT code ); BOOL (WINAPI *pNtGdiGetRasterizerCaps)( RASTERIZER_STATUS *status, UINT size ); @@ -153,7 +151,6 @@ struct unix_funcs UNICODE_STRING *output, ULONG type, BOOL is_display, HANDLE hspool, DRIVER_INFO_2W *driver_info, void *pdev ); BOOL (WINAPI *pNtGdiPatBlt)( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); - HRGN (WINAPI *pNtGdiPathToRegion)( HDC hdc ); BOOL (WINAPI *pNtGdiPlgBlt)( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e4bfe6f172f..957646dc7c3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -195,11 +195,6 @@ BOOL WINAPI NtGdiFillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) return unix_funcs->pNtGdiFillRgn( hdc, hrgn, hbrush ); } -BOOL WINAPI NtGdiFlattenPath( HDC hdc ) -{ - return unix_funcs->pNtGdiFlattenPath( hdc ); -} - BOOL WINAPI NtGdiFontIsLinked( HDC hdc ) { return unix_funcs->pNtGdiFontIsLinked( hdc ); @@ -299,11 +294,6 @@ UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, return unix_funcs->pNtGdiGetOutlineTextMetricsInternalW( hdc, cbData, otm, opts ); } -INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ) -{ - return unix_funcs->pNtGdiGetPath( hdc, points, types, size ); -} - COLORREF WINAPI NtGdiGetPixel( HDC hdc, INT x, INT y ) { return unix_funcs->pNtGdiGetPixel( hdc, x, y ); @@ -412,11 +402,6 @@ BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWOR return unix_funcs->pNtGdiPatBlt( hdc, left, top, width, height, rop ); } -HRGN WINAPI NtGdiPathToRegion( HDC hdc ) -{ - return unix_funcs->pNtGdiPathToRegion( hdc ); -} - BOOL WINAPI NtGdiPlgBlt( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 5f32a65c2fd..daba653f214 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -511,6 +511,30 @@ NTSTATUS WINAPI wow64_NtGdiSetMagicColors( UINT *args ) return NtGdiSetMagicColors( hdc, magic, index ); } +NTSTATUS WINAPI wow64_NtGdiGetPath( UINT *args ) +{ + HDC hdc = get_handle( &args ); + POINT *points = get_ptr( &args ); + BYTE *types = get_ptr( &args ); + INT size = get_ulong( &args ); + + return NtGdiGetPath( hdc, points, types, size ); +} + +NTSTATUS WINAPI wow64_NtGdiPathToRegion( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return HandleToUlong( NtGdiPathToRegion( hdc )); +} + +NTSTATUS WINAPI wow64_NtGdiFlattenPath( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return NtGdiFlattenPath( hdc ); +} + NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) { return NtGdiFlush(); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 143fd1f97ae..a5a38548f5e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -43,6 +43,7 @@ SYSCALL_ENTRY( NtGdiEqualRgn ) \ SYSCALL_ENTRY( NtGdiExtCreateRegion ) \ SYSCALL_ENTRY( NtGdiExtGetObjectW ) \ + SYSCALL_ENTRY( NtGdiFlattenPath ) \ SYSCALL_ENTRY( NtGdiFlush ) \ SYSCALL_ENTRY( NtGdiGetBitmapBits ) \ SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \ @@ -51,12 +52,14 @@ SYSCALL_ENTRY( NtGdiGetFontFileData ) \ SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \ SYSCALL_ENTRY( NtGdiGetNearestPaletteIndex ) \ + SYSCALL_ENTRY( NtGdiGetPath ) \ SYSCALL_ENTRY( NtGdiGetRegionData ) \ SYSCALL_ENTRY( NtGdiGetRgnBox ) \ SYSCALL_ENTRY( NtGdiGetSystemPaletteUse ) \ SYSCALL_ENTRY( NtGdiGetTransform ) \ SYSCALL_ENTRY( NtGdiHfontCreate ) \ SYSCALL_ENTRY( NtGdiOffsetRgn ) \ + SYSCALL_ENTRY( NtGdiPathToRegion ) \ SYSCALL_ENTRY( NtGdiPtInRegion ) \ SYSCALL_ENTRY( NtGdiRectInRegion ) \ SYSCALL_ENTRY( NtGdiRemoveFontMemResourceEx ) \

1 0

David Kahurani : winedump: Remove a FIXME.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 3dea31ed06df6c402d4e5645517f2ebd2778ca79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dea31ed06df6c402d4e5645… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Oct 12 15:31:17 2021 +0300 winedump: Remove a FIXME. It is not considered worthwhile freeing memory in short-lived programs Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msmangle.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d22f4715937..ee7b033f757 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -531,7 +531,6 @@ static char *demangle_datatype (char **str, compound_type *ct, if (*iter == '6') { int sub_expressions = 0; - /* FIXME: there are tons of memory leaks here */ /* FIXME: this is still broken in some cases and it has to be * merged with the function prototype parsing above... */

1 0

Rémi Bernon : hidclass.sys: Don't queue reports in polled mode.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 64191946d3b588a55b93df1c95dec3fd56b757b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64191946d3b588a55b93df1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:24 2021 +0200 hidclass.sys: Don't queue reports in polled mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 5 ----- dlls/hidclass.sys/device.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 7f933df3b06..a2719f65488 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2183,16 +2183,12 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle SetLastError( 0xdeadbeef ); ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); - todo_wine ok( !ret, "ReadFile succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); - todo_wine ok( !ret, "ReadFile succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); /* wait for second report to be ready */ @@ -2205,7 +2201,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", value, (report_id ? 3 : 4) ); - todo_wine ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); CloseHandle( overlapped.hEvent ); diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d588970150e..fb21e230ec4 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -264,7 +264,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack KeAcquireSpinLock( &ext->u.pdo.queues_lock, &irql ); LIST_FOR_EACH_ENTRY( queue, &ext->u.pdo.queues, struct hid_queue, entry ) { - hid_queue_push_report( queue, last_report ); + if (!polled) hid_queue_push_report( queue, last_report ); do {

1 0

Rémi Bernon : hidclass.sys: Re-read the poll timeout on every iteration.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 6a869a2a8c55764665e7e25c1abc59ecdbcc6905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a869a2a8c55764665e7e25c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:23 2021 +0200 hidclass.sys: Re-read the poll timeout on every iteration. Otherwise it's pointless to have it configurable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 29b9215aa22..d588970150e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -313,9 +313,9 @@ static DWORD CALLBACK hid_device_thread(void *args) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; BOOL polled = ext->u.pdo.information.Polled; - ULONG report_id = 0, timeout = 0; HIDP_REPORT_IDS *report; HID_XFER_PACKET *packet; + ULONG report_id = 0; IO_STATUS_BLOCK io; BYTE *buffer; DWORD res; @@ -324,8 +324,6 @@ static DWORD CALLBACK hid_device_thread(void *args) buffer = (BYTE *)(packet + 1); packet->reportBuffer = buffer; - if (polled) timeout = ext->u.pdo.poll_interval; - report = find_report_with_type_and_id( ext, HidP_Input, 0, TRUE ); if (!report) WARN("no input report found.\n"); else report_id = report->ReportID; @@ -356,7 +354,7 @@ static DWORD CALLBACK hid_device_thread(void *args) hid_device_queue_input( device, packet ); } - res = WaitForSingleObject(ext->u.pdo.halt_event, timeout); + res = WaitForSingleObject(ext->u.pdo.halt_event, polled ? ext->u.pdo.poll_interval : 0); } while (res == WAIT_TIMEOUT); TRACE("device thread exiting, res %#x\n", res);

1 0

Rémi Bernon : dinput8/tests: Add some more polled read tests.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 12dc52cd4aeadfebe6021d0762b04eedd4c01a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dc52cd4aeadfebe6021d07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:22 2021 +0200 dinput8/tests: Add some more polled read tests. Showing that we should probably not queue reports in this mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cdb19808fcd..7f933df3b06 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2174,6 +2174,40 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + value = 10; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &value, sizeof(ULONG), NULL, NULL ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + todo_wine + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); }

1 0

Rémi Bernon : winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: de7032816bd71d0edda30a78721e79b5b6af735c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de7032816bd71d0edda30a78… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 09:59:12 2021 +0200 winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field. These contain the bluetooth dongle VID / PID instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2ed9a031af6..b857ba25df8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1085,12 +1085,12 @@ static const struct hid_device_vtbl lnxev_device_vtbl = }; #endif /* HAS_PROPER_INPUT_HEADER */ -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc, + int *bus) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[MAX_PATH]; - DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1121,16 +1121,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || desc->vid || desc->pid) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); + if (*bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", bus, &desc->vid, &desc->pid); } - if (!strncmp(ptr, "PRODUCT=", 8)) + if (!strncmp(ptr, "PRODUCT=", 8) && *bus != BUS_BLUETOOTH) { if (desc->version) continue; if (!strcmp(subsystem, "usb")) sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", bus, &desc->vid, &desc->pid, &desc->version); } } } @@ -1154,7 +1154,7 @@ static void udev_add_device(struct udev_device *dev) struct base_device *impl; const char *subsystem; const char *devnode; - int fd; + int fd, bus = 0; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1176,9 +1176,9 @@ static void udev_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &desc); - get_device_subsystem_info(dev, "input", &desc); - get_device_subsystem_info(dev, "usb", &desc); + get_device_subsystem_info(dev, "hid", &desc, &bus); + get_device_subsystem_info(dev, "input", &desc, &bus); + get_device_subsystem_info(dev, "usb", &desc, &bus); subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw"))

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 October 2021