August 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wow64cpu: Restore the full 32-bit context when changed externally.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: e30f091f3b2acbd133edb599a72b4bea381c0b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30f091f3b2acbd133edb599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:13:21 2021 +0200 wow64cpu: Restore the full 32-bit context when changed externally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 3 +++ dlls/wow64cpu/cpu.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wow64cpu/wow64cpu.spec | 4 ++-- include/winternl.h | 2 ++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index bfc5b34a464..d02a7946945 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1957,12 +1957,15 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) } if (flags & CONTEXT_I386_CONTROL) { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; + wow_frame->Esp = context->Esp; wow_frame->Ebp = context->Ebp; wow_frame->Eip = context->Eip; wow_frame->EFlags = context->EFlags; wow_frame->SegCs = cs32_sel; wow_frame->SegSs = ds64_sel; + cpu->Flags |= WOW64_CPURESERVED_FLAG_RESET_STATE; } if (flags & CONTEXT_I386_SEGMENTS) { diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index df292221117..8293d596ec4 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -82,13 +82,33 @@ __ASM_GLOBAL_FUNC( syscall_32to64, "movl 0xa0(%r13),%esi\n\t" /* context->Esi */ "movl 0xa4(%r13),%ebx\n\t" /* context->Ebx */ "movl 0xb4(%r13),%ebp\n\t" /* context->Ebp */ + "btrl $0,-4(%r13)\n\t" /* cpu->Flags & WOW64_CPURESERVED_FLAG_RESET_STATE */ + "jc 1f\n\t" "movl 0xb8(%r13),%edx\n\t" /* context->Eip */ "movl %edx,(%rsp)\n\t" "movl 0xbc(%r13),%edx\n\t" /* context->SegCs */ "movl %edx,4(%rsp)\n\t" "movl 0xc4(%r13),%r14d\n\t" /* context->Esp */ "xchgq %r14,%rsp\n\t" - "ljmp *(%r14)" ) + "ljmp *(%r14)\n" + "1:\tmovq %rsp,%r14\n\t" + "movl 0xa8(%r13),%edx\n\t" /* context->Edx */ + "movl 0xac(%r13),%ecx\n\t" /* context->Ecx */ + "movl 0xc8(%r13),%eax\n\t" /* context->SegSs */ + "movq %rax,0x20(%rsp)\n\t" + "mov %ax,%ds\n\t" + "mov %ax,%es\n\t" + "mov 0x90(%r13),%fs\n\t" /* context->SegFs */ + "movl 0xc4(%r13),%eax\n\t" /* context->Esp */ + "movq %rax,0x18(%rsp)\n\t" + "movl 0xc0(%r13),%eax\n\t" /* context->EFlags */ + "movq %rax,0x10(%rsp)\n\t" + "movl 0xbc(%r13),%eax\n\t" /* context->SegCs */ + "movq %rax,0x8(%rsp)\n\t" + "movl 0xb8(%r13),%eax\n\t" /* context->Eip */ + "movq %rax,(%rsp)\n\t" + "movl 0xb0(%r13),%eax\n\t" /* context->Eax */ + "iretq" ) /********************************************************************** @@ -137,3 +157,21 @@ void * WINAPI BTCpuGetBopCode(void) { return code_buffer; } + + +/********************************************************************** + * BTCpuGetContext (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuGetContext( HANDLE thread, HANDLE process, void *unknown, I386_CONTEXT *ctx ) +{ + return NtQueryInformationThread( thread, ThreadWow64Context, ctx, sizeof(*ctx), NULL ); +} + + +/********************************************************************** + * BTCpuSetContext (wow64cpu.@) + */ +NTSTATUS WINAPI BTCpuSetContext( HANDLE thread, HANDLE process, void *unknown, I386_CONTEXT *ctx ) +{ + return NtSetInformationThread( thread, ThreadWow64Context, ctx, sizeof(*ctx) ); +} diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec index ba0abb7a8ed..b86481563f2 100644 --- a/dlls/wow64cpu/wow64cpu.spec +++ b/dlls/wow64cpu/wow64cpu.spec @@ -1,8 +1,8 @@ @ stdcall BTCpuGetBopCode() -#@ stub BTCpuGetContext +@ stdcall BTCpuGetContext(long long ptr ptr) @ stdcall BTCpuProcessInit() #@ stub BTCpuResetToConsistentState -#@ stub BTCpuSetContext +@ stdcall BTCpuSetContext(long long ptr ptr) @ stdcall BTCpuSimulate() #@ stub BTCpuTurboThunkControl #@ stub TurboDispatchJumpAddressEnd diff --git a/include/winternl.h b/include/winternl.h index 9dff3a98bed..a048b9546ee 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3727,6 +3727,8 @@ typedef struct _WOW64_CPURESERVED /* CONTEXT_EX *context_ex */ } WOW64_CPURESERVED, *PWOW64_CPURESERVED; +#define WOW64_CPURESERVED_FLAG_RESET_STATE 1 + typedef struct _WOW64_CPU_AREA_INFO { void *Context;

