August 2023 - Wine-Commits - list.winehq.org

Eric Pouech : kernel32/tests: Only access ProcessGroupId field when present.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 43f4a3212764e3527a1574d7ef6184ff205e5c54 URL: https://gitlab.winehq.org/wine/wine/-/commit/43f4a3212764e3527a1574d7ef6184… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Aug 23 12:24:17 2023 +0200 kernel32/tests: Only access ProcessGroupId field when present. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2ddc99f52ac..f9252b7472b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5124,7 +5124,10 @@ START_TEST(console) if (IsWindow(GetConsoleWindow())) exit_code |= CP_WITH_WINDOW; if (pGetConsoleProcessList && GetConsoleProcessList(&pcslist, 1) == 1) exit_code |= CP_ALONE; - if (RtlGetCurrentPeb()->ProcessParameters->ProcessGroupId == GetCurrentProcessId()) + if (RtlGetCurrentPeb()->ProcessParameters->Size >= + offsetof(RTL_USER_PROCESS_PARAMETERS, ProcessGroupId) + + sizeof(RtlGetCurrentPeb()->ProcessParameters->ProcessGroupId) && + RtlGetCurrentPeb()->ProcessParameters->ProcessGroupId == GetCurrentProcessId()) exit_code |= CP_GROUP_LEADER; if (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR) exit_code |= CP_INPUT_VALID;

1 0

