March 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : winebuild: Specify the correct linker emulation for Windows platforms.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: b9c5bac673aa1a4c4e6fcb6ef65f2ce3e04db021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9c5bac673aa1a4c4e6fcb6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:40:23 2019 +0100 winebuild: Specify the correct linker emulation for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index fa9169b..beff2ab 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -449,6 +449,9 @@ struct strarray get_ld_command(void) case PLATFORM_FREEBSD: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; + case PLATFORM_WINDOWS: + strarray_add( &args, "-m", (force_pointer_size == 8) ? "i386pep" : "i386pe", NULL ); + break; default: switch(target_cpu) {

1 0

Michael Stefaniuc : msacm32: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: a3af167373b9fd21e74a556a08ca90acfba0fb9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3af167373b9fd21e74a556a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 6 00:02:32 2019 +0100 msacm32: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd..13187b2 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,8 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) - HeapFree(MSACM_hHeap, 0, pad); + HeapFree(MSACM_hHeap, 0, pad); return ret; }

1 0

Paul Gofman : ntdll: Mark 'float_status' as input operand in save_fpu().
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: bd9cdb3b65dcb07cd6ae645b9d9ce8f6f0d1383e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9cdb3b65dcb07cd6ae645b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 6 14:09:33 2019 +0300 ntdll: Mark 'float_status' as input operand in save_fpu(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f1deb1c..053c87d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -879,7 +879,7 @@ static inline void save_fpu( CONTEXT *context ) memcpy(&float_status, &context->FloatSave, sizeof(float_status)); float_status.StatusWord &= float_status.ControlWord | 0xffffff80; - __asm__ __volatile__( "fldenv %0" : "=m" (float_status) ); + __asm__ __volatile__( "fldenv %0" : : "m" (float_status) ); #endif }

1 0

Jacek Caban : mshtml: Don't store NSContainer in nsWineURI.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 842207e260a446140d92565d4550af9d7a520c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842207e260a446140d92565d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 6 12:46:56 2019 +0100 mshtml: Don't store NSContainer in nsWineURI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 59 +++++++++--------------------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 63038d2..d818889 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -57,7 +57,6 @@ struct nsWineURI { LONG ref; - NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; IUri *uri; @@ -157,7 +156,7 @@ static HRESULT combine_url(IUri *base_uri, const WCHAR *rel_url, IUri **ret) return hres; } -static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLOuterWindow*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -305,7 +304,7 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post if(window->uri_nofrag) { nsWineURI *referrer_uri; - nsres = create_nsuri(window->uri_nofrag, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, NULL, &referrer_uri); + nsres = create_nsuri(window->uri_nofrag, window, NULL, &referrer_uri); if(NS_SUCCEEDED(nsres)) { nsres = nsIDocShellLoadInfo_SetReferrer(load_info, (nsIURI*)&referrer_uri->nsIFileURL_iface); assert(nsres == NS_OK); @@ -330,20 +329,6 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post return S_OK; } -static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) -{ - if(This->container) { - if(This->container == nscontainer) - return; - TRACE("Changing %p -> %p\n", This->container, nscontainer); - nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - } - - if(nscontainer) - nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface); - This->container = nscontainer; -} - static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window) { if(This->window_ref) { @@ -356,9 +341,6 @@ static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window) if(window) { windowref_addref(window->window_ref); This->window_ref = window->window_ref; - - if(window->doc_obj) - set_uri_nscontainer(This, window->doc_obj->nscontainer); }else { This->window_ref = NULL; } @@ -1115,22 +1097,8 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->is_doc_uri) { window = get_channel_window(This); - if(window) { + if(window) set_uri_window(This->uri, window); - }else if(This->uri->container) { - BOOL b; - - /* nscontainer->doc should be NULL which means navigation to a new window */ - if(This->uri->container->doc) - FIXME("nscontainer->doc = %p\n", This->uri->container->doc); - - nsres = before_async_open(This, This->uri->container, &b); - if(NS_FAILED(nsres)) - return nsres; - if(b) - FIXME("Navigation not cancelled\n"); - return NS_ERROR_UNEXPECTED; - } } if(!window) { @@ -2356,8 +2324,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) if(!ref) { if(This->window_ref) windowref_release(This->window_ref); - if(This->container) - nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); if(This->uri_builder) @@ -2860,7 +2826,7 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) return NS_ERROR_UNEXPECTED; nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, - This->container, This->origin_charset, &wine_uri); + This->origin_charset, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -3042,7 +3008,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->origin_charset, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { @@ -3438,7 +3404,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_SetDefaultPort }; -static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, +static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, const char *origin_charset, nsWineURI **_retval) { nsWineURI *ret; @@ -3453,7 +3419,6 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c ret->ref = 1; ret->is_mutable = TRUE; - set_uri_nscontainer(ret, container); set_uri_window(ret, window); IUri_AddRef(iuri); @@ -3481,8 +3446,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) nsWineURI *uri; nsresult nsres; - nsres = create_nsuri(iuri, window, window->doc_obj ? window->doc_obj->nscontainer : NULL, - NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3533,7 +3497,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, window, NULL, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3909,7 +3873,7 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(FAILED(hres)) return NS_SUCCESS_DEFAULT_ACTION; - nsres = create_nsuri(urlmon_uri, window, NULL, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); @@ -4025,11 +3989,6 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, cpp_bool *_ret if(!wine_uri->is_doc_uri) { wine_uri->is_doc_uri = TRUE; - if(!wine_uri->container) { - nsIWebBrowserChrome_AddRef(&nscontainer->nsIWebBrowserChrome_iface); - wine_uri->container = nscontainer; - } - if(nscontainer->doc) *_retval = translate_url(nscontainer->doc, wine_uri); }

1 0

Nikolay Sivov : mfplat: Fix potential invalid memory access (Coverity).
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: cb4d45adfd4b82ef4fc24cd7860f0c6d5e36b080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4d45adfd4b82ef4fc24cd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:11 2019 +0300 mfplat: Fix potential invalid memory access (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 1b9ef38..96dd6de 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -185,6 +185,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) MFASYNC_WORKQUEUE_TYPE queue_type; struct queue_handle *entry; + *ret = NULL; + if (!system_queues[SYS_QUEUE_STANDARD].pool) return MF_E_SHUTDOWN;

1 0

Nikolay Sivov : mfplat: Fix a leak on error path (Coverity).
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 3fb0b48e1ea85beab3656abf4f3f8b9c842445bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb0b48e1ea85beab3656abf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:12 2019 +0300 mfplat: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 96dd6de..408526f 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -577,6 +577,8 @@ static HRESULT alloc_user_queue(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue_ else { LeaveCriticalSection(&queues_section); + heap_free(queue); + WARN("Out of user queue handles.\n"); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : mfplat: Add a stub for system time source.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 58a93786e260586b6b92a0a4e197ed5c43a1513b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58a93786e260586b6b92a0a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:13 2019 +0300 mfplat: Add a stub for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 34 +++++++ include/mfidl.idl | 8 ++ 4 files changed, 258 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58a93786e260586b6b92…

1 0

Nikolay Sivov : mfplat: Implement time source state changes.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 3865a8c9d5633b9f9c71ed39ab74aba6308f31cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3865a8c9d5633b9f9c71ed39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:14 2019 +0300 mfplat: Implement time source state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 112 +++++++++++++++++++++++++++++++++++++++------ dlls/mfplat/tests/mfplat.c | 65 +++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4ce97b1..6bec418 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1,5 +1,4 @@ /* - * * Copyright 2014 Austin English * * This library is free software; you can redistribute it and/or @@ -44,6 +43,8 @@ struct system_time_source IMFPresentationTimeSource IMFPresentationTimeSource_iface; IMFClockStateSink IMFClockStateSink_iface; LONG refcount; + MFCLOCK_STATE state; + CRITICAL_SECTION cs; }; static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) @@ -3085,7 +3086,10 @@ static ULONG WINAPI system_time_source_Release(IMFPresentationTimeSource *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + DeleteCriticalSection(&source->cs); heap_free(source); + } return refcount; } @@ -3120,9 +3124,15 @@ static HRESULT WINAPI system_time_source_GetContinuityKey(IMFPresentationTimeSou static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *iface, DWORD reserved, MFCLOCK_STATE *state) { - FIXME("%p, %#x, %p.\n", iface, reserved, state); + struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p.\n", iface, reserved, state); + + EnterCriticalSection(&source->cs); + *state = source->state; + LeaveCriticalSection(&source->cs); + + return S_OK; } static HRESULT WINAPI system_time_source_GetProperties(IMFPresentationTimeSource *iface, MFCLOCK_PROPERTIES *props) @@ -3170,32 +3180,107 @@ static ULONG WINAPI system_time_source_sink_Release(IMFClockStateSink *iface) return IMFPresentationTimeSource_Release(&source->IMFPresentationTimeSource_iface); } -static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, LONGLONG start_offset) +enum clock_command { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + CLOCK_CMD_START = 0, + CLOCK_CMD_STOP, + CLOCK_CMD_PAUSE, + CLOCK_CMD_RESTART, + CLOCK_CMD_MAX, +}; - return E_NOTIMPL; +static HRESULT system_time_source_change_state(struct system_time_source *source, enum clock_command command) +{ + static const BYTE state_change_is_allowed[MFCLOCK_STATE_PAUSED+1][CLOCK_CMD_MAX] = + { /* S S* P R */ + /* INVALID */ { 1, 0, 1, 0 }, + /* RUNNING */ { 1, 1, 1, 0 }, + /* STOPPED */ { 1, 1, 0, 0 }, + /* PAUSED */ { 1, 1, 0, 1 }, + }; + static const MFCLOCK_STATE states[CLOCK_CMD_MAX] = + { + /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, + /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, + /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + /* CLOCK_CMD_RESTART */ MFCLOCK_STATE_RUNNING, + }; + + /* Special case that go against usual state change vs return value behavior. */ + if (source->state == MFCLOCK_STATE_INVALID && command == CLOCK_CMD_STOP) + return S_OK; + + if (!state_change_is_allowed[source->state][command]) + return MF_E_INVALIDREQUEST; + + source->state = states[command]; + + return S_OK; +} + +static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *iface, MFTIME system_time, + LONGLONG start_offset) +{ + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; + + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_START); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_STOP); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME system_time) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + struct system_time_source *source = impl_from_IMFClockStateSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + + EnterCriticalSection(&source->cs); + hr = system_time_source_change_state(source, CLOCK_CMD_RESTART); + LeaveCriticalSection(&source->cs); + + /* FIXME: update timestamps */ + + return hr; } static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME system_time, float rate) @@ -3226,13 +3311,14 @@ HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source) TRACE("%p.\n", time_source); - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFPresentationTimeSource_iface.lpVtbl = &systemtimesourcevtbl; object->IMFClockStateSink_iface.lpVtbl = &systemtimesourcesinkvtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); *time_source = &object->IMFPresentationTimeSource_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cb3f2a9..c4685a3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1598,11 +1598,46 @@ static void test_presentation_descriptor(void) IMFMediaType_Release(media_type); } +enum clock_action +{ + CLOCK_START, + CLOCK_STOP, + CLOCK_PAUSE, + CLOCK_RESTART, +}; + static void test_system_time_source(void) { + static const struct clock_state_test + { + enum clock_action action; + MFCLOCK_STATE state; + BOOL is_invalid; + } + clock_state_change[] = + { + { CLOCK_STOP, MFCLOCK_STATE_INVALID }, + { CLOCK_RESTART, MFCLOCK_STATE_INVALID, TRUE }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, TRUE }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_RESTART, MFCLOCK_STATE_STOPPED, TRUE }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING, TRUE }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_START, MFCLOCK_STATE_RUNNING }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING }, + { CLOCK_RESTART, MFCLOCK_STATE_RUNNING, TRUE }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, TRUE }, + }; IMFPresentationTimeSource *time_source; IMFClockStateSink *statesink; MFCLOCK_STATE state; + unsigned int i; DWORD value; HRESULT hr; @@ -1620,12 +1655,38 @@ static void test_system_time_source(void) ok(value == 0, "Unexpected value %u.\n", value); hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); -todo_wine { ok(hr == S_OK, "Failed to get state, hr %#x.\n", hr); ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); -} + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&statesink); ok(hr == S_OK, "Failed to get state sink, hr %#x.\n", hr); + + /* State changes. */ + for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) + { + switch (clock_state_change[i].action) + { + case CLOCK_STOP: + hr = IMFClockStateSink_OnClockStop(statesink, 0); + break; + case CLOCK_RESTART: + hr = IMFClockStateSink_OnClockRestart(statesink, 0); + break; + case CLOCK_PAUSE: + hr = IMFClockStateSink_OnClockPause(statesink, 0); + break; + case CLOCK_START: + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + break; + default: + ; + } + ok(hr == (clock_state_change[i].is_invalid ? MF_E_INVALIDREQUEST : S_OK), "%u: unexpected hr %#x.\n", i, hr); + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].state, "%u: unexpected state %d.\n", i, state); + } + IMFClockStateSink_Release(statesink); IMFPresentationTimeSource_Release(time_source);