1 0

Martin Storsjö : msvcrt: Implement fesetenv for arm64.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 6391a9f8978b42b71b37c27b673a0a13c21ea577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6391a9f8978b42b71b37c27b… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 4 18:04:32 2021 +0200 msvcrt: Implement fesetenv for arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2ba810a9903..64ca7197101 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5626,7 +5626,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } -#if _MSVCR_VER >= 140 +#if _MSVCR_VER >= 140 && (defined(__i386__) || defined(__x86_64__)) enum fenv_masks { FENV_X_INVALID = 0x00100010, @@ -5689,7 +5689,6 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) } /* decodes x87/sse control/status word, returns FALSE on error */ -#if (defined(__i386__) || defined(__x86_64__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { *x = *y = 0; @@ -5723,16 +5722,21 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) } return TRUE; } -#endif #elif _MSVCR_VER >= 120 static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) { + if (y & _EM_DENORMAL) + y = (y & ~_EM_DENORMAL) | 0x20; + return x | y; } -#if (defined(__i386__) || defined(__x86_64__)) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { + if (enc & 0x20) + enc = (enc & ~0x20) | _EM_DENORMAL; + *x = *y = enc; return TRUE; } @@ -6038,6 +6042,32 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } + return 0; +#elif defined(__aarch64__) + ULONG_PTR fpsr; + unsigned int tmp, fp_cw, fp_stat; + + if (!env->_Fe_ctl && !env->_Fe_stat) { + _fpreset(); + return 0; + } + + if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) + return 1; + if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) + return 1; + + _control87(_MCW_EM, _MCW_EM); + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + fpsr &= ~0x9f; + if (fp_stat & _SW_INVALID) fpsr |= 0x1; + if (fp_stat & _SW_ZERODIVIDE) fpsr |= 0x2; + if (fp_stat & _SW_OVERFLOW) fpsr |= 0x4; + if (fp_stat & _SW_UNDERFLOW) fpsr |= 0x8; + if (fp_stat & _SW_INEXACT) fpsr |= 0x10; + if (fp_stat & _SW_DENORMAL) fpsr |= 0x80; + __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); + _control87(fp_cw, 0xffffffff); return 0; #else FIXME( "not implemented\n" );

1 0

Jacek Caban : gdi32: Use ntgdi interface for GetTransform and GetWorldTransform.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: b5780cbc5b0dd557b35cbdc982cdda91e0b13ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5780cbc5b0dd557b35cbdc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:23:17 2021 +0200 gdi32: Use ntgdi interface for GetTransform and GetWorldTransform. 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/gdi32/dc.c | 18 ++---------------- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdidc.c | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8c03392c513..70dbade998a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -881,21 +881,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) /*********************************************************************** - * GetWorldTransform (GDI32.@) - */ -BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) -{ - DC * dc; - if (!xform) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - *xform = dc->xformWorld2Wnd; - release_dc_ptr( dc ); - return TRUE; -} - - -/*********************************************************************** - * GetTransform (GDI32.@) + * NtGdiGetTransform (win32u.@) * * Undocumented * @@ -911,7 +897,7 @@ BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) * xform [O] The xform. * */ -BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ) +BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ) { BOOL ret = TRUE; DC *dc = get_dc_ptr( hdc ); diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 2ef2081be71..ca3455459e5 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -85,7 +85,7 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSD emr_stretchblt->cySrc = src->log_height; } emr->dwRop = rop; - GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); + NtGdiGetTransform( dev_src->hdc, 0x204, &emr->xformSrc ); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; emr->offBmiSrc = emr_size; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 41f27fe7f57..049a61d4ab2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -361,7 +361,7 @@ @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) -@ stdcall GetTransform(long long ptr) +@ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) @ stdcall GetWinMetaFileBits(long long ptr long long) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1b9057b33e0..baa6c199b87 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -418,6 +418,14 @@ BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetWorldTransform (GDI32.@) + */ +BOOL WINAPI GetWorldTransform( HDC hdc, XFORM *xform ) +{ + return NtGdiGetTransform( hdc, 0x203, xform ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */

1 0

Jacek Caban : gdi32: Use ntgdi names for PtVisible and RectVisible.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 18a0b5828dba2c8071398057ad89ca06ef6372d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a0b5828dba2c8071398057… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:21:26 2021 +0200 gdi32: Use ntgdi names for PtVisible and RectVisible. 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/gdi32/clipping.c | 8 ++++---- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index bea2c7f8cfc..1fc16149366 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -345,9 +345,9 @@ INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bo /*********************************************************************** - * PtVisible (GDI32.@) + * NtGdiPtVisible (win32u.@) */ -BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) +BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y ) { POINT pt; RECT visrect; @@ -371,9 +371,9 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) /*********************************************************************** - * RectVisible (GDI32.@) + * NtGdiRectVisible (win32u.@) */ -BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) +BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ) { RECT tmpRect, visrect; BOOL ret; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 626463fe2f7..41f27fe7f57 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -407,11 +407,11 @@ @ stdcall Polyline(long ptr long) @ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) NtGdiPtInRegion -@ stdcall PtVisible(long long long) +@ stdcall PtVisible(long long long) NtGdiPtVisible # @ stub QueryFontAssocStatus @ stdcall RealizePalette(long) @ stdcall RectInRegion(long ptr) NtGdiRectInRegion -@ stdcall RectVisible(long ptr) +@ stdcall RectVisible(long ptr) NtGdiRectVisible @ stdcall Rectangle(long long long long long) @ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str)