Eric Pouech : kernel32/tests: Add tests for group and console flags in CreateProcess.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: ad148dfe8841afbb6656253f94e350214b7cc00a URL: https://gitlab.winehq.org/wine/wine/-/commit/ad148dfe8841afbb6656253f94e350… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Aug 23 12:24:17 2023 +0200 kernel32/tests: Add tests for group and console flags in CreateProcess. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f9252b7472b..9212a180f60 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -769,8 +769,14 @@ static void testCtrlHandler(void) ok(WaitForSingleObject(mch_event, 3000) == WAIT_OBJECT_0, "event sending didn't work\n"); CloseHandle(mch_event); + ok(SetConsoleCtrlHandler(NULL, FALSE), "Couldn't turn on ctrl-c handling\n"); + ok((RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags & 1) == 0, + "Unexpect ConsoleFlags value %lx\n", RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags); + /* Turning off ctrl-c handling doesn't work on win9x such way ... */ ok(SetConsoleCtrlHandler(NULL, TRUE), "Couldn't turn off ctrl-c handling\n"); + ok((RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags & 1) != 0, + "Unexpect ConsoleFlags value %lx\n", RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags); mch_event = CreateEventA(NULL, TRUE, FALSE, NULL); mch_count = 0; if(!(GetVersion() & 0x80000000)) @@ -4959,6 +4965,7 @@ static DWORD check_child_console_bits(const char* exec, DWORD flags, enum inheri #define CP_GROUP_LEADER 0x10 /* whether the child is the process group leader */ #define CP_INPUT_VALID 0x20 /* whether StdHandle(INPUT) is a valid console handle */ #define CP_OUTPUT_VALID 0x40 /* whether StdHandle(OUTPUT) is a valid console handle */ +#define CP_ENABLED_CTRLC 0x80 /* whether the ctrl-c handling isn't blocked */ #define CP_OWN_CONSOLE (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_INPUT_VALID | CP_OUTPUT_VALID | CP_ALONE) #define CP_INH_CONSOLE (CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_INPUT_VALID | CP_OUTPUT_VALID) @@ -4971,6 +4978,7 @@ static void test_CreateProcessCUI(void) char **argv; BOOL res; int i; + BOOL saved_console_flags; static struct { @@ -5041,6 +5049,36 @@ static void test_CreateProcessCUI(void) {TRUE, DETACHED_PROCESS | CREATE_NO_WINDOW, STARTUPINFO_STD, CP_INPUT_VALID | CP_OUTPUT_VALID, .is_broken = 0x100}, /*35*/ {TRUE, CREATE_NEW_CONSOLE | CREATE_NO_WINDOW, STARTUPINFO_STD, CP_OWN_CONSOLE | CP_WITH_WINDOW, .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_ALONE}, }; + static struct group_flags_tests + { + /* input */ + BOOL use_cui; + DWORD cp_flags; + enum inheritance_model inherit; + BOOL noctrl_flag; + /* output */ + DWORD expected; + BOOL is_todo; + } + group_flags_tests[] = + { +/* 0 */ {TRUE, 0, CONSOLE_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW}, + {TRUE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER, .is_todo = TRUE}, + {TRUE, 0, CONSOLE_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_ENABLED_CTRLC}, + {TRUE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER, .is_todo = TRUE}, + {TRUE, 0, STARTUPINFO_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW}, +/* 5 */ {TRUE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER, .is_todo = TRUE}, + {TRUE, 0, STARTUPINFO_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_ENABLED_CTRLC}, + {TRUE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER, .is_todo = TRUE}, + {FALSE, 0, CONSOLE_STD, TRUE, 0, .is_todo = TRUE}, + {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, TRUE, CP_GROUP_LEADER, .is_todo = TRUE}, +/* 10 */ {FALSE, 0, CONSOLE_STD, FALSE, CP_ENABLED_CTRLC, .is_todo = TRUE}, + {FALSE, CREATE_NEW_PROCESS_GROUP, CONSOLE_STD, FALSE, CP_GROUP_LEADER, .is_todo = TRUE}, + {FALSE, 0, STARTUPINFO_STD, TRUE, 0, .is_todo = TRUE}, + {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, TRUE, CP_GROUP_LEADER, .is_todo = TRUE}, + {FALSE, 0, STARTUPINFO_STD, FALSE, CP_ENABLED_CTRLC, .is_todo = TRUE}, +/* 15 */ {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, FALSE, CP_GROUP_LEADER, .is_todo = TRUE}, + }; hstd[0] = GetStdHandle(STD_INPUT_HANDLE); hstd[1] = GetStdHandle(STD_OUTPUT_HANDLE); @@ -5080,6 +5118,25 @@ static void test_CreateProcessCUI(void) i, res, with_console_tests[i].expected); } + saved_console_flags = RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags; + + for (i = 0; i < ARRAY_SIZE(group_flags_tests); i++) + { + res = SetConsoleCtrlHandler(NULL, group_flags_tests[i].noctrl_flag); + ok(res, "Couldn't set ctrl handler\n"); + res = check_child_console_bits(group_flags_tests[i].use_cui ? cuiexec : guiexec, + group_flags_tests[i].cp_flags, + group_flags_tests[i].inherit); + todo_wine_if(group_flags_tests[i].is_todo) + ok(res == group_flags_tests[i].expected || + /* Win7 doesn't report group id */ + broken(res == (group_flags_tests[i].expected & ~CP_GROUP_LEADER)), + "[%d] Unexpected result %x (%lx)\n", + i, res, group_flags_tests[i].expected); + } + + RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags = saved_console_flags; + DeleteFileA(guiexec); DeleteFileA(cuiexec); @@ -5133,6 +5190,8 @@ START_TEST(console) exit_code |= CP_INPUT_VALID; if (GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)) == FILE_TYPE_CHAR) exit_code |= CP_OUTPUT_VALID; + if (!(RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) + exit_code |= CP_ENABLED_CTRLC; ExitProcess(exit_code); }

1 0