1 0

Nikolay Sivov : include: Define MFT category GUIDs.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 2ed529ca6db582be58fcff489c99a53d35782139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ed529ca6db582be58fcff48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 6 12:42:15 2019 +0300 include: Define MFT category GUIDs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 -- include/mfapi.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c4685a3..2f4db9b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -55,8 +55,6 @@ DEFINE_GUID(MF_BYTESTREAM_CONTENT_TYPE, 0xfc358289,0x3cb6,0x460c,0xa4,0x24,0xb6, DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); -DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); - DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); diff --git a/include/mfapi.h b/include/mfapi.h index 4062e2f..0c51627 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -76,6 +76,10 @@ typedef enum _EAllocationType eAllocationTypeIgnore } EAllocationType; +#ifdef MF_INIT_GUIDS +#include <initguid.h> +#endif + DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); @@ -86,6 +90,17 @@ DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0 DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(MFT_CATEGORY_VIDEO_DECODER, 0xd6c02d4b, 0x6833, 0x45b4, 0x97, 0x1a, 0x05, 0xa4, 0xb0, 0x4b, 0xab, 0x91); +DEFINE_GUID(MFT_CATEGORY_VIDEO_ENCODER, 0xf79eac7d, 0xe545, 0x4387, 0xbd, 0xee, 0xd6, 0x47, 0xd7, 0xbd, 0xe4, 0x2a); +DEFINE_GUID(MFT_CATEGORY_VIDEO_EFFECT, 0x12e17c21, 0x532c, 0x4a6e, 0x8a, 0x1c, 0x40, 0x82, 0x5a, 0x73, 0x63, 0x97); +DEFINE_GUID(MFT_CATEGORY_MULTIPLEXER, 0x059c561e, 0x05ae, 0x4b61, 0xb6, 0x9d, 0x55, 0xb6, 0x1e, 0xe5, 0x4a, 0x7b); +DEFINE_GUID(MFT_CATEGORY_DEMULTIPLEXER, 0xa8700a7a, 0x939b, 0x44c5, 0x99, 0xd7, 0x76, 0x22, 0x6b, 0x23, 0xb3, 0xf1); +DEFINE_GUID(MFT_CATEGORY_AUDIO_DECODER, 0x9ea73fb4, 0xef7a, 0x4559, 0x8d, 0x5d, 0x71, 0x9d, 0x8f, 0x04, 0x26, 0xc7); +DEFINE_GUID(MFT_CATEGORY_AUDIO_ENCODER, 0x91c64bd0, 0xf91e, 0x4d8c, 0x92, 0x76, 0xdb, 0x24, 0x82, 0x79, 0xd9, 0x75); +DEFINE_GUID(MFT_CATEGORY_AUDIO_EFFECT, 0x11064c48, 0x3648, 0x4ed0, 0x93, 0x2e, 0x05, 0xce, 0x8a, 0xc8, 0x11, 0xb7); +DEFINE_GUID(MFT_CATEGORY_VIDEO_PROCESSOR, 0x302ea3fc, 0xaa5f, 0x47f9, 0x9f, 0x7a, 0xc2, 0x18, 0x8b, 0xb1, 0x63, 0x02); +DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57, 0xb7ea, 0x4901, 0xae, 0xb3, 0x93, 0x3a, 0x87, 0x47, 0x75, 0x6f); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum

