April 2020 - Wine-Commits - list.winehq.org

Biswapriyo Nath : include/dxgi.idl: Add cpu access flags.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 7fa051eca7986d631342eea72f1476e28c059730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa051eca7986d631342eea7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Apr 30 11:43:14 2020 +0530 include/dxgi.idl: Add cpu access flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index b724770ab7..c2960fd88c 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -33,6 +33,12 @@ typedef struct _LUID { } LUID, *PLUID; cpp_quote("#endif") +const UINT DXGI_CPU_ACCESS_NONE = 0; +const UINT DXGI_CPU_ACCESS_DYNAMIC = 1; +const UINT DXGI_CPU_ACCESS_READ_WRITE = 2; +const UINT DXGI_CPU_ACCESS_SCRATCH = 3; +const UINT DXGI_CPU_ACCESS_FIELD = 15; + typedef UINT DXGI_USAGE; const DXGI_USAGE DXGI_USAGE_SHADER_INPUT = 0x10L; const DXGI_USAGE DXGI_USAGE_RENDER_TARGET_OUTPUT = 0x20L; @@ -439,6 +445,7 @@ interface IDXGIDevice : IDXGIObject typedef enum DXGI_ADAPTER_FLAG { DXGI_ADAPTER_FLAG_NONE = 0, DXGI_ADAPTER_FLAG_REMOTE = 1, + DXGI_ADAPTER_FLAG_SOFTWARE = 2, DXGI_ADAPTER_FLAG_FORCE_DWORD = 0xFFFFFFFF } DXGI_ADAPTER_FLAG;

1 0

Alexandre Julliard : include: Get rid of BITFIELDS_BIGENDIAN.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: a4c6ad6b1f84a4aa45d818839fd1de1f0729ef62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c6ad6b1f84a4aa45d81883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 11:17:54 2020 +0200 include: Get rid of BITFIELDS_BIGENDIAN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 10 ---------- include/winnt.h | 16 ---------------- 2 files changed, 26 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 96ea3f01bc..c4b9e18f28 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -271,43 +271,33 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */ #if defined(__i386__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS #elif defined(__x86_64__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS #elif defined(__powerpc__) # define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__ALPHA__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__ARMEB__) # define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__ARMEL__) || defined(__arm__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__AARCH64EB__) # define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__AARCH64EL__) || defined(__aarch64__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__MIPSEB__) # define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif defined(__MIPSEL__) # undef WORDS_BIGENDIAN -# undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS #elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl) # error Unknown CPU architecture! diff --git a/include/winnt.h b/include/winnt.h index c90e9052de..883794cde8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3817,33 +3817,17 @@ typedef struct _IMAGE_RESOURCE_DIRECTORY { typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { union { struct { -#ifdef BITFIELDS_BIGENDIAN - unsigned NameIsString:1; - unsigned NameOffset:31; -#else unsigned NameOffset:31; unsigned NameIsString:1; -#endif } DUMMYSTRUCTNAME; DWORD Name; -#ifdef WORDS_BIGENDIAN - WORD __pad; - WORD Id; -#else WORD Id; - WORD __pad; -#endif } DUMMYUNIONNAME; union { DWORD OffsetToData; struct { -#ifdef BITFIELDS_BIGENDIAN - unsigned DataIsDirectory:1; - unsigned OffsetToDirectory:31; -#else unsigned OffsetToDirectory:31; unsigned DataIsDirectory:1; -#endif } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; } IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY;

1 0

Alexandre Julliard : ntdll: Get rid of obsolete KERN_THALTSTACK sysctl.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 5dcb9ddff7cdd017b647cd6555c531ac2e15d368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcb9ddff7cdd017b647cd65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 09:54:26 2020 +0200 ntdll: Get rid of obsolete KERN_THALTSTACK sysctl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 2f2a36a579..e905ed0af1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -45,9 +45,6 @@ #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif @@ -2593,14 +2590,6 @@ void signal_init_thread( TEB *teb ) struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; stack_t ss; -#ifdef __APPLE__ - int mib[2], val = 1; - - mib[0] = CTL_KERN; - mib[1] = KERN_THALTSTACK; - sysctl( mib, 2, NULL, NULL, &val, sizeof(val) ); -#endif - ss.ss_sp = (char *)teb + teb_size; ss.ss_size = signal_stack_size; ss.ss_flags = 0;