Eric Pouech : kernel32/tests: Fix spurious failures in console:test_wait() test.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 7899577c974c0c88ca9f5a081d0080a26f12d204 URL: https://gitlab.winehq.org/wine/wine/-/commit/7899577c974c0c88ca9f5a081d0080… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Aug 23 12:28:56 2023 +0200 kernel32/tests: Fix spurious failures in console:test_wait() test. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 64 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4e164c11b3d..2ddc99f52ac 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1198,6 +1198,32 @@ static void testWaitForConsoleInput(HANDLE input_handle) CloseHandle(complete_event); } +static BOOL filter_spurious_event(HANDLE input) +{ + INPUT_RECORD ir; + DWORD r; + + if (!ReadConsoleInputW(input, &ir, 1, &r) || r != 1) return FALSE; + + switch (ir.EventType) + { + case MOUSE_EVENT: + if (ir.Event.MouseEvent.dwEventFlags == MOUSE_MOVED) return TRUE; + ok(0, "Unexcepted mouse message: state=%lx ctrl=%lx flags=%lx (%u, %u)\n", + ir.Event.MouseEvent.dwButtonState, + ir.Event.MouseEvent.dwControlKeyState, + ir.Event.MouseEvent.dwEventFlags, + ir.Event.MouseEvent.dwMousePosition.X, + ir.Event.MouseEvent.dwMousePosition.Y); + break; + case WINDOW_BUFFER_SIZE_EVENT: + return TRUE; + default: + ok(0, "Unexpected message %u\n", ir.EventType); + } + return FALSE; +} + static void test_wait(HANDLE input, HANDLE orig_output) { HANDLE output, unbound_output, unbound_input; @@ -1221,25 +1247,47 @@ static void test_wait(HANDLE input, HANDLE orig_output) ret = SetConsoleActiveScreenBuffer(output); ok(ret, "SetConsoleActiveScreenBuffer failed: %lu\n", GetLastError()); - FlushConsoleInputBuffer(input); + ret = FlushConsoleInputBuffer(input); + ok(ret, "FlushConsoleInputBuffer failed: %lu\n", GetLastError()); unbound_output = create_unbound_handle(TRUE, TRUE); unbound_input = create_unbound_handle(FALSE, TRUE); - res = WaitForSingleObject(input, 0); + while ((res = WaitForSingleObject(input, 0)) == WAIT_OBJECT_0) + { + if (!filter_spurious_event(input)) break; + } ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %lx\n", res); - res = WaitForSingleObject(output, 0); + while ((res = WaitForSingleObject(output, 0)) == WAIT_OBJECT_0) + { + if (!filter_spurious_event(input)) break; + } ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %lx\n", res); - res = WaitForSingleObject(orig_output, 0); + while ((res = WaitForSingleObject(orig_output, 0)) == WAIT_OBJECT_0) + { + if (!filter_spurious_event(input)) break; + } ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %lx\n", res); - res = WaitForSingleObject(unbound_output, 0); + while ((res = WaitForSingleObject(unbound_output, 0)) == WAIT_OBJECT_0) + { + if (!filter_spurious_event(unbound_input)) break; + } ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %lx\n", res); - res = WaitForSingleObject(unbound_input, 0); + while ((res = WaitForSingleObject(unbound_input, 0)) == WAIT_OBJECT_0) + { + if (!filter_spurious_event(unbound_input)) break; + } ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %lx\n", res); - status = NtWaitForSingleObject(input, FALSE, &zero); + while ((status = NtWaitForSingleObject(input, FALSE, &zero)) == STATUS_SUCCESS) + { + if (!filter_spurious_event(input)) break; + } ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %lx\n", status); - status = NtWaitForSingleObject(output, FALSE, &zero); + while ((status = NtWaitForSingleObject(output, FALSE, &zero)) == STATUS_SUCCESS) + { + if (!filter_spurious_event(input)) break; + } ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %lx\n", status);

1 0

Rémi Bernon : winegstreamer: Don't append videoconvert for video/x-wmv output.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 61d9065315fba14436bb1caf72cb09f029ffb1de URL: https://gitlab.winehq.org/wine/wine/-/commit/61d9065315fba14436bb1caf72cb09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 18:39:41 2023 +0200 winegstreamer: Don't append videoconvert for video/x-wmv output. --- dlls/winegstreamer/wg_transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 775fed7a46c..25dfb62b08c 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -401,7 +401,6 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_VIDEO: - case WG_MAJOR_TYPE_VIDEO_WMV: if (!(element = create_element("videoconvert", "base")) || !append_element(transform->container, element, &first, &last)) goto out; @@ -418,13 +417,14 @@ NTSTATUS wg_transform_create(void *args) gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); break; + case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: - case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_VIDEO_INDEO: + case WG_MAJOR_TYPE_VIDEO_WMV: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; }

1 0

Alistair Leslie-Hughes : dxdiagn: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 92d7b284e0a0cf2df45f31b52b5e90285fe18a14 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d7b284e0a0cf2df45f31b52b5e90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 dxdiagn: Remove DECLSPEC_HIDDEN usage. --- dlls/dxdiagn/dxdiag_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 7c32a8518a5..5f4b7c28fd0 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -70,18 +70,18 @@ struct IDxDiagContainerImpl { /** * factories */ -extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); /** internal factory */ -extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj); /********************************************************************** * Dll lifetime tracking declaration for dxdiagn.dll */ -extern LONG DXDIAGN_refCount DECLSPEC_HIDDEN; +extern LONG DXDIAGN_refCount; static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); } static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); } -extern HINSTANCE dxdiagn_instance DECLSPEC_HIDDEN; +extern HINSTANCE dxdiagn_instance; #endif

