[PATCH 5/5] wineoss: Build with msvcrt.

[Huw Davies]

Signed-off-by: Huw Davies 
---
 dlls/wineoss.drv/Makefile.in | 2 --
 dlls/wineoss.drv/mmdevdrv.c  | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
index 13fb18b6004..d41aa0113c8 100644
--- a/dlls/wineoss.drv/Makefile.in
+++ b/dlls/wineoss.drv/Makefile.in
@@ -6,8 +6,6 @@ DELAYIMPORTS = winmm
 EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS)
 EXTRAINCL = $(OSS4_CFLAGS)

-EXTRADLLFLAGS = -mcygwin
-
 C_SRCS = \
    midi.c \
    midipatch.c \
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 9e3380ca8d9..c282ff14f01 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -39,7 +39,6 @@

#include "wine/debug.h"
 #include "wine/list.h"
-#include "wine/unicode.h"
 #include "wine/unixlib.h"

#include "unixlib.h"
@@ -391,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu
     }

for(i = 0; i < params.num; i++){
-        unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR);
+        unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR);
         unsigned int dev_size = strlen(params.endpoints[i].device) + 1;
         OSSDevice *oss_dev;

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Tue, May 03, 2022 at 07:42:32AM +0100, Huw Davies wrote:
> Signed-off-by: Huw Davies
>
> dlls/wineoss.drv/Makefile.in | 2 --
>  dlls/wineoss.drv/mmdevdrv.c  | 3 +--
>  2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
> index 13fb18b6004..d41aa0113c8 100644
> --- a/dlls/wineoss.drv/Makefile.in
> +++ b/dlls/wineoss.drv/Makefile.in
> @@ -6,8 +6,6 @@ DELAYIMPORTS = winmm
>  EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS)
>  EXTRAINCL = $(OSS4_CFLAGS)
>
> -EXTRADLLFLAGS = -mcygwin
> -
>
> C_SRCS = \
>    midi.c \
>    midipatch.c \
> diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
> index 9e3380ca8d9..c282ff14f01 100644
> --- a/dlls/wineoss.drv/mmdevdrv.c
> +++ b/dlls/wineoss.drv/mmdevdrv.c
> @@ -39,7 +39,6 @@
>
> #include "wine/debug.h"
>  #include "wine/list.h"
> -#include "wine/unicode.h"
>  #include "wine/unixlib.h"
>
> #include "unixlib.h"
> @@ -391,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu
>      }
>  for(i = 0; i < params.num; i++){
> -
>    unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR);
> -
>    unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR);
>    unsigned int dev_size = strlen(params.endpoints[i].device) + 1;
>    OSSDevice *oss_dev;
>
> -- 
> 2.25.1