Zebediah Figura : newdev: Correct definition of DiInstallDriver().

Alexandre Julliard julliard at winehq.org
Wed May 29 15:50:37 CDT 2019


Module: wine
Branch: master
Commit: 1c1de06dfa5cbf776889bea4660c8944ce6f3ee1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1c1de06dfa5cbf776889bea4660c8944ce6f3ee1

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue May 28 19:14:13 2019 -0500

newdev: Correct definition of DiInstallDriver().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/newdev/main.c      | 12 +++++-------
 dlls/newdev/newdev.spec |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c
index 20725a4..b1a5ccf 100644
--- a/dlls/newdev/main.c
+++ b/dlls/newdev/main.c
@@ -25,7 +25,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "winreg.h"
-#include "setupapi.h"
+#include "newdev.h"
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
@@ -75,19 +75,17 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR Hardware
 /***********************************************************************
  *           DiInstallDriverA (NEWDEV.@)
  */
-BOOL WINAPI DiInstallDriverA(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata,
-    PSP_DRVINFO_DATA_A driverdata, DWORD flags, BOOL *reboot)
+BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot)
 {
-    FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot);
+    FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot);
     return TRUE;
 }
 
 /***********************************************************************
  *           DiInstallDriverW (NEWDEV.@)
  */
-BOOL WINAPI DiInstallDriverW(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata,
-    PSP_DRVINFO_DATA_W driverdata, DWORD flags, BOOL *reboot)
+BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot)
 {
-    FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot);
+    FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot);
     return TRUE;
 }
diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec
index 84303cc..6d45c7e 100644
--- a/dlls/newdev/newdev.spec
+++ b/dlls/newdev/newdev.spec
@@ -1,7 +1,7 @@
 @ stub DeviceInternetSettingUiW
 @ stub DiInstallDevice
-@ stdcall DiInstallDriverA(long ptr ptr ptr long ptr)
-@ stdcall DiInstallDriverW(long ptr ptr ptr long ptr)
+@ stdcall DiInstallDriverA(ptr str long ptr)
+@ stdcall DiInstallDriverW(ptr wstr long ptr)
 @ stub DiRollbackDriver
 @ stub DiShowUpdateDevice
 @ stub DiUninstallDevice




More information about the wine-cvs mailing list