1 0

Zebediah Figura : quartz/vmr9: Retrieve a default format if none is given in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper().
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 1c8c26dfde2eeab7f72877903b1c695d1d81e5ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c8c26dfde2eeab7f7287790… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 20:15:15 2020 -0500 quartz/vmr9: Retrieve a default format if none is given in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 22 ++++++++++++++++++++++ dlls/quartz/vmr9.c | 12 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 783165a03a..367d7df568 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2523,6 +2523,28 @@ static void test_allocate_surface_helper(void) ok(!surfaces[0], "Surface 0 was allocated.\n"); ok(!surfaces[1], "Surface 1 was allocated.\n"); + info.Format = 0; + info.dwFlags = VMR9AllocFlag_3DRenderTarget; + count = 1; + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + ok(!!surfaces[0], "Surface 0 was not allocated.\n"); + ok(info.Format != 0, "Expected a format.\n"); + + hr = IDirect3DSurface9_GetDesc(surfaces[0], &desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(desc.Format == info.Format, "Expected format %#x, got %#x.\n", info.Format, desc.Format); + ok(desc.Type == D3DRTYPE_SURFACE, "Got type %u.\n", desc.Type); + ok(desc.Usage == D3DUSAGE_RENDERTARGET, "Got usage %#x.\n", desc.Usage); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u.\n", desc.Pool); + ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Got multisample type %u.\n", desc.MultiSampleType); + ok(!desc.MultiSampleQuality, "Got multisample quality %u.\n", desc.MultiSampleQuality); + ok(desc.Width == 32, "Got width %u.\n", desc.Width); + ok(desc.Height == 16, "Got height %u.\n", desc.Height); + + IDirect3DSurface9_Release(surfaces[0]); + out: IVMRSurfaceAllocatorNotify9_Release(notify); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 888f9e1751..f4faf2f97a 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2112,6 +2112,18 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa if (!allocinfo || !numbuffers || !surface) return E_POINTER; + if (!allocinfo->Format) + { + IDirect3DSurface9 *backbuffer; + D3DSURFACE_DESC desc; + + IDirect3DDevice9_GetBackBuffer(This->allocator_d3d9_dev, 0, 0, + D3DBACKBUFFER_TYPE_MONO, &backbuffer); + IDirect3DSurface9_GetDesc(backbuffer, &desc); + IDirect3DSurface9_Release(backbuffer); + allocinfo->Format = desc.Format; + } + if (!*numbuffers || *numbuffers < allocinfo->MinBuffers) { ERR("Invalid number of buffers?\n");

1 0

Zebediah Figura : d3dcompiler: Respect arrays in struct fields.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: aa333c63fca62e1958e341829d88897487c571f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa333c63fca62e1958e34182… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:41 2020 -0500 d3dcompiler: Respect arrays in struct fields. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 3b812de410..a628d8b20a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -789,7 +789,10 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s d3dcompiler_free(v); return list; } - field->type = type; + if (v->array_size) + field->type = new_array_type(type, v->array_size); + else + field->type = type; field->name = v->name; field->modifiers = modifiers; field->semantic = v->semantic;

1 0

Vijay Kiran Kamuju : include: Add dvdif.idl.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 7acbd367a593c6176a96162a64b321383fc1e81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7acbd367a593c6176a96162a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:47:26 2020 -0500 include: Add dvdif.idl. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dvdif.idl | 742 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/strmif.idl | 6 +- 3 files changed, 744 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7acbd367a593c6176a96…

1 0

Alexandre Julliard : wrc: Remove some dead code.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 6cc475dbe53f8c89796b29af2a5979c1c85a4438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc475dbe53f8c89796b29af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 10:09:04 2020 +0200 wrc: Remove some dead code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/readres.c | 391 -------------------------------------------------- tools/wrc/readres.h | 28 ---- tools/wrc/wrc.c | 1 - 4 files changed, 421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc475dbe53f8c89796b…

