Re: [PATCH 6/6] winealsa: Build with msvcrt.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Fri, Mar 25, 2022 at 08:42:19AM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies
>
> dlls/winealsa.drv/Makefile.in |  2 --
>  dlls/winealsa.drv/midi.c      |  9 ---------
>  dlls/winealsa.drv/mmdevdrv.c  | 17 ++++++-----------
>  3 files changed, 6 insertions(+), 22 deletions(-)
>
> diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
> index 2113594fbe3..1349f6f9dab 100644
> --- a/dlls/winealsa.drv/Makefile.in
> +++ b/dlls/winealsa.drv/Makefile.in
> @@ -5,8 +5,6 @@ IMPORTS   = uuid ole32 advapi32
>  DELAYIMPORTS = winmm
>  EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS)
>
> -EXTRADLLFLAGS = -mcygwin
> -
>
> C_SRCS = \
>    alsa.c \
>    alsamidi.c \
> diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
> index 4db38537dd0..fc2205de6f6 100644
> --- a/dlls/winealsa.drv/midi.c
> +++ b/dlls/winealsa.drv/midi.c
> @@ -22,17 +22,8 @@
> - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
>
> */
>
> -#include "config.h"
> -
>
> -#include <string.h>
>  #include <stdarg.h>
> -#include <stdio.h>
> -#include <unistd.h>
> -#include <fcntl.h>
> -#include <errno.h>
>
> -#include "ntstatus.h"
> -#define WIN32_NO_STATUS
>  #include "windef.h"
>  #include "winbase.h"
>  #include "wingdi.h"
> diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
> index 389c40b47de..7dc01940dc9 100644
> --- a/dlls/winealsa.drv/mmdevdrv.c
> +++ b/dlls/winealsa.drv/mmdevdrv.c
> @@ -18,23 +18,15 @@
> - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
>
> */
>
> -#define NONAMELESSUNION
>  #define COBJMACROS
> -#include "config.h"
>
> #include <stdarg.h>
> -#include <stdio.h>
> -#include <math.h>
>
> #include "windef.h"
>  #include "winbase.h"
>  #include "winnls.h"
>  #include "winreg.h"
> -#include "wine/debug.h"
> -#include "wine/unicode.h"
> -#include "wine/list.h"
> -#include "wine/unixlib.h"
> -
>
> +#include "winternl.h"
>  #include "propsys.h"
>  #include "initguid.h"
>  #include "ole2.h"
> @@ -44,11 +36,14 @@
>  #include "mmsystem.h"
>  #include "dsound.h"
>
> -#include "initguid.h"
>  #include "endpointvolume.h"
>  #include "audioclient.h"
>  #include "audiopolicy.h"
>
> +#include "wine/debug.h"
> +#include "wine/list.h"
> +#include "wine/unixlib.h"
> -
>
> #include "unixlib.h"
>
> WINE_DEFAULT_DEBUG_CHANNEL(alsa);
> @@ -371,7 +366,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu
>      }
>  for(i = 0; i < params.num; i++){
> -
>    unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR);
> -
>    unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR);
>    ids[i] = HeapAlloc(GetProcessHeap(), 0, size);
>    if(!ids[i]){
>        params.result = E_OUTOFMEMORY;
>
> -- 
> 2.25.1