ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-08-10 18:02:39 +02:00
parent 8347c686e9
commit 4303e75313
3 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winepulse.drv/mmdevdrv.c
View File

@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(pulse);
static UINT64 pulse_handle;
static unixlib_handle_t pulse_handle;
#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
@ -82,10 +82,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
{
if (reason == DLL_PROCESS_ATTACH) {
DisableThreadLibraryCalls(dll);
if (__wine_init_unix_lib(dll, reason, NULL, &pulse_handle))
if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs,
&pulse_handle, sizeof(pulse_handle), NULL ))
return FALSE;
if (__wine_unix_call(pulse_handle, process_attach, NULL))
return FALSE;
} else if (reason == DLL_PROCESS_DETACH) {
__wine_init_unix_lib(dll, reason, NULL, NULL);
__wine_unix_call(pulse_handle, process_detach, NULL);
if (pulse_thread) {
WaitForSingleObject(pulse_thread, INFINITE);
CloseHandle(pulse_thread);

59
dlls/winepulse.drv/pulse.c
View File

@ -178,6 +178,32 @@ static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout,
return r;
}
static NTSTATUS pulse_process_attach(void *args)
{
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
if (pthread_mutex_init(&pulse_mutex, &attr) != 0)
pthread_mutex_init(&pulse_mutex, NULL);
return STATUS_SUCCESS;
}
static NTSTATUS pulse_process_detach(void *args)
{
if (pulse_ctx)
{
pa_context_disconnect(pulse_ctx);
pa_context_unref(pulse_ctx);
}
if (pulse_ml)
pa_mainloop_quit(pulse_ml, 0);
return STATUS_SUCCESS;
}
static NTSTATUS pulse_main_loop(void *args)
{
struct main_loop_params *params = args;
@ -1929,8 +1955,10 @@ static NTSTATUS pulse_is_started(void *args)
return STATUS_SUCCESS;
}
static const unixlib_entry_t unix_funcs[] =
const unixlib_entry_t __wine_unix_call_funcs[] =
{
pulse_process_attach,
pulse_process_detach,
pulse_main_loop,
pulse_create_stream,
pulse_release_stream,
@ -1953,32 +1981,3 @@ static const unixlib_entry_t unix_funcs[] =
pulse_test_connect,
pulse_is_started,
};
NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)
{
pthread_mutexattr_t attr;
switch (reason)
{
case DLL_PROCESS_ATTACH:
pthread_mutexattr_init(&attr);
pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
if (pthread_mutex_init(&pulse_mutex, &attr) != 0)
pthread_mutex_init(&pulse_mutex, NULL);
*(UINT64 *)ptr_out = (UINT_PTR)&unix_funcs;
break;
case DLL_PROCESS_DETACH:
if (pulse_ctx)
{
pa_context_disconnect(pulse_ctx);
pa_context_unref(pulse_ctx);
}
if (pulse_ml)
pa_mainloop_quit(pulse_ml, 0);
}
return STATUS_SUCCESS;
}

2
dlls/winepulse.drv/unixlib.h
View File

@ -187,6 +187,8 @@ struct is_started_params
enum unix_funcs
{
process_attach,
process_detach,
main_loop,
create_stream,
release_stream,