Index: trunk/src/setupapi/dbgwrap.cpp
===================================================================
--- trunk/src/setupapi/dbgwrap.cpp	(revision 9400)
+++ trunk/src/setupapi/dbgwrap.cpp	(revision 9403)
@@ -27,5 +27,6 @@
 NODEF_DEBUGWRAP12(SetupDiEnumDeviceInfo)
 NODEF_DEBUGWRAP20(SetupDiEnumDeviceInterfaces)
-NODEF_DEBUGWRAP16(SetupDiGetClassDevsA)
+DEBUGWRAP16(SetupDiGetClassDevsA)
+DEBUGWRAP16(SetupDiGetClassDevsW)
 NODEF_DEBUGWRAP28(SetupDiGetDeviceRegistryPropertyA)
 NODEF_DEBUGWRAP24(SetupDiGetDeviceInterfaceDetailA)
@@ -85,2 +86,15 @@
 DEBUGWRAP12(SetupSetDirectoryIdW)
 DEBUGWRAP4(SetupTermDefaultQueueCallback)
+
+
+NODEF_DEBUGWRAP8(CM_Connect_MachineW)
+NODEF_DEBUGWRAP4(CM_Disconnect_Machine)
+NODEF_DEBUGWRAP24(SetupDiBuildClassInfoListExW)
+NODEF_DEBUGWRAP24(SetupDiClassGuidsFromNameExW)
+NODEF_DEBUGWRAP24(SetupDiClassNameFromGuidExW)
+NODEF_DEBUGWRAP16(SetupDiCreateDeviceInfoListExW)
+DEBUGWRAP12(SetupSetFileQueueFlags)
+NODEF_DEBUGWRAP8(SetupDiGetDeviceInfoListDetailW)
+NODEF_DEBUGWRAP28(SetupDiGetClassDevsExW)
+NODEF_DEBUGWRAP20(SetupDiOpenClassRegKeyExW)
+NODEF_DEBUGWRAP24(SetupDiGetClassDescriptionExW)
Index: trunk/src/setupapi/devinst.c
===================================================================
--- trunk/src/setupapi/devinst.c	(revision 9400)
+++ trunk/src/setupapi/devinst.c	(revision 9403)
@@ -98,9 +98,22 @@
        DWORD flags)
 {
-    FIXME("%s %s %04x %08lx\n",debugstr_guid(class),enumstr,parent,flags);
+    FIXME("%s %s %p %08lx\n",debugstr_guid(class),enumstr,parent,flags);
 
-    return NULL;
+    return (HDEVINFO) INVALID_HANDLE_VALUE;
 }
 
+/***********************************************************************
+ *		SetupDiGetClassDevsW (SETUPAPI.@)
+ */
+HDEVINFO WINAPI SetupDiGetClassDevsW(
+       CONST GUID *class,
+       LPCWSTR enumstr,
+       HWND parent,
+       DWORD flags)
+{
+    FIXME("%s %s %p %08lx\n",debugstr_guid(class),debugstr_w(enumstr),parent,flags);
+
+    return (HDEVINFO) INVALID_HANDLE_VALUE;
+}
 /***********************************************************************
  *		SetupDiEnumDeviceInfo (SETUPAPI.@)
@@ -147,3 +160,2 @@
     return FALSE;
 }
-
Index: trunk/src/setupapi/dirid.c
===================================================================
--- trunk/src/setupapi/dirid.c	(revision 9400)
+++ trunk/src/setupapi/dirid.c	(revision 9403)
@@ -21,5 +21,5 @@
 #include "windef.h"
 #include "winbase.h"
-#include "ntddk.h"
+#include "winternl.h"
 #include "winerror.h"
 #include "setupapi.h"
Index: trunk/src/setupapi/infparse.c
===================================================================
--- trunk/src/setupapi/infparse.c	(revision 9400)
+++ trunk/src/setupapi/infparse.c	(revision 9403)
@@ -29,5 +29,5 @@
 #include "windef.h"
 #include "winbase.h"
-#include "ntddk.h"
+#include "winternl.h"
 #include "wine/winbase16.h"
 #include "setupapi.h"
@@ -179,6 +179,7 @@
     if (genflags & GENINSTALL_DO_INI2REG) flags |= SPINST_INI2REG;
     if (genflags & GENINSTALL_DO_LOGCONFIG) flags |= SPINST_LOGCONFIG;
-    if (genflags & (GENINSTALL_DO_REGSRCPATH|GENINSTALL_DO_CFGAUTO|GENINSTALL_DO_PERUSER))
-        FIXME( "unsupported flags %x\n", genflags );
+    if (genflags & GENINSTALL_DO_REGSRCPATH) FIXME( "unsupported flag: GENINSTALL_DO_REGSRCPATH\n" );
+    if (genflags & GENINSTALL_DO_CFGAUTO) FIXME( "unsupported flag: GENINSTALL_DO_CFGAUTO\n" );
+    if (genflags & GENINSTALL_DO_PERUSER) FIXME( "unsupported flag: GENINSTALL_DO_PERUSER\n" );
 
     context = SetupInitDefaultQueueCallback( 0 );
@@ -190,34 +191,2 @@
     return ret;
 }
-
-
-WORD InfNumEntries = 0;
-INF_FILE *InfList = NULL;
-HINF16 IP_curr_handle = 0;
-
-
-BOOL IP_FindInf(HINF16 hInf, WORD *ret)
-{
-    WORD n;
-
-    for (n=0; n < InfNumEntries; n++)
-	if (InfList[n].hInf == hInf)
-	{
-	    *ret = n;
-	    return TRUE;
-	}
-    return FALSE;
-}
-
-
-LPCSTR IP_GetFileName(HINF16 hInf)
-{
-    WORD n;
-    if (IP_FindInf(hInf, &n))
-    {
-	return InfList[n].lpInfFileName;
-    }
-    return NULL;
-}
-
-
Index: trunk/src/setupapi/install.c
===================================================================
--- trunk/src/setupapi/install.c	(revision 9400)
+++ trunk/src/setupapi/install.c	(revision 9403)
@@ -21,5 +21,5 @@
 #include "windef.h"
 #include "winbase.h"
-#include "ntddk.h"
+#include "winternl.h"
 #include "winerror.h"
 #include "setupapi.h"
@@ -394,8 +394,8 @@
         else if (RegCreateKeyW( root_key, buffer, &hkey ))
         {
-            ERR( "could not create key %08x %s\n", root_key, debugstr_w(buffer) );
+            ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) );
             continue;
         }
-        TRACE( "key %08x %s\n", root_key, debugstr_w(buffer) );
+        TRACE( "key %p %s\n", root_key, debugstr_w(buffer) );
 
         /* get value name */
Index: trunk/src/setupapi/parser.c
===================================================================
--- trunk/src/setupapi/parser.c	(revision 9400)
+++ trunk/src/setupapi/parser.c	(revision 9403)
@@ -28,5 +28,5 @@
 
 #include "windef.h"
-#include "ntddk.h"
+#include "winternl.h"
 #include "winbase.h"
 #include "winerror.h"
