Make use of now full and correct HKLM\HARDWARE\DEVICES\Scsi.

0df36de5 · Vitaliy Margolen · Alexandre Julliard · 6ce9a791 · 0df36de5 · 0df36de5
Commit 0df36de5 authored Aug 10, 2005 by Vitaliy Margolen Committed by Alexandre Julliard Aug 10, 2005
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Makefile.in dlls/winaspi/Makefile.in +1 -0

aspi.c dlls/winaspi/aspi.c +0 -0

winescsi.h dlls/winaspi/winescsi.h +2 -3

No files found.
--- a/dlls/winaspi/Makefile.in
+++ b/dlls/winaspi/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
 IMPORTLIB = libwnaspi32.$(IMPLIBEXT)
 IMPORTS   = advapi32 kernel32
+EXTRALIBS = $(LIBUNICODE)

 C_SRCS = \
 	aspi.c \

--- a/dlls/winaspi/aspi.c
+++ b/dlls/winaspi/aspi.c
--- a/dlls/winaspi/winescsi.h
+++ b/dlls/winaspi/winescsi.h
@@ -52,9 +52,8 @@ struct sg_header
 #endif


-/* RegKey used for SCSI info under HKEY_DYN_DATA */
-#define KEYNAME_SCSI "WineScsi"
-#define KEYNAME_SCSI_CONTROLLERMAP "ControllerMap"
+/* RegKey used for SCSI info under HKLM */
+#define KEYNAME_SCSI "HARDWARE\\DEVICEMAP\\Scsi\\Scsi Port %d\\Scsi Bus %d\\Target Id %d\\Logical Unit Id %d"

 /* Function prototypes from dlls/wnaspi32/aspi.c */
 void