1 0

Andrew Eikum : user32: GetRawInputDeviceInfo uses characters for RIDI_DEVICENAME size.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: d1b19a2d0acad40ab8786f5d75c0cebd52ae6cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b19a2d0acad40ab8786f5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 6 08:21:32 2019 -0600 user32: GetRawInputDeviceInfo uses characters for RIDI_DEVICENAME size. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 41 +++++++++++++++++++++++++++--------- dlls/user32/tests/input.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index b247c15..2085fd3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -329,16 +329,37 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, */ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) { - UINT ret; - TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); - ret = GetRawInputDeviceInfoW(device, command, data, data_size); - if (command == RIDI_DEVICENAME && ret && ret != ~0U) - ret = WideCharToMultiByte(CP_ACP, 0, data, -1, data, *data_size, NULL, NULL); + /* RIDI_DEVICENAME data_size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, nameW_sz; - return ret; + if (!data_size) return ~0U; + + nameW_sz = *data_size; + + if (data && nameW_sz > 0) + nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); + else + nameW = NULL; + + ret = GetRawInputDeviceInfoW(device, command, nameW, &nameW_sz); + + if (ret && ret != ~0U) + WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); + + *data_size = nameW_sz; + + HeapFree(GetProcessHeap(), 0, nameW); + + return ret; + } + + return GetRawInputDeviceInfoW(device, command, data, data_size); } /*********************************************************************** @@ -366,18 +387,18 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: if (device == WINE_MOUSE_HANDLE) { - s = sizeof(mouse_name); + s = ARRAY_SIZE(mouse_name); name = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = sizeof(keyboard_name); + s = ARRAY_SIZE(keyboard_name); name = keyboard_name; } else { hid_device = device; - s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + s = strlenW(hid_device->path) + 1; name = hid_device->path; } break; @@ -402,7 +423,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT if (command == RIDI_DEVICENAME) { - memcpy(data, name, s); + memcpy(data, name, s * sizeof(WCHAR)); return s; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 835dfb1..625de3d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -80,6 +80,8 @@ static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); +static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); +static UINT (WINAPI *pGetRawInputDeviceInfoA) (HANDLE, UINT, void *, UINT *); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -164,6 +166,8 @@ static void init_function_pointers(void) GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetRawInputDeviceList); + GET_PROC(GetRawInputDeviceInfoW); + GET_PROC(GetRawInputDeviceInfoA); #undef GET_PROC } @@ -1555,7 +1559,7 @@ static void test_GetMouseMovePointsEx(void) static void test_GetRawInputDeviceList(void) { RAWINPUTDEVICELIST devices[32]; - UINT ret, oret, devcount, odevcount; + UINT ret, oret, devcount, odevcount, i; DWORD err; SetLastError(0xdeadbeef); @@ -1587,6 +1591,53 @@ static void test_GetRawInputDeviceList(void) ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); + for(i = 0; i < devcount; ++i) + { + WCHAR name[128]; + char nameA[128]; + UINT sz, len; + RID_DEVICE_INFO info; + + /* get required buffer size */ + name[0] = '\0'; + sz = 5; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz > 5 && sz < ARRAY_SIZE(name), "Size should have been set and not too large (got: %u)\n", sz); + + /* buffer size for RIDI_DEVICENAME is in CHARs, not BYTEs */ + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %d\n", err); + len = lstrlenW(name); + ok(len + 1 == ret, "GetRawInputDeviceInfo returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* test A variant with same size */ + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICENAME, nameA, &sz); + ok(ret == sz, "GetRawInputDeviceInfoA gave wrong return: %d\n", err); + len = strlen(nameA); + ok(len + 1 == ret, "GetRawInputDeviceInfoA returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* buffer size for RIDI_DEVICEINFO is in BYTEs */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + sz = sizeof(info) - 1; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + } + /* check if variable changes from larger to smaller value */ devcount = odevcount = ARRAY_SIZE(devices); oret = ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0]));

1 0