1 0

Alexandre Julliard : ntdll: Remove support for custom virtual memory alignments.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 2af035f53f2ebdcc56974aa938c1de83ada5b8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2af035f53f2ebdcc56974aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 10:07:36 2020 +0200 ntdll: Remove support for custom virtual memory alignments. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/server.c | 8 ++--- dlls/ntdll/virtual.c | 86 +++++++++++++++++++++---------------------------- 3 files changed, 41 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2af035f53f2ebdcc5697…

1 0

Alexandre Julliard : ntdll: Allocate TEBs out of a larger memory block.
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: dee934c0ff54851f049ab27b11d84c5a5810662c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee934c0ff54851f049ab27b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 10:05:56 2020 +0200 ntdll: Allocate TEBs out of a larger memory block. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 19 ++------- dlls/ntdll/virtual.c | 103 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 86 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3e877593b6..a22b77b481 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -93,7 +93,6 @@ extern void debug_init(void) DECLSPEC_HIDDEN; extern TEB *thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; -extern void virtual_init_threading(void) DECLSPEC_HIDDEN; extern void fill_cpu_info(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_unix_codepage(void) DECLSPEC_HIDDEN; @@ -200,6 +199,7 @@ extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned sh ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; +extern TEB * virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 604fd20c84..d116c7bd57 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -246,13 +246,10 @@ TEB *thread_init(void) user_shared_data = addr; memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); - /* allocate and initialize the PEB */ - - addr = NULL; - size = sizeof(*peb); - virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE, 1 ); - peb = addr; + /* allocate and initialize the PEB and initial TEB */ + teb = virtual_alloc_first_teb(); + peb = teb->Peb; peb->FastPebLock = &peb_lock; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; @@ -282,21 +279,12 @@ TEB *thread_init(void) */ peb->SessionId = 1; - /* allocate and initialize the initial TEB */ - - signal_init_threading(); - virtual_alloc_teb( &teb ); - teb->Peb = peb; - teb->Tib.StackBase = (void *)~0UL; - thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = -1; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - signal_init_thread( teb ); - virtual_init_threading(); debug_init(); init_paths(); set_process_name( __wine_main_argc, __wine_main_argv ); @@ -517,7 +505,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, if ((status = virtual_alloc_teb( &teb ))) goto error; - teb->Peb = NtCurrentTeb()->Peb; teb->ClientId.UniqueProcess = ULongToHandle(GetCurrentProcessId()); teb->ClientId.UniqueThread = ULongToHandle(tid); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7be00a1ac2..5900616e0c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -164,6 +164,11 @@ SIZE_T signal_stack_size = 0; SIZE_T signal_stack_mask = 0; static SIZE_T signal_stack_align; +/* TEB allocation blocks */ +static TEB *teb_block; +static TEB *next_free_teb; +static int teb_block_pos; + #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -2011,15 +2016,6 @@ void virtual_init(void) } -/*********************************************************************** - * virtual_init_threading - */ -void virtual_init_threading(void) -{ - use_locks = TRUE; -} - - /*********************************************************************** * virtual_get_system_info */ @@ -2093,29 +2089,90 @@ NTSTATUS virtual_create_builtin_view( void *module ) } +/*********************************************************************** + * virtual_alloc_first_teb + */ +TEB *virtual_alloc_first_teb(void) +{ + TEB *teb; + PEB *peb; + SIZE_T peb_size = page_size; + SIZE_T teb_size = signal_stack_mask + 1; + SIZE_T total = 32 * teb_size; + + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb_block, 0, &total, + MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); + teb_block_pos = 30; + teb = (TEB *)((char *)teb_block + 30 * teb_size); + peb = (PEB *)((char *)teb_block + 32 * teb_size - peb_size); + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb, 0, &teb_size, MEM_COMMIT, PAGE_READWRITE ); + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); + + teb->Peb = peb; + teb->Tib.Self = &teb->Tib; + teb->Tib.ExceptionList = (void *)~0ul; + teb->Tib.StackBase = (void *)~0ul; + teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; + teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + signal_init_threading(); + signal_alloc_thread( teb ); + signal_init_thread( teb ); + use_locks = TRUE; + return teb; +} + + /*********************************************************************** * virtual_alloc_teb */ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { - SIZE_T size = signal_stack_mask + 1; - void *addr = NULL; - TEB *teb; - NTSTATUS status; + sigset_t sigset; + TEB *teb = NULL; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T teb_size = signal_stack_mask + 1; - if ((status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, signal_stack_align ))) - return status; + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (next_free_teb) + { + teb = next_free_teb; + next_free_teb = *(TEB **)teb; + memset( teb, 0, sizeof(*teb) ); + } + else + { + if (!teb_block_pos) + { + void *addr = NULL; + SIZE_T total = 32 * teb_size; - *ret_teb = teb = addr; + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &total, + MEM_RESERVE, PAGE_READWRITE ))) + { + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return status; + } + teb_block = addr; + teb_block_pos = 32; + } + teb = (TEB *)((char *)teb_block + --teb_block_pos * teb_size); + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb, 0, &teb_size, + MEM_COMMIT, PAGE_READWRITE ); + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + + *ret_teb = teb; + teb->Peb = NtCurrentTeb()->Peb; teb->Tib.Self = &teb->Tib; teb->Tib.ExceptionList = (void *)~0UL; teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); if ((status = signal_alloc_thread( teb ))) { - size = 0; - NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + server_enter_uninterrupted_section( &csVirtual, &sigset ); + *(TEB **)teb = next_free_teb; + next_free_teb = teb; + server_leave_uninterrupted_section( &csVirtual, &sigset ); } return status; } @@ -2128,6 +2185,7 @@ void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; SIZE_T size; + sigset_t sigset; signal_free_thread( teb ); if (teb->DeallocationStack) @@ -2140,8 +2198,11 @@ void virtual_free_teb( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &thread_data->start_stack, &size, MEM_RELEASE ); } - size = 0; - NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + *(TEB **)teb = next_free_teb; + next_free_teb = teb; + server_leave_uninterrupted_section( &csVirtual, &sigset ); }