1 0

Alistair Leslie-Hughes : schedsvc: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: dd6515c9ba04bca5a93336fb619729909adfadf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6515c9ba04bca5a93336fb619729… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:07 2023 +1000 schedsvc: Remove DECLSPEC_HIDDEN usage. --- dlls/schedsvc/schedsvc_private.h | 20 ++++++++++---------- dlls/schedsvc/tests/atsvcapi.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 224b4c1b398..fae5d2b376a 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -19,15 +19,15 @@ #ifndef __WINE_SCHEDSVC_PRIVATE_H__ #define __WINE_SCHEDSVC_PRIVATE_H__ -void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -void add_job(const WCHAR *name) DECLSPEC_HIDDEN; -void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; -void check_task_state(void) DECLSPEC_HIDDEN; -void add_process_to_queue(HANDLE hproc) DECLSPEC_HIDDEN; -void update_process_status(DWORD pid) DECLSPEC_HIDDEN; -BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; -void check_task_time(void) DECLSPEC_HIDDEN; -void load_at_tasks(void) DECLSPEC_HIDDEN; -void check_missed_task_time(void) DECLSPEC_HIDDEN; +void schedsvc_auto_start(void); +void add_job(const WCHAR *name); +void remove_job(const WCHAR *name); +void check_task_state(void); +void add_process_to_queue(HANDLE hproc); +void update_process_status(DWORD pid); +BOOL get_next_runtime(LARGE_INTEGER *rt); +void check_task_time(void); +void load_at_tasks(void); +void check_missed_task_time(void); #endif /* __WINE_SCHEDSVC_PRIVATE_H__ */ diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index fb70c346654..4903c9d9417 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -177,7 +177,7 @@ skip_tests: ok(hr == RPC_S_OK, "RpcBindingFree error %#lx\n", hr); } -DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) +handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) { static unsigned char ncalrpc[] = "ncalrpc"; unsigned char *binding_str; @@ -194,7 +194,7 @@ DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) return rpc_handle; } -DECLSPEC_HIDDEN void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) +void __RPC_USER ATSVC_HANDLE_unbind(ATSVC_HANDLE ServerName, handle_t rpc_handle) { RpcBindingFree(&rpc_handle); }

1 0

Alistair Leslie-Hughes : netcfgx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 6b4921520373eda331828e90a6bad80ec4c38876 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4921520373eda331828e90a6bad8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 netcfgx: Remove DECLSPEC_HIDDEN usage. --- dlls/netcfgx/netcfg_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netcfgx/netcfg_private.h b/dlls/netcfgx/netcfg_private.h index 14c5111168d..a43dd881632 100644 --- a/dlls/netcfgx/netcfg_private.h +++ b/dlls/netcfgx/netcfg_private.h @@ -18,6 +18,6 @@ #ifndef __NETCFG_PRIVATE_H__ #define __NETCFG_PRIVATE_H__ -extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN; +extern HRESULT INetCfg_CreateInstance(IUnknown **ppUnk); #endif

1 0

