mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

win32: Fix WSAStartup issues

Browse source 
WSAStartup was not being called for pacat and pactl built with meson,
causing them to fail in pa_mainloop_new with "cannot create wakeup
pipe". This issue also affects other applications linking to libpulse
other than the pulseaudio daemon, which calls WSAStartup itself.

When built with autotools, WSAStartup would have been called in
DllMain, which is recommended against by the documentation [1].

To fix these issues, the WSAStartup/WSACleanup calls can be moved
into pa_mainloop_new/pa_mainloop_free.

[1] https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-wsastartup

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/456>
This commit is contained in:
Patrick Gaskin 2021-01-03 04:01:40 -05:00 • committed by PulseAudio Marge Bot
parent fa0d30eee1
commit 0edcf725bc
3 changed files with 21 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -842,10 +842,6 @@ libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
endif
if OS_IS_WIN32
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += pulsecore/dllmain.c
endif
if HAVE_DBUS
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
pulsecore/dbus-util.c pulsecore/dbus-util.h \

21
src/pulse/mainloop.c
View file

@ -32,6 +32,10 @@
#include <pulsecore/pipe.h>
#endif
#ifdef OS_IS_WIN32
#include <winsock2.h>
#endif
#include <pulse/rtclock.h>
#include <pulse/timeval.h>
#include <pulse/xmalloc.h>
@ -450,6 +454,17 @@ static const pa_mainloop_api vtable = {
pa_mainloop *pa_mainloop_new(void) {
pa_mainloop *m;
#ifdef OS_IS_WIN32
{
int r;
WSADATA data;
if ((r = WSAStartup(MAKEWORD(2, 0), &data))) {
pa_log_error("ERROR: cannot initialize Winsock2 (%d)", r);
return NULL;
}
}
#endif
pa_init_i18n();
m = pa_xnew0(pa_mainloop, 1);
@ -579,6 +594,12 @@ void pa_mainloop_free(pa_mainloop *m) {
pa_close_pipe(m->wakeup_pipe);
pa_xfree(m);
#ifdef OS_IS_WIN32
{
WSACleanup();
}
#endif
}
static void scan_dead(pa_mainloop *m) {

53
src/pulsecore/dllmain.c
View file

@ -1,53 +0,0 @@
/***
This file is part of PulseAudio.
Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
PulseAudio 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.
PulseAudio 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
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef OS_IS_WIN32
#include <stdlib.h>
#include <stdio.h>
#include <windows.h>
#include <winsock2.h>
extern char *pa_win32_get_toplevel(HANDLE handle);
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
WSADATA data;
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
if (!pa_win32_get_toplevel(hinstDLL))
return FALSE;
WSAStartup(MAKEWORD(2, 0), &data);
break;
case DLL_PROCESS_DETACH:
WSACleanup();
break;
}
return TRUE;
}
#endif /* OS_IS_WIN32 */