@@ -1667,5 +1667,5 @@
         for (p = field->text; *p && isxdigitW(*p); p++)
         {
-            if ((value <<= 8) > 255)
+            if ((value <<= 4) > 255)
             {
                 SetLastError( ERROR_INVALID_DATA );
Index: trunk/src/setupapi/queue.c
===================================================================
--- trunk/src/setupapi/queue.c	(revision 9400)
+++ trunk/src/setupapi/queue.c	(revision 9403)
@@ -21,5 +21,5 @@
 #include "windef.h"
 #include "winbase.h"
-#include "ntddk.h"
+#include "winternl.h"
 #include "winerror.h"
 #include "setupapi.h"
@@ -960,5 +960,5 @@
         return TRUE;  /* nothing to do */
 
-    if (!handler( context, SPFILENOTIFY_STARTQUEUE, owner, 0 )) return FALSE;
+    if (!handler( context, SPFILENOTIFY_STARTQUEUE, (UINT)owner, 0 )) return FALSE;
 
     /* perform deletes */
Index: trunk/src/setupapi/setupapi.def
===================================================================
--- trunk/src/setupapi/setupapi.def	(revision 9400)
+++ trunk/src/setupapi/setupapi.def	(revision 9403)
@@ -5,235 +5,298 @@
 EXPORTS
 
-; 45 stdcall SetupAddInstallSectionToDiskSpaceListA()         SetupAddInstallSectionToDiskSpaceListA
-; 46 stdcall SetupAddInstallSectionToDiskSpaceListW()         SetupAddInstallSectionToDiskSpaceListW
-; 47 stdcall SetupAddSectionToDiskSpaceListA()                SetupAddSectionToDiskSpaceListA
-; 48 stdcall SetupAddSectionToDiskSpaceListW()                SetupAddSectionToDiskSpaceListW
-; 49 stdcall SetupAddToDiskSpaceListA()                       SetupAddToDiskSpaceListA
-; 50 stdcall SetupAddToDiskSpaceListW()                       SetupAddToDiskSpaceListW
-; 51 stdcall SetupAddToSourceListA()                          SetupAddToSourceListA
-; 52 stdcall SetupAddToSourceListW()                          SetupAddToSourceListW
-; 53 stdcall SetupAdjustDiskSpaceListA()                      SetupAdjustDiskSpaceListA
-; 54 stdcall SetupAdjustDiskSpaceListW()                      SetupAdjustDiskSpaceListW
-; 55 stdcall SetupCancelTemporarySourceList()                 SetupCancelTemporarySourceList
+  CM_Connect_MachineW             = _CM_Connect_MachineW@8          @1
+  CM_Disconnect_Machine           = _CM_Disconnect_Machine@4        @2
+;@ stub CM_Free_Log_Conf_Handle
+;@ stub CM_Free_Res_Des_Handle
+;@ stub CM_Get_DevNode_Status_Ex
+;@ stub CM_Get_Device_ID_ExW
+;@ stub CM_Get_First_Log_Conf_Ex
+;@ stub CM_Get_Next_Res_Des_Ex
+;@ stub CM_Get_Res_Des_Data_Ex
+;@ stub CM_Get_Res_Des_Data_Size_Ex
+;@ stub CM_Locate_DevNode_ExW
+;@ stub CM_Reenumerate_DevNode_Ex
+;@ stub CaptureAndConvertAnsiArg
+;@ stub CaptureStringArg
+;@ stub CenterWindowRelativeToParent
+;@ stub ConcatenatePaths
+;@ stub DelayedMove
+;@ stub DelimStringToMultiSz
+;@ stub DestroyTextFileReadBuffer
+;@ stub DoesUserHavePrivilege
+;@ stub DuplicateString
+;@ stub EnablePrivilege
+;@ stub ExtensionPropSheetPageProc
+;@ stub FileExists
+;@ stub FreeStringArray
+;@ stub GetNewInfName
+;@ stub GetSetFileTimestamp
+;@ stub GetVersionInfoFromImage
+;@ stub InfIsFromOemLocation
+;@ stub InstallHinfSection
+;@ stub InstallHinfSectionA
+;@ stub InstallHinfSectionW
+;@ stub InstallStop
+;@ stub IsUserAdmin
+;@ stub LookUpStringInTable
+;@ stub MemoryInitialize
+;@ stub MultiByteToUnicode
+;@ stub MultiSzFromSearchControl
+;@ stub MyFree
+;@ stub MyGetFileTitle
+;@ stub MyMalloc
+;@ stub MyRealloc
+;@ stub OpenAndMapFileForRead
+;@ stub OutOfMemory
+;@ stub QueryMultiSzValueToArray
+;@ stub QueryRegistryValue
+;@ stub ReadAsciiOrUnicodeTextFile
+;@ stub RegistryDelnode
+;@ stub RetreiveFileSecurity
+;@ stub RetrieveServiceConfig
+;@ stub SearchForInfFile
+;@ stub SetArrayToMultiSzValue
+;@ stub SetupAddInstallSectionToDiskSpaceListA
+;@ stub SetupAddInstallSectionToDiskSpaceListW
+;@ stub SetupAddSectionToDiskSpaceListA
+;@ stub SetupAddSectionToDiskSpaceListW
+;@ stub SetupAddToDiskSpaceListA
+;@ stub SetupAddToDiskSpaceListW
+;@ stub SetupAddToSourceListA
+;@ stub SetupAddToSourceListW
+;@ stub SetupAdjustDiskSpaceListA
+;@ stub SetupAdjustDiskSpaceListW
+;@ stub SetupCancelTemporarySourceList
   SetupCloseFileQueue              = _SetupCloseFileQueue@4         @56
   SetupCloseInfFile                = _SetupCloseInfFile@4           @57
-; 58 stdcall SetupCommitFileQueue()                           SetupCommitFileQueue
+;@ stub SetupCommitFileQueue
   SetupCommitFileQueueA            = _SetupCommitFileQueueA@16      @59
   SetupCommitFileQueueW            = _SetupCommitFileQueueW@16      @60
-; 61 stdcall SetupCopyErrorA()                                SetupCopyErrorA
-; 62 stdcall SetupCopyErrorW()                                SetupCopyErrorW
-; 63 stdcall SetupCreateDiskSpaceListA()                      SetupCreateDiskSpaceListA
-; 64 stdcall SetupCreateDiskSpaceListW()                      SetupCreateDiskSpaceListW
-; 65 stdcall SetupDecompressOrCopyFileA()                     SetupDecompressOrCopyFileA
-; 66 stdcall SetupDecompressOrCopyFileW()                     SetupDecompressOrCopyFileW
-; 67 stdcall SetupDefaultQueueCallback()                      SetupDefaultQueueCallback
+;@ stub SetupCopyErrorA
+;@ stub SetupCopyErrorW
+;@ stub SetupCreateDiskSpaceListA
+;@ stub SetupCreateDiskSpaceListW
+;@ stub SetupDecompressOrCopyFileA
+;@ stub SetupDecompressOrCopyFileW
+;@ stub SetupDefaultQueueCallback
   SetupDefaultQueueCallbackA       = _SetupDefaultQueueCallbackA@16 @68
   SetupDefaultQueueCallbackW       = _SetupDefaultQueueCallbackW@16 @69
-; 70 stdcall SetupDeleteErrorA()                              SetupDeleteErrorA
-; 71 stdcall SetupDeleteErrorW()                              SetupDeleteErrorW
-; 72 stdcall SetupDestroyDiskSpaceList()                      SetupDestroyDiskSpaceList
-; 73 stdcall SetupDiAskForOEMDisk()                           SetupDiAskForOEMDisk
-; 74 stdcall SetupDiBuildClassInfoList()                      SetupDiBuildClassInfoList
-; 75 stdcall SetupDiBuildDriverInfoList()                     SetupDiBuildDriverInfoList
-; 76 stdcall SetupDiCallClassInstaller()                      SetupDiCallClassInstaller
-; 77 stdcall SetupDiCancelDriverInfoSearch()                  SetupDiCancelDriverInfoSearch
-; 78 stdcall SetupDiChangeState()                             SetupDiChangeState
-; 79 stdcall SetupDiClassGuidsFromNameA()                     SetupDiClassGuidsFromNameA
-; 80 stdcall SetupDiClassGuidsFromNameW()                     SetupDiClassGuidsFromNameW
-; 81 stdcall SetupDiClassNameFromGuidA()                      SetupDiClassNameFromGuidA
-; 82 stdcall SetupDiClassNameFromGuidW()                      SetupDiClassNameFromGuidW
-; 83 stdcall SetupDiCreateDevRegKeyA()                        SetupDiCreateDevRegKeyA
-; 84 stdcall SetupDiCreateDevRegKeyW()                        SetupDiCreateDevRegKeyW
-; 85 stdcall SetupDiCreateDeviceInfoA()                       SetupDiCreateDeviceInfoA
-; 86 stdcall SetupDiCreateDeviceInfoList()                    SetupDiCreateDeviceInfoList
-; 87 stdcall SetupDiCreateDeviceInfoW()                       SetupDiCreateDeviceInfoW
-; 88 stdcall SetupDiDeleteDevRegKey()                         SetupDiDeleteDevRegKey
-; 89 stdcall SetupDiDeleteDeviceInfo()                        SetupDiDeleteDeviceInfo
-; 90 stdcall SetupDiDestroyClassImageList()                   SetupDiDestroyClassImageList
-  SetupDiDestroyDeviceInfoList = _SetupDiDestroyDeviceInfoList@4         @91
-; 92 stdcall SetupDiDestroyDriverInfoList
-; 93 stdcall SetupDiDrawMiniIcon()                            SetupDiDrawMiniIcon
-  SetupDiEnumDeviceInfo        = _SetupDiEnumDeviceInfo@12               @94
-  SetupDiEnumDeviceInterfaces  = _SetupDiEnumDeviceInterfaces@20         @95
-; 95 stdcall SetupDiEnumDriverInfoA()                         SetupDiEnumDriverInfoA
-; 96 stdcall SetupDiEnumDriverInfoW()                         SetupDiEnumDriverInfoW
-; 97 stdcall SetupDiGetActualSectionToInstallA()              SetupDiGetActualSectionToInstallA
-; 98 stdcall SetupDiGetActualSectionToInstallW()              SetupDiGetActualSectionToInstallW
-; 99 stdcall SetupDiGetClassBitmapIndex()                     SetupDiGetClassBitmapIndex
-;100 stdcall SetupDiGetClassDescriptionA()                    SetupDiGetClassDescriptionA
-;101 stdcall SetupDiGetClassDescriptionW()                    SetupDiGetClassDescriptionW
-;102 stdcall SetupDiGetClassDevPropertySheetsA()              SetupDiGetClassDevPropertySheetsA
-;103 stdcall SetupDiGetClassDevPropertySheetsW()              SetupDiGetClassDevPropertySheetsW
-  SetupDiGetClassDevsA         = _SetupDiGetClassDevsA@16                @103
-;105 stdcall SetupDiGetClassDevsW()                           SetupDiGetClassDevsW
-;106 stdcall SetupDiGetClassImageIndex()                      SetupDiGetClassImageIndex
-;107 stdcall SetupDiGetClassImageList()                       SetupDiGetClassImageList
-;108 stdcall SetupDiGetClassInstallParamsA()                  SetupDiGetClassInstallParamsA
-;109 stdcall SetupDiGetClassInstallParamsW()                  SetupDiGetClassInstallParamsW
-;110 stdcall SetupDiGetDeviceInfoListClass()                  SetupDiGetDeviceInfoListClass
-;111 stdcall SetupDiGetDeviceInstallParamsA()                 SetupDiGetDeviceInstallParamsA
-;112 stdcall SetupDiGetDeviceInstallParamsW()                 SetupDiGetDeviceInstallParamsW
-;113 stdcall SetupDiGetDeviceInstanceIdA()                    SetupDiGetDeviceInstanceIdA
-;114 stdcall SetupDiGetDeviceInstanceIdW()                    SetupDiGetDeviceInstanceIdW
-  SetupDiGetDeviceRegistryPropertyA = _SetupDiGetDeviceRegistryPropertyA@28 @115
-;116 stdcall SetupDiGetDeviceRegistryPropertyW()              SetupDiGetDeviceRegistryPropertyW
-;  SetupDiGetDriverInfoDetailA  = _SetupDiGetDriverInfoDetailA@24         @117
-;  SetupDiGetDriverInfoDetailW  = _SetupDiGetDriverInfoDetailW@24         @118
-;119 stdcall SetupDiGetDriverInstallParamsA()                 SetupDiGetDriverInstallParamsA
-;120 stdcall SetupDiGetDriverInstallParamsW()                 SetupDiGetDriverInstallParamsW
-  SetupDiGetDeviceInterfaceDetailA = _SetupDiGetDeviceInterfaceDetailA@24    @121
-  SetupDiGetDeviceInterfaceDetailW = _SetupDiGetDeviceInterfaceDetailW@24    @122
-;121 stdcall SetupDiGetHwProfileFriendlyNameA()               SetupDiGetHwProfileFriendlyNameA
-;122 stdcall SetupDiGetHwProfileFriendlyNameW()               SetupDiGetHwProfileFriendlyNameW
-;123 stdcall SetupDiGetHwProfileList()                        SetupDiGetHwProfileList
-;124 stdcall SetupDiGetINFClassA()                            SetupDiGetINFClassA
-;125 stdcall SetupDiGetINFClassW()                            SetupDiGetINFClassW
-;126 stdcall SetupDiGetSelectedDevice()                       SetupDiGetSelectedDevice
-;127 stdcall SetupDiGetSelectedDriverA()                      SetupDiGetSelectedDriverA
-;128 stdcall SetupDiGetSelectedDriverW()                      SetupDiGetSelectedDriverW
-;129 stdcall SetupDiGetWizardPage()                           SetupDiGetWizardPage
-;130 stdcall SetupDiInstallClassA()                           SetupDiInstallClassA
-;131 stdcall SetupDiInstallClassW()                           SetupDiInstallClassW
-;132 stdcall SetupDiInstallDevice()                           SetupDiInstallDevice
-;133 stdcall SetupDiInstallDriverFiles()                      SetupDiInstallDriverFiles
-;134 stdcall SetupDiLoadClassIcon()                           SetupDiLoadClassIcon
-;135 stdcall SetupDiMoveDuplicateDevice()                     SetupDiMoveDuplicateDevice
-;136 stdcall SetupDiOpenClassRegKey()                         SetupDiOpenClassRegKey
-;137 stdcall SetupDiOpenDevRegKey()                           SetupDiOpenDevRegKey
-;138 stdcall SetupDiOpenDeviceInfoA()                         SetupDiOpenDeviceInfoA
-;139 stdcall SetupDiOpenDeviceInfoW()                         SetupDiOpenDeviceInfoW
-;140 stdcall SetupDiRegisterDeviceInfo()                      SetupDiRegisterDeviceInfo
-;141 stdcall SetupDiRemoveDevice()                            SetupDiRemoveDevice
-;142 stdcall SetupDiSelectDevice()                            SetupDiSelectDevice
-;143 stdcall SetupDiSelectOEMDrv()                            SetupDiSelectOEMDrv
-;144 stdcall SetupDiSetClassInstallParamsA()                  SetupDiSetClassInstallParamsA
-;145 stdcall SetupDiSetClassInstallParamsW()                  SetupDiSetClassInstallParamsW
-;146 stdcall SetupDiSetDeviceInstallParamsA()                 SetupDiSetDeviceInstallParamsA
-;147 stdcall SetupDiSetDeviceInstallParamsW()                 SetupDiSetDeviceInstallParamsW
-;148 stdcall SetupDiSetDeviceRegistryPropertyA()              SetupDiSetDeviceRegistryPropertyA
-;149 stdcall SetupDiSetDeviceRegistryPropertyW()              SetupDiSetDeviceRegistryPropertyW
-;150 stdcall SetupDiSetDriverInstallParamsA()                 SetupDiSetDriverInstallParamsA
-;151 stdcall SetupDiSetDriverInstallParamsW()                 SetupDiSetDriverInstallParamsW
-;152 stdcall SetupDiSetSelectedDevice()                       SetupDiSetSelectedDevice
-;153 stdcall SetupDiSetSelectedDriverA()                      SetupDiSetSelectedDriverA
-;154 stdcall SetupDiSetSelectedDriverW()                      SetupDiSetSelectedDriverW
-;155 stdcall SetupDuplicateDiskSpaceListA()                   SetupDuplicateDiskSpaceListA
-;156 stdcall SetupDuplicateDiskSpaceListW()                   SetupDuplicateDiskSpaceListW
-  SetupFindFirstLineA                      = _SetupFindFirstLineA@16       @157
-  SetupFindFirstLineW                      = _SetupFindFirstLineW@16       @158
-  SetupFindNextLine                        = _SetupFindNextLine@8          @159
-  SetupFindNextMatchLineA                  = _SetupFindNextMatchLineA@12   @160
-  SetupFindNextMatchLineW                  = _SetupFindNextMatchLineW@12   @161
-;162 stdcall SetupFreeSourceListA()                           SetupFreeSourceListA
-;163 stdcall SetupFreeSourceListW()                           SetupFreeSourceListW
-  SetupGetBinaryField                      = _SetupGetBinaryField@20       @164
-  SetupGetFieldCount                       = _SetupGetFieldCount@4         @165
-;166 stdcall SetupGetFileCompressionInfoA()                   SetupGetFileCompressionInfoA
-;167 stdcall SetupGetFileCompressionInfoW()                   SetupGetFileCompressionInfoW
-  SetupGetFileQueueCount                   = _SetupGetFileQueueCount@12    @168
-  SetupGetFileQueueFlags                   = _SetupGetFileQueueFlags@8     @169
-;168 stdcall SetupGetInfFileListA()                           SetupGetInfFileListA
-;169 stdcall SetupGetInfFileListW()                           SetupGetInfFileListW
-;170 stdcall SetupGetInfInformationA()                        SetupGetInfInformationA
-;171 stdcall SetupGetInfInformationW()                        SetupGetInfInformationW
-  SetupGetIntField                         = _SetupGetIntField@12          @172
-  SetupGetLineByIndexA                     = _SetupGetLineByIndexA@16      @173
-  SetupGetLineByIndexW                     = _SetupGetLineByIndexW@16      @174
-  SetupGetLineCountA                       = _SetupGetLineCountA@8         @175
-  SetupGetLineCountW                       = _SetupGetLineCountW@8         @176
-  SetupGetLineTextA                        = _SetupGetLineTextA@28         @177
-  SetupGetLineTextW                        = _SetupGetLineTextW@28         @178
-  SetupGetMultiSzFieldA                    = _SetupGetMultiSzFieldA@20     @179
-  SetupGetMultiSzFieldW                    = _SetupGetMultiSzFieldW@20     @180
-;181 stdcall SetupGetSourceFileLocationA()                    SetupGetSourceFileLocationA
-;182 stdcall SetupGetSourceFileLocationW()                    SetupGetSourceFileLocationW
-;183 stdcall SetupGetSourceFileSizeA()                        SetupGetSourceFileSizeA
-;184 stdcall SetupGetSourceFileSizeW()                        SetupGetSourceFileSizeW
-;185 stdcall SetupGetSourceInfoA()                            SetupGetSourceInfoA
-;186 stdcall SetupGetSourceInfoW()                            SetupGetSourceInfoW
-  SetupGetStringFieldA                     = _SetupGetStringFieldA@20      @187
-  SetupGetStringFieldW                     = _SetupGetStringFieldW@20      @188
-;189 stdcall SetupGetTargetPathA()                            SetupGetTargetPathA
-;190 stdcall SetupGetTargetPathW()                            SetupGetTargetPathW
-  SetupInitDefaultQueueCallback            = _SetupInitDefaultQueueCallback@4    @191
-  SetupInitDefaultQueueCallbackEx          = _SetupInitDefaultQueueCallbackEx@20 @192
-;193 stdcall SetupInitializeFileLogA()                        SetupInitializeFileLogA
-;194 stdcall SetupInitializeFileLogW()                        SetupInitializeFileLogW
-;195 stdcall SetupInstallFileA()                              SetupInstallFileA
-;196 stdcall SetupInstallFileExA()                            SetupInstallFileExA
-;197 stdcall SetupInstallFileExW()                            SetupInstallFileExW
-;198 stdcall SetupInstallFileW()                              SetupInstallFileW
-  SetupInstallFilesFromInfSectionA          = _SetupInstallFilesFromInfSectionA@24  @199
-  SetupInstallFilesFromInfSectionW          = _SetupInstallFilesFromInfSectionW@24  @200
-  SetupInstallFromInfSectionA               = _SetupInstallFromInfSectionA@44       @201
-  SetupInstallFromInfSectionW               = _SetupInstallFromInfSectionW@44       @202
-;203 stdcall SetupInstallServicesFromInfSectionA()            SetupInstallServicesFromInfSectionA
-;204 stdcall SetupInstallServicesFromInfSectionW()            SetupInstallServicesFromInfSectionW
-  SetupIterateCabinetA                      = _SetupIterateCabinetA@16    @203
-  SetupIterateCabinetW                      = _SetupIterateCabinetW@16    @204
-;207 stdcall SetupLogFileA()                                  SetupLogFileA
-;208 stdcall SetupLogFileW()                                  SetupLogFileW
-  SetupOpenAppendInfFileA                   = _SetupOpenAppendInfFileA@12 @209
-  SetupOpenAppendInfFileW                   = _SetupOpenAppendInfFileW@12 @210
-  SetupOpenFileQueue                        = _SetupOpenFileQueue@0       @211
-  SetupOpenInfFileA                         = _SetupOpenInfFileA@16       @212
-  SetupOpenInfFileW                         = _SetupOpenInfFileW@16       @213
-;214 stdcall SetupOpenMasterInf()                             SetupOpenMasterInf
-;215 stdcall SetupPromptForDiskA()                            SetupPromptForDiskA
-;216 stdcall SetupPromptForDiskW()                            SetupPromptForDiskW
-;217 stdcall SetupPromptReboot()                              SetupPromptReboot
-;218 stdcall SetupQueryDrivesInDiskSpaceListA()               SetupQueryDrivesInDiskSpaceListA
-;219 stdcall SetupQueryDrivesInDiskSpaceListW()               SetupQueryDrivesInDiskSpaceListW
-;220 stdcall SetupQueryFileLogA()                             SetupQueryFileLogA
-;221 stdcall SetupQueryFileLogW()                             SetupQueryFileLogW
-;222 stdcall SetupQueryInfFileInformationA()                  SetupQueryInfFileInformationA
-;223 stdcall SetupQueryInfFileInformationW()                  SetupQueryInfFileInformationW
-;224 stdcall SetupQueryInfVersionInformationA()               SetupQueryInfVersionInformationA
-;225 stdcall SetupQueryInfVersionInformationW()               SetupQueryInfVersionInformationW
-;226 stdcall SetupQuerySourceListA()                          SetupQuerySourceListA
-;227 stdcall SetupQuerySourceListW()                          SetupQuerySourceListW
-;228 stdcall SetupQuerySpaceRequiredOnDriveA()                SetupQuerySpaceRequiredOnDriveA
-;229 stdcall SetupQuerySpaceRequiredOnDriveW()                SetupQuerySpaceRequiredOnDriveW
-  SetupQueueCopyA                            = _SetupQueueCopyA@36          @230
-  SetupQueueCopyIndirectA                    = _SetupQueueCopyIndirectA@4   @231
-  SetupQueueCopyIndirectW                    = _SetupQueueCopyIndirectW@4   @232
-  SetupQueueCopySectionA                     = _SetupQueueCopySectionA@24   @233
-  SetupQueueCopySectionW                     = _SetupQueueCopySectionW@24   @234
-  SetupQueueCopyW                            = _SetupQueueCopyW@36          @235
-  SetupQueueDefaultCopyA                     = _SetupQueueDefaultCopyA@24   @236
-  SetupQueueDefaultCopyW                     = _SetupQueueDefaultCopyW@24   @237
-  SetupQueueDeleteA                          = _SetupQueueDeleteA@12        @238
-  SetupQueueDeleteSectionA                   = _SetupQueueDeleteSectionA@16 @239
-  SetupQueueDeleteSectionW                   = _SetupQueueDeleteSectionW@16 @240
-  SetupQueueDeleteW                          = _SetupQueueDeleteW@12        @241
-  SetupQueueRenameA                          = _SetupQueueRenameA@20        @242
-  SetupQueueRenameSectionA                   = _SetupQueueRenameSectionA@16 @243
-  SetupQueueRenameSectionW                   = _SetupQueueRenameSectionW@16 @244
-  SetupQueueRenameW                          = _SetupQueueRenameW@20        @245
-;244 stdcall SetupRemoveFileLogEntryA()                       SetupRemoveFileLogEntryA
-;245 stdcall SetupRemoveFileLogEntryW()                       SetupRemoveFileLogEntryW
-;246 stdcall SetupRemoveFromDiskSpaceListA()                  SetupRemoveFromDiskSpaceListA
-;247 stdcall SetupRemoveFromDiskSpaceListW()                  SetupRemoveFromDiskSpaceListW
-;248 stdcall SetupRemoveFromSourceListA()                     SetupRemoveFromSourceListA
-;249 stdcall SetupRemoveFromSourceListW()                     SetupRemoveFromSourceListW
-;250 stdcall SetupRemoveInstallSectionFromDiskSpaceListA()    SetupRemoveInstallSectionFromDiskSpaceListA
-;251 stdcall SetupRemoveInstallSectionFromDiskSpaceListW()    SetupRemoveInstallSectionFromDiskSpaceListW
-;252 stdcall SetupRemoveSectionFromDiskSpaceListA()           SetupRemoveSectionFromDiskSpaceListA
-;253 stdcall SetupRemoveSectionFromDiskSpaceListW()           SetupRemoveSectionFromDiskSpaceListW
-;254 stdcall SetupRenameErrorA()                              SetupRenameErrorA
-;255 stdcall SetupRenameErrorW()                              SetupRenameErrorW
-;256 stdcall SetupScanFileQueue()                             SetupScanFileQueue
-  SetupScanFileQueueA                        = _SetupScanFileQueueA@24    @257
-  SetupScanFileQueueW                        = _SetupScanFileQueueW@24    @258
-  SetupSetDirectoryIdA                       = _SetupSetDirectoryIdA@12   @259
-;260 stdcall SetupSetDirectoryIdExA(long long str long long ptr)  SetupSetDirectoryIdExA
-;261 stdcall SetupSetDirectoryIdExW(long long wstr long long ptr) SetupSetDirectoryIdExW
-  SetupSetDirectoryIdW                       = _SetupSetDirectoryIdW@12   @262
-;263 stdcall SetupSetPlatformPathOverrideA(str)               SetupSetPlatformPathOverrideA
-;264 stdcall SetupSetPlatformPathOverrideW(wstr)              SetupSetPlatformPathOverrideW
-;265 stdcall SetupSetSourceListA(long str long)               SetupSetSourceListA
-;266 stdcall SetupSetSourceListW(long wstr long)              SetupSetSourceListW
-  SetupTermDefaultQueueCallback              = _SetupTermDefaultQueueCallback@4 @267
-;268 stdcall SetupTerminateFileLog(ptr)                       SetupTerminateFileLog
+;@ stub SetupDeleteErrorA
+;@ stub SetupDeleteErrorW
+;@ stub SetupDestroyDiskSpaceList
+;@ stub SetupDiAskForOEMDisk
+;@ stub SetupDiBuildClassInfoList
+  SetupDiBuildClassInfoListExW     = _SetupDiBuildClassInfoListExW@24  @75
+;@ stub SetupDiBuildDriverInfoList
+;@ stub SetupDiCallClassInstaller
+;@ stub SetupDiCancelDriverInfoSearch
+;@ stub SetupDiChangeState
+;@ stub SetupDiClassGuidsFromNameA
+  SetupDiClassGuidsFromNameExW     = _SetupDiClassGuidsFromNameExW@24  @81
+;@ stub SetupDiClassGuidsFromNameW
+;@ stub SetupDiClassNameFromGuidA
+  SetupDiClassNameFromGuidExW      = _SetupDiClassNameFromGuidExW@24   @84
+;@ stub SetupDiClassNameFromGuidW
+;@ stub SetupDiCreateDevRegKeyA
+;@ stub SetupDiCreateDevRegKeyW
+;@ stub SetupDiCreateDeviceInfoA
+;@ stub SetupDiCreateDeviceInfoList
+  SetupDiCreateDeviceInfoListExW   = _SetupDiCreateDeviceInfoListExW@16 @90
+;@ stub SetupDiCreateDeviceInfoW
+;@ stub SetupDiDeleteDevRegKey
+;@ stub SetupDiDeleteDeviceInfo
+;@ stub SetupDiDestroyClassImageList
+  SetupDiDestroyDeviceInfoList = _SetupDiDestroyDeviceInfoList@4         @95
+;@ stub SetupDiDestroyDriverInfoList
+;@ stub SetupDiDrawMiniIcon
+  SetupDiEnumDeviceInfo        = _SetupDiEnumDeviceInfo@12               @96
+  SetupDiEnumDeviceInterfaces  = _SetupDiEnumDeviceInterfaces@20         @97
+;@ stub SetupDiEnumDriverInfoA
+;@ stub SetupDiEnumDriverInfoW
+;@ stub SetupDiGetActualSectionToInstallA
+;@ stub SetupDiGetActualSectionToInstallW
+;@ stub SetupDiGetClassBitmapIndex
+;@ stub SetupDiGetClassDescriptionA
+  SetupDiGetClassDescriptionExW= _SetupDiGetClassDescriptionExW@24       @104
+;@ stub SetupDiGetClassDescriptionW
+;@ stub SetupDiGetClassDevPropertySheetsA
+;@ stub SetupDiGetClassDevPropertySheetsW
+  SetupDiGetClassDevsA         = _SetupDiGetClassDevsA@16                @108
+  SetupDiGetClassDevsExW       = _SetupDiGetClassDevsExW@28              @109
+  SetupDiGetClassDevsW         = _SetupDiGetClassDevsW@16                @110
+;@ stub SetupDiGetClassImageIndex
+;@ stub SetupDiGetClassImageList
+;@ stub SetupDiGetClassInstallParamsA
+;@ stub SetupDiGetClassInstallParamsW
+;@ stub SetupDiGetDeviceInfoListClass
+  SetupDiGetDeviceInfoListDetailW = _SetupDiGetDeviceInfoListDetailW@8   @116
+;@ stub SetupDiGetDeviceInstallParamsA
+;@ stub SetupDiGetDeviceInstallParamsW
+;@ stub SetupDiGetDeviceInstanceIdA
+;@ stub SetupDiGetDeviceInstanceIdW
+  SetupDiGetDeviceRegistryPropertyA = _SetupDiGetDeviceRegistryPropertyA@28 @121
+;@ stub SetupDiGetDeviceRegistryPropertyW
+;@ stub SetupDiGetDriverInfoDetailA
+;@ stub SetupDiGetDriverInfoDetailW
+;@ stub SetupDiGetDriverInstallParamsA
+;@ stub SetupDiGetDriverInstallParamsW
+;@ stub SetupDiGetDeviceInterfaceAlias
+  SetupDiGetDeviceInterfaceDetailA = _SetupDiGetDeviceInterfaceDetailA@24    @128
+  SetupDiGetDeviceInterfaceDetailW = _SetupDiGetDeviceInterfaceDetailW@24    @129
+;@ stub SetupDiGetHwProfileFriendlyNameA
+;@ stub SetupDiGetHwProfileFriendlyNameW
+;@ stub SetupDiGetHwProfileList
+;@ stub SetupDiGetINFClassA
+;@ stub SetupDiGetINFClassW
+;@ stub SetupDiGetSelectedDevice
+;@ stub SetupDiGetSelectedDriverA
+;@ stub SetupDiGetSelectedDriverW
+;@ stub SetupDiGetWizardPage
+;@ stub SetupDiInstallClassA
+;@ stub SetupDiInstallClassW
+;@ stub SetupDiInstallDevice
+;@ stub SetupDiInstallDriverFiles
+;@ stub SetupDiLoadClassIcon
+;@ stub SetupDiMoveDuplicateDevice
+;@ stub SetupDiOpenClassRegKey
+  SetupDiOpenClassRegKeyExW        = _SetupDiOpenClassRegKeyExW@20      @146
+;@ stub SetupDiOpenDevRegKey
+;@ stub SetupDiOpenDeviceInfoA
+;@ stub SetupDiOpenDeviceInfoW
+;@ stub SetupDiRegisterDeviceInfo
+;@ stub SetupDiRemoveDevice
+;@ stub SetupDiSelectDevice
+;@ stub SetupDiSelectOEMDrv
+;@ stub SetupDiSetClassInstallParamsA
+;@ stub SetupDiSetClassInstallParamsW
+;@ stub SetupDiSetDeviceInstallParamsA
+;@ stub SetupDiSetDeviceInstallParamsW
+;@ stub SetupDiSetDeviceRegistryPropertyA
+;@ stub SetupDiSetDeviceRegistryPropertyW
+;@ stub SetupDiSetDriverInstallParamsA
+;@ stub SetupDiSetDriverInstallParamsW
+;@ stub SetupDiSetSelectedDevice
+;@ stub SetupDiSetSelectedDriverA
+;@ stub SetupDiSetSelectedDriverW
+;@ stub SetupDuplicateDiskSpaceListA
+;@ stub SetupDuplicateDiskSpaceListW
+
+  SetupFindFirstLineA                      = _SetupFindFirstLineA@16       @166
+  SetupFindFirstLineW                      = _SetupFindFirstLineW@16       @167
+  SetupFindNextLine                        = _SetupFindNextLine@8          @168
+  SetupFindNextMatchLineA                  = _SetupFindNextMatchLineA@12   @169
+  SetupFindNextMatchLineW                  = _SetupFindNextMatchLineW@12   @170
+;@ stub SetupFreeSourceListA
+;@ stub SetupFreeSourceListW
+  SetupGetBinaryField                      = _SetupGetBinaryField@20       @173
+  SetupGetFieldCount                       = _SetupGetFieldCount@4         @174
+;@ stub SetupGetFileCompressionInfoA
+;@ stub SetupGetFileCompressionInfoW
+  SetupGetFileQueueCount                   = _SetupGetFileQueueCount@12    @177
+  SetupGetFileQueueFlags                   = _SetupGetFileQueueFlags@8     @178
+;@ stub SetupGetInfFileListA
+;@ stub SetupGetInfFileListW
+;@ stub SetupGetInfInformationA
+;@ stub SetupGetInfInformationW
+  SetupGetIntField                         = _SetupGetIntField@12          @183
+  SetupGetLineByIndexA                     = _SetupGetLineByIndexA@16      @184
+  SetupGetLineByIndexW                     = _SetupGetLineByIndexW@16      @185
+  SetupGetLineCountA                       = _SetupGetLineCountA@8         @186
+  SetupGetLineCountW                       = _SetupGetLineCountW@8         @187
+  SetupGetLineTextA                        = _SetupGetLineTextA@28         @188
+  SetupGetLineTextW                        = _SetupGetLineTextW@28         @189
+  SetupGetMultiSzFieldA                    = _SetupGetMultiSzFieldA@20     @190
+  SetupGetMultiSzFieldW                    = _SetupGetMultiSzFieldW@20     @191
+;@ stub SetupGetSourceFileLocationA
+;@ stub SetupGetSourceFileLocationW
+;@ stub SetupGetSourceFileSizeA
+;@ stub SetupGetSourceFileSizeW
+;@ stub SetupGetSourceInfoA
+;@ stub SetupGetSourceInfoW
+  SetupGetStringFieldA                     = _SetupGetStringFieldA@20      @198
+  SetupGetStringFieldW                     = _SetupGetStringFieldW@20      @199
+;@ stub SetupGetTargetPathA
+;@ stub SetupGetTargetPathW
+  SetupInitDefaultQueueCallback            = _SetupInitDefaultQueueCallback@4    @202
+  SetupInitDefaultQueueCallbackEx          = _SetupInitDefaultQueueCallbackEx@20 @203
+;@ stub SetupInitializeFileLogA
+;@ stub SetupInitializeFileLogW
+;@ stub SetupInstallFileA
+;@ stub SetupInstallFileExA
+;@ stub SetupInstallFileExW
+;@ stub SetupInstallFileW
+  SetupInstallFilesFromInfSectionA          = _SetupInstallFilesFromInfSectionA@24  @210
+  SetupInstallFilesFromInfSectionW          = _SetupInstallFilesFromInfSectionW@24  @211
+  SetupInstallFromInfSectionA               = _SetupInstallFromInfSectionA@44       @212
+  SetupInstallFromInfSectionW               = _SetupInstallFromInfSectionW@44       @213
+;@ stub SetupInstallServicesFromInfSectionA
+;@ stub SetupInstallServicesFromInfSectionW
+  SetupIterateCabinetA                      = _SetupIterateCabinetA@16    @216
+  SetupIterateCabinetW                      = _SetupIterateCabinetW@16    @217
+;@ stub SetupLogFileA
+;@ stub SetupLogFileW
+  SetupOpenAppendInfFileA                   = _SetupOpenAppendInfFileA@12 @220
+  SetupOpenAppendInfFileW                   = _SetupOpenAppendInfFileW@12 @221
+  SetupOpenFileQueue                        = _SetupOpenFileQueue@0       @222
+  SetupOpenInfFileA                         = _SetupOpenInfFileA@16       @223
+  SetupOpenInfFileW                         = _SetupOpenInfFileW@16       @224
+;@ stub SetupOpenMasterInf
+;@ stub SetupPromptForDiskA
+;@ stub SetupPromptForDiskW
+;@ stub SetupPromptReboot
+;@ stub SetupQueryDrivesInDiskSpaceListA
+;@ stub SetupQueryDrivesInDiskSpaceListW
+;@ stub SetupQueryFileLogA
+;@ stub SetupQueryFileLogW
+;@ stub SetupQueryInfFileInformationA
+;@ stub SetupQueryInfFileInformationW
+;@ stub SetupQueryInfVersionInformationA
+;@ stub SetupQueryInfVersionInformationW
+;@ stub SetupQuerySourceListA
+;@ stub SetupQuerySourceListW
+;@ stub SetupQuerySpaceRequiredOnDriveA
+;@ stub SetupQuerySpaceRequiredOnDriveW
+  SetupQueueCopyA                            = _SetupQueueCopyA@36          @241
+  SetupQueueCopyIndirectA                    = _SetupQueueCopyIndirectA@4   @242
+  SetupQueueCopyIndirectW                    = _SetupQueueCopyIndirectW@4   @243
+  SetupQueueCopySectionA                     = _SetupQueueCopySectionA@24   @244
+  SetupQueueCopySectionW                     = _SetupQueueCopySectionW@24   @245
+  SetupQueueCopyW                            = _SetupQueueCopyW@36          @246
+  SetupQueueDefaultCopyA                     = _SetupQueueDefaultCopyA@24   @247
+  SetupQueueDefaultCopyW                     = _SetupQueueDefaultCopyW@24   @248
+  SetupQueueDeleteA                          = _SetupQueueDeleteA@12        @249
+  SetupQueueDeleteSectionA                   = _SetupQueueDeleteSectionA@16 @250
+  SetupQueueDeleteSectionW                   = _SetupQueueDeleteSectionW@16 @251
+  SetupQueueDeleteW                          = _SetupQueueDeleteW@12        @252
+  SetupQueueRenameA                          = _SetupQueueRenameA@20        @253
+  SetupQueueRenameSectionA                   = _SetupQueueRenameSectionA@16 @254
+  SetupQueueRenameSectionW                   = _SetupQueueRenameSectionW@16 @255
+  SetupQueueRenameW                          = _SetupQueueRenameW@20        @256
+;@ stub SetupRemoveFileLogEntryA
+;@ stub SetupRemoveFileLogEntryW
+;@ stub SetupRemoveFromDiskSpaceListA
+;@ stub SetupRemoveFromDiskSpaceListW
+;@ stub SetupRemoveFromSourceListA
+;@ stub SetupRemoveFromSourceListW
+;@ stub SetupRemoveInstallSectionFromDiskSpaceListA
+;@ stub SetupRemoveInstallSectionFromDiskSpaceListW
+;@ stub SetupRemoveSectionFromDiskSpaceListA
+;@ stub SetupRemoveSectionFromDiskSpaceListW
+;@ stub SetupRenameErrorA
+;@ stub SetupRenameErrorW
+;@ stub SetupScanFileQueue
+  SetupScanFileQueueA                        = _SetupScanFileQueueA@24    @269
+  SetupScanFileQueueW                        = _SetupScanFileQueueW@24    @270
+  SetupSetDirectoryIdA                       = _SetupSetDirectoryIdA@12   @271
+;@ stub SetupSetDirectoryIdExA
+;@ stub SetupSetDirectoryIdExW
+  SetupSetDirectoryIdW                       = _SetupSetDirectoryIdW@12   @274
+  SetupSetFileQueueFlags                     = _SetupSetFileQueueFlags@12 @275
+;@ stub SetupSetPlatformPathOverrideA
+;@ stub SetupSetPlatformPathOverrideW
+;@ stub SetupSetSourceListA
+;@ stub SetupSetSourceListW
+  SetupTermDefaultQueueCallback              = _SetupTermDefaultQueueCallback@4 @280
+;@ stub SetupTerminateFileLog
 ;@ stub ShouldDeviceBeExcluded
 ;@ stub StampFileSecurity
@@ -254,4 +317,7 @@
 ;@ stub UnicodeToMultiByte
 ;@ stub UnmapAndCloseFile
+;@ stub pSetupAddMiniIconToList
+;@ stub pSetupAddTagToGroupOrderListEntry
+;@ stub pSetupAppendStringToMultiSz
 ;@ stub pSetupDirectoryIdToPath
 ;@ stub pSetupGetField
Index: trunk/src/setupapi/setupapi_private.h
===================================================================
--- trunk/src/setupapi/setupapi_private.h	(revision 9400)
+++ trunk/src/setupapi/setupapi_private.h	(revision 9403)
@@ -49,15 +49,4 @@
   } while(0)
 
-typedef struct {
-    HINF16 hInf;
-    HFILE hInfFile;
-    LPSTR lpInfFileName;
-} INF_FILE;
-
-extern INF_FILE *InfList;
-extern WORD InfNumEntries;
-
-extern LPCSTR IP_GetFileName(HINF16 hInf);
-
 /* string substitutions */
 
Index: trunk/src/setupapi/setupapidbg.def
===================================================================
--- trunk/src/setupapi/setupapidbg.def	(revision 9400)
+++ trunk/src/setupapi/setupapidbg.def	(revision 9403)
@@ -5,235 +5,298 @@
 EXPORTS
 
-; 45 stdcall SetupAddInstallSectionToDiskSpaceListA()         SetupAddInstallSectionToDiskSpaceListA
-; 46 stdcall SetupAddInstallSectionToDiskSpaceListW()         SetupAddInstallSectionToDiskSpaceListW
-; 47 stdcall SetupAddSectionToDiskSpaceListA()                SetupAddSectionToDiskSpaceListA
-; 48 stdcall SetupAddSectionToDiskSpaceListW()                SetupAddSectionToDiskSpaceListW
-; 49 stdcall SetupAddToDiskSpaceListA()                       SetupAddToDiskSpaceListA
-; 50 stdcall SetupAddToDiskSpaceListW()                       SetupAddToDiskSpaceListW
-; 51 stdcall SetupAddToSourceListA()                          SetupAddToSourceListA
-; 52 stdcall SetupAddToSourceListW()                          SetupAddToSourceListW
-; 53 stdcall SetupAdjustDiskSpaceListA()                      SetupAdjustDiskSpaceListA
-; 54 stdcall SetupAdjustDiskSpaceListW()                      SetupAdjustDiskSpaceListW
-; 55 stdcall SetupCancelTemporarySourceList()                 SetupCancelTemporarySourceList
+  CM_Connect_MachineW             = _DbgCM_Connect_MachineW@8          @1
+  CM_Disconnect_Machine           = _DbgCM_Disconnect_Machine@4        @2
+;@ stub CM_Free_Log_Conf_Handle
+;@ stub CM_Free_Res_Des_Handle
+;@ stub CM_Get_DevNode_Status_Ex
+;@ stub CM_Get_Device_ID_ExW
+;@ stub CM_Get_First_Log_Conf_Ex
+;@ stub CM_Get_Next_Res_Des_Ex
+;@ stub CM_Get_Res_Des_Data_Ex
+;@ stub CM_Get_Res_Des_Data_Size_Ex
+;@ stub CM_Locate_DevNode_ExW
+;@ stub CM_Reenumerate_DevNode_Ex
+;@ stub CaptureAndConvertAnsiArg
+;@ stub CaptureStringArg
+;@ stub CenterWindowRelativeToParent
+;@ stub ConcatenatePaths
+;@ stub DelayedMove
+;@ stub DelimStringToMultiSz
+;@ stub DestroyTextFileReadBuffer
+;@ stub DoesUserHavePrivilege
+;@ stub DuplicateString
+;@ stub EnablePrivilege
+;@ stub ExtensionPropSheetPageProc
+;@ stub FileExists
+;@ stub FreeStringArray
+;@ stub GetNewInfName
+;@ stub GetSetFileTimestamp
+;@ stub GetVersionInfoFromImage
+;@ stub InfIsFromOemLocation
+;@ stub InstallHinfSection
+;@ stub InstallHinfSectionA
+;@ stub InstallHinfSectionW
+;@ stub InstallStop
+;@ stub IsUserAdmin
+;@ stub LookUpStringInTable
+;@ stub MemoryInitialize
+;@ stub MultiByteToUnicode
+;@ stub MultiSzFromSearchControl
+;@ stub MyFree
+;@ stub MyGetFileTitle
+;@ stub MyMalloc
+;@ stub MyRealloc
+;@ stub OpenAndMapFileForRead
+;@ stub OutOfMemory
+;@ stub QueryMultiSzValueToArray
+;@ stub QueryRegistryValue
+;@ stub ReadAsciiOrUnicodeTextFile
+;@ stub RegistryDelnode
+;@ stub RetreiveFileSecurity
+;@ stub RetrieveServiceConfig
+;@ stub SearchForInfFile
+;@ stub SetArrayToMultiSzValue
+;@ stub SetupAddInstallSectionToDiskSpaceListA
+;@ stub SetupAddInstallSectionToDiskSpaceListW
+;@ stub SetupAddSectionToDiskSpaceListA
+;@ stub SetupAddSectionToDiskSpaceListW
+;@ stub SetupAddToDiskSpaceListA
+;@ stub SetupAddToDiskSpaceListW
+;@ stub SetupAddToSourceListA
+;@ stub SetupAddToSourceListW
+;@ stub SetupAdjustDiskSpaceListA
+;@ stub SetupAdjustDiskSpaceListW
+;@ stub SetupCancelTemporarySourceList
   SetupCloseFileQueue              = _DbgSetupCloseFileQueue@4         @56
   SetupCloseInfFile                = _DbgSetupCloseInfFile@4           @57
-; 58 stdcall SetupCommitFileQueue()                           SetupCommitFileQueue
+;@ stub SetupCommitFileQueue
   SetupCommitFileQueueA            = _DbgSetupCommitFileQueueA@16      @59
   SetupCommitFileQueueW            = _DbgSetupCommitFileQueueW@16      @60
-; 61 stdcall SetupCopyErrorA()                                SetupCopyErrorA
-; 62 stdcall SetupCopyErrorW()                                SetupCopyErrorW
-; 63 stdcall SetupCreateDiskSpaceListA()                      SetupCreateDiskSpaceListA
-; 64 stdcall SetupCreateDiskSpaceListW()                      SetupCreateDiskSpaceListW
-; 65 stdcall SetupDecompressOrCopyFileA()                     SetupDecompressOrCopyFileA
-; 66 stdcall SetupDecompressOrCopyFileW()                     SetupDecompressOrCopyFileW
-; 67 stdcall SetupDefaultQueueCallback()                      SetupDefaultQueueCallback
+;@ stub SetupCopyErrorA
+;@ stub SetupCopyErrorW
+;@ stub SetupCreateDiskSpaceListA
+;@ stub SetupCreateDiskSpaceListW
+;@ stub SetupDecompressOrCopyFileA
+;@ stub SetupDecompressOrCopyFileW
+;@ stub SetupDefaultQueueCallback
   SetupDefaultQueueCallbackA       = _DbgSetupDefaultQueueCallbackA@16 @68
   SetupDefaultQueueCallbackW       = _DbgSetupDefaultQueueCallbackW@16 @69
-; 70 stdcall SetupDeleteErrorA()                              SetupDeleteErrorA
-; 71 stdcall SetupDeleteErrorW()                              SetupDeleteErrorW
-; 72 stdcall SetupDestroyDiskSpaceList()                      SetupDestroyDiskSpaceList
-; 73 stdcall SetupDiAskForOEMDisk()                           SetupDiAskForOEMDisk
-; 74 stdcall SetupDiBuildClassInfoList()                      SetupDiBuildClassInfoList
-; 75 stdcall SetupDiBuildDriverInfoList()                     SetupDiBuildDriverInfoList
-; 76 stdcall SetupDiCallClassInstaller()                      SetupDiCallClassInstaller
-; 77 stdcall SetupDiCancelDriverInfoSearch()                  SetupDiCancelDriverInfoSearch
-; 78 stdcall SetupDiChangeState()                             SetupDiChangeState
-; 79 stdcall SetupDiClassGuidsFromNameA()                     SetupDiClassGuidsFromNameA
-; 80 stdcall SetupDiClassGuidsFromNameW()                     SetupDiClassGuidsFromNameW
-; 81 stdcall SetupDiClassNameFromGuidA()                      SetupDiClassNameFromGuidA
-; 82 stdcall SetupDiClassNameFromGuidW()                      SetupDiClassNameFromGuidW
-; 83 stdcall SetupDiCreateDevRegKeyA()                        SetupDiCreateDevRegKeyA
-; 84 stdcall SetupDiCreateDevRegKeyW()                        SetupDiCreateDevRegKeyW
-; 85 stdcall SetupDiCreateDeviceInfoA()                       SetupDiCreateDeviceInfoA
-; 86 stdcall SetupDiCreateDeviceInfoList()                    SetupDiCreateDeviceInfoList
-; 87 stdcall SetupDiCreateDeviceInfoW()                       SetupDiCreateDeviceInfoW
-; 88 stdcall SetupDiDeleteDevRegKey()                         SetupDiDeleteDevRegKey
-; 89 stdcall SetupDiDeleteDeviceInfo()                        SetupDiDeleteDeviceInfo
-; 90 stdcall SetupDiDestroyClassImageList()                   SetupDiDestroyClassImageList
-  SetupDiDestroyDeviceInfoList = _DbgSetupDiDestroyDeviceInfoList@4         @91
-; 92 stdcall SetupDiDestroyDriverInfoList
-; 93 stdcall SetupDiDrawMiniIcon()                            SetupDiDrawMiniIcon
-  SetupDiEnumDeviceInfo        = _DbgSetupDiEnumDeviceInfo@12               @94
-  SetupDiEnumDeviceInterfaces  = _DbgSetupDiEnumDeviceInterfaces@20         @95
-; 95 stdcall SetupDiEnumDriverInfoA()                         SetupDiEnumDriverInfoA
-; 96 stdcall SetupDiEnumDriverInfoW()                         SetupDiEnumDriverInfoW
-; 97 stdcall SetupDiGetActualSectionToInstallA()              SetupDiGetActualSectionToInstallA
-; 98 stdcall SetupDiGetActualSectionToInstallW()              SetupDiGetActualSectionToInstallW
-; 99 stdcall SetupDiGetClassBitmapIndex()                     SetupDiGetClassBitmapIndex
-;100 stdcall SetupDiGetClassDescriptionA()                    SetupDiGetClassDescriptionA
-;101 stdcall SetupDiGetClassDescriptionW()                    SetupDiGetClassDescriptionW
-;102 stdcall SetupDiGetClassDevPropertySheetsA()              SetupDiGetClassDevPropertySheetsA
-;103 stdcall SetupDiGetClassDevPropertySheetsW()              SetupDiGetClassDevPropertySheetsW
-  SetupDiGetClassDevsA         = _DbgSetupDiGetClassDevsA@16                @103
-;105 stdcall SetupDiGetClassDevsW()                           SetupDiGetClassDevsW
-;106 stdcall SetupDiGetClassImageIndex()                      SetupDiGetClassImageIndex
-;107 stdcall SetupDiGetClassImageList()                       SetupDiGetClassImageList
-;108 stdcall SetupDiGetClassInstallParamsA()                  SetupDiGetClassInstallParamsA
-;109 stdcall SetupDiGetClassInstallParamsW()                  SetupDiGetClassInstallParamsW
-;110 stdcall SetupDiGetDeviceInfoListClass()                  SetupDiGetDeviceInfoListClass
-;111 stdcall SetupDiGetDeviceInstallParamsA()                 SetupDiGetDeviceInstallParamsA
-;112 stdcall SetupDiGetDeviceInstallParamsW()                 SetupDiGetDeviceInstallParamsW
-;113 stdcall SetupDiGetDeviceInstanceIdA()                    SetupDiGetDeviceInstanceIdA
-;114 stdcall SetupDiGetDeviceInstanceIdW()                    SetupDiGetDeviceInstanceIdW
-  SetupDiGetDeviceRegistryPropertyA = _DbgSetupDiGetDeviceRegistryPropertyA@28 @115
-;116 stdcall SetupDiGetDeviceRegistryPropertyW()              SetupDiGetDeviceRegistryPropertyW
-;  SetupDiGetDriverInfoDetailA  = _DbgSetupDiGetDriverInfoDetailA@24         @117
-;  SetupDiGetDriverInfoDetailW  = _DbgSetupDiGetDriverInfoDetailW@24         @118
-;119 stdcall SetupDiGetDriverInstallParamsA()                 SetupDiGetDriverInstallParamsA
-;120 stdcall SetupDiGetDriverInstallParamsW()                 SetupDiGetDriverInstallParamsW
-  SetupDiGetDeviceInterfaceDetailA = _DbgSetupDiGetDeviceInterfaceDetailA@24    @121
-  SetupDiGetDeviceInterfaceDetailW = _DbgSetupDiGetDeviceInterfaceDetailW@24    @122
-;121 stdcall SetupDiGetHwProfileFriendlyNameA()               SetupDiGetHwProfileFriendlyNameA
-;122 stdcall SetupDiGetHwProfileFriendlyNameW()               SetupDiGetHwProfileFriendlyNameW
-;123 stdcall SetupDiGetHwProfileList()                        SetupDiGetHwProfileList
-;124 stdcall SetupDiGetINFClassA()                            SetupDiGetINFClassA
-;125 stdcall SetupDiGetINFClassW()                            SetupDiGetINFClassW
-;126 stdcall SetupDiGetSelectedDevice()                       SetupDiGetSelectedDevice
-;127 stdcall SetupDiGetSelectedDriverA()                      SetupDiGetSelectedDriverA
-;128 stdcall SetupDiGetSelectedDriverW()                      SetupDiGetSelectedDriverW
-;129 stdcall SetupDiGetWizardPage()                           SetupDiGetWizardPage
-;130 stdcall SetupDiInstallClassA()                           SetupDiInstallClassA
-;131 stdcall SetupDiInstallClassW()                           SetupDiInstallClassW
-;132 stdcall SetupDiInstallDevice()                           SetupDiInstallDevice
-;133 stdcall SetupDiInstallDriverFiles()                      SetupDiInstallDriverFiles
-;134 stdcall SetupDiLoadClassIcon()                           SetupDiLoadClassIcon
-;135 stdcall SetupDiMoveDuplicateDevice()                     SetupDiMoveDuplicateDevice
-;136 stdcall SetupDiOpenClassRegKey()                         SetupDiOpenClassRegKey
-;137 stdcall SetupDiOpenDevRegKey()                           SetupDiOpenDevRegKey
-;138 stdcall SetupDiOpenDeviceInfoA()                         SetupDiOpenDeviceInfoA
-;139 stdcall SetupDiOpenDeviceInfoW()                         SetupDiOpenDeviceInfoW
-;140 stdcall SetupDiRegisterDeviceInfo()                      SetupDiRegisterDeviceInfo
-;141 stdcall SetupDiRemoveDevice()                            SetupDiRemoveDevice
-;142 stdcall SetupDiSelectDevice()                            SetupDiSelectDevice
-;143 stdcall SetupDiSelectOEMDrv()                            SetupDiSelectOEMDrv
-;144 stdcall SetupDiSetClassInstallParamsA()                  SetupDiSetClassInstallParamsA
-;145 stdcall SetupDiSetClassInstallParamsW()                  SetupDiSetClassInstallParamsW
-;146 stdcall SetupDiSetDeviceInstallParamsA()                 SetupDiSetDeviceInstallParamsA
-;147 stdcall SetupDiSetDeviceInstallParamsW()                 SetupDiSetDeviceInstallParamsW
-;148 stdcall SetupDiSetDeviceRegistryPropertyA()              SetupDiSetDeviceRegistryPropertyA
-;149 stdcall SetupDiSetDeviceRegistryPropertyW()              SetupDiSetDeviceRegistryPropertyW
-;150 stdcall SetupDiSetDriverInstallParamsA()                 SetupDiSetDriverInstallParamsA
-;151 stdcall SetupDiSetDriverInstallParamsW()                 SetupDiSetDriverInstallParamsW
-;152 stdcall SetupDiSetSelectedDevice()                       SetupDiSetSelectedDevice
-;153 stdcall SetupDiSetSelectedDriverA()                      SetupDiSetSelectedDriverA
-;154 stdcall SetupDiSetSelectedDriverW()                      SetupDiSetSelectedDriverW
-;155 stdcall SetupDuplicateDiskSpaceListA()                   SetupDuplicateDiskSpaceListA
-;156 stdcall SetupDuplicateDiskSpaceListW()                   SetupDuplicateDiskSpaceListW
-  SetupFindFirstLineA                      = _DbgSetupFindFirstLineA@16       @157
-  SetupFindFirstLineW                      = _DbgSetupFindFirstLineW@16       @158
-  SetupFindNextLine                        = _DbgSetupFindNextLine@8          @159
-  SetupFindNextMatchLineA                  = _DbgSetupFindNextMatchLineA@12   @160
-  SetupFindNextMatchLineW                  = _DbgSetupFindNextMatchLineW@12   @161
-;162 stdcall SetupFreeSourceListA()                           SetupFreeSourceListA
-;163 stdcall SetupFreeSourceListW()                           SetupFreeSourceListW
-  SetupGetBinaryField                      = _DbgSetupGetBinaryField@20       @164
-  SetupGetFieldCount                       = _DbgSetupGetFieldCount@4         @165
-;166 stdcall SetupGetFileCompressionInfoA()                   SetupGetFileCompressionInfoA
-;167 stdcall SetupGetFileCompressionInfoW()                   SetupGetFileCompressionInfoW
-  SetupGetFileQueueCount                   = _DbgSetupGetFileQueueCount@12    @168
-  SetupGetFileQueueFlags                   = _DbgSetupGetFileQueueFlags@8     @169
-;168 stdcall SetupGetInfFileListA()                           SetupGetInfFileListA
-;169 stdcall SetupGetInfFileListW()                           SetupGetInfFileListW
-;170 stdcall SetupGetInfInformationA()                        SetupGetInfInformationA
-;171 stdcall SetupGetInfInformationW()                        SetupGetInfInformationW
-  SetupGetIntField                         = _DbgSetupGetIntField@12          @172
-  SetupGetLineByIndexA                     = _DbgSetupGetLineByIndexA@16      @173
-  SetupGetLineByIndexW                     = _DbgSetupGetLineByIndexW@16      @174
-  SetupGetLineCountA                       = _DbgSetupGetLineCountA@8         @175
-  SetupGetLineCountW                       = _DbgSetupGetLineCountW@8         @176
-  SetupGetLineTextA                        = _DbgSetupGetLineTextA@28         @177
-  SetupGetLineTextW                        = _DbgSetupGetLineTextW@28         @178
-  SetupGetMultiSzFieldA                    = _DbgSetupGetMultiSzFieldA@20     @179
-  SetupGetMultiSzFieldW                    = _DbgSetupGetMultiSzFieldW@20     @180
-;181 stdcall SetupGetSourceFileLocationA()                    SetupGetSourceFileLocationA
-;182 stdcall SetupGetSourceFileLocationW()                    SetupGetSourceFileLocationW
-;183 stdcall SetupGetSourceFileSizeA()                        SetupGetSourceFileSizeA
-;184 stdcall SetupGetSourceFileSizeW()                        SetupGetSourceFileSizeW
-;185 stdcall SetupGetSourceInfoA()                            SetupGetSourceInfoA
-;186 stdcall SetupGetSourceInfoW()                            SetupGetSourceInfoW
-  SetupGetStringFieldA                     = _DbgSetupGetStringFieldA@20      @187
-  SetupGetStringFieldW                     = _DbgSetupGetStringFieldW@20      @188
-;189 stdcall SetupGetTargetPathA()                            SetupGetTargetPathA
-;190 stdcall SetupGetTargetPathW()                            SetupGetTargetPathW
-  SetupInitDefaultQueueCallback            = _DbgSetupInitDefaultQueueCallback@4    @191
-  SetupInitDefaultQueueCallbackEx          = _DbgSetupInitDefaultQueueCallbackEx@20 @192
-;193 stdcall SetupInitializeFileLogA()                        SetupInitializeFileLogA
-;194 stdcall SetupInitializeFileLogW()                        SetupInitializeFileLogW
-;195 stdcall SetupInstallFileA()                              SetupInstallFileA
-;196 stdcall SetupInstallFileExA()                            SetupInstallFileExA
-;197 stdcall SetupInstallFileExW()                            SetupInstallFileExW
-;198 stdcall SetupInstallFileW()                              SetupInstallFileW
-  SetupInstallFilesFromInfSectionA          = _DbgSetupInstallFilesFromInfSectionA@24  @199
-  SetupInstallFilesFromInfSectionW          = _DbgSetupInstallFilesFromInfSectionW@24  @200
-  SetupInstallFromInfSectionA               = _DbgSetupInstallFromInfSectionA@44       @201
-  SetupInstallFromInfSectionW               = _DbgSetupInstallFromInfSectionW@44       @202
-;203 stdcall SetupInstallServicesFromInfSectionA()            SetupInstallServicesFromInfSectionA
-;204 stdcall SetupInstallServicesFromInfSectionW()            SetupInstallServicesFromInfSectionW
-  SetupIterateCabinetA                      = _DbgSetupIterateCabinetA@16    @203
-  SetupIterateCabinetW                      = _DbgSetupIterateCabinetW@16    @204
-;207 stdcall SetupLogFileA()                                  SetupLogFileA
-;208 stdcall SetupLogFileW()                                  SetupLogFileW
-  SetupOpenAppendInfFileA                   = _DbgSetupOpenAppendInfFileA@12 @209
-  SetupOpenAppendInfFileW                   = _DbgSetupOpenAppendInfFileW@12 @210
-  SetupOpenFileQueue                        = _DbgSetupOpenFileQueue@0       @211
-  SetupOpenInfFileA                         = _DbgSetupOpenInfFileA@16       @212
-  SetupOpenInfFileW                         = _DbgSetupOpenInfFileW@16       @213
-;214 stdcall SetupOpenMasterInf()                             SetupOpenMasterInf
-;215 stdcall SetupPromptForDiskA()                            SetupPromptForDiskA
-;216 stdcall SetupPromptForDiskW()                            SetupPromptForDiskW
-;217 stdcall SetupPromptReboot()                              SetupPromptReboot
-;218 stdcall SetupQueryDrivesInDiskSpaceListA()               SetupQueryDrivesInDiskSpaceListA
-;219 stdcall SetupQueryDrivesInDiskSpaceListW()               SetupQueryDrivesInDiskSpaceListW
-;220 stdcall SetupQueryFileLogA()                             SetupQueryFileLogA
-;221 stdcall SetupQueryFileLogW()                             SetupQueryFileLogW
-;222 stdcall SetupQueryInfFileInformationA()                  SetupQueryInfFileInformationA
-;223 stdcall SetupQueryInfFileInformationW()                  SetupQueryInfFileInformationW
-;224 stdcall SetupQueryInfVersionInformationA()               SetupQueryInfVersionInformationA
-;225 stdcall SetupQueryInfVersionInformationW()               SetupQueryInfVersionInformationW
-;226 stdcall SetupQuerySourceListA()                          SetupQuerySourceListA
-;227 stdcall SetupQuerySourceListW()                          SetupQuerySourceListW
-;228 stdcall SetupQuerySpaceRequiredOnDriveA()                SetupQuerySpaceRequiredOnDriveA
-;229 stdcall SetupQuerySpaceRequiredOnDriveW()                SetupQuerySpaceRequiredOnDriveW
-  SetupQueueCopyA                            = _DbgSetupQueueCopyA@36          @230
-  SetupQueueCopyIndirectA                    = _DbgSetupQueueCopyIndirectA@4   @231
-  SetupQueueCopyIndirectW                    = _DbgSetupQueueCopyIndirectW@4   @232
-  SetupQueueCopySectionA                     = _DbgSetupQueueCopySectionA@24   @233
-  SetupQueueCopySectionW                     = _DbgSetupQueueCopySectionW@24   @234
-  SetupQueueCopyW                            = _DbgSetupQueueCopyW@36          @235
-  SetupQueueDefaultCopyA                     = _DbgSetupQueueDefaultCopyA@24   @236
-  SetupQueueDefaultCopyW                     = _DbgSetupQueueDefaultCopyW@24   @237
-  SetupQueueDeleteA                          = _DbgSetupQueueDeleteA@12        @238
-  SetupQueueDeleteSectionA                   = _DbgSetupQueueDeleteSectionA@16 @239
-  SetupQueueDeleteSectionW                   = _DbgSetupQueueDeleteSectionW@16 @240
-  SetupQueueDeleteW                          = _DbgSetupQueueDeleteW@12        @241
-  SetupQueueRenameA                          = _DbgSetupQueueRenameA@20        @242
-  SetupQueueRenameSectionA                   = _DbgSetupQueueRenameSectionA@16 @243
-  SetupQueueRenameSectionW                   = _DbgSetupQueueRenameSectionW@16 @244
-  SetupQueueRenameW                          = _DbgSetupQueueRenameW@20        @245
-;244 stdcall SetupRemoveFileLogEntryA()                       SetupRemoveFileLogEntryA
-;245 stdcall SetupRemoveFileLogEntryW()                       SetupRemoveFileLogEntryW
-;246 stdcall SetupRemoveFromDiskSpaceListA()                  SetupRemoveFromDiskSpaceListA
-;247 stdcall SetupRemoveFromDiskSpaceListW()                  SetupRemoveFromDiskSpaceListW
-;248 stdcall SetupRemoveFromSourceListA()                     SetupRemoveFromSourceListA
-;249 stdcall SetupRemoveFromSourceListW()                     SetupRemoveFromSourceListW
-;250 stdcall SetupRemoveInstallSectionFromDiskSpaceListA()    SetupRemoveInstallSectionFromDiskSpaceListA
-;251 stdcall SetupRemoveInstallSectionFromDiskSpaceListW()    SetupRemoveInstallSectionFromDiskSpaceListW
-;252 stdcall SetupRemoveSectionFromDiskSpaceListA()           SetupRemoveSectionFromDiskSpaceListA
-;253 stdcall SetupRemoveSectionFromDiskSpaceListW()           SetupRemoveSectionFromDiskSpaceListW
-;254 stdcall SetupRenameErrorA()                              SetupRenameErrorA
-;255 stdcall SetupRenameErrorW()                              SetupRenameErrorW
-;256 stdcall SetupScanFileQueue()                             SetupScanFileQueue
-  SetupScanFileQueueA                        = _DbgSetupScanFileQueueA@24    @257
-  SetupScanFileQueueW                        = _DbgSetupScanFileQueueW@24    @258
-  SetupSetDirectoryIdA                       = _DbgSetupSetDirectoryIdA@12   @259
-;260 stdcall SetupSetDirectoryIdExA(long long str long long ptr)  SetupSetDirectoryIdExA
-;261 stdcall SetupSetDirectoryIdExW(long long wstr long long ptr) SetupSetDirectoryIdExW
-  SetupSetDirectoryIdW                       = _DbgSetupSetDirectoryIdW@12   @262
-;263 stdcall SetupSetPlatformPathOverrideA(str)               SetupSetPlatformPathOverrideA
-;264 stdcall SetupSetPlatformPathOverrideW(wstr)              SetupSetPlatformPathOverrideW
-;265 stdcall SetupSetSourceListA(long str long)               SetupSetSourceListA
-;266 stdcall SetupSetSourceListW(long wstr long)              SetupSetSourceListW
-  SetupTermDefaultQueueCallback              = _DbgSetupTermDefaultQueueCallback@4 @267
-;268 stdcall SetupTerminateFileLog(ptr)                       SetupTerminateFileLog
+;@ stub SetupDeleteErrorA
+;@ stub SetupDeleteErrorW
+;@ stub SetupDestroyDiskSpaceList
+;@ stub SetupDiAskForOEMDisk
+;@ stub SetupDiBuildClassInfoList
+  SetupDiBuildClassInfoListExW     = _DbgSetupDiBuildClassInfoListExW@24  @75
+;@ stub SetupDiBuildDriverInfoList
+;@ stub SetupDiCallClassInstaller
+;@ stub SetupDiCancelDriverInfoSearch
+;@ stub SetupDiChangeState
+;@ stub SetupDiClassGuidsFromNameA
+  SetupDiClassGuidsFromNameExW     = _DbgSetupDiClassGuidsFromNameExW@24  @81
+;@ stub SetupDiClassGuidsFromNameW
+;@ stub SetupDiClassNameFromGuidA
+  SetupDiClassNameFromGuidExW      = _DbgSetupDiClassNameFromGuidExW@24   @84
+;@ stub SetupDiClassNameFromGuidW
+;@ stub SetupDiCreateDevRegKeyA
+;@ stub SetupDiCreateDevRegKeyW
+;@ stub SetupDiCreateDeviceInfoA
+;@ stub SetupDiCreateDeviceInfoList
+  SetupDiCreateDeviceInfoListExW   = _DbgSetupDiCreateDeviceInfoListExW@16 @90
+;@ stub SetupDiCreateDeviceInfoW
+;@ stub SetupDiDeleteDevRegKey
+;@ stub SetupDiDeleteDeviceInfo
+;@ stub SetupDiDestroyClassImageList
+  SetupDiDestroyDeviceInfoList = _DbgSetupDiDestroyDeviceInfoList@4         @95
+;@ stub SetupDiDestroyDriverInfoList
+;@ stub SetupDiDrawMiniIcon
+  SetupDiEnumDeviceInfo        = _DbgSetupDiEnumDeviceInfo@12               @96
+  SetupDiEnumDeviceInterfaces  = _DbgSetupDiEnumDeviceInterfaces@20         @97
+;@ stub SetupDiEnumDriverInfoA
+;@ stub SetupDiEnumDriverInfoW
+;@ stub SetupDiGetActualSectionToInstallA
+;@ stub SetupDiGetActualSectionToInstallW
+;@ stub SetupDiGetClassBitmapIndex
+;@ stub SetupDiGetClassDescriptionA
+  SetupDiGetClassDescriptionExW= _DbgSetupDiGetClassDescriptionExW@24       @104
+;@ stub SetupDiGetClassDescriptionW
+;@ stub SetupDiGetClassDevPropertySheetsA
+;@ stub SetupDiGetClassDevPropertySheetsW
+  SetupDiGetClassDevsA         = _DbgSetupDiGetClassDevsA@16                @108
+  SetupDiGetClassDevsExW       = _DbgSetupDiGetClassDevsExW@28              @109
+  SetupDiGetClassDevsW         = _DbgSetupDiGetClassDevsW@16                @110
+;@ stub SetupDiGetClassImageIndex
+;@ stub SetupDiGetClassImageList
+;@ stub SetupDiGetClassInstallParamsA
+;@ stub SetupDiGetClassInstallParamsW
+;@ stub SetupDiGetDeviceInfoListClass
+  SetupDiGetDeviceInfoListDetailW = _DbgSetupDiGetDeviceInfoListDetailW@8   @116
+;@ stub SetupDiGetDeviceInstallParamsA
+;@ stub SetupDiGetDeviceInstallParamsW
+;@ stub SetupDiGetDeviceInstanceIdA
+;@ stub SetupDiGetDeviceInstanceIdW
+  SetupDiGetDeviceRegistryPropertyA = _DbgSetupDiGetDeviceRegistryPropertyA@28 @121
+;@ stub SetupDiGetDeviceRegistryPropertyW
+;@ stub SetupDiGetDriverInfoDetailA
+;@ stub SetupDiGetDriverInfoDetailW
+;@ stub SetupDiGetDriverInstallParamsA
+;@ stub SetupDiGetDriverInstallParamsW
+;@ stub SetupDiGetDeviceInterfaceAlias
+  SetupDiGetDeviceInterfaceDetailA = _DbgSetupDiGetDeviceInterfaceDetailA@24    @128
+  SetupDiGetDeviceInterfaceDetailW = _DbgSetupDiGetDeviceInterfaceDetailW@24    @129
+;@ stub SetupDiGetHwProfileFriendlyNameA
+;@ stub SetupDiGetHwProfileFriendlyNameW
+;@ stub SetupDiGetHwProfileList
+;@ stub SetupDiGetINFClassA
+;@ stub SetupDiGetINFClassW
+;@ stub SetupDiGetSelectedDevice
+;@ stub SetupDiGetSelectedDriverA
+;@ stub SetupDiGetSelectedDriverW
+;@ stub SetupDiGetWizardPage
+;@ stub SetupDiInstallClassA
+;@ stub SetupDiInstallClassW
+;@ stub SetupDiInstallDevice
+;@ stub SetupDiInstallDriverFiles
+;@ stub SetupDiLoadClassIcon
+;@ stub SetupDiMoveDuplicateDevice
+;@ stub SetupDiOpenClassRegKey
+  SetupDiOpenClassRegKeyExW        = _DbgSetupDiOpenClassRegKeyExW@20      @146
+;@ stub SetupDiOpenDevRegKey
+;@ stub SetupDiOpenDeviceInfoA
+;@ stub SetupDiOpenDeviceInfoW
+;@ stub SetupDiRegisterDeviceInfo
+;@ stub SetupDiRemoveDevice
+;@ stub SetupDiSelectDevice
+;@ stub SetupDiSelectOEMDrv
+;@ stub SetupDiSetClassInstallParamsA
+;@ stub SetupDiSetClassInstallParamsW
+;@ stub SetupDiSetDeviceInstallParamsA
+;@ stub SetupDiSetDeviceInstallParamsW
+;@ stub SetupDiSetDeviceRegistryPropertyA
+;@ stub SetupDiSetDeviceRegistryPropertyW
+;@ stub SetupDiSetDriverInstallParamsA
+;@ stub SetupDiSetDriverInstallParamsW
+;@ stub SetupDiSetSelectedDevice
+;@ stub SetupDiSetSelectedDriverA
+;@ stub SetupDiSetSelectedDriverW
+;@ stub SetupDuplicateDiskSpaceListA
+;@ stub SetupDuplicateDiskSpaceListW
+
+  SetupFindFirstLineA                      = _DbgSetupFindFirstLineA@16       @166
+  SetupFindFirstLineW                      = _DbgSetupFindFirstLineW@16       @167
+  SetupFindNextLine                        = _DbgSetupFindNextLine@8          @168
+  SetupFindNextMatchLineA                  = _DbgSetupFindNextMatchLineA@12   @169
+  SetupFindNextMatchLineW                  = _DbgSetupFindNextMatchLineW@12   @170
+;@ stub SetupFreeSourceListA
+;@ stub SetupFreeSourceListW
+  SetupGetBinaryField                      = _DbgSetupGetBinaryField@20       @173
+  SetupGetFieldCount                       = _DbgSetupGetFieldCount@4         @174
+;@ stub SetupGetFileCompressionInfoA
+;@ stub SetupGetFileCompressionInfoW
+  SetupGetFileQueueCount                   = _DbgSetupGetFileQueueCount@12    @177
+  SetupGetFileQueueFlags                   = _DbgSetupGetFileQueueFlags@8     @178
+;@ stub SetupGetInfFileListA
+;@ stub SetupGetInfFileListW
+;@ stub SetupGetInfInformationA
+;@ stub SetupGetInfInformationW
+  SetupGetIntField                         = _DbgSetupGetIntField@12          @183
+  SetupGetLineByIndexA                     = _DbgSetupGetLineByIndexA@16      @184
+  SetupGetLineByIndexW                     = _DbgSetupGetLineByIndexW@16      @185
+  SetupGetLineCountA                       = _DbgSetupGetLineCountA@8         @186
+  SetupGetLineCountW                       = _DbgSetupGetLineCountW@8         @187
+  SetupGetLineTextA                        = _DbgSetupGetLineTextA@28         @188
+  SetupGetLineTextW                        = _DbgSetupGetLineTextW@28         @189
+  SetupGetMultiSzFieldA                    = _DbgSetupGetMultiSzFieldA@20     @190
+  SetupGetMultiSzFieldW                    = _DbgSetupGetMultiSzFieldW@20     @191
+;@ stub SetupGetSourceFileLocationA
+;@ stub SetupGetSourceFileLocationW
+;@ stub SetupGetSourceFileSizeA
+;@ stub SetupGetSourceFileSizeW
+;@ stub SetupGetSourceInfoA
+;@ stub SetupGetSourceInfoW
+  SetupGetStringFieldA                     = _DbgSetupGetStringFieldA@20      @198
+  SetupGetStringFieldW                     = _DbgSetupGetStringFieldW@20      @199
+;@ stub SetupGetTargetPathA
+;@ stub SetupGetTargetPathW
+  SetupInitDefaultQueueCallback            = _DbgSetupInitDefaultQueueCallback@4    @202
+  SetupInitDefaultQueueCallbackEx          = _DbgSetupInitDefaultQueueCallbackEx@20 @203
+;@ stub SetupInitializeFileLogA
+;@ stub SetupInitializeFileLogW
+;@ stub SetupInstallFileA
+;@ stub SetupInstallFileExA
+;@ stub SetupInstallFileExW
+;@ stub SetupInstallFileW
+  SetupInstallFilesFromInfSectionA          = _DbgSetupInstallFilesFromInfSectionA@24  @210
+  SetupInstallFilesFromInfSectionW          = _DbgSetupInstallFilesFromInfSectionW@24  @211
+  SetupInstallFromInfSectionA               = _DbgSetupInstallFromInfSectionA@44       @212
+  SetupInstallFromInfSectionW               = _DbgSetupInstallFromInfSectionW@44       @213
+;@ stub SetupInstallServicesFromInfSectionA
+;@ stub SetupInstallServicesFromInfSectionW
+  SetupIterateCabinetA                      = _DbgSetupIterateCabinetA@16    @216
+  SetupIterateCabinetW                      = _DbgSetupIterateCabinetW@16    @217
+;@ stub SetupLogFileA
+;@ stub SetupLogFileW
+  SetupOpenAppendInfFileA                   = _DbgSetupOpenAppendInfFileA@12 @220
+  SetupOpenAppendInfFileW                   = _DbgSetupOpenAppendInfFileW@12 @221
+  SetupOpenFileQueue                        = _DbgSetupOpenFileQueue@0       @222
+  SetupOpenInfFileA                         = _DbgSetupOpenInfFileA@16       @223
+  SetupOpenInfFileW                         = _DbgSetupOpenInfFileW@16       @224
+;@ stub SetupOpenMasterInf
+;@ stub SetupPromptForDiskA
+;@ stub SetupPromptForDiskW
+;@ stub SetupPromptReboot
+;@ stub SetupQueryDrivesInDiskSpaceListA
+;@ stub SetupQueryDrivesInDiskSpaceListW
+;@ stub SetupQueryFileLogA
+;@ stub SetupQueryFileLogW
+;@ stub SetupQueryInfFileInformationA
+;@ stub SetupQueryInfFileInformationW
+;@ stub SetupQueryInfVersionInformationA
+;@ stub SetupQueryInfVersionInformationW
+;@ stub SetupQuerySourceListA
+;@ stub SetupQuerySourceListW
+;@ stub SetupQuerySpaceRequiredOnDriveA
+;@ stub SetupQuerySpaceRequiredOnDriveW
+  SetupQueueCopyA                            = _DbgSetupQueueCopyA@36          @241
+  SetupQueueCopyIndirectA                    = _DbgSetupQueueCopyIndirectA@4   @242
+  SetupQueueCopyIndirectW                    = _DbgSetupQueueCopyIndirectW@4   @243
+  SetupQueueCopySectionA                     = _DbgSetupQueueCopySectionA@24   @244
+  SetupQueueCopySectionW                     = _DbgSetupQueueCopySectionW@24   @245
+  SetupQueueCopyW                            = _DbgSetupQueueCopyW@36          @246
+  SetupQueueDefaultCopyA                     = _DbgSetupQueueDefaultCopyA@24   @247
+  SetupQueueDefaultCopyW                     = _DbgSetupQueueDefaultCopyW@24   @248
+  SetupQueueDeleteA                          = _DbgSetupQueueDeleteA@12        @249
+  SetupQueueDeleteSectionA                   = _DbgSetupQueueDeleteSectionA@16 @250
+  SetupQueueDeleteSectionW                   = _DbgSetupQueueDeleteSectionW@16 @251
+  SetupQueueDeleteW                          = _DbgSetupQueueDeleteW@12        @252
+  SetupQueueRenameA                          = _DbgSetupQueueRenameA@20        @253
+  SetupQueueRenameSectionA                   = _DbgSetupQueueRenameSectionA@16 @254
+  SetupQueueRenameSectionW                   = _DbgSetupQueueRenameSectionW@16 @255
+  SetupQueueRenameW                          = _DbgSetupQueueRenameW@20        @256
+;@ stub SetupRemoveFileLogEntryA
+;@ stub SetupRemoveFileLogEntryW
+;@ stub SetupRemoveFromDiskSpaceListA
+;@ stub SetupRemoveFromDiskSpaceListW
+;@ stub SetupRemoveFromSourceListA
+;@ stub SetupRemoveFromSourceListW
+;@ stub SetupRemoveInstallSectionFromDiskSpaceListA
+;@ stub SetupRemoveInstallSectionFromDiskSpaceListW
+;@ stub SetupRemoveSectionFromDiskSpaceListA
+;@ stub SetupRemoveSectionFromDiskSpaceListW
+;@ stub SetupRenameErrorA
+;@ stub SetupRenameErrorW
+;@ stub SetupScanFileQueue
+  SetupScanFileQueueA                        = _DbgSetupScanFileQueueA@24    @269
+  SetupScanFileQueueW                        = _DbgSetupScanFileQueueW@24    @270
+  SetupSetDirectoryIdA                       = _DbgSetupSetDirectoryIdA@12   @271
+;@ stub SetupSetDirectoryIdExA
+;@ stub SetupSetDirectoryIdExW
+  SetupSetDirectoryIdW                       = _DbgSetupSetDirectoryIdW@12   @274
+  SetupSetFileQueueFlags                     = _DbgSetupSetFileQueueFlags@12 @275
+;@ stub SetupSetPlatformPathOverrideA
+;@ stub SetupSetPlatformPathOverrideW
+;@ stub SetupSetSourceListA
+;@ stub SetupSetSourceListW
+  SetupTermDefaultQueueCallback              = _DbgSetupTermDefaultQueueCallback@4 @280
+;@ stub SetupTerminateFileLog
 ;@ stub ShouldDeviceBeExcluded
 ;@ stub StampFileSecurity
@@ -254,4 +317,7 @@
 ;@ stub UnicodeToMultiByte
 ;@ stub UnmapAndCloseFile
+;@ stub pSetupAddMiniIconToList
+;@ stub pSetupAddTagToGroupOrderListEntry
+;@ stub pSetupAppendStringToMultiSz
 ;@ stub pSetupDirectoryIdToPath
 ;@ stub pSetupGetField
Index: trunk/src/setupapi/setupx16.h
===================================================================
--- trunk/src/setupapi/setupx16.h	(revision 9400)
+++ trunk/src/setupapi/setupx16.h	(revision 9403)
@@ -83,5 +83,5 @@
 	VCPPROGRESS	prgFileWrite;
 	VCPPROGRESS	prgByteWrite;
-} VCPDISKINFO, *LPVCPDISKINFO;	
+} VCPDISKINFO, *LPVCPDISKINFO;
 
 typedef struct {
@@ -361,8 +361,23 @@
 #else
 typedef LRESULT (CALLBACK *VIFPROC)(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, LPARAM lParam, LPARAM lparamRef);
+
 typedef int (CALLBACK *VCPENUMPROC)(LPVIRTNODE lpvn, LPARAM lparamRef);
 #endif
 
 RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef);