Alistair Leslie-Hughes : hhctrl.ocx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 23c75adf2d36c73f1853ed2a7c4db6465711b013 URL: https://gitlab.winehq.org/wine/wine/-/commit/23c75adf2d36c73f1853ed2a7c4db6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 hhctrl.ocx: Remove DECLSPEC_HIDDEN usage. --- dlls/hhctrl.ocx/hhctrl.h | 76 ++++++++++++++++++++++++------------------------ dlls/hhctrl.ocx/stream.h | 16 +++++----- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 359b199e141..ebec0eebf30 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -205,42 +205,42 @@ typedef struct { DWORD current_tab; } HHInfo; -BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN; -void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN; -void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN; -void DoPageAction(WebBrowserContainer*,DWORD) DECLSPEC_HIDDEN; - -void InitContent(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN; -void ActivateContentTopic(HWND,LPCWSTR,ContentItem *) DECLSPEC_HIDDEN; - -void InitIndex(HHInfo*) DECLSPEC_HIDDEN; -void ReleaseIndex(HHInfo*) DECLSPEC_HIDDEN; - -CHMInfo *OpenCHM(LPCWSTR szFile) DECLSPEC_HIDDEN; -BOOL LoadWinTypeFromCHM(HHInfo *info) DECLSPEC_HIDDEN; -CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN; -void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; -LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; -WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; - -extern struct list window_list DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; -void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; -BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; -BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; -void UpdateHelpWindow(HHInfo *info) DECLSPEC_HIDDEN; - -void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; -void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; - -LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; -void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN; -void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; -WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) DECLSPEC_HIDDEN; -HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; +BOOL InitWebBrowser(HHInfo*,HWND); +void ReleaseWebBrowser(HHInfo*); +void ResizeWebBrowser(HHInfo*,DWORD,DWORD); +void DoPageAction(WebBrowserContainer*,DWORD); + +void InitContent(HHInfo*); +void ReleaseContent(HHInfo*); +void ActivateContentTopic(HWND,LPCWSTR,ContentItem *); + +void InitIndex(HHInfo*); +void ReleaseIndex(HHInfo*); + +CHMInfo *OpenCHM(LPCWSTR szFile); +BOOL LoadWinTypeFromCHM(HHInfo *info); +CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); +IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); +LPWSTR FindContextAlias(CHMInfo*,DWORD); +WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR); + +extern struct list window_list; +HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND); +void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToUrl(HHInfo*,LPCWSTR); +BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); +void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL); +void UpdateHelpWindow(HHInfo *info); + +void InitSearch(HHInfo *info, const char *needle); +void ReleaseSearch(HHInfo *info); + +LPCWSTR skip_schema(LPCWSTR url); +void wintype_stringsA_free(struct wintype_stringsA *stringsA); +void wintype_stringsW_free(struct wintype_stringsW *stringsW); +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); +HHInfo *find_window(const WCHAR *window); /* memory allocation functions */ @@ -287,7 +287,7 @@ static inline LPSTR strdupWtoA(LPCWSTR str) } -extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; -extern BOOL hh_process DECLSPEC_HIDDEN; +extern HINSTANCE hhctrl_hinstance; +extern BOOL hh_process; #endif diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index 8d61ad54d51..68f105c11a3 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -36,13 +36,13 @@ typedef struct { ULONG p; } stream_t; -void strbuf_init(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_zero(strbuf_t *buf) DECLSPEC_HIDDEN; -void strbuf_free(strbuf_t *buf) DECLSPEC_HIDDEN; -void stream_init(stream_t *stream, IStream *str) DECLSPEC_HIDDEN; -void get_node_name(strbuf_t *node, strbuf_t *name) DECLSPEC_HIDDEN; -BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; -const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; +void strbuf_init(strbuf_t *buf); +void strbuf_zero(strbuf_t *buf); +void strbuf_free(strbuf_t *buf); +void stream_init(stream_t *stream, IStream *str); +void get_node_name(strbuf_t *node, strbuf_t *name); +BOOL next_content(stream_t *stream, strbuf_t *buf); +BOOL next_node(stream_t *stream, strbuf_t *buf); +const char *get_attr(const char *node, const char *name, int *len); #endif

1 0

Alistair Leslie-Hughes : evr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 59718856802d3f41f48cd1ecbe294d4134e70671 URL: https://gitlab.winehq.org/wine/wine/-/commit/59718856802d3f41f48cd1ecbe294d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 23 20:32:06 2023 +1000 evr: Remove DECLSPEC_HIDDEN usage. --- dlls/evr/evr_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 93047b50c94..225e60348b4 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -51,9 +51,9 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect * return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); } -HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; -HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv); +HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv); HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj);

1 0

