[gvg] 15582: Sync to Wine-20050524:

Sync to Wine-20050524:
Alexandre Julliard [e-mail]
- 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 [e-mail]
- Stub implementation for SetupCopyOEMInfW.
Ivan Leo Puoti [e-mail]
- Minor fix in SetupQueueCopySectionW.
Modified: trunk/reactos/lib/setupapi/Makefile.in
Modified: trunk/reactos/lib/setupapi/queue.c
Modified: trunk/reactos/lib/setupapi/setupapi.spec
Modified: trunk/reactos/lib/setupapi/setupx.spec
Modified: trunk/reactos/lib/setupapi/stubs.c
Modified: trunk/reactos/lib/setupapi/virtcopy.c
  _____

Modified: trunk/reactos/lib/setupapi/Makefile.in
--- trunk/reactos/lib/setupapi/Makefile.in	2005-05-28 15:04:47 UTC
(rev 15581)
+++ trunk/reactos/lib/setupapi/Makefile.in	2005-05-28 15:14:29 UTC
(rev 15582)
@@ -4,6 +4,7 @@

SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupapi.dll
+IMPORTLIB = libsetupapi.$(IMPLIBEXT)
 IMPORTS   = user32 version advapi32 rpcrt4 kernel32 ntdll
 DELAYIMPORTS = shell32
 EXTRALIBS = $(LIBUNICODE)
  _____

Modified: trunk/reactos/lib/setupapi/queue.c
--- trunk/reactos/lib/setupapi/queue.c	2005-05-28 15:04:47 UTC (rev
15581)
+++ trunk/reactos/lib/setupapi/queue.c	2005-05-28 15:14:29 UTC (rev
15582)
@@ -767,6 +767,7 @@

params.SecurityDescriptor = NULL;

if (!hlist) hlist = hinf;
+    if (!hinf) hinf = hlist;
     if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return
FALSE;
     if (!(params.TargetDirectory = get_destination_dir( hinf, section
))) return FALSE;
     do
  _____

Modified: trunk/reactos/lib/setupapi/setupapi.spec
--- trunk/reactos/lib/setupapi/setupapi.spec	2005-05-28 15:04:47 UTC
(rev 15581)
+++ trunk/reactos/lib/setupapi/setupapi.spec	2005-05-28 15:14:29 UTC
(rev 15582)
@@ -253,7 +253,7 @@

@ stub SetupCopyErrorA
 @ stub SetupCopyErrorW
 @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr)
-@ stub SetupCopyOEMInfW
+@ stdcall SetupCopyOEMInfW(wstr wstr long long ptr long ptr ptr)
 @ stdcall SetupCreateDiskSpaceListA(ptr long long)
 @ stdcall SetupCreateDiskSpaceListW(ptr long long)
 @ stub SetupDecompressOrCopyFileA
  _____

Modified: trunk/reactos/lib/setupapi/setupx.spec
--- trunk/reactos/lib/setupapi/setupx.spec	2005-05-28 15:04:47 UTC
(rev 15581)
+++ trunk/reactos/lib/setupapi/setupx.spec	2005-05-28 15:14:29 UTC
(rev 15582)
@@ -1,4 +1,4 @@

-1    stub     WEP
+#1    stub     WEP
 2    pascal -ret16 IpOpen(str ptr) IpOpen16
 3    stub     IpOpenAppend #(str word)
 4    pascal -ret16 IpClose(word) IpClose16
  _____

Modified: trunk/reactos/lib/setupapi/stubs.c
--- trunk/reactos/lib/setupapi/stubs.c	2005-05-28 15:04:47 UTC (rev
15581)
+++ trunk/reactos/lib/setupapi/stubs.c	2005-05-28 15:14:29 UTC (rev
15582)
@@ -99,11 +99,25 @@

DWORD destnamesize, PDWORD required,
    		    PSTR *destinfnamecomponent)
 {
-  FIXME("stub: source %s location %s ...\n",sourceinffile,
sourcemedialoc);
+  FIXME("stub: source %s location %s ...\n", debugstr_a(sourceinffile),
+        debugstr_a(sourcemedialoc));
   return FALSE;
 }

/***********************************************************************
+ *      SetupCopyOEMInfW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR
sourcemedialoc,
+                DWORD mediatype, DWORD copystyle, PWSTR destinfname,
+                DWORD destnamesize, PDWORD required,
+                PWSTR *destinfnamecomponent)
+{
+  FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile),
+        debugstr_w(sourcemedialoc));
+  return FALSE;
+}
+
+/**********************************************************************
*
  *		SetupGetInfInformationA    (SETUPAPI.@)
  */
 BOOL WINAPI SetupGetInfInformationA( LPCVOID InfSpec, DWORD
SearchControl,
  _____

Modified: trunk/reactos/lib/setupapi/virtcopy.c
--- trunk/reactos/lib/setupapi/virtcopy.c	2005-05-28 15:04:47 UTC
(rev 15581)
+++ trunk/reactos/lib/setupapi/virtcopy.c	2005-05-28 15:14:29 UTC
(rev 15582)
@@ -305,7 +305,7 @@

VCP_MsgRef = lparamMsgRef;

/* load SETUPAPI needed for dialog resources etc. */
-    SETUPAPI_hInstance = LoadLibraryA("setupapi.dll");
+    SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll");
     if (!SETUPAPI_hInstance)
     {
    ERR("Could not load sibling setupapi.dll\n");
@@ -555,7 +555,6 @@
     cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0,
VCP_MsgRef);
     TRACE("#6\n");
     VCP_Proc = NULL;
-    FreeLibrary(SETUPAPI_hInstance);
     VCP_opened = FALSE;
     return OK;
 }