Re: [PATCH v2 7/7] winepulse: Build with msvcrt.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Mon, May 24, 2021 at 06:22:40PM +0200, Jacek Caban wrote:
> Signed-off-by: Jacek Caban
>
> dlls/winepulse.drv/Makefile.in |  2 ++
>  dlls/winepulse.drv/mmdevdrv.c  | 15 ++-------------
>  2 files changed, 4 insertions(+), 13 deletions(-)
> diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
> index d05d63e92e3..9a04eaee5ee 100644
> --- a/dlls/winepulse.drv/Makefile.in
> +++ b/dlls/winepulse.drv/Makefile.in
> @@ -3,6 +3,8 @@ IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
>  EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS)
>  EXTRAINCL = $(PULSE_CFLAGS)
>
> +EXTRADLLFLAGS = -mno-cygwin
> -
>
> C_SRCS = \
>    mmdevdrv.c \
>    mult.c \
> diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
> index 0d55b0fc2d0..bc28bce137e 100644
> --- a/dlls/winepulse.drv/mmdevdrv.c
> +++ b/dlls/winepulse.drv/mmdevdrv.c
> @@ -18,25 +18,14 @@
> - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
>
> */
>
> -#define NONAMELESSUNION
>  #define COBJMACROS
> -#define _GNU_SOURCE
> -
>
> -#include "config.h"
>
> #include <stdarg.h>
> -#include <unistd.h>
> -#include <math.h>
> -#include <stdio.h>
> -#include <errno.h>
>
> #include "windef.h"
>  #include "winbase.h"
> -#include "winnls.h"
> -#include "winreg.h"
>  #include "winternl.h"
>  #include "wine/debug.h"
> -#include "wine/unicode.h"
>  #include "wine/list.h"
>
> #include "ole2.h"
> @@ -145,7 +134,7 @@ struct ACImpl {
>      AudioSessionWrapper *session_wrapper;
>  };
>
> -static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0};
> +static const WCHAR defaultW[] = L"Pulseaudio";
>
> static const IAudioClient3Vtbl AudioClient3_Vtbl;
>  static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
> @@ -216,7 +205,7 @@ static char *get_application_name(void)
>      char *str;
>  GetModuleFileNameW(NULL, path, ARRAY_SIZE(path));
> - name = strrchrW(path, '\');
> - name = wcsrchr(path, '\');
> if (!name)
>     name = path;
> else