Commit e97ec060 authored by Alexandre Julliard's avatar Alexandre Julliard

newdev: Build with msvcrt.

parent 3e5db60e
...@@ -2,4 +2,6 @@ MODULE = newdev.dll ...@@ -2,4 +2,6 @@ MODULE = newdev.dll
IMPORTLIB = newdev IMPORTLIB = newdev
IMPORTS = setupapi IMPORTS = setupapi
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = main.c C_SRCS = main.c
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "winuser.h" #include "winuser.h"
#include "winreg.h" #include "winreg.h"
#include "cfgmgr32.h" #include "cfgmgr32.h"
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
...@@ -71,9 +71,9 @@ static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids) ...@@ -71,9 +71,9 @@ static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids)
{ {
while (*device_ids) while (*device_ids)
{ {
if (!strcmpW(id, device_ids)) if (!wcscmp(id, device_ids))
return TRUE; return TRUE;
device_ids += strlenW(device_ids) + 1; device_ids += lstrlenW(device_ids) + 1;
} }
return FALSE; return FALSE;
} }
...@@ -128,7 +128,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar ...@@ -128,7 +128,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar
if (!SetupDiGetDeviceInstallParamsW(set, &device, &params)) if (!SetupDiGetDeviceInstallParamsW(set, &device, &params))
continue; continue;
strcpyW(params.DriverPath, inf_path); lstrcpyW(params.DriverPath, inf_path);
params.Flags |= DI_ENUMSINGLEINF; params.Flags |= DI_ENUMSINGLEINF;
if (!SetupDiSetDeviceInstallParamsW(set, &device, &params)) if (!SetupDiSetDeviceInstallParamsW(set, &device, &params))
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment