February 2021 - Wine-Commits

Alexandre Julliard : wdscore: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: e31f9e375faf538c6066e78b2a71daf9b3bf6a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31f9e375faf538c6066e78b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:55:03 2021 +0100 wdscore: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wdscore/Makefile.in | 5 +---- dlls/wdscore/wdscore_main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 8bfc6d1210c..20ba1d3b1c9 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,6 +1,3 @@ MODULE = wdscore.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - wdscore_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wdscore/wdscore_main.c b/dlls/wdscore/wdscore_main.c deleted file mode 100644 index 52e4fb4531c..00000000000 --- a/dlls/wdscore/wdscore_main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2017 Stefan Leichter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wdscore); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 547d34d0cd44f9b74dbb485642561abe0c455ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547d34d0cd44f9b74dbb4856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:18 2021 +0100 svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/svrapi/Makefile.in | 5 +---- dlls/svrapi/svrapi_main.c | 46 ---------------------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in index c9467f28d97..4ebcc804cda 100644 --- a/dlls/svrapi/Makefile.in +++ b/dlls/svrapi/Makefile.in @@ -1,6 +1,3 @@ MODULE = svrapi.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - svrapi_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c deleted file mode 100644 index 8c7b007fc5a..00000000000 --- a/dlls/svrapi/svrapi_main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -* Part of NETAPI on Windows 9x -* -* Copyright 2006 Konstantin Petrov -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "svrapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(svrapi); - -/*********************************************************************** - * DllMain (SVRAPI.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); - - switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /*prefer native version*/ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : strmdll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 3d7261eb9c0a8bd66d8a0385d5dd0b928347f73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7261eb9c0a8bd66d8a0385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:02 2021 +0100 strmdll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmdll/Makefile.in | 5 +---- dlls/strmdll/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in index f710169b6ab..e224b6f4a51 100644 --- a/dlls/strmdll/Makefile.in +++ b/dlls/strmdll/Makefile.in @@ -1,8 +1,5 @@ MODULE = strmdll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c deleted file mode 100644 index 1278fc2b781..00000000000 --- a/dlls/strmdll/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 Stefan Leichter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(strmdll); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : utildll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 210298e4d09c29695cfab336a8b7ffb88baa44a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=210298e4d09c29695cfab336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:35 2021 +0100 utildll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/utildll/Makefile.in | 5 +---- dlls/utildll/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/utildll/Makefile.in b/dlls/utildll/Makefile.in index 5bd9a6fa0e0..6a04261eeae 100644 --- a/dlls/utildll/Makefile.in +++ b/dlls/utildll/Makefile.in @@ -1,6 +1,3 @@ MODULE = utildll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/utildll/main.c b/dlls/utildll/main.c deleted file mode 100644 index e0487944340..00000000000 --- a/dlls/utildll/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Utility Functions - * - * Copyright 2019 Alex Henrie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(utildll); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 63b2ee515d30829e0353545a4fa11c83d838dfbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b2ee515d30829e0353545a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:37 2021 +0100 srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srvcli/Makefile.in | 4 +--- dlls/srvcli/main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in index 716cc1b3867..22c1230b769 100644 --- a/dlls/srvcli/Makefile.in +++ b/dlls/srvcli/Makefile.in @@ -1,5 +1,3 @@ MODULE = srvcli.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c deleted file mode 100644 index 0df8e00d0fa..00000000000 --- a/dlls/srvcli/main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * Copyright (C) 2020 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(srvcli); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : wmasf: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 4eb0545f3cc481e2c193d6b8b52f30e39ced2233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb0545f3cc481e2c193d6b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:55:30 2021 +0100 wmasf: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmasf/Makefile.in | 5 +---- dlls/wmasf/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/wmasf/Makefile.in b/dlls/wmasf/Makefile.in index 1da9f78cf94..cfeab3b64a8 100644 --- a/dlls/wmasf/Makefile.in +++ b/dlls/wmasf/Makefile.in @@ -1,6 +1,3 @@ MODULE = wmasf.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wmasf/main.c b/dlls/wmasf/main.c deleted file mode 100644 index baf7619b9f0..00000000000 --- a/dlls/wmasf/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * WMASF.dll - * - * Copyright 2016 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wmasf); - -BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) -{ - TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(dll); - break; - default: - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : srclient: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: d428965cf27b0ed9bb04d0382e15835e328562af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d428965cf27b0ed9bb04d038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:24 2021 +0100 srclient: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srclient/Makefile.in | 5 +---- dlls/srclient/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in index 48aab4dd67c..1d2391bf582 100644 --- a/dlls/srclient/Makefile.in +++ b/dlls/srclient/Makefile.in @@ -1,6 +1,3 @@ MODULE = srclient.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c deleted file mode 100644 index 98832a97585..00000000000 --- a/dlls/srclient/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(srclient); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Zebediah Figura : quartz/tests: Add more tests for media events.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 5b0b78b6f0cb47dd87b353d1c4bf20bd7677e517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b0b78b6f0cb47dd87b353d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:08 2021 -0600 quartz/tests: Add more tests for media events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 86 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 55c70702e47..6288e3095dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5156,12 +5156,12 @@ static void test_set_notify_flags(void) IMediaEventEx *media_event; struct testfilter filter; LONG_PTR param1, param2; + LONG code, flags; HANDLE event; HWND window; BSTR status; HRESULT hr; ULONG ref; - LONG code; MSG msg; window = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, @@ -5196,9 +5196,25 @@ static void test_set_notify_flags(void) while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + hr = IMediaEventEx_SetNotifyFlags(media_event, 2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetNotifyFlags(media_event, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); @@ -5249,6 +5265,11 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Run(media_control); @@ -5295,6 +5316,8 @@ static void check_events_(unsigned int line, IMediaEventEx *media_event, ++ec_complete_count; if (code == EC_STATUS) ++ec_status_count; + hr = IMediaEventEx_FreeEventParams(media_event, code, param1, param2); + ok(hr == S_OK, "Got hr %#x.\n", hr); } ok(hr == E_ABORT, "Got hr %#x.\n", hr); todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, @@ -5336,9 +5359,51 @@ static void test_events(void) hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); ok(hr == S_OK, "Got hr %#x.\n", hr); + code = 0xdeadbeef; + param1 = 0xdeadbeef; + param2 = 0xdeadbeef; + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 0); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(!code, "Got code %#x.\n", code); + todo_wine ok(!param1, "Got param1 %#Ix.\n", param1); + todo_wine ok(!param2, "Got param2 %#Ix.\n", param2); + + /* EC_COMPLETE is ignored while in stopped or paused state. */ + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_events(media_event, 0, 0, FALSE); + + /* Pausing and then running the graph clears pending EC_COMPLETE events. + * This remains true even with default handling canceled. */ + + hr = IMediaEventEx_CancelDefaultHandling(media_event, EC_COMPLETE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, @@ -5385,6 +5450,25 @@ static void test_events(void) check_events(media_event, 1, 2, FALSE); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, TRUE); + + /* GetEvent() resets the event object if there are no events available. */ + SetEvent(event); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50);

