Sync to Wine-20050524:

Alexandre Julliard <julliard@winehq.org>
- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
- Comment out stub WEP entry points so that we can call WEP for builtin
  dlls too.
- Removed unnecessary code in the 16-bit DllEntryPoint function of some
  dlls, and also fixed its ordinal in a few places.
Hans Leidekker <hans@it.vu.nl>
- Stub implementation for SetupCopyOEMInfW.
Ivan Leo Puoti <ivanleo@gmail.com>
- Minor fix in SetupQueueCopySectionW.

svn path=/trunk/; revision=15582

diff --git a/reactos/lib/setupapi/Makefile.in b/reactos/lib/setupapi/Makefile.in
index 6321589..f006515 100644 (file)
--- a/reactos/lib/setupapi/Makefile.in
+++ b/reactos/lib/setupapi/Makefile.in
@@ -4,6 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = setupapi.dll\r
+IMPORTLIB = libsetupapi.$(IMPLIBEXT)\r
 IMPORTS   = user32 version advapi32 rpcrt4 kernel32 ntdll\r
 DELAYIMPORTS = shell32\r
 EXTRALIBS = $(LIBUNICODE)\r

diff --git a/reactos/lib/setupapi/queue.c b/reactos/lib/setupapi/queue.c
index 66da7b7..3144707 100644 (file)
--- a/reactos/lib/setupapi/queue.c
+++ b/reactos/lib/setupapi/queue.c
@@ -767,6 +767,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf,
     params.SecurityDescriptor = NULL;\r
 \r
     if (!hlist) hlist = hinf;\r
+    if (!hinf) hinf = hlist;\r
     if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE;\r
     if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE;\r
     do\r

diff --git a/reactos/lib/setupapi/setupapi.spec b/reactos/lib/setupapi/setupapi.spec
index 7b17247..8283933 100644 (file)
--- a/reactos/lib/setupapi/setupapi.spec
+++ b/reactos/lib/setupapi/setupapi.spec
@@ -253,7 +253,7 @@
 @ stub SetupCopyErrorA\r
 @ stub SetupCopyErrorW\r
 @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr)\r
-@ stub SetupCopyOEMInfW\r
+@ stdcall SetupCopyOEMInfW(wstr wstr long long ptr long ptr ptr)\r
 @ stdcall SetupCreateDiskSpaceListA(ptr long long)\r
 @ stdcall SetupCreateDiskSpaceListW(ptr long long)\r
 @ stub SetupDecompressOrCopyFileA\r

diff --git a/reactos/lib/setupapi/setupx.spec b/reactos/lib/setupapi/setupx.spec
index 2c40e0e..0796629 100644 (file)
--- a/reactos/lib/setupapi/setupx.spec
+++ b/reactos/lib/setupapi/setupx.spec
@@ -1,4 +1,4 @@
-1    stub     WEP\r
+#1    stub     WEP\r
 2    pascal -ret16 IpOpen(str ptr) IpOpen16\r
 3    stub     IpOpenAppend #(str word)\r
 4    pascal -ret16 IpClose(word) IpClose16\r

diff --git a/reactos/lib/setupapi/stubs.c b/reactos/lib/setupapi/stubs.c
index f392481..3790ebc 100644 (file)
--- a/reactos/lib/setupapi/stubs.c
+++ b/reactos/lib/setupapi/stubs.c
@@ -99,7 +99,21 @@ BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,
                            DWORD destnamesize, PDWORD required,\r
                            PSTR *destinfnamecomponent)\r
 {\r
-  FIXME("stub: source %s location %s ...\n",sourceinffile, sourcemedialoc);\r
+  FIXME("stub: source %s location %s ...\n", debugstr_a(sourceinffile),\r
+        debugstr_a(sourcemedialoc));\r
+  return FALSE;\r
+}\r
+\r
+/***********************************************************************\r
+ *      SetupCopyOEMInfW  (SETUPAPI.@)\r
+ */\r
+BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR sourcemedialoc,\r
+                DWORD mediatype, DWORD copystyle, PWSTR destinfname,\r
+                DWORD destnamesize, PDWORD required,\r
+                PWSTR *destinfnamecomponent)\r
+{\r
+  FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile),\r
+        debugstr_w(sourcemedialoc));\r
   return FALSE;\r
 }\r
 \r

diff --git a/reactos/lib/setupapi/virtcopy.c b/reactos/lib/setupapi/virtcopy.c
index b21692e..2771fcb 100644 (file)
--- a/reactos/lib/setupapi/virtcopy.c
+++ b/reactos/lib/setupapi/virtcopy.c
@@ -305,7 +305,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef)
     VCP_MsgRef = lparamMsgRef;\r
 \r
     /* load SETUPAPI needed for dialog resources etc. */\r
-    SETUPAPI_hInstance = LoadLibraryA("setupapi.dll");\r
+    SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll");\r
     if (!SETUPAPI_hInstance)\r
     {\r
        ERR("Could not load sibling setupapi.dll\n");\r
@@ -555,7 +555,6 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
     cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef);\r
     TRACE("#6\n");\r
     VCP_Proc = NULL;\r
-    FreeLibrary(SETUPAPI_hInstance);\r
     VCP_opened = FALSE;\r
     return OK;\r
 }\r