1 0

Alexandre Julliard : wow64: Add thunks for a few misc syscalls.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 4f0d8b697bf6665f358f05e3ad962b720b70adc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f0d8b697bf6665f358f05e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 15:11:08 2021 +0200 wow64: Add thunks for a few misc syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wow64/process.c | 22 ++++++++++++++++++++++ dlls/wow64/security.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64/sync.c | 11 +++++++++++ dlls/wow64/syscall.c | 12 ++++++++++++ dlls/wow64/syscall.h | 9 +++++++++ dlls/wow64/system.c | 17 +++++++++++++++++ dlls/wow64/virtual.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 9 files changed, 164 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d8b697bf6665f358f…

1 0

Alexandre Julliard : wow64: Make the syscall dispatcher point to the wow64cpu syscall wrapper.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 9f24bc44bcb5e147e46a74de4e8d570641aa1377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f24bc44bcb5e147e46a74de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 12:06:27 2021 +0200 wow64: Make the syscall dispatcher point to the wow64cpu syscall wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 2fd9f309b1b..e120ed022cd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -62,8 +62,16 @@ struct mem_header BYTE data[1]; }; +static void **pWow64Transition; +static void **p__wine_syscall_dispatcher; static SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; +/* cpu backend dll functions */ +static void * (WINAPI *pBTCpuGetBopCode)(void); +static void (WINAPI *pBTCpuProcessInit)(void); +static void (WINAPI *pBTCpuSimulate)(void); + + void *dummy = RtlUnwind; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -400,9 +408,17 @@ static void process_init(void) GET_PTR( LdrSystemDllInitBlock ); module = (HMODULE)(ULONG_PTR)pLdrSystemDllInitBlock->ntdll_handle; + GET_PTR( Wow64Transition ); + GET_PTR( __wine_syscall_dispatcher ); init_syscall_table( module ); - load_cpu_dll(); + module = load_cpu_dll(); + GET_PTR( BTCpuGetBopCode ); + GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuSimulate ); + + pBTCpuProcessInit(); + *pWow64Transition = *p__wine_syscall_dispatcher = pBTCpuGetBopCode(); init_file_redirects();

1 0

Paul Gofman : kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: d63e0b7084ff651a8423324c54ab98ff8669de51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63e0b7084ff651a8423324c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 4 13:43:46 2021 +0300 kernelbase: Fix copy size for delete_privs in CreateRestrictedToken(). Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret);

1 0

Nikolay Sivov : d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: b1b49b586328a2df09e3983da661e6784f9c4342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b49b586328a2df09e3983d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 10:04:10 2021 +0300 d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 2014e8edc94..58b5f90fadb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1976,6 +1976,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_MISC_SHARED | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE},

1 0

Jacek Caban : gdi32: Use NtGdiIntersectClipRect for IntersectClipRect implementation.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 496eaa0bc6c1cfcb0fb0323c365ee4f3d6d56aec URL: https://source.winehq.org/git/wine.git/?a=commit;h=496eaa0bc6c1cfcb0fb0323c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:20:21 2021 +0200 gdi32: Use NtGdiIntersectClipRect for IntersectClipRect implementation. 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/gdi32/clipping.c | 49 ++++++++++++++++-------------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 16 ++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 47 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=496eaa0bc6c1cfcb0fb0…

1 0

Jacek Caban : gdi32: Use NtGdiExtSelectClipRgn for ExtSelectClipRgn implementation.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 24a22a51ff704d620f7326f72f84bfb33dcf8eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a22a51ff704d620f7326f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:22:02 2021 +0200 gdi32: Use NtGdiExtSelectClipRgn for ExtSelectClipRgn implementation. 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/gdi32/clipping.c | 57 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 10 +++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 24 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 +++++---- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 62 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24a22a51ff704d620f73…

1 0