October 2021 - Wine-Commits

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

Oct. 12, 2021

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 Oct. 12, 2021

Oct. 12, 2021

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

Eric Pouech : winedbg: Properly print 64bit integers.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 22c1619409d87ed9e79a8e39a363b0e888efc13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c1619409d87ed9e79a8e39… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:10:39 2021 +0200 winedbg: Properly print 64bit integers. Regression introduced in 0ea9fe999c1ed3a8b645476d97d2e0221be17bb5. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm64.c | 14 +++++++------- programs/winedbg/be_x86_64.c | 17 ++++++++--------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d22f254013b..9ceb9291d54 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -80,19 +80,19 @@ static void be_arm64_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08x(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.u.s.Lr, ctx->ctx.Cpsr, buf); - dbg_printf(" x0: %016lx x1: %016lx x2: %016lx x3: %016lx x4: %016lx\n", + dbg_printf(" x0: %016I64x x1: %016I64x x2: %016I64x x3: %016I64x x4: %016I64x\n", ctx->ctx.u.s.X0, ctx->ctx.u.s.X1, ctx->ctx.u.s.X2, ctx->ctx.u.s.X3, ctx->ctx.u.s.X4); - dbg_printf(" x5: %016lx x6: %016lx x7: %016lx x8: %016lx x9: %016lx\n", + dbg_printf(" x5: %016I64x x6: %016I64x x7: %016I64x x8: %016I64x x9: %016I64x\n", ctx->ctx.u.s.X5, ctx->ctx.u.s.X6, ctx->ctx.u.s.X7, ctx->ctx.u.s.X8, ctx->ctx.u.s.X9); - dbg_printf(" x10:%016lx x11:%016lx x12:%016lx x13:%016lx x14:%016lx\n", + dbg_printf(" x10:%016I64x x11:%016I64x x12:%016I64x x13:%016I64x x14:%016I64x\n", ctx->ctx.u.s.X10, ctx->ctx.u.s.X11, ctx->ctx.u.s.X12, ctx->ctx.u.s.X13, ctx->ctx.u.s.X14); - dbg_printf(" x15:%016lx ip0:%016lx ip1:%016lx x18:%016lx x19:%016lx\n", + dbg_printf(" x15:%016I64x ip0:%016I64x ip1:%016I64x x18:%016I64x x19:%016I64x\n", ctx->ctx.u.s.X15, ctx->ctx.u.s.X16, ctx->ctx.u.s.X17, ctx->ctx.u.s.X18, ctx->ctx.u.s.X19); - dbg_printf(" x20:%016lx x21:%016lx x22:%016lx x23:%016lx x24:%016lx\n", + dbg_printf(" x20:%016I64x x21:%016I64x x22:%016I64x x23:%016I64x x24:%016I64x\n", ctx->ctx.u.s.X20, ctx->ctx.u.s.X21, ctx->ctx.u.s.X22, ctx->ctx.u.s.X23, ctx->ctx.u.s.X24); - dbg_printf(" x25:%016lx x26:%016lx x27:%016lx x28:%016lx Fp:%016lx\n", + dbg_printf(" x25:%016I64x x26:%016I64x x27:%016I64x x28:%016I64x Fp:%016I64x\n", ctx->ctx.u.s.X25, ctx->ctx.u.s.X26, ctx->ctx.u.s.X27, ctx->ctx.u.s.X28, ctx->ctx.u.s.Fp); if (all_regs) dbg_printf( "Floating point ARM64 dump not implemented\n" ); diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 74481645081..c2839cf4097 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -89,13 +89,13 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, buf[i] = ' '; dbg_printf("Register dump:\n"); - dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n", + dbg_printf(" rip:%016I64x rsp:%016I64x rbp:%016I64x eflags:%08x (%s)\n", ctx->Rip, ctx->Rsp, ctx->Rbp, ctx->EFlags, buf); - dbg_printf(" rax:%016lx rbx:%016lx rcx:%016lx rdx:%016lx\n", + dbg_printf(" rax:%016I64x rbx:%016I64x rcx:%016I64x rdx:%016I64x\n", ctx->Rax, ctx->Rbx, ctx->Rcx, ctx->Rdx); - dbg_printf(" rsi:%016lx rdi:%016lx r8:%016lx r9:%016lx r10:%016lx\n", + dbg_printf(" rsi:%016I64x rdi:%016I64x r8:%016I64x r9:%016I64x r10:%016I64x\n", ctx->Rsi, ctx->Rdi, ctx->R8, ctx->R9, ctx->R10 ); - dbg_printf(" r11:%016lx r12:%016lx r13:%016lx r14:%016lx r15:%016lx\n", + dbg_printf(" r11:%016I64x r12:%016I64x r13:%016I64x r14:%016I64x r15:%016I64x\n", ctx->R11, ctx->R12, ctx->R13, ctx->R14, ctx->R15 ); if (!all_regs) return; @@ -104,9 +104,9 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, ctx->SegCs, ctx->SegDs, ctx->SegEs, ctx->SegFs, ctx->SegGs, ctx->SegSs ); dbg_printf("Debug:\n"); - dbg_printf(" dr0:%016lx dr1:%016lx dr2:%016lx dr3:%016lx\n", + dbg_printf(" dr0:%016I64x dr1:%016I64x dr2:%016I64x dr3:%016I64x\n", ctx->Dr0, ctx->Dr1, ctx->Dr2, ctx->Dr3 ); - dbg_printf(" dr6:%016lx dr7:%016lx\n", ctx->Dr6, ctx->Dr7 ); + dbg_printf(" dr6:%016I64x dr7:%016I64x\n", ctx->Dr6, ctx->Dr7 ); dbg_printf("Floating point:\n"); dbg_printf(" flcw:%04x ", LOWORD(ctx->u.FltSave.ControlWord)); @@ -150,8 +150,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, { M128A reg = ctx->u.FltSave.FloatRegisters[i]; if (i == 4) dbg_printf("\n"); - dbg_printf(" ST%u:%08x%08x%08x%08x ", i, - (DWORD)(reg.High >> 32), (DWORD)reg.High, (DWORD)(reg.Low >> 32), (DWORD)reg.Low ); + dbg_printf(" ST%u:%016I64x%16I64x ", i, reg.High, reg.Low ); } dbg_printf("\n"); @@ -162,7 +161,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, for (i = 0; i < 16; i++) { - dbg_printf( " %sxmm%u: uint=%016lx%016lx", (i > 9) ? "" : " ", i, + dbg_printf( " %sxmm%u: uint=%016I64x%016I64x", (i > 9) ? "" : " ", i, ctx->u.FltSave.XmmRegisters[i].High, ctx->u.FltSave.XmmRegisters[i].Low ); dbg_printf( " double={%g; %g}", *(double *)&ctx->u.FltSave.XmmRegisters[i].Low, *(double *)&ctx->u.FltSave.XmmRegisters[i].High );

1 0

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

Oct. 12, 2021

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 : maintainers: Assume maintainership of the Joystick input section.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 33578878e6988879790a41f2eccbc37f0d70e0c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33578878e6988879790a41f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:32 2021 +0200 maintainers: Assume maintainership of the Joystick input section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e11186011fc..ea27dc41af3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,8 +181,8 @@ M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/jscript/ Joystick input +M: Rémi Bernon <rbernon(a)codeweavers.com> P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/

1 0

Alexandre Julliard : winemenubuilder: Remove dead code.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: ca034201429201452d95d6a2e2cadbef93a20c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca034201429201452d95d6a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 17:36:18 2021 +0200 winemenubuilder: Remove dead code. __APPLE__ is never defined in the PE build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 143 ----------------------------- 1 file changed, 143 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 51d83aed971..5b6fe071916 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -181,8 +181,6 @@ struct rb_string_entry struct wine_rb_entry entry; }; -DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); - static WCHAR *xdg_menu_dir; static WCHAR *xdg_data_dir; static WCHAR xdg_desktop_dir[MAX_PATH]; @@ -355,7 +353,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder = NULL; IWICBitmapEncoder *encoder = NULL; - IWICBitmapScaler *scaler = NULL; IStream *outputFile = NULL; int i; HRESULT hr = E_FAIL; @@ -374,14 +371,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); goto end; } - if (IsEqualCLSID(outputFormat,&CLSID_WICIcnsEncoder)) - { - hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); - if (FAILED(hr)) - { - WINE_WARN("error 0x%08X creating IWICBitmapScaler\n", hr); - } - } hr = CoCreateInstance(outputFormat, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); if (FAILED(hr)) @@ -422,22 +411,6 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); goto endloop; } - if ( scaler) - { - IWICBitmapSource_GetSize(sourceBitmap, &width, &height); - if (width == 64) /* Classic Mode */ - { - hr = IWICBitmapScaler_Initialize( scaler, sourceBitmap, 128, 128, - WICBitmapInterpolationModeNearestNeighbor); - if (FAILED(hr)) - WINE_ERR("error 0x%08X scaling bitmap\n", hr); - else - { - IWICBitmapSource_Release(sourceBitmap); - IWICBitmapScaler_QueryInterface(scaler, &IID_IWICBitmapSource, (LPVOID)&sourceBitmap); - } - } - } hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); if (FAILED(hr)) { @@ -503,8 +476,6 @@ end: IWICImagingFactory_Release(factory); if (decoder) IWICBitmapDecoder_Release(decoder); - if (scaler) - IWICBitmapScaler_Release(scaler); if (encoder) IWICBitmapEncoder_Release(encoder); if (outputFile) @@ -1081,119 +1052,6 @@ static WCHAR *compute_native_identifier(int exeIndex, LPCWSTR icoPathW, LPCWSTR return heap_wprintf(L"%04X_%.*s.%d", crc, (int)(ext - basename), basename, exeIndex); } -#ifdef __APPLE__ -#define ICNS_SLOTS 6 - -static inline int size_to_slot(int size) -{ - switch (size) - { - case 16: return 0; - case 32: return 1; - case 48: return 2; - case 64: return -2; /* Classic Mode */ - case 128: return 3; - case 256: return 4; - case 512: return 5; - } - - return -1; -} - -#define CLASSIC_SLOT 3 - -static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, - int numEntries, int exeIndex, LPCWSTR icoPathW, - const WCHAR *destFilename, WCHAR **nativeIdentifier) -{ - struct { - int index; - int maxBits; - BOOL scaled; - } best[ICNS_SLOTS]; - int indexes[ICNS_SLOTS]; - int i; - WCHAR tmpdir[MAX_PATH]; - WCHAR *icnsPath; - LARGE_INTEGER zero; - HRESULT hr; - - for (i = 0; i < ICNS_SLOTS; i++) - { - best[i].index = -1; - best[i].maxBits = 0; - } - for (i = 0; i < numEntries; i++) - { - int slot; - int width = iconDirEntries[i].bWidth ? iconDirEntries[i].bWidth : 256; - int height = iconDirEntries[i].bHeight ? iconDirEntries[i].bHeight : 256; - BOOL scaled = FALSE; - - WINE_TRACE("[%d]: %d x %d @ %d\n", i, width, height, iconDirEntries[i].wBitCount); - if (height != width) - continue; - slot = size_to_slot(width); - if (slot == -2) - { - scaled = TRUE; - slot = CLASSIC_SLOT; - } - else if (slot < 0) - continue; - if (scaled && best[slot].maxBits && !best[slot].scaled) - continue; /* don't replace unscaled with scaled */ - if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) - { - best[slot].index = i; - best[slot].maxBits = iconDirEntries[i].wBitCount; - best[slot].scaled = scaled; - } - } - /* remove the scaled icon if a larger unscaled icon exists */ - if (best[CLASSIC_SLOT].scaled) - { - for (i = CLASSIC_SLOT+1; i < ICNS_SLOTS; i++) - if (best[i].index >= 0 && !best[i].scaled) - { - best[CLASSIC_SLOT].index = -1; - break; - } - } - - numEntries = 0; - for (i = 0; i < ICNS_SLOTS; i++) - { - if (best[i].index >= 0) - { - indexes[numEntries] = best[i].index; - numEntries++; - } - } - - *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW, destFilename); - GetTempPathW( MAX_PATH, tmpdir ); - icnsPath = heap_wprintf(L"%s\\%s.icns", tmpdir, *nativeIdentifier); - zero.QuadPart = 0; - hr = IStream_Seek(icoStream, zero, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - WINE_WARN("seeking icon stream failed, error 0x%08X\n", hr); - goto end; - } - hr = convert_to_native_icon(icoStream, indexes, numEntries, &CLSID_WICIcnsEncoder, icnsPath); - if (FAILED(hr)) - { - WINE_WARN("converting %s to %s failed, error 0x%08X\n", - wine_dbgstr_w(icoPathW), wine_dbgstr_w(icnsPath), hr); - goto end; - } - -end: - heap_free(icnsPath); - return hr; -} -#else static void refresh_icon_cache(const WCHAR *iconsDir) { WCHAR buffer[MAX_PATH]; @@ -1270,7 +1128,6 @@ static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntr heap_free(iconsDir); return hr; } -#endif /* defined(__APPLE__) */ /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilename, BOOL bWait)

1 0

Alexandre Julliard : explorer: Use the correct buffer size for the full path name.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: wine Branch: master Commit: 130ec9dbf9e1ff70f6a6817dc325d24b7a3b568b URL: https://source.winehq.org/git/wine.git/?a=commit;h=130ec9dbf9e1ff70f6a6817d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 12:53:11 2021 +0200 explorer: Use the correct buffer size for the full path name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 43bd4ef13a8..cb0d63fb688 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -404,7 +404,7 @@ static void make_explorer_window(parameters_struct *params) if (params->root[0]) { size = GetFullPathNameW(params->root, 0, NULL, NULL); - path = malloc(size); + path = malloc( size * sizeof(WCHAR) ); GetFullPathNameW(params->root, size, path, NULL); }

1 0

Conor McCarthy : tests: Add UINT_MAX layer count tests to test_clear_render_target_view().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: dbb07a40f8524881fbc0f81c5c1842c54401b2f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dbb07a40f8524881fbc0f81… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:15 2021 +0200 tests: Add UINT_MAX layer count tests to test_clear_render_target_view(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac1e24d..9e4dcb5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4672,7 +4672,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; rtv_desc.Texture2DArray.FirstArraySlice = i; - rtv_desc.Texture2DArray.ArraySize = 1; + rtv_desc.Texture2DArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4703,7 +4703,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; rtv_desc.Texture2DMSArray.FirstArraySlice = i; - rtv_desc.Texture2DMSArray.ArraySize = 1; + rtv_desc.Texture2DMSArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4759,6 +4759,23 @@ static void test_clear_render_target_view(void) check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); release_resource_readback(&rb); + rtv_desc.Texture3D.FirstWSlice = 30; + rtv_desc.Texture3D.WSize = UINT_MAX; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 4, 32, 32, 30); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 30, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context);

1 0

Conor McCarthy : tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 41685c374a4883696c98c72cd9b3090c29c1334e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41685c374a4883696c98c72… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:16 2021 +0200 tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e4dcb5..5593393 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4485,6 +4485,17 @@ static void test_clear_depth_stencil_view(void) reset_command_list(command_list, context.allocator); } + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + dsv_desc.Texture2DArray.ArraySize = UINT_MAX; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 5, queue, command_list, expected_values[4], 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

Conor McCarthy : tests: Add a test for 5-bit masking of shader bit shift operands.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 0c3fb46a7afe76d0be1ef72362cfa96b6e2884d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c3fb46a7afe76d0be1ef72… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:08 2021 +0200 tests: Add a test for 5-bit masking of shader bit shift operands. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38fab13..d1337e2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8584,15 +8584,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9913,6 +9914,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}},

1 0