Alexandre Julliard : newdev: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Fri Jun 14 16:52:17 CDT 2019
Module: wine
Branch: master
Commit: e97ec06022640c8e747fc4e7bf3346902fa3cc43
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97ec06022640c8e747fc4e7bf3346902fa3cc43
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jun 14 09:22:56 2019 +0200
newdev: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/newdev/Makefile.in | 2 ++
dlls/newdev/main.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in
index c447a38..85086f1 100644
--- a/dlls/newdev/Makefile.in
+++ b/dlls/newdev/Makefile.in
@@ -2,4 +2,6 @@ MODULE = newdev.dll
IMPORTLIB = newdev
IMPORTS = setupapi
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = main.c
diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c
index 108aec0..72e7cbc 100644
--- a/dlls/newdev/main.c
+++ b/dlls/newdev/main.c
@@ -23,6 +23,7 @@
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
+#include "winnls.h"
#include "winuser.h"
#include "winreg.h"
#include "cfgmgr32.h"
@@ -30,7 +31,6 @@
#include "wine/debug.h"
#include "wine/heap.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
@@ -71,9 +71,9 @@ static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids)
{
while (*device_ids)
{
- if (!strcmpW(id, device_ids))
+ if (!wcscmp(id, device_ids))
return TRUE;
- device_ids += strlenW(device_ids) + 1;
+ device_ids += lstrlenW(device_ids) + 1;
}
return FALSE;
}
@@ -128,7 +128,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar
if (!SetupDiGetDeviceInstallParamsW(set, &device, ¶ms))
continue;
- strcpyW(params.DriverPath, inf_path);
+ lstrcpyW(params.DriverPath, inf_path);
params.Flags |= DI_ENUMSINGLEINF;
if (!SetupDiSetDeviceInstallParamsW(set, &device, ¶ms))
continue;
More information about the wine-cvs
mailing list