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

Anton Baskanov : amstream: Move initialization code from audio_stream_create into AMAudioStream::Initialize and ::JoinAMMultiMediaStream.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 8b5f9145f7cf889513a2226197086a39bf17deb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b5f9145f7cf889513a22261… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 28 02:05:48 2020 +0700 amstream: Move initialization code from audio_stream_create into AMAudioStream::Initialize and ::JoinAMMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 50 +++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 265c3bf9f2..a38cbc5f63 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -502,11 +502,24 @@ static HRESULT WINAPI audio_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, REFMSPID purpose_id, const STREAM_TYPE stream_type) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); + TRACE("stream %p, source_object %p, flags %x, purpose_id %s, stream_type %u.\n", stream, source_object, flags, + debugstr_guid(purpose_id), stream_type); - return S_FALSE; + if (!purpose_id) + return E_POINTER; + + if (source_object) + FIXME("Specifying a stream object is not yet supported.\n"); + + if (flags & AMMSF_CREATEPEER) + FIXME("AMMSF_CREATEPEER is not yet supported.\n"); + + stream->purpose_id = *purpose_id; + stream->stream_type = stream_type; + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) @@ -530,13 +543,15 @@ static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTE } static HRESULT WINAPI audio_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, - IAMMultiMediaStream *am_multi_media_stream) + IAMMultiMediaStream *mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - return S_FALSE; + stream->parent = (IMultiMediaStream *)mmstream; + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *filter) @@ -1262,12 +1277,10 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { struct audio_stream *object; + HRESULT hr; TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - if (stream_object) - FIXME("Specifying a stream object is not yet supported.\n"); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -1279,12 +1292,23 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, object->ref = 1; InitializeCriticalSection(&object->cs); - object->parent = parent; - object->purpose_id = *purpose_id; - object->stream_type = stream_type; list_init(&object->receive_queue); list_init(&object->update_queue); + hr = IAMMediaStream_Initialize(&object->IAMMediaStream_iface, stream_object, 0, purpose_id, stream_type); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } + + hr = IAMMediaStream_JoinAMMultiMediaStream(&object->IAMMediaStream_iface, (IAMMultiMediaStream *)parent); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } + *media_stream = &object->IAMMediaStream_iface; return S_OK;

1 0

