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

Merge remote-tracking branch 'mkbosmans/mingw32-build'

Browse source
This commit is contained in:
Colin Guthrie 2011-03-20 11:18:19 +00:00
commit d7ce59de88
28 changed files with 267 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/pulsecore/inet_ntop.c → src/pulsecore/arpa-inet.c
View file

@ -23,16 +23,15 @@
#include <config.h>
#endif
#include <stdio.h>
#include <errno.h>
#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32)
#ifndef HAVE_INET_NTOP
#include <errno.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
#include "inet_ntop.h"
#include "arpa-inet.h"
const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
struct in_addr *in = (struct in_addr*)src;
@ -79,4 +78,31 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
return dst;
}
#endif /* INET_NTOP */
int inet_pton(int af, const char *src, void *dst) {
struct in_addr *in = (struct in_addr*)dst;
#ifdef HAVE_IPV6
struct in6_addr *in6 = (struct in6_addr*)dst;
#endif
pa_assert(src);
pa_assert(dst);
switch (af) {
case AF_INET:
in->s_addr = inet_addr(src);
if (in->s_addr == INADDR_NONE)
return 0;
break;
#ifdef HAVE_IPV6
case AF_INET6:
/* FIXME */
#endif
default:
errno = EAFNOSUPPORT;
return -1;
}
return 1;
}
#endif

23
src/pulsecore/arpa-inet.h Normal file
View file

@ -0,0 +1,23 @@
#ifndef fooarpa_inethfoo
#define fooarpa_inethfoo
#if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h>
#elif defined(OS_IS_WIN32)
/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for
* the inet_ntop and inet_pton functions, which are implemented here. */
#include <pulsecore/socket.h>
const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
int inet_pton(int af, const char *src, void *dst);
#endif
#endif

14
src/pulsecore/core-rtclock.c
View file

@ -182,15 +182,13 @@ void pa_rtclock_hrtimer_enable(void) {
}
struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
#ifdef HAVE_CLOCK_GETTIME
struct timeval wc_now, rt_now;
pa_assert(tv);
pa_gettimeofday(&wc_now);
pa_rtclock_get(&rt_now);
pa_assert(tv);
/* pa_timeval_sub() saturates on underflow! */
if (pa_timeval_cmp(&wc_now, tv) < 0)
@ -199,7 +197,6 @@ struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
pa_timeval_sub(&rt_now, pa_timeval_diff(&wc_now, tv));
*tv = rt_now;
#endif
return tv;
}
@ -232,15 +229,13 @@ struct timespec* pa_timespec_store(struct timespec *ts, pa_usec_t v) {
#endif
static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
#ifdef HAVE_CLOCK_GETTIME
struct timeval wc_now, rt_now;
pa_assert(tv);
pa_gettimeofday(&wc_now);
pa_rtclock_get(&rt_now);
pa_assert(tv);
/* pa_timeval_sub() saturates on underflow! */
if (pa_timeval_cmp(&rt_now, tv) < 0)
@ -249,7 +244,6 @@ static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
pa_timeval_sub(&wc_now, pa_timeval_diff(&rt_now, tv));
*tv = wc_now;
#endif
return tv;
}

127
src/pulsecore/core-util.c
View file

