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

Zebediah Figura : d3dcompiler: Rename HLSL_IR_DEREF to HLSL_IR_LOAD.
by Alexandre Julliard 01 Jun '20

01 Jun '20

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

Alexandre Julliard : ntdll: Move NtClose() and NtDuplicateObject() to the Unix library.
by Alexandre Julliard 01 Jun '20

01 Jun '20

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

Alexandre Julliard : ntdll: Add missing server_init_process_done() call.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 704975f58d7947721f530d202022721c16df466a URL: https://source.winehq.org/git/wine.git/?a=commit;h=704975f58d7947721f530d20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 17:31:45 2020 +0200 ntdll: Add missing server_init_process_done() call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49295 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ed4e3f2553..ada5e16d4e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -722,6 +722,8 @@ void server_init_process_done(void) NTSTATUS status; int suspend; + unix_funcs->server_init_process_done(); + /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that * is sent by REQ_INIT_PROCESS_DONE.

1 0

Anton Baskanov : amstream: Move initialization code from audio_stream_create into AMAudioStream::Initialize and ::JoinAMMultiMediaStream.
by Alexandre Julliard 01 Jun '20

01 Jun '20

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

Anton Baskanov : amstream: Move initialization code from ddraw_stream_create into AMDirectDrawStream::Initialize and ::JoinAMMultiMediaStream.
by Alexandre Julliard 01 Jun '20

01 Jun '20

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

Anton Baskanov : amstream: Move initialization calls from *_stream_create into AMMultiMediaStream::AddMediaStream.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 5eb568354cc6eddc6653cbf7ed53606ae8b488fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb568354cc6eddc6653cbf7… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 28 02:05:50 2020 +0700 amstream: Move initialization calls from *_stream_create into AMMultiMediaStream::AddMediaStream. 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/amstream_private.h | 6 ++---- dlls/amstream/audiostream.c | 23 +++++------------------ dlls/amstream/ddrawstream.c | 23 +++++------------------ dlls/amstream/multimedia.c | 18 +++++++++++++----- dlls/amstream/tests/amstream.c | 2 +- 5 files changed, 26 insertions(+), 46 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index bec107f819..e71563cb11 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -37,9 +37,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - IUnknown *stream_object, STREAM_TYPE type, IAMMediaStream **stream) DECLSPEC_HIDDEN; -HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; +HRESULT ddraw_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; +HRESULT audio_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a38cbc5f63..f9470fa5f9 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1273,13 +1273,12 @@ static const IMemInputPinVtbl audio_meminput_vtbl = audio_meminput_ReceiveCanBlock, }; -HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) +HRESULT audio_stream_create(IUnknown *outer, void **out) { struct audio_stream *object; - HRESULT hr; - TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); + if (outer) + return CLASS_E_NOAGGREGATION; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1295,21 +1294,9 @@ HRESULT audio_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, 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; - } + TRACE("Created audio stream %p.\n", object); - *media_stream = &object->IAMMediaStream_iface; + *out = &object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 8e99ea3bf5..1c924e40a2 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -926,13 +926,12 @@ static const IMemInputPinVtbl ddraw_meminput_vtbl = ddraw_meminput_ReceiveCanBlock, }; -HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) +HRESULT ddraw_stream_create(IUnknown *outer, void **out) { struct ddraw_stream *object; - HRESULT hr; - TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); + if (outer) + return CLASS_E_NOAGGREGATION; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -946,21 +945,9 @@ HRESULT ddraw_stream_create(IMultiMediaStream *parent, const MSPID *purpose_id, InitializeCriticalSection(&object->cs); - 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; - } + TRACE("Created ddraw stream %p.\n", object); - *media_stream = &object->IAMMediaStream_iface; + *out = &object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index be8fd4ecbf..e77392e483 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -301,6 +301,7 @@ static HRESULT WINAPI multimedia_stream_GetFilter(IAMMultiMediaStream *iface, static void add_stream(struct multimedia_stream *mmstream, IAMMediaStream *stream, IMediaStream **ret_stream) { IMediaStreamFilter_AddMediaStream(mmstream->filter, stream); + IAMMediaStream_JoinAMMultiMediaStream(stream, &mmstream->IAMMultiMediaStream_iface); if (ret_stream) { *ret_stream = (IMediaStream *)stream; @@ -377,19 +378,26 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac } if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) - hr = ddraw_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream); + hr = ddraw_stream_create(NULL, (void **)&pStream); else if (IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) - hr = audio_stream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->type, &pStream); + hr = audio_stream_create(NULL, (void **)&pStream); else return MS_E_PURPOSEID; - if (SUCCEEDED(hr)) + if (FAILED(hr)) + return hr; + + hr = IAMMediaStream_Initialize(pStream, stream_object, dwFlags, PurposeId, This->type); + if (FAILED(hr)) { - add_stream(This, pStream, ret_stream); IAMMediaStream_Release(pStream); + return hr; } - return hr; + add_stream(This, pStream, ret_stream); + IAMMediaStream_Release(pStream); + + return S_OK; } static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 073e372c94..13c00aac25 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -730,7 +730,7 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); if (hr == S_OK) IMediaStream_Release(stream); - todo_wine ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); + ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n");

1 0

Henri Verbeet : include: Use standard 64-bit types.
by Alexandre Julliard 01 Jun '20

01 Jun '20

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