Alexandre Julliard : ntdll: Move NtClose() and NtDuplicateObject() to the Unix library.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 04f41e87a369828a698f62c32cabad34ed34a3e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04f41e87a369828a698f62c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 14:21:09 2020 +0200 ntdll: Move NtClose() and NtDuplicateObject() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 35 +++------------------------ dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/server.c | 54 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 9 +++++-- 5 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c3a17f7748..aaed9abaa9 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -351,28 +351,8 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, PHANDLE dest, ACCESS_MASK access, ULONG attributes, ULONG options ) { - NTSTATUS ret; - SERVER_START_REQ( dup_handle ) - { - req->src_process = wine_server_obj_handle( source_process ); - req->src_handle = wine_server_obj_handle( source ); - req->dst_process = wine_server_obj_handle( dest_process ); - req->access = access; - req->attributes = attributes; - req->options = options; - - if (!(ret = wine_server_call( req ))) - { - if (dest) *dest = wine_server_ptr_handle( reply->handle ); - if (reply->closed && reply->self) - { - int fd = unix_funcs->server_remove_fd_from_cache( source ); - if (fd != -1) close( fd ); - } - } - } - SERVER_END_REQ; - return ret; + return unix_funcs->NtDuplicateObject( source_process, source, dest_process, + dest, access, attributes, options ); } static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) @@ -384,16 +364,7 @@ static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { - NTSTATUS ret; - int fd = unix_funcs->server_remove_fd_from_cache( handle ); - - SERVER_START_REQ( close_handle ) - { - req->handle = wine_server_obj_handle( handle ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (fd != -1) close( fd ); + NTSTATUS ret = unix_funcs->NtClose( handle ); if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4a3f101d30..dfe6b6b1ad 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -983,6 +983,8 @@ static HMODULE load_ntdll(void) */ static struct unix_funcs unix_funcs = { + NtClose, + NtDuplicateObject, get_main_args, get_paths, get_dll_path, @@ -999,7 +1001,6 @@ static struct unix_funcs unix_funcs = server_call_unlocked, wine_server_call, server_send_fd, - server_remove_fd_from_cache, server_get_unix_fd, server_fd_to_handle, server_handle_to_fd, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 8dc3f33bc8..d301da534e 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -542,9 +542,9 @@ static inline NTSTATUS get_cached_fd( HANDLE handle, int *fd, enum server_fd_typ /*********************************************************************** - * server_remove_fd_from_cache + * remove_fd_from_cache */ -int CDECL server_remove_fd_from_cache( HANDLE handle ) +static int remove_fd_from_cache( HANDLE handle ) { unsigned int entry, idx = handle_to_index( handle, &entry ); int fd = -1; @@ -1122,3 +1122,53 @@ size_t CDECL server_init_thread( void *entry_point, BOOL *suspend, unsigned int server_protocol_error( "init_thread failed with status %x\n", ret ); } } + + +/****************************************************************************** + * NtDuplicateObject + */ +NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest, + ACCESS_MASK access, ULONG attributes, ULONG options ) +{ + NTSTATUS ret; + + SERVER_START_REQ( dup_handle ) + { + req->src_process = wine_server_obj_handle( source_process ); + req->src_handle = wine_server_obj_handle( source ); + req->dst_process = wine_server_obj_handle( dest_process ); + req->access = access; + req->attributes = attributes; + req->options = options; + if (!(ret = wine_server_call( req ))) + { + if (dest) *dest = wine_server_ptr_handle( reply->handle ); + if (reply->closed && reply->self) + { + int fd = remove_fd_from_cache( source ); + if (fd != -1) close( fd ); + } + } + } + SERVER_END_REQ; + return ret; +} + + +/************************************************************************** + * NtClose + */ +NTSTATUS WINAPI NtClose( HANDLE handle ) +{ + NTSTATUS ret; + int fd = remove_fd_from_cache( handle ); + + SERVER_START_REQ( close_handle ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (fd != -1) close( fd ); + return ret; +} diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 2bf39f8537..30b130aa37 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -62,7 +62,6 @@ extern void CDECL dbg_init(void) DECLSPEC_HIDDEN; extern unsigned int CDECL server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN; -extern int CDECL server_remove_fd_from_cache( HANDLE handle ) DECLSPEC_HIDDEN; extern int CDECL server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 142e8956e7..4af2dbe31f 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -25,10 +25,16 @@ #include "wine/debug.h" /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 10 +#define NTDLL_UNIXLIB_VERSION 11 struct unix_funcs { + /* Nt* functions */ + NTSTATUS (WINAPI *NtClose)( HANDLE handle ); + NTSTATUS (WINAPI *NtDuplicateObject)( HANDLE source_process, HANDLE source, + HANDLE dest_process, HANDLE *dest, + ACCESS_MASK access, ULONG attributes, ULONG options ); + /* environment functions */ void (CDECL *get_main_args)( int *argc, char **argv[], char **envp[] ); void (CDECL *get_paths)( const char **builddir, const char **datadir, const char **configdir ); @@ -54,7 +60,6 @@ struct unix_funcs unsigned int (CDECL *server_call_unlocked)( void *req_ptr ); unsigned int (CDECL *server_call)( void *req_ptr ); void (CDECL *server_send_fd)( int fd ); - int (CDECL *server_remove_fd_from_cache)( HANDLE handle ); int (CDECL *server_get_unix_fd)( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ); NTSTATUS (CDECL *server_fd_to_handle)( int fd, unsigned int access, unsigned int attributes,

1 0

Anton Baskanov : amstream: Move initialization code from ddraw_stream_create into AMDirectDrawStream::Initialize and ::JoinAMMultiMediaStream.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: f568c47a470c7a567dfdc3c64d186f935501d47c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f568c47a470c7a567dfdc3c6… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 28 02:05:49 2020 +0700 amstream: Move initialization code from ddraw_stream_create into AMDirectDrawStream::Initialize and ::JoinAMMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 49 +++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index a4bfe948d2..8e99ea3bf5 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -198,11 +198,26 @@ static HRESULT WINAPI ddraw_IAMMediaStream_SendEndOfStream(IAMMediaStream *iface static HRESULT WINAPI ddraw_IAMMediaStream_Initialize(IAMMediaStream *iface, IUnknown *source_object, DWORD flags, REFMSPID purpose_id, const STREAM_TYPE stream_type) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + HRESULT hr; - FIXME("(%p/%p)->(%p,%x,%p,%u) stub!\n", This, iface, source_object, flags, purpose_id, stream_type); + TRACE("stream %p, source_object %p, flags %x, purpose_id %s, stream_type %u.\n", stream, source_object, flags, + debugstr_guid(purpose_id), stream_type); - return S_FALSE; + if (!purpose_id) + return E_POINTER; + + if (flags & AMMSF_CREATEPEER) + FIXME("AMMSF_CREATEPEER is not yet supported.\n"); + + stream->purpose_id = *purpose_id; + stream->stream_type = stream_type; + + if (source_object + && FAILED(hr = IUnknown_QueryInterface(source_object, &IID_IDirectDraw7, (void **)&stream->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + + return S_OK; } static HRESULT WINAPI ddraw_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) @@ -214,13 +229,15 @@ static HRESULT WINAPI ddraw_IAMMediaStream_SetState(IAMMediaStream *iface, FILTE return S_FALSE; } -static HRESULT WINAPI ddraw_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *am_multi_media_stream) +static HRESULT WINAPI ddraw_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, IAMMultiMediaStream *mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); + + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, am_multi_media_stream); + stream->parent = (IMultiMediaStream *)mmstream; - return S_FALSE; + return S_OK; } static HRESULT WINAPI ddraw_IAMMediaStream_JoinFilter(IAMMediaStream *iface, IMediaStreamFilter *filter) @@ -929,13 +946,19 @@ HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, InitializeCriticalSection(&object->cs); - object->parent = parent; - object->purpose_id = *purpose_id; - object->stream_type = stream_type; + hr = IAMMediaStream_Initialize(&object->IAMMediaStream_iface, stream_object, 0, purpose_id, stream_type); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } - if (stream_object - && FAILED(hr = IUnknown_QueryInterface(stream_object, &IID_IDirectDraw7, (void **)&object->ddraw))) - FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + hr = IAMMediaStream_JoinAMMultiMediaStream(&object->IAMMediaStream_iface, (IAMMultiMediaStream *)parent); + if (FAILED(hr)) + { + IAMMediaStream_Release(&object->IAMMediaStream_iface); + return hr; + } *media_stream = &object->IAMMediaStream_iface;

1 0

Zebediah Figura : d3dcompiler: Rename HLSL_IR_DEREF to HLSL_IR_LOAD.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 09fcfe27ac7ffb15792f76615d63667393c5fbca URL: https://source.winehq.org/git/wine.git/?a=commit;h=09fcfe27ac7ffb15792f7661… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 15:45:30 2020 -0500 d3dcompiler: Rename HLSL_IR_DEREF to HLSL_IR_LOAD. 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/d3dcompiler_private.h | 10 ++-- dlls/d3dcompiler_43/hlsl.y | 97 +++++++++++++++---------------- dlls/d3dcompiler_43/utils.c | 18 +++--- 3 files changed, 62 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09fcfe27ac7ffb15792f…

1 0

Zebediah Figura : d3dcompiler: Store derefs as an offset to a variable.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 323be6c51556ab6cea405694cc09e44616618858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=323be6c51556ab6cea405694… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 15:45:29 2020 -0500 d3dcompiler: Store derefs as an offset to a variable. 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/d3dcompiler_private.h | 24 +----- dlls/d3dcompiler_43/hlsl.y | 131 ++++++++++++++++-------------- dlls/d3dcompiler_43/utils.c | 76 +++-------------- 3 files changed, 86 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=323be6c51556ab6cea40…

1 0

Rémi Bernon : ntdll: Introduce free_ranges indexing sequence.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: eb716839e1533fdba3614ac57bbc9de8639650f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb716839e1533fdba3614ac5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 29 20:11:18 2020 +0200 ntdll: Introduce free_ranges indexing sequence. This is an ordered range sequence used to keep track of free address ranges. The sequence contains an entry for every free address range, with base pointing to the first free address and end pointing to the next first used address. It is initialized to [0, ~0] for convenience, so that there's always a range before or after a view. In the worst case scenario, where memory is entirely fragmented, there's going to be one more range than allocated views, but in general there's much less. In any case, because of cache locality, iterating in the contiguous sequence is much faster than traversing the view rbtree. In theory there can be a performance hit when allocating or deleting a view, as we may have to move the end of the sequence when a range is split or merged. But in practice and given the usually low number of ranges, this is not an issue. The default and maximum sequence size can hold up to 65536 ranges, which is much more than enough in general, and performance is probably going to be bad before reaching the limit anyway. The code currently asserts when reaching the limit, although we could possibly grow the sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 183 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0ba46c35ac..e4da11902a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -195,6 +195,177 @@ static void *preload_reserve_end; static BOOL use_locks; static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */ +struct range_entry +{ + void *base; + void *end; +}; + +static struct range_entry *free_ranges; +static struct range_entry *free_ranges_end; + + +/*********************************************************************** + * free_ranges_lower_bound + * + * Returns the first range whose end is not less than addr, or end if there's none. + */ +static struct range_entry *free_ranges_lower_bound( void *addr ) +{ + struct range_entry *begin = free_ranges; + struct range_entry *end = free_ranges_end; + struct range_entry *mid; + + while (begin < end) + { + mid = begin + (end - begin) / 2; + if (mid->end < addr) + begin = mid + 1; + else + end = mid; + } + + return begin; +} + + +/*********************************************************************** + * free_ranges_insert_view + * + * Updates the free_ranges after a new view has been created. + */ +static void free_ranges_insert_view( struct file_view *view ) +{ + void *view_base = ROUND_ADDR( view->base, granularity_mask ); + void *view_end = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask ); + struct range_entry *range = free_ranges_lower_bound( view_base ); + struct range_entry *next = range + 1; + + /* free_ranges initial value is such that the view is either inside range or before another one. */ + assert( range != free_ranges_end ); + assert( range->end > view_base || next != free_ranges_end ); + + /* this happens because virtual_alloc_thread_stack shrinks a view, then creates another one on top, + * or because AT_ROUND_TO_PAGE was used with NtMapViewOfSection to force 4kB aligned mapping. */ + if ((range->end > view_base && range->base >= view_end) || + (range->end == view_base && next->base >= view_end)) + { + /* on Win64, assert that it's correctly aligned so we're not going to be in trouble later */ + assert( (!is_win64 && !is_wow64) || view->base == view_base ); + WARN( "range %p - %p is already mapped\n", view_base, view_end ); + return; + } + + /* this should never happen */ + if (range->base > view_base || range->end < view_end) + ERR( "range %p - %p is already partially mapped\n", view_base, view_end ); + assert( range->base <= view_base && range->end >= view_end ); + + /* need to split the range in two */ + if (range->base < view_base && range->end > view_end) + { + memmove( next + 1, next, (free_ranges_end - next) * sizeof(struct range_entry) ); + free_ranges_end += 1; + if ((char *)free_ranges_end - (char *)free_ranges > view_block_size) + MESSAGE( "Free range sequence is full, trouble ahead!\n" ); + assert( (char *)free_ranges_end - (char *)free_ranges <= view_block_size ); + + next->base = view_end; + next->end = range->end; + range->end = view_base; + } + else + { + /* otherwise we just have to shrink it */ + if (range->base < view_base) + range->end = view_base; + else + range->base = view_end; + + if (range->base < range->end) return; + + /* and possibly remove it if it's now empty */ + memmove( range, next, (free_ranges_end - next) * sizeof(struct range_entry) ); + free_ranges_end -= 1; + assert( free_ranges_end - free_ranges > 0 ); + } +} + + +/*********************************************************************** + * free_ranges_remove_view + * + * Updates the free_ranges after a view has been destroyed. + */ +static void free_ranges_remove_view( struct file_view *view ) +{ + void *view_base = ROUND_ADDR( view->base, granularity_mask ); + void *view_end = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask ); + struct range_entry *range = free_ranges_lower_bound( view_base ); + struct range_entry *next = range + 1; + + /* It's possible to use AT_ROUND_TO_PAGE on 32bit with NtMapViewOfSection to force 4kB alignment, + * and this breaks our assumptions. Look at the views around to check if the range is still in use. */ +#ifndef _WIN64 + struct file_view *prev_view = WINE_RB_ENTRY_VALUE( wine_rb_prev( &view->entry ), struct file_view, entry ); + struct file_view *next_view = WINE_RB_ENTRY_VALUE( wine_rb_next( &view->entry ), struct file_view, entry ); + void *prev_view_base = prev_view ? ROUND_ADDR( prev_view->base, granularity_mask ) : NULL; + void *prev_view_end = prev_view ? ROUND_ADDR( (char *)prev_view->base + prev_view->size + granularity_mask, granularity_mask ) : NULL; + void *next_view_base = next_view ? ROUND_ADDR( next_view->base, granularity_mask ) : NULL; + void *next_view_end = next_view ? ROUND_ADDR( (char *)next_view->base + next_view->size + granularity_mask, granularity_mask ) : NULL; + + if ((prev_view_base < view_end && prev_view_end > view_base) || + (next_view_base < view_end && next_view_end > view_base)) + { + WARN( "range %p - %p is still mapped\n", view_base, view_end ); + return; + } +#endif + + /* free_ranges initial value is such that the view is either inside range or before another one. */ + assert( range != free_ranges_end ); + assert( range->end > view_base || next != free_ranges_end ); + + /* this should never happen, but we can safely ignore it */ + if (range->base <= view_base && range->end >= view_end) + { + WARN( "range %p - %p is already unmapped\n", view_base, view_end ); + return; + } + + /* this should never happen */ + if (range->base < view_end && range->end > view_base) + ERR( "range %p - %p is already partially unmapped\n", view_base, view_end ); + assert( range->end <= view_base || range->base >= view_end ); + + /* merge with next if possible */ + if (range->end == view_base && next->base == view_end) + { + range->end = next->end; + memmove( next, next + 1, (free_ranges_end - next - 1) * sizeof(struct range_entry) ); + free_ranges_end -= 1; + assert( free_ranges_end - free_ranges > 0 ); + } + /* or try growing the range */ + else if (range->end == view_base) + range->end = view_end; + else if (range->base == view_end) + range->base = view_base; + /* otherwise create a new one */ + else + { + memmove( range + 1, range, (free_ranges_end - range) * sizeof(struct range_entry) ); + free_ranges_end += 1; + if ((char *)free_ranges_end - (char *)free_ranges > view_block_size) + MESSAGE( "Free range sequence is full, trouble ahead!\n" ); + assert( (char *)free_ranges_end - (char *)free_ranges <= view_block_size ); + + range->base = view_base; + range->end = view_end; + } +} + + static inline int is_view_valloc( const struct file_view *view ) { return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)); @@ -833,6 +1004,8 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); set_page_vprot( view->base, view->size, 0 ); + if (unix_funcs->mmap_is_in_reserved_area( view->base, view->size )) + free_ranges_remove_view( view ); wine_rb_remove( &views_tree, &view->entry ); *(struct file_view **)view = next_free_view; next_free_view = view; @@ -880,6 +1053,8 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz set_page_vprot( base, size, vprot ); wine_rb_put( &views_tree, view->base, &view->entry ); + if (unix_funcs->mmap_is_in_reserved_area( view->base, view->size )) + free_ranges_insert_view( view ); *view_ret = view; @@ -1981,9 +2156,9 @@ void virtual_init(void) /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_views.size = view_block_size + pages_vprot_size * sizeof(*pages_vprot); + alloc_views.size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_views.size = view_block_size + (1U << (32 - page_shift)); + alloc_views.size = 2 * view_block_size + (1U << (32 - page_shift)); #endif if (unix_funcs->mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) unix_funcs->mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); @@ -1993,9 +2168,14 @@ void virtual_init(void) assert( alloc_views.base != (void *)-1 ); view_block_start = alloc_views.base; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); - pages_vprot = (void *)((char *)alloc_views.base + view_block_size); + free_ranges = (void *)((char *)alloc_views.base + view_block_size); + pages_vprot = (void *)((char *)alloc_views.base + 2 * view_block_size); wine_rb_init( &views_tree, compare_view ); + free_ranges[0].base = (void *)0; + free_ranges[0].end = (void *)~0; + free_ranges_end = free_ranges + 1; + /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000; if (size && unix_funcs->mmap_is_in_reserved_area( (void*)0x10000, size ) == 1)

1 0

Henri Verbeet : include: Use standard 64-bit types.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: vkd3d Branch: master Commit: 3ec487d93a3e726475bfbb388198faccd54d2d85 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ec487d93a3e726475bfbb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 16:37:30 2020 +0430 include: Use standard 64-bit types. In particular, we want these to be consistent with PRIx64. On 64-bit macOS, that's "llx". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7d63ead..ad2f08a 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -33,8 +33,11 @@ #if !defined(_WIN32) || defined(__WIDL__) -# if !defined(__WIDL__) && !defined(VKD3D_WIN32_WCHAR) -# include <wchar.h> +# if !defined(__WIDL__) +# if !defined(VKD3D_WIN32_WCHAR) +# include <wchar.h> +# endif +# include <stdint.h> # endif # ifdef __GNUC__ @@ -79,12 +82,12 @@ typedef short INT16; typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; -# if defined(__x86_64__) || defined(__WIDL__) -typedef long INT64; -typedef unsigned long UINT64; +# if defined(__WIDL__) +typedef __int64 INT64; +typedef unsigned __int64 UINT64; # else -typedef long long DECLSPEC_ALIGN(8) INT64; -typedef unsigned long long DECLSPEC_ALIGN(8) UINT64; +typedef int64_t DECLSPEC_ALIGN(8) INT64; +typedef uint64_t DECLSPEC_ALIGN(8) UINT64; # endif typedef long LONG_PTR; typedef unsigned long ULONG_PTR;

1 0