1 0

Zebediah Figura : quartz/vmr9: Support VMR9AllocFlag_3DRenderTarget in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper().
by Alexandre Julliard April 30, 2020

April 30, 2020

Module: wine Branch: master Commit: 3a3981272f33b83fac768c0a4d2ab11a8420e341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3981272f33b83fac768c0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 20:15:14 2020 -0500 quartz/vmr9: Support VMR9AllocFlag_3DRenderTarget in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 652705e843..888f9e1751 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2124,7 +2124,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa return VFW_E_WRONG_STATE; } - if (allocinfo->dwFlags & VMR9AllocFlag_OffscreenSurface) + if (allocinfo->dwFlags == VMR9AllocFlag_OffscreenSurface) { ERR("Creating offscreen surface\n"); for (i = 0; i < *numbuffers; ++i) @@ -2135,7 +2135,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa break; } } - else if (allocinfo->dwFlags & VMR9AllocFlag_TextureSurface) + else if (allocinfo->dwFlags == VMR9AllocFlag_TextureSurface) { TRACE("Creating texture surface\n"); for (i = 0; i < *numbuffers; ++i) @@ -2150,10 +2150,20 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa IDirect3DTexture9_Release(texture); } } + else if (allocinfo->dwFlags == VMR9AllocFlag_3DRenderTarget) + { + for (i = 0; i < *numbuffers; ++i) + { + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(This->allocator_d3d9_dev, + allocinfo->dwWidth, allocinfo->dwHeight, allocinfo->Format, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface[i], NULL))) + break; + } + } else { - FIXME("Could not allocate for type %08x\n", allocinfo->dwFlags); - return E_NOTIMPL; + FIXME("Unhandled flags %#x.\n", allocinfo->dwFlags); + return E_NOTIMPL; } if (i >= allocinfo->MinBuffers)

1 0