Davide Beatrici : winepulse: Move GetEndpointIDs into mmdevapi.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 09a84020de7bd206c0cf8bf680c29f17e21284ea URL: https://gitlab.winehq.org/wine/wine/-/commit/09a84020de7bd206c0cf8bf680c29f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 13 16:40:53 2023 +0200 winepulse: Move GetEndpointIDs into mmdevapi. --- dlls/mmdevapi/devenum.c | 53 ++++++++++++++++++++++------- dlls/mmdevapi/main.c | 1 - dlls/mmdevapi/mmdevapi_private.h | 7 ---- dlls/winepulse.drv/mmdevdrv.c | 64 ----------------------------------- dlls/winepulse.drv/winepulse.drv.spec | 1 - 5 files changed, 41 insertions(+), 85 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b87b082e6ef..34fa5a66802 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <wchar.h> #define COBJMACROS #include "windef.h" @@ -526,29 +527,57 @@ static HRESULT set_format(MMDevice *dev) HRESULT load_driver_devices(EDataFlow flow) { - WCHAR **ids; - GUID *guids; - UINT num, def, i; - HRESULT hr; + struct get_endpoint_ids_params params; + WCHAR **ids = NULL; + GUID *guids = NULL; + UINT i; - if(!drvs.pGetEndpointIDs) - return S_OK; + params.flow = flow; + params.size = 1024; + params.endpoints = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + __wine_unix_call(drvs.module_unixlib, get_endpoint_ids, &params); + } while (params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - hr = drvs.pGetEndpointIDs(flow, &ids, &guids, &num, &def); - if(FAILED(hr)) - return hr; + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + for (i = 0; i < params.num; i++) { + const WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + const char *dev_name = (char *)params.endpoints + params.endpoints[i].device; + const unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - for(i = 0; i < num; ++i){ + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + params.result = E_OUTOFMEMORY; + goto end; + } + memcpy(ids[i], name, size); + drvs.pget_device_guid(flow, dev_name, &guids[i]); + } + + for (i = 0; i < params.num; i++) { MMDevice *dev; dev = MMDevice_Create(ids[i], &guids[i], flow, DEVICE_STATE_ACTIVE, - def == i); + params.default_idx == i); set_format(dev); } +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); HeapFree(GetProcessHeap(), 0, guids); HeapFree(GetProcessHeap(), 0, ids); - return S_OK; + return params.result; } static void MMDevice_Destroy(MMDevice *This) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index d5ed3a653d4..12a81ba9aa5 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -100,7 +100,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) if(!driver->p##n) { goto fail; } } while(0) LDFC(get_device_guid); LDFC(get_device_name_from_guid); - LDFC(GetEndpointIDs); #undef LDFC GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index c703ef2517b..0ed9140c3ed 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -44,13 +44,6 @@ typedef struct _DriverFuncs { void (WINAPI *pget_device_guid)(EDataFlow flow, const char *name, GUID *guid); BOOL (WINAPI *pget_device_name_from_guid)(GUID *guid, char **name, EDataFlow *flow); - /* ids gets an array of human-friendly endpoint names - * keys gets an array of driver-specific stuff that is used - * in GetAudioEndpoint to identify the endpoint - * it is the caller's responsibility to free both arrays, and - * all of the elements in both arrays with HeapFree() */ - HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, - GUID **guids, UINT *num, UINT *default_index); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 11cbc15448c..19d3d4040a3 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -96,13 +96,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -static void pulse_call(enum unix_funcs code, void *params) -{ - NTSTATUS status; - status = WINE_UNIX_CALL(code, params); - assert(!status); -} - void WINAPI get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) { WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; @@ -147,63 +140,6 @@ void WINAPI get_device_guid(EDataFlow flow, const char *pulse_name, GUID *guid) RegCloseKey(drv_key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, - UINT *num, UINT *def_index) -{ - struct get_endpoint_ids_params params; - GUID *guids = NULL; - WCHAR **ids = NULL; - unsigned int i = 0; - - TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); - - params.flow = flow; - params.size = MAX_PULSE_NAME_LEN * 4; - params.endpoints = NULL; - do { - HeapFree(GetProcessHeap(), 0, params.endpoints); - params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); - pulse_call(get_endpoint_ids, &params); - } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); - - if (FAILED(params.result)) - goto end; - - ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); - guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); - if (!ids || !guids) { - params.result = E_OUTOFMEMORY; - goto end; - } - - for (i = 0; i < params.num; i++) { - WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); - char *pulse_name = (char *)params.endpoints + params.endpoints[i].device; - unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); - - if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { - params.result = E_OUTOFMEMORY; - break; - } - memcpy(ids[i], name, size); - get_device_guid(flow, pulse_name, &guids[i]); - } - -end: - HeapFree(GetProcessHeap(), 0, params.endpoints); - if (FAILED(params.result)) { - HeapFree(GetProcessHeap(), 0, guids); - while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); - HeapFree(GetProcessHeap(), 0, ids); - } else { - *ids_out = ids; - *keys = guids; - *num = params.num; - *def_index = params.default_idx; - } - return params.result; -} - BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) { struct device_cache *device; diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 5aea12a6a86..17a0d504c7c 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,7 +1,6 @@ # MMDevAPI driver functions @ stdcall -private get_device_guid(long ptr ptr) get_device_guid @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid -@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs # WinMM driver functions @ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc

1 0