Module: wine Branch: master Commit: 414304658e5183d1dcea89e3728908625bef40f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/414304658e5183d1dcea89e37289086...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Nov 28 11:39:16 2022 +0100
avicap32: Use the Unix call helpers.
---
dlls/avicap32/avicap32_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 1a1c514e931..641e3896027 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap);
static HINSTANCE avicap_instance; -static unixlib_handle_t unix_handle;
static const WCHAR class_name[] = L"wine_avicap_class";
@@ -125,8 +124,7 @@ BOOL VFWAPI capGetDriverDescriptionW(WORD index, WCHAR *name, int name_len, WCHA struct get_device_desc_params params;
params.index = index; - if (!unix_handle || __wine_unix_call(unix_handle, unix_get_device_desc, ¶ms)) - return FALSE; + if (WINE_UNIX_CALL(unix_get_device_desc, ¶ms)) return FALSE;
TRACE("Found device name %s, version %s.\n", debugstr_w(params.name), debugstr_w(params.version)); lstrcpynW(name, params.name, name_len); @@ -139,9 +137,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: - NtQueryVirtualMemory(GetCurrentProcess(), instance, - MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL); DisableThreadLibraryCalls(instance); + __wine_init_unix_call(); register_class(); avicap_instance = instance; break;