November 2020 - Wine-commits

Gijs Vermeulen : avrt: Add AvSetMmMaxThreadCharacteristicsA/W stub.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: fed67d6edd2e6451a3e773d37a916add310e6ae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fed67d6edd2e6451a3e773d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 15:45:14 2020 +0100 avrt: Add AvSetMmMaxThreadCharacteristicsA/W stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50160 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avrt/avrt.spec | 4 +-- dlls/avrt/main.c | 86 ++++++++++++++++++++++++++++++++++++++++++----------- include/avrt.h | 2 +- 3 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index a7dfc42879c..0a05abcdbca 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -7,8 +7,8 @@ @ stub AvRtJoinThreadOrderingGroup @ stub AvRtLeaveThreadOrderingGroup @ stub AvRtWaitOnThreadOrderingGroup -@ stub AvSetMmMaxThreadCharacteristicsA -@ stub AvSetMmMaxThreadCharacteristicsW +@ stdcall AvSetMmMaxThreadCharacteristicsA(str str ptr) +@ stdcall AvSetMmMaxThreadCharacteristicsW(wstr wstr ptr) @ stdcall AvSetMmThreadCharacteristicsA(str ptr) @ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) @ stdcall AvSetMmThreadPriority(ptr long) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index eb5704cc508..258c525e198 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,10 +23,21 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); +static inline WCHAR *heap_strdupAW(const char *src) +{ + int len; + WCHAR *dst; + if (!src) return NULL; + len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + return dst; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -43,41 +54,39 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) { + WCHAR *nameW = NULL; HANDLE ret; - LPWSTR str = NULL; - if (TaskName) + if (name && !(nameW = heap_strdupAW(name))) { - DWORD len = (lstrlenA(TaskName)+1); - str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (!str) - { - SetLastError(ERROR_OUTOFMEMORY); - return NULL; - } - MultiByteToWideChar(CP_ACP, 0, TaskName, len, str, len); + SetLastError(ERROR_OUTOFMEMORY); + return NULL; } - ret = AvSetMmThreadCharacteristicsW(str, TaskIndex); - HeapFree(GetProcessHeap(), 0, str); + + ret = AvSetMmThreadCharacteristicsW(nameW, index); + + heap_free(nameW); return ret; } -HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsW(const WCHAR *name, DWORD *index) { - FIXME("(%s,%p): stub\n", debugstr_w(TaskName), TaskIndex); + FIXME("(%s,%p): stub\n", debugstr_w(name), index); - if (!TaskName) + if (!name) { SetLastError(ERROR_INVALID_TASK_NAME); return NULL; } - if (!TaskIndex) + + if (!index) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } + return (HANDLE)0x12345678; } @@ -98,3 +107,46 @@ BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY prio) FIXME("(%p)->(%u) stub\n", AvrtHandle, prio); return TRUE; } + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *task2, DWORD *index) +{ + WCHAR *task1W = NULL, *task2W = NULL; + HANDLE ret; + + if (task1 && !(task1W = heap_strdupAW(task1))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + if (task2 && !(task2W = heap_strdupAW(task2))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); + + heap_free(task2W); + heap_free(task1W); + return ret; +} + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(const WCHAR *task1, const WCHAR *task2, DWORD *index) +{ + FIXME("(%s,%s,%p): stub\n", debugstr_w(task1), debugstr_w(task2), index); + + if (!task1 || task2) + { + SetLastError(ERROR_INVALID_TASK_NAME); + return NULL; + } + + if (!index) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + return (HANDLE)0x12345678; +} diff --git a/include/avrt.h b/include/avrt.h index 9d12c1b5b1b..88beebb0bf8 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -43,7 +43,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) #define AvSetMmThreadCharacteristics WINELIB_NAME_AW(AvSetMmThreadCharacteristics) HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); -HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCWSTR FirstTask, LPCWSTR SecondTask, LPDWORD TaskIndex); #define AvSetMmMaxThreadCharacteristics WINELIB_NAME_AW(AvSetMmMaxThreadCharacteristics) BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle);

1 0

Esme Povirk : windowscodecs: Move jpeg encoding to the unix lib.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 92fb63d7754ba56b2604d253b600284c52ab82c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fb63d7754ba56b2604d253… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 24 15:22:06 2020 -0600 windowscodecs: Move jpeg encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 14 +- dlls/windowscodecs/jpegformat.c | 920 --------------------------------- dlls/windowscodecs/libjpeg.c | 313 +++++++++++ dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 7 + 7 files changed, 364 insertions(+), 922 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92fb63d7754ba56b2604…

1 0

Michael Stefaniuc : wininet: Use wide-char string literals in struct initialization.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 085f3738a86e6fa0e12b3f59fa4a9ca86826bb60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085f3738a86e6fa0e12b3f59… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:07 2020 +0100 wininet: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 249 +++++++++++++++++++----------------------------- dlls/wininet/internet.c | 10 +- dlls/wininet/urlcache.c | 9 +- 3 files changed, 105 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=085f3738a86e6fa0e12b…

1 0

Michael Stefaniuc : jscript: Use wide-char string literals.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 59b9747644a0c8692bd0d47169a0ab0dbc308847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b9747644a0c8692bd0d471… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:04 2020 +0100 jscript: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/activex.c | 4 +- dlls/jscript/bool.c | 9 +-- dlls/jscript/compile.c | 4 +- dlls/jscript/date.c | 65 ++++++------------- dlls/jscript/dispex.c | 15 ++--- dlls/jscript/engine.c | 35 ++++------ dlls/jscript/enumerator.c | 6 +- dlls/jscript/error.c | 35 +++------- dlls/jscript/function.c | 44 ++++--------- dlls/jscript/global.c | 78 ++++++++--------------- dlls/jscript/json.c | 27 +++----- dlls/jscript/jsregexp.c | 27 +++----- dlls/jscript/jsstr.c | 6 +- dlls/jscript/jsutils.c | 19 ++---- dlls/jscript/lex.c | 4 +- dlls/jscript/number.c | 7 +- dlls/jscript/string.c | 159 +++++++++++++++------------------------------- dlls/jscript/vbarray.c | 4 +- 18 files changed, 167 insertions(+), 381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59b9747644a0c8692bd0…

