[PATCH 0/4] MR2677: wine{alsa,coreaudio,oss,pulse}: Symlink mmdevapi headers.
From: Davide Beatrici <git(a)davidebeatrici.dev> --- dlls/winealsa.drv/mmdevdrv.c | 3 +-- dlls/winealsa.drv/mmdevdrv.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 dlls/winealsa.drv/mmdevdrv.h diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c46ae41f48b..3653a27db50 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -45,10 +45,9 @@ #include "wine/list.h" #include "wine/unixlib.h" +#include "mmdevdrv.h" #include "unixlib.h" -#include "../mmdevapi/mmdevdrv.h" - WINE_DEFAULT_DEBUG_CHANNEL(alsa); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) diff --git a/dlls/winealsa.drv/mmdevdrv.h b/dlls/winealsa.drv/mmdevdrv.h new file mode 120000 index 00000000000..35fcb226acb --- /dev/null +++ b/dlls/winealsa.drv/mmdevdrv.h @@ -0,0 +1 @@ +../mmdevapi/mmdevdrv.h \ No newline at end of file -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2677
From: Davide Beatrici <git(a)davidebeatrici.dev> --- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- dlls/winecoreaudio.drv/mmdevdrv.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 dlls/winecoreaudio.drv/mmdevdrv.h diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 21c2528cab1..52da71aa78b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -40,9 +40,9 @@ #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" -#include "unixlib.h" -#include "../mmdevapi/mmdevdrv.h" +#include "mmdevdrv.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.h b/dlls/winecoreaudio.drv/mmdevdrv.h new file mode 120000 index 00000000000..35fcb226acb --- /dev/null +++ b/dlls/winecoreaudio.drv/mmdevdrv.h @@ -0,0 +1 @@ +../mmdevapi/mmdevdrv.h \ No newline at end of file -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2677
From: Davide Beatrici <git(a)davidebeatrici.dev> --- dlls/wineoss.drv/mmdevdrv.c | 3 +-- dlls/wineoss.drv/mmdevdrv.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 dlls/wineoss.drv/mmdevdrv.h diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 56e619dd163..fb524c71ed8 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -42,10 +42,9 @@ #include "wine/list.h" #include "wine/unixlib.h" +#include "mmdevdrv.h" #include "unixlib.h" -#include "../mmdevapi/mmdevdrv.h" - WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) diff --git a/dlls/wineoss.drv/mmdevdrv.h b/dlls/wineoss.drv/mmdevdrv.h new file mode 120000 index 00000000000..35fcb226acb --- /dev/null +++ b/dlls/wineoss.drv/mmdevdrv.h @@ -0,0 +1 @@ +../mmdevapi/mmdevdrv.h \ No newline at end of file -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2677
From: Davide Beatrici <git(a)davidebeatrici.dev> --- dlls/winepulse.drv/mmdevdrv.c | 4 ++-- dlls/winepulse.drv/mmdevdrv.h | 1 + dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 120000 dlls/winepulse.drv/mmdevdrv.h create mode 120000 dlls/winepulse.drv/unixlib.h diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7f1dbb765cf..5a5b541ee3f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -47,8 +47,8 @@ #include "endpointvolume.h" #include "audiopolicy.h" -#include "../mmdevapi/unixlib.h" -#include "../mmdevapi/mmdevdrv.h" +#include "mmdevdrv.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(pulse); diff --git a/dlls/winepulse.drv/mmdevdrv.h b/dlls/winepulse.drv/mmdevdrv.h new file mode 120000 index 00000000000..35fcb226acb --- /dev/null +++ b/dlls/winepulse.drv/mmdevdrv.h @@ -0,0 +1 @@ +../mmdevapi/mmdevdrv.h \ No newline at end of file diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h new file mode 120000 index 00000000000..69485b6beec --- /dev/null +++ b/dlls/winepulse.drv/unixlib.h @@ -0,0 +1 @@ +../mmdevapi/unixlib.h \ No newline at end of file -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2677
This merge request was closed by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2677
This doesn't look like an improvement to me. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2677#note_30628
participants (3)
-
Davide Beatrici -
Davide Beatrici (@davidebeatrici) -
Huw Davies (@huw)