[SETUPAPI]

Rename functions according to the new naming scheme:
  CaptureAndConvertAnsiArg --> pSetupCaptureAndConvertAnsiArg
  CenterWindowRelativeToParent --> pSetupCenterWindowRelativeToParent
  ConcatenatePaths --> pSetupConcatenatePaths
  DuplicateString --> pSetupDuplicateString
  EnablePrivilege --> pSetupEnablePrivilege
  GetVersionInfoFromImage --> pSetupGetVersionInfoFromImage
  IsUserAdmin --> pSetupIsUserAdmin
  MultiByteToUnicode --> pSetupMultiByteToUnicode
  MyGetFileTitle --> pSetupGetFileTitle
  OpenAndMapForRead --> pSetupOpenAndMapForRead
  RegistryDelnode --> pSetupRegistryDelnode
  UnicodeToMultiByte --> pSetupUnicodeToMultiByte
  UnmapAndCloseFile --> pSetupUnmapAndCloseFile

svn path=/trunk/; revision=50915

diff --git a/reactos/dll/win32/setupapi/cfgmgr.c b/reactos/dll/win32/setupapi/cfgmgr.c
index 7763c0e..a324ce5 100644 (file)
--- a/reactos/dll/win32/setupapi/cfgmgr.c
+++ b/reactos/dll/win32/setupapi/cfgmgr.c
@@ -153,7 +153,7 @@ CONFIGRET WINAPI CMP_Report_LogOn(
     if (!PnpGetLocalHandles(&BindingHandle, NULL))
         return CR_FAILURE;
 
-    bAdmin = IsUserAdmin();
+    bAdmin = pSetupIsUserAdmin();
 
     for (i = 0; i < 30; i++)
     {
@@ -237,7 +237,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
     FIXME("%p %p %lu %lx %p\n",
           plcLogConf, dnDevInst, Priority, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (plcLogConf == NULL)
@@ -340,7 +340,7 @@ CONFIGRET WINAPI CM_Add_ID_ExA(
 
     TRACE("%p %s %lx %p\n", dnDevInst, pszID, ulFlags, hMachine);
 
-    if (CaptureAndConvertAnsiArg(pszID, &pszIDW))
+    if (pSetupCaptureAndConvertAnsiArg(pszID, &pszIDW))
         return CR_INVALID_DATA;
 
     ret = CM_Add_ID_ExW(dnDevInst, pszIDW, ulFlags, hMachine);
@@ -364,7 +364,7 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
 
     TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -455,7 +455,7 @@ CONFIGRET WINAPI CM_Connect_MachineA(
     if (UNCServerName == NULL || *UNCServerName == 0)
         return CM_Connect_MachineW(NULL, phMachine);
 
-    if (CaptureAndConvertAnsiArg(UNCServerName, &pServerNameW))
+    if (pSetupCaptureAndConvertAnsiArg(UNCServerName, &pServerNameW))
         return CR_INVALID_DATA;
 
     ret = CM_Connect_MachineW(pServerNameW, phMachine);
@@ -572,7 +572,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExA(
     TRACE("%p %s %p %lx %p\n",
           pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags, hMachine);
 
-    if (CaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW))
+    if (pSetupCaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW))
         return CR_INVALID_DATA;
 
     ret = CM_Create_DevNode_ExW(pdnDevInst, pDeviceIDW, dnParent, ulFlags,
@@ -599,7 +599,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
     FIXME("%p %s %p %lx %p\n",
           pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (pdnDevInst == NULL)
@@ -769,7 +769,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
 
     FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -868,7 +868,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
 
     TRACE("%p %lx %p\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)
@@ -1135,7 +1135,7 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
 
     TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed;
@@ -2040,7 +2040,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_ExA(
     }
     else
     {
-        if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
+        if (pSetupCaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
         {
             ret = CR_INVALID_DEVICE_ID;
             goto Done;
@@ -2165,7 +2165,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA(
     }
     else
     {
-        if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
+        if (pSetupCaptureAndConvertAnsiArg(pszFilter, &pszFilterW))
             return CR_INVALID_DEVICE_ID;
 
         ret = CM_Get_Device_ID_List_Size_ExW(pulLen,
@@ -2576,7 +2576,7 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA(
 
     if (szDevInstName != NULL)
     {
-       if (CaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
+       if (pSetupCaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
          return CR_INVALID_DEVICE_ID;
     }
 
@@ -3356,7 +3356,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExA(
 
     if (pDeviceID != NULL)
     {
-       if (CaptureAndConvertAnsiArg(pDeviceID, &pDevIdW))
+       if (pSetupCaptureAndConvertAnsiArg(pDeviceID, &pDevIdW))
          return CR_INVALID_DEVICE_ID;
     }
 
@@ -3506,7 +3506,7 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
     FIXME("%lx %lx %lx %lx\n",
           dnFromDevInst, dnToDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnFromDevInst == 0 || dnToDevInst == 0)
@@ -3606,7 +3606,7 @@ CONFIGRET WINAPI CM_Open_Class_Key_ExA(
 
     if (pszClassName != NULL)
     {
-       if (CaptureAndConvertAnsiArg(pszClassName, &pszClassNameW))
+       if (pSetupCaptureAndConvertAnsiArg(pszClassName, &pszClassNameW))
          return CR_INVALID_DATA;
     }
 
@@ -4201,7 +4201,7 @@ CONFIGRET WINAPI CM_Run_Detection_Ex(
 
     TRACE("%lx %lx\n", ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (ulFlags & ~CM_DETECT_BITS)
@@ -4612,7 +4612,7 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Ex(
 
     TRACE("%lu %lu %lx\n", ulHardwareProfile, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (ulFlags != 0)
@@ -4687,7 +4687,7 @@ CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExA(
 
     if (szDevInstName != NULL)
     {
-       if (CaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
+       if (pSetupCaptureAndConvertAnsiArg(szDevInstName, &pszDevIdW))
          return CR_INVALID_DEVICE_ID;
     }
 
@@ -4773,7 +4773,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
 
     FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine);
 
-    if (!IsUserAdmin())
+    if (!pSetupIsUserAdmin())
         return CR_ACCESS_DENIED;
 
     if (dnDevInst == 0)

diff --git a/reactos/dll/win32/setupapi/devclass.c b/reactos/dll/win32/setupapi/devclass.c
index f636e66..61a9be4 100644 (file)
--- a/reactos/dll/win32/setupapi/devclass.c
+++ b/reactos/dll/win32/setupapi/devclass.c
@@ -446,7 +446,7 @@ SetupDiGetClassImageListExA(
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (MachineNameW == NULL)
             return FALSE;
     }

diff --git a/reactos/dll/win32/setupapi/devinst.c b/reactos/dll/win32/setupapi/devinst.c
index 6ab6184..c87811f 100644 (file)
--- a/reactos/dll/win32/setupapi/devinst.c
+++ b/reactos/dll/win32/setupapi/devinst.c
@@ -156,10 +156,10 @@ CheckSectionValid(
 
     *ScorePlatform = *ScoreMajorVersion = *ScoreMinorVersion = *ScoreProductType = *ScoreSuiteMask = 0;
 
-    Section = DuplicateString(SectionName);
+    Section = pSetupDuplicateString(SectionName);
     if (!Section)
     {
-        TRACE("DuplicateString() failed\n");
+        TRACE("pSetupDuplicateString() failed\n");
         goto cleanup;
     }
 
@@ -687,7 +687,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExA(
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (MachineNameW == NULL) return FALSE;
     }
 
@@ -910,13 +910,13 @@ BOOL WINAPI SetupDiClassGuidsFromNameExA(
         return FALSE;
     }
 
-    ClassNameW = MultiByteToUnicode(ClassName, CP_ACP);
+    ClassNameW = pSetupMultiByteToUnicode(ClassName, CP_ACP);
     if (ClassNameW == NULL)
         return FALSE;
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (MachineNameW == NULL)
         {
             MyFree(ClassNameW);
@@ -1101,7 +1101,7 @@ BOOL WINAPI SetupDiClassNameFromGuidExA(
     BOOL ret;
 
     if (MachineName)
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
     ret = SetupDiClassNameFromGuidExW(ClassGuid, ClassNameW, MAX_CLASS_NAME_LEN,
      RequiredSize, MachineNameW, Reserved);
     if (ret)
@@ -1235,7 +1235,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid,
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (MachineNameW == NULL)
             return INVALID_HANDLE_VALUE;
     }
@@ -1381,7 +1381,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyA(
         }
         else
         {
-            InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP);
+            InfSectionNameW = pSetupMultiByteToUnicode(InfSectionName, CP_ACP);
             if (InfSectionNameW == NULL) return INVALID_HANDLE_VALUE;
         }
     }
@@ -1635,12 +1635,12 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(
 
     if (DeviceName)
     {
-        DeviceNameW = MultiByteToUnicode(DeviceName, CP_ACP);
+        DeviceNameW = pSetupMultiByteToUnicode(DeviceName, CP_ACP);
         if (DeviceNameW == NULL) return FALSE;
     }
     if (DeviceDescription)
     {
-        DeviceDescriptionW = MultiByteToUnicode(DeviceDescription, CP_ACP);
+        DeviceDescriptionW = pSetupMultiByteToUnicode(DeviceDescription, CP_ACP);
         if (DeviceDescriptionW == NULL)
         {
             MyFree(DeviceNameW);
@@ -2038,7 +2038,7 @@ SetupDiGetActualSectionToInstallExA(
 
     if (InfSectionName)
     {
-        InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP);
+        InfSectionNameW = pSetupMultiByteToUnicode(InfSectionName, CP_ACP);
         if (InfSectionNameW == NULL)
             goto cleanup;
     }
@@ -2135,7 +2135,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA(
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (!MachineNameW)
         {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -2285,7 +2285,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
 
     if (enumstr)
     {
-        enumstrW = MultiByteToUnicode(enumstr, CP_ACP);
+        enumstrW = pSetupMultiByteToUnicode(enumstr, CP_ACP);
         if (!enumstrW)
         {
             ret = INVALID_HANDLE_VALUE;
@@ -2294,7 +2294,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(
     }
     if (machine)
     {
-        machineW = MultiByteToUnicode(machine, CP_ACP);
+        machineW = pSetupMultiByteToUnicode(machine, CP_ACP);
         if (!machineW)
         {
             MyFree(enumstrW);
@@ -2540,7 +2540,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA(
 
     if (ReferenceString)
     {
-        ReferenceStringW = MultiByteToUnicode(ReferenceString, CP_ACP);
+        ReferenceStringW = pSetupMultiByteToUnicode(ReferenceString, CP_ACP);
         if (ReferenceStringW == NULL) return FALSE;
     }
 
@@ -2621,7 +2621,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(
             SetLastError(ERROR_INVALID_PARAMETER);
             return INVALID_HANDLE_VALUE;
         }
-        InfSectionNameW = MultiByteToUnicode(InfSectionName, CP_ACP);
+        InfSectionNameW = pSetupMultiByteToUnicode(InfSectionName, CP_ACP);
         if (!InfSectionNameW)
             return INVALID_HANDLE_VALUE;
     }
@@ -3462,7 +3462,7 @@ SetupDiInstallClassExA(
     }
     else
     {
-        InfFileNameW = MultiByteToUnicode(InfFileName, CP_ACP);
+        InfFileNameW = pSetupMultiByteToUnicode(InfFileName, CP_ACP);
         if (InfFileNameW == NULL)
         {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -3592,7 +3592,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExA(
 
     if (MachineName)
     {
-        MachineNameW = MultiByteToUnicode(MachineName, CP_ACP);
+        MachineNameW = pSetupMultiByteToUnicode(MachineName, CP_ACP);
         if (MachineNameW == NULL)
             return INVALID_HANDLE_VALUE;
     }
@@ -3934,7 +3934,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA(
 
     TRACE("%p %s %08lx %p\n", DeviceInfoSet, debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData);
 
-    DevicePathW = MultiByteToUnicode(DevicePath, CP_ACP);
+    DevicePathW = pSetupMultiByteToUnicode(DevicePath, CP_ACP);
     if (DevicePathW == NULL)
         return FALSE;
 
@@ -4667,7 +4667,7 @@ SetupDiOpenDeviceInfoA(
 
     TRACE("%p %s %p %lx %p\n", DeviceInfoSet, DeviceInstanceId, hwndParent, OpenFlags, DeviceInfoData);
 
-    DeviceInstanceIdW = MultiByteToUnicode(DeviceInstanceId, CP_ACP);
+    DeviceInstanceIdW = pSetupMultiByteToUnicode(DeviceInstanceId, CP_ACP);
     if (DeviceInstanceIdW == NULL)
         return FALSE;
 

diff --git a/reactos/dll/win32/setupapi/install.c b/reactos/dll/win32/setupapi/install.c
index 0d1fd06..5a6ad6c 100644 (file)
--- a/reactos/dll/win32/setupapi/install.c
+++ b/reactos/dll/win32/setupapi/install.c
@@ -998,7 +998,7 @@ profile_items_callback(
     }
     else
     {
-        FullIconName = DuplicateString(FullFileName);
+        FullIconName = pSetupDuplicateString(FullFileName);
         if (!FullIconName)
             goto cleanup;
     }
@@ -2177,9 +2177,9 @@ BOOL WINAPI SetupCopyOEMInfA(
 
     if (!DestinationInfFileName && DestinationInfFileNameSize > 0)
         SetLastError(ERROR_INVALID_PARAMETER);
-    else if (!(SourceInfFileNameW = MultiByteToUnicode(SourceInfFileName, CP_ACP)))
+    else if (!(SourceInfFileNameW = pSetupMultiByteToUnicode(SourceInfFileName, CP_ACP)))
         SetLastError(ERROR_INVALID_PARAMETER);
-    else if (OEMSourceMediaType != SPOST_NONE && !(OEMSourceMediaLocationW = MultiByteToUnicode(OEMSourceMediaLocation, CP_ACP)))
+    else if (OEMSourceMediaType != SPOST_NONE && !(OEMSourceMediaLocationW = pSetupMultiByteToUnicode(OEMSourceMediaLocation, CP_ACP)))
         SetLastError(ERROR_INVALID_PARAMETER);
     else
     {

diff --git a/reactos/dll/win32/setupapi/misc.c b/reactos/dll/win32/setupapi/misc.c
index 7f76472..fa35e36 100644 (file)
--- a/reactos/dll/win32/setupapi/misc.c
+++ b/reactos/dll/win32/setupapi/misc.c
@@ -63,7 +63,7 @@ GetFunctionPointer(
         Comma++;
 
     /* W->A conversion for function name */
-    FunctionNameA = UnicodeToMultiByte(Comma, CP_ACP);
+    FunctionNameA = pSetupUnicodeToMultiByte(Comma, CP_ACP);
     if (!FunctionNameA)
     {
         rc = GetLastError();
@@ -168,7 +168,7 @@ LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize)
 
 
 /**************************************************************************
- * DuplicateString [SETUPAPI.@]
+ * pSetupDuplicateString [SETUPAPI.@]
  *
  * Duplicates a unicode string.
  *
@@ -182,7 +182,7 @@ LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize)
  * NOTES
  *     Call MyFree() to release the duplicated string.
  */
-LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc)
+LPWSTR WINAPI pSetupDuplicateString(LPCWSTR lpSrc)
 {
     LPWSTR lpDst;
 
@@ -250,7 +250,7 @@ LONG WINAPI QueryRegistryValue(HKEY hKey,
 
 
 /**************************************************************************
- * MultiByteToUnicode [SETUPAPI.@]
+ * pSetupMultiByteToUnicode [SETUPAPI.@]
  *
  * Converts a multi-byte string to a Unicode string.
  *
@@ -265,7 +265,7 @@ LONG WINAPI QueryRegistryValue(HKEY hKey,
  * NOTE
  *     Use MyFree to release the returned Unicode string.
  */
-LPWSTR WINAPI MultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage)
+LPWSTR WINAPI pSetupMultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage)
 {
     LPWSTR lpUnicodeStr;
     int nLength;
@@ -296,7 +296,7 @@ LPWSTR WINAPI MultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage)
 
 
 /**************************************************************************
- * UnicodeToMultiByte [SETUPAPI.@]
+ * pSetupUnicodeToMultiByte [SETUPAPI.@]
  *
  * Converts a Unicode string to a multi-byte string.
  *
@@ -311,7 +311,7 @@ LPWSTR WINAPI MultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage)
  * NOTE
  *     Use MyFree to release the returned multi-byte string.
  */
-LPSTR WINAPI UnicodeToMultiByte(LPCWSTR lpUnicodeStr, UINT uCodePage)
+LPSTR WINAPI pSetupUnicodeToMultiByte(LPCWSTR lpUnicodeStr, UINT uCodePage)
 {
     LPSTR lpMultiByteStr;
     int nLength;
@@ -411,7 +411,7 @@ BOOL WINAPI DoesUserHavePrivilege(LPCWSTR lpPrivilegeName)
 
 
 /**************************************************************************
- * EnablePrivilege [SETUPAPI.@]
+ * pSetupEnablePrivilege [SETUPAPI.@]
  *
  * Enables or disables one of the current users privileges.
  *
@@ -424,7 +424,7 @@ BOOL WINAPI DoesUserHavePrivilege(LPCWSTR lpPrivilegeName)
  *     Success: TRUE
  *     Failure: FALSE
  */
-BOOL WINAPI EnablePrivilege(LPCWSTR lpPrivilegeName, BOOL bEnable)
+BOOL WINAPI pSetupEnablePrivilege(LPCWSTR lpPrivilegeName, BOOL bEnable)
 {
     TOKEN_PRIVILEGES Privileges;
     HANDLE hToken;
@@ -536,14 +536,14 @@ DWORD WINAPI CaptureStringArg(LPCWSTR pSrc, LPWSTR *pDst)
     if (pDst == NULL)
         return ERROR_INVALID_PARAMETER;
 
-    *pDst = DuplicateString(pSrc);
+    *pDst = pSetupDuplicateString(pSrc);
 
     return ERROR_SUCCESS;
 }
 
 
 /**************************************************************************
- * CaptureAndConvertAnsiArg [SETUPAPI.@]
+ * pSetupCaptureAndConvertAnsiArg [SETUPAPI.@]
  *
  * Captures an ANSI string and converts it to a UNICODE string.
  *
@@ -558,19 +558,19 @@ DWORD WINAPI CaptureStringArg(LPCWSTR pSrc, LPWSTR *pDst)
  * NOTE
  *     Call MyFree to release the captured UNICODE string.
  */
-DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst)
+DWORD WINAPI pSetupCaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst)
 {
     if (pDst == NULL)
         return ERROR_INVALID_PARAMETER;
 
-    *pDst = MultiByteToUnicode(pSrc, CP_ACP);
+    *pDst = pSetupMultiByteToUnicode(pSrc, CP_ACP);
 
     return ERROR_SUCCESS;
 }
 
 
 /**************************************************************************
- * OpenAndMapFileForRead [SETUPAPI.@]
+ * pSetupOpenAndMapFileForRead [SETUPAPI.@]
  *
  * Open and map a file to a buffer.
  *
@@ -588,11 +588,11 @@ DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst)
  * NOTE
  *     Call UnmapAndCloseFile to release the file.
  */
-DWORD WINAPI OpenAndMapFileForRead(LPCWSTR lpFileName,
-                                   LPDWORD lpSize,
-                                   LPHANDLE lpFile,
-                                   LPHANDLE lpMapping,
-                                   LPVOID *lpBuffer)
+DWORD WINAPI pSetupOpenAndMapFileForRead(LPCWSTR lpFileName,
+                                         LPDWORD lpSize,
+                                         LPHANDLE lpFile,
+                                         LPHANDLE lpMapping,
+                                         LPVOID *lpBuffer)
 {
     DWORD dwError;
 
@@ -635,7 +635,7 @@ DWORD WINAPI OpenAndMapFileForRead(LPCWSTR lpFileName,
 
 
 /**************************************************************************
- * UnmapAndCloseFile [SETUPAPI.@]
+ * pSetupUnmapAndCloseFile [SETUPAPI.@]
  *
  * Unmap and close a mapped file.
  *
@@ -648,7 +648,7 @@ DWORD WINAPI OpenAndMapFileForRead(LPCWSTR lpFileName,
  *     Success: TRUE
  *     Failure: FALSE
  */
-BOOL WINAPI UnmapAndCloseFile(HANDLE hFile, HANDLE hMapping, LPVOID lpBuffer)
+BOOL WINAPI pSetupUnmapAndCloseFile(HANDLE hFile, HANDLE hMapping, LPVOID lpBuffer)
 {
     TRACE("%p %p %p\n",
           hFile, hMapping, lpBuffer);
@@ -938,7 +938,7 @@ DWORD WINAPI GetSetFileTimestamp(LPCWSTR lpFileName,
 
 
 /**************************************************************************
- * MyGetFileTitle [SETUPAPI.@]
+ * pSetupGetFileTitle [SETUPAPI.@]
  *
  * Returns a pointer to the last part of a fully qualified file name.
  *
@@ -949,7 +949,7 @@ DWORD WINAPI GetSetFileTimestamp(LPCWSTR lpFileName,
  *     Pointer to a files name.
  */
 LPWSTR WINAPI
-MyGetFileTitle(LPCWSTR lpFileName)
+pSetupGetFileTitle(LPCWSTR lpFileName)
 {
     LPWSTR ptr;
     LPWSTR ret;
@@ -976,7 +976,7 @@ MyGetFileTitle(LPCWSTR lpFileName)
 
 
 /**************************************************************************
- * ConcatenatePaths [SETUPAPI.@]
+ * pSetupConcatenatePaths [SETUPAPI.@]
  *
  * Concatenates two paths.
  *
@@ -991,10 +991,10 @@ MyGetFileTitle(LPCWSTR lpFileName)
  *     Failure: FALSE
  */
 BOOL WINAPI
-ConcatenatePaths(LPWSTR lpPath,
-                 LPCWSTR lpAppend,
-                 DWORD dwBufferSize,
-                 LPDWORD lpRequiredSize)
+pSetupConcatenatePaths(LPWSTR lpPath,
+                       LPCWSTR lpAppend,
+                       DWORD dwBufferSize,
+                       LPDWORD lpRequiredSize)
 {
     DWORD dwPathSize;
     DWORD dwAppendSize;
@@ -1048,7 +1048,7 @@ ConcatenatePaths(LPWSTR lpPath,
 
 
 /**************************************************************************
- * CenterWindowRelativeToParent [SETUPAPI.@]
+ * pSetupCenterWindowRelativeToParent [SETUPAPI.@]
  *
  * Centers a window relative to its parent.
  *
@@ -1059,7 +1059,7 @@ ConcatenatePaths(LPWSTR lpPath,
  *     None
  */
 VOID WINAPI
-CenterWindowRelativeToParent(HWND hwnd)
+pSetupCenterWindowRelativeToParent(HWND hwnd)
 {
     HWND hwndOwner;
     POINT ptOrigin;
@@ -1094,7 +1094,7 @@ CenterWindowRelativeToParent(HWND hwnd)
 
 
 /**************************************************************************
- * GetVersionInfoFromImage [SETUPAPI.@]
+ * pSetupGetVersionInfoFromImage [SETUPAPI.@]
  *
  * Retrieves version information for a given file.
  *
@@ -1109,9 +1109,9 @@ CenterWindowRelativeToParent(HWND hwnd)
  *     Failure: FALSE
  */
 BOOL WINAPI
-GetVersionInfoFromImage(LPWSTR lpFileName,
-                        PULARGE_INTEGER lpFileVersion,
-                        LPWORD lpVersionVarSize)
+pSetupGetVersionInfoFromImage(LPWSTR lpFileName,
+                              PULARGE_INTEGER lpFileVersion,
+                              LPWORD lpVersionVarSize)
 {
     DWORD dwHandle;
     DWORD dwSize;
@@ -1345,7 +1345,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len,
     TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required,
           source_size, target_size, type);
 
-    if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE;
+    if (!source || !(sourceW = pSetupMultiByteToUnicode( source, CP_ACP ))) return FALSE;
 
     if (name)
     {
@@ -1359,7 +1359,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len,
     ret = SetupGetFileCompressionInfoExW( sourceW, nameW, nb_chars, &nb_chars, source_size, target_size, type );
     if (ret)
     {
-        if ((nameA = UnicodeToMultiByte( nameW, CP_ACP )))
+        if ((nameA = pSetupUnicodeToMultiByte( nameW, CP_ACP )))
         {
             if (name && len >= nb_chars) lstrcpyA( name, nameA );
             else
@@ -1580,8 +1580,8 @@ DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR source, PCSTR target, PUINT type
     DWORD ret = FALSE;
     WCHAR *sourceW = NULL, *targetW = NULL;
 
-    if (source && !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE;
-    if (target && !(targetW = MultiByteToUnicode( target, CP_ACP )))
+    if (source && !(sourceW = pSetupMultiByteToUnicode( source, CP_ACP ))) return FALSE;
+    if (target && !(targetW = pSetupMultiByteToUnicode( target, CP_ACP )))
     {
         MyFree( sourceW );
         return ERROR_NOT_ENOUGH_MEMORY;
@@ -1736,7 +1736,7 @@ pSetupIsGuidNull(LPGUID lpGUID)
  */
 BOOL
 WINAPI
-IsUserAdmin(VOID)
+pSetupIsUserAdmin(VOID)
 {
     SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY};
     BOOL bResult = FALSE;
@@ -1773,7 +1773,7 @@ HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags)
 
     if (Flags & SPFILELOG_SYSTEMLOG)
     {
-        if (!IsUserAdmin() && !(Flags & SPFILELOG_QUERYONLY))
+        if (!pSetupIsUserAdmin() && !(Flags & SPFILELOG_QUERYONLY))
         {
             /* insufficient privileges */
             SetLastError(ERROR_ACCESS_DENIED);

diff --git a/reactos/dll/win32/setupapi/parser.c b/reactos/dll/win32/setupapi/parser.c
index e1b693d..0271d17 100644 (file)
--- a/reactos/dll/win32/setupapi/parser.c
+++ b/reactos/dll/win32/setupapi/parser.c
@@ -2243,7 +2243,7 @@ SetupGetInfFileListA(
 
     if (DirectoryPath != NULL)
     {
-        DirectoryPathW = MultiByteToUnicode(DirectoryPath, CP_ACP);
+        DirectoryPathW = pSetupMultiByteToUnicode(DirectoryPath, CP_ACP);
         if (DirectoryPathW == NULL) goto Cleanup;
     }
 
@@ -2318,7 +2318,7 @@ BOOL WINAPI SetupDiGetINFClassA(
 
     if (InfName != NULL)
     {
-        InfNameW = MultiByteToUnicode(InfName, CP_ACP);
+        InfNameW = pSetupMultiByteToUnicode(InfName, CP_ACP);
         if (InfNameW == NULL) goto Cleanup;
     }
 

diff --git a/reactos/dll/win32/setupapi/setupapi.spec b/reactos/dll/win32/setupapi/setupapi.spec
index 79bf3aa..1bff6b0 100644 (file)
--- a/reactos/dll/win32/setupapi/setupapi.spec
+++ b/reactos/dll/win32/setupapi/setupapi.spec
@@ -213,7 +213,7 @@
 @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA
 @ stdcall InstallHinfSectionA(long long str long)
 @ stdcall InstallHinfSectionW(long long wstr long)
-@ stdcall IsUserAdmin()
+@ stdcall IsUserAdmin() pSetupIsUserAdmin
 @ stdcall MyFree(ptr)
 @ stdcall MyMalloc(long)
 @ stdcall MyRealloc(ptr long)
@@ -532,32 +532,32 @@
 @ stdcall SetupUninstallOEMInfW(wstr long ptr)
 @ stub SetupVerifyInfFileA
 @ stub SetupVerifyInfFileW
-@ stdcall UnicodeToMultiByte(wstr long)
+@ stdcall UnicodeToMultiByte(wstr long) pSetupUnicodeToMultiByte
 @ stub VerifyCatalogFile
 @ stub pSetupAccessRunOnceNodeList
 @ stub pSetupAcquireSCMLock
 @ stub pSetupAddMiniIconToList
 @ stub pSetupAddTagToGroupOrderListEntry
 @ stub pSetupAppendStringToMultiSz
-@ stdcall pSetupCaptureAndConvertAnsiArg(str ptr) CaptureAndConvertAnsiArg
-@ stdcall pSetupCenterWindowRelativeToParent(long) CenterWindowRelativeToParent
-@ stdcall pSetupConcatenatePaths(wstr wstr long ptr) ConcatenatePaths
+@ stdcall pSetupCaptureAndConvertAnsiArg(str ptr)
+@ stdcall pSetupCenterWindowRelativeToParent(long)
+@ stdcall pSetupConcatenatePaths(wstr wstr long ptr)
 @ stub pSetupDestroyRunOnceNodeList
 @ stub pSetupDiGetDeviceInfoContext
 @ stub pSetupDiSetDeviceInfoContext
 @ stub pSetupDoesUserHavePrivilege
-@ stdcall pSetupDuplicateString(wstr) DuplicateString
-@ stdcall pSetupEnablePrivilege(wstr long) EnablePrivilege
+@ stdcall pSetupDuplicateString(wstr)
+@ stdcall pSetupEnablePrivilege(wstr long)
 @ stub pSetupFree
 @ stub pSetupFreeStringArray
 @ stub pSetupGetCurrentDriverSigningPolicy
 @ stdcall pSetupGetField(ptr long)
-@ stdcall pSetupGetFileTitle(wstr) MyGetFileTitle
+@ stdcall pSetupGetFileTitle(wstr)
 @ stdcall pSetupGetGlobalFlags()
 @ stub pSetupGetInfSections
 @ stdcall pSetupGetQueueFlags(ptr)
 @ stub pSetupGetRealSystemTime
-@ stdcall pSetupGetVersionInfoFromImage(wstr ptr ptr) GetVersionInfoFromImage
+@ stdcall pSetupGetVersionInfoFromImage(wstr ptr ptr)
 @ stdcall pSetupGuidFromString(wstr ptr)
 @ stub pSetupHandleFailedVerification
 @ stub pSetupInfCacheBuild
@@ -566,16 +566,16 @@
 @ stub pSetupInstallStopEx
 @ stdcall pSetupIsGuidNull(ptr)
 @ stub pSetupIsLocalSystem
-@ stdcall pSetupIsUserAdmin() IsUserAdmin
+@ stdcall pSetupIsUserAdmin()
 @ stub pSetupMakeSurePathExists
 @ stub pSetupMalloc
 @ stub pSetupModifyGlobalFlags
-@ stdcall pSetupMultiByteToUnicode(str long) MultiByteToUnicode
-@ stdcall pSetupOpenAndMapFileForRead(wstr ptr ptr ptr ptr) OpenAndMapFileForRead
+@ stdcall pSetupMultiByteToUnicode(str long)
+@ stdcall pSetupOpenAndMapFileForRead(wstr ptr ptr ptr ptr)
 @ stub pSetupOutOfMemory
 @ stub pSetupQueryMultiSzValueToArray
 @ stub pSetupRealloc
-@ stdcall pSetupRegistryDelnode(long long) RegistryDelnode
+@ stdcall pSetupRegistryDelnode(long long)
 @ stub pSetupRetrieveServiceConfig
 @ stub pSetupSetArrayToMultiSzValue
 @ stdcall pSetupSetGlobalFlags(long)
@@ -597,8 +597,8 @@
 @ stdcall pSetupStringTableSetExtraData(ptr long ptr long)
 @ stdcall pSetupStringTableStringFromId(ptr long)
 @ stdcall pSetupStringTableStringFromIdEx(ptr long ptr ptr)
-@ stdcall pSetupUnicodeToMultiByte(wstr long) UnicodeToMultiByte
-@ stdcall pSetupUnmapAndCloseFile(long long ptr) UnmapAndCloseFile
+@ stdcall pSetupUnicodeToMultiByte(wstr long)
+@ stdcall pSetupUnmapAndCloseFile(long long ptr)
 @ stub pSetupVerifyCatalogFile
 @ stub pSetupVerifyFile
 @ stub pSetupVerifyQueuedCatalogs

diff --git a/reactos/dll/win32/setupapi/stubs.c b/reactos/dll/win32/setupapi/stubs.c
index 2ea7498..99ef8d1 100644 (file)
--- a/reactos/dll/win32/setupapi/stubs.c
+++ b/reactos/dll/win32/setupapi/stubs.c
@@ -42,9 +42,9 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 )
 }
 
 /***********************************************************************
- *             RegistryDelnode(SETUPAPI.@)
+ *             pSetupRegistryDelnode(SETUPAPI.@)
  */
-BOOL WINAPI RegistryDelnode(DWORD x, DWORD y)
+BOOL WINAPI pSetupRegistryDelnode(DWORD x, DWORD y)
 {
     FIXME("%08x %08x: stub\n", x, y);
     return FALSE;

diff --git a/reactos/include/psdk/setupapi.h b/reactos/include/psdk/setupapi.h
index 1f998c4..066d78d 100644 (file)
--- a/reactos/include/psdk/setupapi.h
+++ b/reactos/include/psdk/setupapi.h
@@ -1116,24 +1116,15 @@ typedef SP_REGISTER_CONTROL_STATUSA SP_REGISTER_CONTROL_STATUS, *PSP_REGISTER_CO
 
 WINSETUPAPI LONG WINAPI AddTagToGroupOrderList(PCWSTR, DWORD, DWORD);
 WINSETUPAPI VOID WINAPI AssertFail(LPSTR, UINT, LPSTR);
-WINSETUPAPI DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR, PWSTR*);
 WINSETUPAPI DWORD WINAPI CaptureStringArg(PCWSTR, PWSTR*);
-WINSETUPAPI VOID WINAPI CenterWindowRelativeToParent(HWND);
-WINSETUPAPI BOOL WINAPI ConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD);
 WINSETUPAPI BOOL WINAPI DelayedMove(PCWSTR, PCWSTR);
 WINSETUPAPI BOOL WINAPI DoesUserHavePrivilege(PCWSTR);
-WINSETUPAPI PWSTR WINAPI DuplicateString(PCWSTR);
-WINSETUPAPI BOOL WINAPI EnablePrivilege(PCWSTR, BOOL);
 WINSETUPAPI BOOL WINAPI FileExists(PCWSTR, PWIN32_FIND_DATAW);
 WINSETUPAPI DWORD WINAPI GetSetFileTimestamp(PCWSTR, PFILETIME, PFILETIME, PFILETIME, BOOLEAN);
-WINSETUPAPI BOOL WINAPI GetVersionInfoFromImage(LPWSTR, PULARGE_INTEGER, LPWORD);
 WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID);
-WINSETUPAPI PWSTR WINAPI MultiByteToUnicode(PCSTR, UINT);
 WINSETUPAPI VOID WINAPI MyFree(PVOID);
-WINSETUPAPI PWSTR WINAPI MyGetFileTitle(PCWSTR);
 WINSETUPAPI PVOID WINAPI MyMalloc(DWORD);
 WINSETUPAPI PVOID WINAPI MyRealloc(PVOID, DWORD);
-WINSETUPAPI DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*);
 WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE*, PDWORD, PDWORD);
 WINSETUPAPI DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR*);
 
@@ -1430,6 +1421,20 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
 
 WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);
 
+
+WINSETUPAPI DWORD WINAPI pSetupCaptureAndConvertAnsiArg(PCSTR, PWSTR*);
+WINSETUPAPI VOID WINAPI pSetupCenterWindowRelativeToParent(HWND);
+WINSETUPAPI BOOL WINAPI pSetupConcatenatePaths(LPWSTR, LPCWSTR, DWORD, LPDWORD);
+WINSETUPAPI PWSTR WINAPI pSetupDuplicateString(PCWSTR);
+WINSETUPAPI BOOL WINAPI pSetupEnablePrivilege(PCWSTR, BOOL);
+WINSETUPAPI PWSTR WINAPI pSetupGetFileTitle(PCWSTR);
+WINSETUPAPI BOOL WINAPI pSetupGetVersionInfoFromImage(LPWSTR, PULARGE_INTEGER, LPWORD);
+WINSETUPAPI BOOL WINAPI pSetupIsUserAdmin(VOID);
+WINSETUPAPI PWSTR WINAPI pSetupMultiByteToUnicode(PCSTR, UINT);
+WINSETUPAPI DWORD WINAPI pSetupOpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID*);
+
+
+
 WINSETUPAPI DWORD  WINAPI pSetupStringTableAddString(HSTRING_TABLE, LPWSTR, DWORD);
 WINSETUPAPI DWORD  WINAPI pSetupStringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
 WINSETUPAPI VOID   WINAPI pSetupStringTableDestroy(HSTRING_TABLE);
@@ -1443,9 +1448,12 @@ WINSETUPAPI BOOL   WINAPI pSetupStringTableSetExtraData(HSTRING_TABLE, DWORD, LP
 WINSETUPAPI LPWSTR WINAPI pSetupStringTableStringFromId(HSTRING_TABLE, DWORD);
 WINSETUPAPI BOOL   WINAPI pSetupStringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);
 
+WINSETUPAPI PSTR WINAPI pSetupUnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
+WINSETUPAPI BOOL WINAPI pSetupUnmapAndCloseFile(HANDLE, HANDLE, PVOID);
+
+
 WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR);
 WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);
-WINSETUPAPI BOOL WINAPI UnmapAndCloseFile(HANDLE, HANDLE, PVOID);
 
 
 /* for backward compatability */