+
+/* VcpQueueCopy flags */
+#define VNLP_SYSCRITICAL	0x0001
+#define VNLP_SETUPCRITICAL	0x0002
+#define VNLP_NOVERCHECK		0x0004
+#define VNLP_FORCETEMP		0x0008
+#define VNLP_IFEXISTS		0x0010
+#define VNLP_KEEPNEWER		0x0020
+#define VNLP_PATCHIFEXIST	0x0040
+#define VNLP_NOPATCH		0x0080
+#define VNLP_CATALOGCERT	0x0100
+#define VNLP_NEEDCERTIFY	0x0200
+#define VNLP_COPYIFEXISTS	0x0400
+
 RETERR16 WINAPI VcpQueueCopy16(
 	LPCSTR lpszSrcFileName, LPCSTR lpszDstFileName,
Index: trunk/src/setupapi/setupx_main.c
===================================================================
--- trunk/src/setupapi/setupx_main.c	(revision 9400)
+++ trunk/src/setupapi/setupx_main.c	(revision 9403)
@@ -62,4 +62,5 @@
 #include "winerror.h"
 #include "wine/winuser16.h"
+#include "wownt32.h"
 #include "setupapi.h"
 #include "setupx16.h"
@@ -70,10 +71,11 @@
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
+
 /***********************************************************************
  *		SURegOpenKey (SETUPX.47)
  */
-DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
-{
-    FIXME("(%x,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
+DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, PHKEY retkey )
+{
+    FIXME("(%p,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey);
     return RegOpenKeyA( hkey, lpszSubKey, retkey );
 }
@@ -86,5 +88,5 @@
                                 LPBYTE lpbData, LPDWORD lpcbData )
 {
-    FIXME("(%x,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
+    FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName),
           lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0);
     return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType,
@@ -203,5 +205,5 @@
 	case HOW_ALWAYS_PROMPT_REBOOT:
 	case HOW_PROMPT_REBOOT:
-            if (MessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
+            if (MessageBoxA(HWND_32(hwnd), "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
                 reboot = TRUE;
 	    break;
@@ -502,5 +504,5 @@
 RETERR16 WINAPI CtlDelLdd16(LOGDISKID16 ldid)
 {
-    FIXME("(%d); - please report to a.mohr@mailto.de !!!\n", ldid);
+    FIXME("(%d); - please report this!\n", ldid);
     return SETUPX_DelLdd(ldid);
 }
@@ -679,5 +681,5 @@
 RETERR16 WINAPI CtlGetLdd16(LPLOGDISKDESC pldd)
 {
-    FIXME("(%p); - please report to a.mohr@mailto.de !!!\n", pldd);
+    FIXME("(%p); - please report this!\n", pldd);
     return SETUPX_GetLdd(pldd);
 }
Index: trunk/src/setupapi/stubs.c
===================================================================
--- trunk/src/setupapi/stubs.c	(revision 9400)
+++ trunk/src/setupapi/stubs.c	(revision 9403)
@@ -65,2 +65,99 @@
     return 0;
 }
+
+/***********************************************************************
+ *		SetupDiOpenClassRegKeyExW  (SETUPAPI.@)
+ *
+ * WINAPI in description not given
+ */
+HKEY WINAPI SetupDiOpenClassRegKeyExW(LPGUID lpClass, DWORD access, DWORD flags, LPCWSTR  machine, PVOID reserved)
+{
+  FIXME("\n");
+  return INVALID_HANDLE_VALUE;
+}
+
+/***********************************************************************
+ *		SetupDiGetClassDescriptionExW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiGetClassDescriptionExW (GUID* lpClass, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR  machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		SetupDiClassNameFromGuidExW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiClassNameFromGuidExW (GUID* lpClass, LPCWSTR desc, DWORD size, PDWORD required, LPCWSTR  machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		SetupDiBuildClassInfoListExW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD flags, LPGUID list, DWORD size, PDWORD required,  LPCWSTR  machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		SetupDiGetDeviceInfoListDetailW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data )
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		SetupDiCreateDeviceInfoListExW  (SETUPAPI.@)
+ */
+HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(LPGUID lpClass, HWND parend, LPCWSTR machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		  (SETUPAPI.@)
+ *
+ * NO WINAPI in description given
+ */
+HDEVINFO WINAPI SetupDiGetClassDevsExW(LPGUID lpClass, LPCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, LPCWSTR machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		SetupDiClassGuidsFromNameExW  (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiClassGuidsFromNameExW(LPCWSTR lpClass, LPGUID list, DWORD size, PDWORD required,  LPCWSTR  machine, PVOID reserved)
+{
+  FIXME("\n");
+  return FALSE;
+}
+
+/***********************************************************************
+ *		CM_Connect_MachineW  (SETUPAPI.@)
+ */
+DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine)
+{
+#define  CR_SUCCESS       0x00000000
+#define  CR_ACCESS_DENIED 0x00000033
+  FIXME("\n");
+  return  CR_ACCESS_DENIED;
+}
+
+/***********************************************************************
+ *		CM_Disconnect_Machine  (SETUPAPI.@)
+ */
+DWORD WINAPI CM_Disconnect_Machine(DWORD handle)
+{
+  FIXME("\n");
+  return  CR_SUCCESS;
+
+}
Index: trunk/src/setupapi/virtcopy.c
===================================================================
--- trunk/src/setupapi/virtcopy.c	(revision 9400)
+++ trunk/src/setupapi/virtcopy.c	(revision 9403)
@@ -468,5 +468,6 @@
 	TRACE("copying '%s' to '%s'\n", fn_src, fn_dst);
         /* perform the file copy */
-        if (!(CopyFileA(fn_src, fn_dst, TRUE)))
+        if (!(CopyFileA(fn_src, fn_dst,
+	       (lpvn->fl & VNLP_COPYIFEXISTS) ? FALSE : TRUE )))
         {
             ERR("error copying, src: %s -> dst: %s\n", fn_src, fn_dst);
@@ -579,7 +580,7 @@
 static char BackupDir[12];
 
-static BOOL CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
-{
-    BOOL retval = FALSE;
+static INT_PTR CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
+{
+    INT_PTR retval = FALSE;
 
     if (iMsg == WM_INITDIALOG)
@@ -594,5 +595,6 @@
 BOOL VCP_UI_GetDialogTemplate(LPCVOID *template32)
 {
-    HANDLE hResInfo, hDlgTmpl32;
+    HRSRC hResInfo;
+    HGLOBAL hDlgTmpl32;
 
     if (!(hResInfo = FindResourceA(SETUPAPI_hInstance, MAKEINTRESOURCEA(COPYFILEDLGORD), RT_DIALOGA)))