1 0

Michael Stefaniuc : mshtml: Use wide-char string literals in html*.c.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 097898460e93aa720bc76cc08225f90a3b05bf3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=097898460e93aa720bc76cc0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:05 2020 +0100 mshtml: Use wide-char string literals in html*.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 10 ++--- dlls/mshtml/htmlbody.c | 38 +++++++------------ dlls/mshtml/htmldoc.c | 32 ++++------------ dlls/mshtml/htmlelem.c | 49 ++++++++---------------- dlls/mshtml/htmlform.c | 14 ++----- dlls/mshtml/htmlframe.c | 13 ++----- dlls/mshtml/htmlhead.c | 6 +-- dlls/mshtml/htmlimg.c | 6 +-- dlls/mshtml/htmlinput.c | 21 +++-------- dlls/mshtml/htmllocation.c | 6 +-- dlls/mshtml/htmlobject.c | 10 ++--- dlls/mshtml/htmlstyle.c | 94 ++++++++++++++++------------------------------ dlls/mshtml/htmltable.c | 3 +- dlls/mshtml/htmltextarea.c | 4 +- dlls/mshtml/htmlwindow.c | 8 +--- 15 files changed, 97 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=097898460e93aa720bc7…

1 0

Michael Stefaniuc : mshtml: Use wide-char string literals for PRUnichar strings.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 33de9b1475edf566866d91818e0af2c453f99027 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33de9b1475edf566866d9181… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:06 2020 +0100 mshtml: Use wide-char string literals for PRUnichar strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 7 ++----- dlls/mshtml/htmldoc.c | 4 +--- dlls/mshtml/htmlelemcol.c | 4 +--- dlls/mshtml/htmlform.c | 8 ++------ dlls/mshtml/htmlhead.c | 9 +++------ dlls/mshtml/htmlimg.c | 4 +--- dlls/mshtml/htmlselect.c | 4 +--- dlls/mshtml/nsevents.c | 21 ++++++++------------- dlls/mshtml/nsservice.c | 8 +++----- dlls/mshtml/olecmd.c | 14 ++++++-------- dlls/mshtml/pluginhost.c | 18 +++++------------- dlls/mshtml/range.c | 7 ++----- dlls/mshtml/script.c | 8 ++------ 13 files changed, 37 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33de9b1475edf566866d…

1 0

Brendan Shanks : winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 9c0c0e2b57e0a5e27a1e0a8d1d2ca4660a0e4a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0c0e2b57e0a5e27a1e0a8d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 23 16:48:44 2020 -0800 winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50153 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index df578b4b9d6..ee6225bf398 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,6 +297,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) + { + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + return; + } + IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { @@ -365,6 +372,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ + IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDDeviceClose(IOHIDDevice, 0); device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { @@ -383,13 +392,6 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) - { - ERR("Couldn't open IOHIDManager.\n"); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); - return 0; - } CFRunLoopRun(); TRACE("Run Loop exiting\n");

1 0

Kevin Puetz : ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 029ec25e54166535978a47bffe6efd846e8609fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=029ec25e54166535978a47bf… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Nov 23 19:55:25 2020 -0600 ntdll: Don't access empty IMAGE_FILE_IMPORT_DIRECTORY. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..61c8f5e18f5 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -810,11 +810,15 @@ static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) { const IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *descr; + const IMAGE_DATA_DIRECTORY *dir; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); - descr = get_rva( module, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); + dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY]; + if (!dir->VirtualAddress || !dir->Size) return STATUS_SUCCESS; + + descr = get_rva( module, dir->VirtualAddress ); for (; descr->Name && descr->FirstThunk; descr++) { thunk_list = get_rva( module, descr->FirstThunk );

1 0

Zebediah Figura : quartz/tests: Avoid some test failures related to timing.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: bc588e9c5274754e80bb24f14449c6af9c67dc87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc588e9c5274754e80bb24f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 23 22:59:20 2020 -0600 quartz/tests: Avoid some test failures related to timing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 11 ++++++++--- dlls/quartz/tests/vmr9.c | 17 +++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7daa6deed5..fd39945b2e3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1181,7 +1181,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1201,10 +1201,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -2108,8 +2113,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f88c43b07b5..8b46e4706a5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1220,10 +1220,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -1432,18 +1437,14 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont hr = join_thread(send_frame_time(input, -2, 0x00ff0000)); /* red */ ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 2, 0x00ff00ff); /* magenta */ - ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 1000000, 0x00ffffff); /* white */ ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2351,8 +2352,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n");

1 0

Zebediah Figura : quartz: Avoid autoplugging renderers in IGraphBuilder::Connect().
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 68d355883016d88fbb6c1aad9ee131e0c0457c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d355883016d88fbb6c1aad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:01 2020 -0600 quartz: Avoid autoplugging renderers in IGraphBuilder::Connect(). I don't know of an application that this helps, but it seems like an optimization worth performing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cf2421f64e2..58038829217 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1397,7 +1397,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I EnterCriticalSection(&graph->cs); - hr = autoplug(graph, source, sink, FALSE, 0); + hr = autoplug(graph, source, sink, TRUE, 0); LeaveCriticalSection(&graph->cs);

1 0