1 0

Anton Baskanov : quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent().
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: d293200f7f1b6771ab49ac2d3e2cd68d34d42812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d293200f7f1b6771ab49ac2d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Feb 18 16:58:13 2021 -0600 quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 +--- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8909ba64024..131e022b0ba 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4744,6 +4744,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, if (!(entry = list_head(&graph->media_events))) { + ResetEvent(graph->media_event_handle); LeaveCriticalSection(&graph->cs); return E_ABORT; } @@ -4754,9 +4755,6 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, *param2 = event->param2; free(event); - if (list_empty(&graph->media_events)) - ResetEvent(graph->media_event_handle); - LeaveCriticalSection(&graph->cs); return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5d22ba410af..81b13255382 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5260,7 +5260,7 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5474,7 +5474,7 @@ static void test_events(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : regapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 1028fdfebda06139059abd783571d5248a0b71b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1028fdfebda06139059abd78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:49:59 2021 +0100 regapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/regapi/Makefile.in | 5 +---- dlls/regapi/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in index 4d8d773f9af..ce76b50a91f 100644 --- a/dlls/regapi/Makefile.in +++ b/dlls/regapi/Makefile.in @@ -1,6 +1,3 @@ MODULE = regapi.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/regapi/main.c b/dlls/regapi/main.c deleted file mode 100644 index 1164e92102a..00000000000 --- a/dlls/regapi/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * regapi implementation - * - * Copyright 2011 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(regapi); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -}

1 0