@ -146,24 +146,29 @@ static pa_strlist *recorded_env = NULL;
#ifdef OS_IS_WIN32
#define PULSE_ROOTENV "PULSE_ROOT"
/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */
char *pa_win32_get_toplevel(HANDLE handle) {
static char *toplevel = NULL;
int pa_set_root(HANDLE handle) {
char library_path[MAX_PATH], *sep;
if (!toplevel) {
char library_path[MAX_PATH];
char *p;
/* FIXME: Needs to set errno */
if (!GetModuleFileName(handle, library_path, MAX_PATH))
return NULL;
if (!GetModuleFileName(handle, library_path, MAX_PATH))
return 0;
toplevel = pa_xstrdup(library_path);
sep = strrchr(library_path, PA_PATH_SEP_CHAR);
if (sep)
*sep = '\0';
p = strrchr(toplevel, PA_PATH_SEP_CHAR);
if (p)
*p = '\0';
if (!SetEnvironmentVariable(PULSE_ROOTENV, library_path))
return 0;
p = strrchr(toplevel, PA_PATH_SEP_CHAR);
if (p && (strcmp(p + 1, "bin") == 0))
*p = '\0';
}
return 1;
return toplevel;
}
#endif
@ -701,7 +706,7 @@ int pa_make_realtime(int rtprio) {
#elif defined(OS_IS_WIN32)
/* Windows only allows realtime scheduling to be set on a per process basis.
* Therefore, instead of making the thread realtime, just give it the highest non-realtime priority. */
if(SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) {
if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) {
pa_log_info("Successfully enabled THREAD_PRIORITY_TIME_CRITICAL scheduling for thread.");
return 0;
}
@ -932,7 +937,7 @@ const char *pa_sig2str(int sig) {
}
#else
switch(sig) {
switch (sig) {
#ifdef SIGHUP
case SIGHUP: return "SIGHUP";
#endif
@ -1219,11 +1224,11 @@ int pa_lock_fd(int fd, int b) {
return 0;
}
pa_log("%slock: %s", !b? "un" : "", pa_cstrerror(errno));
pa_log("%slock: %s", !b ? "un" : "", pa_cstrerror(errno));
#endif
#ifdef OS_IS_WIN32
HANDLE h = (HANDLE)_get_osfhandle(fd);
HANDLE h = (HANDLE) _get_osfhandle(fd);
if (b && LockFile(h, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF))
return 0;
@ -1676,23 +1681,9 @@ fail:
* stored there.*/
FILE *pa_open_config_file(const char *global, const char *local, const char *env, char **result) {
const char *fn;
#ifdef OS_IS_WIN32
char buf[PATH_MAX];
if (!getenv(PULSE_ROOTENV))
pa_set_root(NULL);
#endif
FILE *f;
if (env && (fn = getenv(env))) {
FILE *f;
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
/* FIXME: Needs to set errno! */
return NULL;
fn = buf;
#endif
if ((f = pa_fopen_cloexec(fn, "r"))) {
if (result)
*result = pa_xstrdup(fn);
@ -1708,7 +1699,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
const char *e;
char *lfn;
char *h;
FILE *f;
if ((e = getenv("PULSE_CONFIG_PATH")))
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
@ -1718,15 +1708,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
} else
return NULL;
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
/* FIXME: Needs to set errno! */
pa_xfree(lfn);
return NULL;
}
fn = buf;
#endif
if ((f = pa_fopen_cloexec(fn, "r"))) {
if (result)
*result = pa_xstrdup(fn);
@ -1745,22 +1726,26 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
}
if (global) {
FILE *f;
char *gfn;
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
/* FIXME: Needs to set errno! */
return NULL;
global = buf;
if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
pa_win32_get_toplevel(NULL),
global + strlen(PA_DEFAULT_CONFIG_DIR));
else
#endif
gfn = pa_xstrdup(global);
if ((f = pa_fopen_cloexec(global, "r"))) {
if ((f = pa_fopen_cloexec(gfn, "r"))) {
if (result)
*result = pa_xstrdup(global);
*result = gfn;
else
pa_xfree(gfn);
return f;
}
pa_xfree(gfn);
}
errno = ENOENT;
@ -1769,22 +1754,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
char *pa_find_config_file(const char *global, const char *local, const char *env) {
const char *fn;
#ifdef OS_IS_WIN32
char buf[PATH_MAX];
if (!getenv(PULSE_ROOTENV))
pa_set_root(NULL);
#endif
if (env && (fn = getenv(env))) {
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
/* FIXME: Needs to set errno! */
return NULL;
fn = buf;
#endif
if (access(fn, R_OK) == 0)
return pa_xstrdup(fn);
@ -1805,15 +1776,6 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
} else
return NULL;
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
/* FIXME: Needs to set errno! */
pa_xfree(lfn);
return NULL;
}
fn = buf;
#endif
if (access(fn, R_OK) == 0) {
char *r = pa_xstrdup(fn);
pa_xfree(lfn);
@ -1830,15 +1792,20 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
}
if (global) {
#ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
/* FIXME: Needs to set errno! */
return NULL;
global = buf;
#endif
char *gfn;
if (access(global, R_OK) == 0)
return pa_xstrdup(global);
#ifdef OS_IS_WIN32
if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
pa_win32_get_toplevel(NULL),
global + strlen(PA_DEFAULT_CONFIG_DIR));
else
#endif
gfn = pa_xstrdup(global);
if (access(gfn, R_OK) == 0)
return gfn;
pa_xfree(gfn);
}
errno = ENOENT;

4
src/pulsecore/core-util.h
View file

@ -271,4 +271,8 @@ void pa_nullify_stdfds(void);
char *pa_read_line_from_file(const char *fn);
pa_bool_t pa_running_in_vm(void);
#ifdef OS_IS_WIN32
char *pa_win32_get_toplevel(HANDLE handle);
#endif
#endif

4
src/pulsecore/dllmain.c
View file

@ -31,7 +31,7 @@
#include <windows.h>
extern pa_set_root(HANDLE handle);
extern pa_win32_get_toplevel(HANDLE handle);
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
WSADATA data;
@ -39,7 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
if (!pa_set_root(hinstDLL))
if (!pa_win32_get_toplevel(hinstDLL))
return FALSE;
WSAStartup(MAKEWORD(2, 0), &data);
break;

12
src/pulsecore/inet_ntop.h
View file

@ -1,12 +0,0 @@
#ifndef fooinet_ntophfoo
#define fooinet_ntophfoo
#ifndef HAVE_INET_NTOP
#include <pulsecore/socket.h>
const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
#endif
#endif

63
src/pulsecore/inet_pton.c
View file

@ -1,63 +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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
***/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <errno.h>
#ifndef HAVE_INET_PTON
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
#include "inet_pton.h"
int inet_pton(int af, const char *src, void *dst) {
struct in_addr *in = (struct in_addr*)dst;
#ifdef HAVE_IPV6
struct in6_addr *in6 = (struct in6_addr*)dst;
#endif
pa_assert(src);
pa_assert(dst);
switch (af) {
case AF_INET:
in->s_addr = inet_addr(src);
if (in->s_addr == INADDR_NONE)
return 0;
break;
#ifdef HAVE_IPV6
case AF_INET6:
/* FIXME */
#endif
default:
errno = EAFNOSUPPORT;
return -1;
}
return 1;
}
#endif /* INET_PTON */

12
src/pulsecore/inet_pton.h
View file

@ -1,12 +0,0 @@
#ifndef fooinet_ptonhfoo
#define fooinet_ptonhfoo
#ifndef HAVE_INET_PTON
#include <pulsecore/socket.h>
int inet_pton(int af, const char *src, void *dst);
#endif
#endif

8
src/pulsecore/ipacl.c
View file

@ -37,9 +37,6 @@
#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <pulse/xmalloc.h>
@ -48,10 +45,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
#ifndef HAVE_INET_PTON
#include <pulsecore/inet_pton.h>
#endif
#include <pulsecore/arpa-inet.h>
#include "ipacl.h"

6
src/pulsecore/parseaddr.c
View file

@ -26,16 +26,12 @@
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
#include <pulsecore/inet_pton.h>
#include <pulsecore/arpa-inet.h>
#include "parseaddr.h"

4
src/pulsecore/socket-client.c
View file

@ -35,9 +35,6 @@
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@ -63,6 +60,7 @@
#include <pulsecore/parseaddr.h>
#include <pulsecore/macro.h>
#include <pulsecore/refcnt.h>
#include <pulsecore/arpa-inet.h>
#include "socket-client.h"

11
src/pulsecore/socket-server.c
View file

@ -39,9 +39,6 @@
((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))
#endif
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@ -50,13 +47,6 @@
#include <tcpd.h>
#endif
#ifndef HAVE_INET_NTOP
#include <pulsecore/inet_ntop.h>
#endif
#ifndef HAVE_INET_PTON
#include <pulsecore/inet_pton.h>
#endif
#include <pulse/xmalloc.h>
#include <pulse/util.h>
@ -67,6 +57,7 @@
#include <pulsecore/macro.h>
#include <pulsecore/core-error.h>
#include <pulsecore/refcnt.h>
#include <pulsecore/arpa-inet.h>
#include "socket-server.h"

8
src/pulsecore/socket-util.c
View file

@ -54,13 +54,6 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifndef HAVE_INET_NTOP
#include <pulsecore/inet_ntop.h>
#endif
#include <pulse/xmalloc.h>
@ -69,6 +62,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
#include <pulsecore/arpa-inet.h>
#include "socket-util.h"