[SETUPAPI]
authorEric Kohl <eric.kohl@reactos.org>
Sun, 20 Feb 2011 22:13:59 +0000 (22:13 +0000)
committerEric Kohl <eric.kohl@reactos.org>
Sun, 20 Feb 2011 22:13:59 +0000 (22:13 +0000)
- Add 'pSetup'-Prefix to the string table functions according to the new naming convention.
- Remove the obsolete function StringTableTrim.

svn path=/trunk/; revision=50844

reactos/dll/win32/setupapi/cfgmgr.c
reactos/dll/win32/setupapi/rpc.c
reactos/dll/win32/setupapi/setupapi.spec
reactos/dll/win32/setupapi/stringtable.c
reactos/include/psdk/setupapi.h

index c44aed5..7763c0e 100644 (file)
@@ -268,7 +268,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -392,7 +392,7 @@ CONFIGRET WINAPI CM_Add_ID_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -508,18 +508,18 @@ CONFIGRET WINAPI CM_Connect_MachineW(
         }
         lstrcpyW(pMachine->szMachineName, UNCServerName);
 
-        pMachine->StringTable = StringTableInitialize();
+        pMachine->StringTable = pSetupStringTableInitialize();
         if (pMachine->StringTable == NULL)
         {
             HeapFree(GetProcessHeap(), 0, pMachine);
             return CR_FAILURE;
         }
 
-        StringTableAddString(pMachine->StringTable, L"PLT", 1);
+        pSetupStringTableAddString(pMachine->StringTable, L"PLT", 1);
 
         if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle))
         {
-            StringTableDestroy(pMachine->StringTable);
+            pSetupStringTableDestroy(pMachine->StringTable);
             HeapFree(GetProcessHeap(), 0, pMachine);
             return CR_INVALID_MACHINENAME;
         }
@@ -630,7 +630,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
             return CR_FAILURE;
     }
 
-    lpParentDevInst = StringTableStringFromId(StringTable, dnParent);
+    lpParentDevInst = pSetupStringTableStringFromId(StringTable, dnParent);
     if (lpParentDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -650,7 +650,7 @@ CONFIGRET WINAPI CM_Create_DevNode_ExW(
 
     if (ret == CR_SUCCESS)
     {
-        *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1);
+        *pdnDevInst = pSetupStringTableAddString(StringTable, pDeviceID, 1);
         if (*pdnDevInst == 0)
             ret = CR_NO_SUCH_DEVNODE;
     }
@@ -794,7 +794,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -832,7 +832,7 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine)
     if (pMachine->bLocal == FALSE)
     {
         if (pMachine->StringTable != NULL)
-            StringTableDestroy(pMachine->StringTable);
+            pSetupStringTableDestroy(pMachine->StringTable);
 
         if (!PnpUnbindRpc(pMachine->BindingHandle))
             return CR_ACCESS_DENIED;
@@ -893,7 +893,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1161,7 +1161,7 @@ CONFIGRET WINAPI CM_Free_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1289,7 +1289,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1313,7 +1313,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex(
 
     TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
     if (dwIndex == -1)
         return CR_FAILURE;
 
@@ -1596,7 +1596,7 @@ CONFIGRET WINAPI CM_Get_Depth_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1773,7 +1773,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1861,7 +1861,7 @@ CM_Get_DevNode_Status_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -1978,10 +1978,10 @@ CONFIGRET WINAPI CM_Get_Device_ID_ExW(
             return CR_FAILURE;
     }
 
-    if (!StringTableStringFromIdEx(StringTable,
-                                   dnDevInst,
-                                   Buffer,
-                                   &BufferLen))
+    if (!pSetupStringTableStringFromIdEx(StringTable,
+                                         dnDevInst,
+                                         Buffer,
+                                         &BufferLen))
         return CR_FAILURE;
 
     return CR_SUCCESS;
@@ -2271,7 +2271,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(
             return CR_FAILURE;
     }
 
-    DeviceId = StringTableStringFromId(StringTable, dnDevInst);
+    DeviceId = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (DeviceId == NULL)
     {
         *pulLen = 0;
@@ -2438,7 +2438,7 @@ CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -2798,7 +2798,7 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -2875,7 +2875,7 @@ CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -2996,7 +2996,7 @@ CONFIGRET WINAPI CM_Get_Parent_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3020,7 +3020,7 @@ CONFIGRET WINAPI CM_Get_Parent_Ex(
 
     TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
     if (dwIndex == -1)
         return CR_FAILURE;
 
@@ -3128,7 +3128,7 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3152,7 +3152,7 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex(
 
     TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst));
 
-    dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1);
+    dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1);
     if (dwIndex == -1)
         return CR_FAILURE;
 
@@ -3443,7 +3443,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(
 
     if (ret == CR_SUCCESS)
     {
-        *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1);
+        *pdnDevInst = pSetupStringTableAddString(StringTable, DeviceIdBuffer, 1);
         if (*pdnDevInst == -1)
             ret = CR_FAILURE;
     }
@@ -3531,11 +3531,11 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpFromDevInst = StringTableStringFromId(StringTable, dnFromDevInst);
+    lpFromDevInst = pSetupStringTableStringFromId(StringTable, dnFromDevInst);
     if (lpFromDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
-    lpToDevInst = StringTableStringFromId(StringTable, dnToDevInst);
+    lpToDevInst = pSetupStringTableStringFromId(StringTable, dnToDevInst);
     if (lpToDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3856,7 +3856,7 @@ CONFIGRET WINAPI CM_Query_And_Remove_SubTree_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnAncestor);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnAncestor);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -3952,7 +3952,7 @@ CM_Reenumerate_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4109,7 +4109,7 @@ CONFIGRET WINAPI CM_Request_Device_Eject_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4280,7 +4280,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4508,7 +4508,7 @@ CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4798,7 +4798,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnDevInst);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
@@ -4866,7 +4866,7 @@ CONFIGRET WINAPI CM_Uninstall_DevNode_Ex(
             return CR_FAILURE;
     }
 
-    lpDevInst = StringTableStringFromId(StringTable, dnPhantom);
+    lpDevInst = pSetupStringTableStringFromId(StringTable, dnPhantom);
     if (lpDevInst == NULL)
         return CR_INVALID_DEVNODE;
 
index b4bce19..72ce54a 100644 (file)
@@ -79,17 +79,17 @@ PnpGetLocalHandles(RPC_BINDING_HANDLE *BindingHandle,
         return TRUE;
     }
 
-    LocalStringTable = StringTableInitialize();
+    LocalStringTable = pSetupStringTableInitialize();
     if (LocalStringTable == NULL)
         return FALSE;
 
     if (PnpBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK)
     {
-        StringTableDestroy(LocalStringTable);
+        pSetupStringTableDestroy(LocalStringTable);
         return FALSE;
     }
 
-    StringTableAddString(LocalStringTable, L"PLT", 1);
+    pSetupStringTableAddString(LocalStringTable, L"PLT", 1);
 
     if (BindingHandle != NULL)
         *BindingHandle = LocalBindingHandle;
@@ -104,7 +104,7 @@ PnpGetLocalHandles(RPC_BINDING_HANDLE *BindingHandle,
 RPC_STATUS
 PnpUnbindLocalBindingHandle(VOID)
 {
-    StringTableDestroy(LocalStringTable);
+    pSetupStringTableDestroy(LocalStringTable);
     LocalStringTable = NULL;
     return PnpUnbindRpc(&LocalBindingHandle);
 }
index fcff7a1..79bf3aa 100644 (file)
 @ stub pSetupSetSystemSourcePath
 @ stub pSetupShouldDeviceBeExcluded
 @ stdcall pSetupStringFromGuid(ptr wstr long)
-@ stdcall pSetupStringTableAddString(ptr wstr long) StringTableAddString
-@ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long) StringTableAddStringEx
-@ stdcall pSetupStringTableDestroy(ptr) StringTableDestroy
-@ stdcall pSetupStringTableDuplicate(ptr) StringTableDuplicate
+@ stdcall pSetupStringTableAddString(ptr wstr long)
+@ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long)
+@ stdcall pSetupStringTableDestroy(ptr)
+@ stdcall pSetupStringTableDuplicate(ptr)
 @ stub pSetupStringTableEnum
-@ stdcall pSetupStringTableGetExtraData(ptr long ptr long) StringTableGetExtraData
-@ stdcall pSetupStringTableInitialize() StringTableInitialize
-@ stdcall pSetupStringTableInitializeEx(long long) StringTableInitializeEx
-@ stdcall pSetupStringTableLookUpString(ptr wstr long) StringTableLookUpString
-@ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) StringTableLookUpStringEx
-@ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData
-@ stdcall pSetupStringTableStringFromId(ptr long) StringTableStringFromId
-@ stdcall pSetupStringTableStringFromIdEx(ptr long ptr ptr) StringTableStringFromIdEx
+@ stdcall pSetupStringTableGetExtraData(ptr long ptr long)
+@ stdcall pSetupStringTableInitialize()
+@ stdcall pSetupStringTableInitializeEx(long long)
+@ stdcall pSetupStringTableLookUpString(ptr wstr long)
+@ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr)
+@ 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
 @ stub pSetupVerifyCatalogFile
 @ stdcall RetreiveFileSecurity(wstr ptr)
 @ stub SearchForInfFile
 @ stdcall StampFileSecurity(wstr ptr)
-@ stdcall StringTableTrim(ptr)
 @ stdcall TakeOwnershipOfFile(wstr)
 @ stub pSetupDirectoryIdToPath
 @ stub pSetupGetOsLoaderDriveAndPath
index 9eba15f..522df7c 100644 (file)
@@ -41,7 +41,7 @@ typedef struct _STRING_TABLE
 
 
 /**************************************************************************
- * StringTableInitialize [SETUPAPI.@]
+ * pSetupStringTableInitialize [SETUPAPI.@]
  *
  * Creates a new string table and initializes it.
  *
@@ -53,7 +53,7 @@ typedef struct _STRING_TABLE
  *     Failure: NULL
  */
 HSTRING_TABLE WINAPI
-StringTableInitialize(VOID)
+pSetupStringTableInitialize(VOID)
 {
     PSTRING_TABLE pStringTable;
 
@@ -88,7 +88,7 @@ StringTableInitialize(VOID)
 
 
 /**************************************************************************
- * StringTableInitializeEx [SETUPAPI.@]
+ * pSetupStringTableInitializeEx [SETUPAPI.@]
  *
  * Creates a new string table and initializes it.
  *
@@ -101,8 +101,8 @@ StringTableInitialize(VOID)
  *     Failure: NULL
  */
 HSTRING_TABLE WINAPI
-StringTableInitializeEx(DWORD dwMaxExtraDataSize,
-                        DWORD dwReserved)
+pSetupStringTableInitializeEx(DWORD dwMaxExtraDataSize,
+                              DWORD dwReserved)
 {
     PSTRING_TABLE pStringTable;
 
@@ -133,7 +133,7 @@ StringTableInitializeEx(DWORD dwMaxExtraDataSize,
 
 
 /**************************************************************************
- * StringTableDestroy [SETUPAPI.@]
+ * pSetupStringTableDestroy [SETUPAPI.@]
  *
  * Destroys a string table.
  *
@@ -144,7 +144,7 @@ StringTableInitializeEx(DWORD dwMaxExtraDataSize,
  *     None
  */
 VOID WINAPI
-StringTableDestroy(HSTRING_TABLE hStringTable)
+pSetupStringTableDestroy(HSTRING_TABLE hStringTable)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
@@ -175,7 +175,7 @@ StringTableDestroy(HSTRING_TABLE hStringTable)
 
 
 /**************************************************************************
- * StringTableAddString [SETUPAPI.@]
+ * pSetupStringTableAddString [SETUPAPI.@]
  *
  * Adds a new string to the string table.
  *
@@ -195,9 +195,9 @@ StringTableDestroy(HSTRING_TABLE hStringTable)
  *     this case.
  */
 DWORD WINAPI
-StringTableAddString(HSTRING_TABLE hStringTable,
-                     LPWSTR lpString,
-                     DWORD dwFlags)
+pSetupStringTableAddString(HSTRING_TABLE hStringTable,
+                           LPWSTR lpString,
+                           DWORD dwFlags)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
@@ -250,7 +250,7 @@ StringTableAddString(HSTRING_TABLE hStringTable,
         MyFree(pNewSlots);
         pStringTable->dwMaxSlots = dwNewMaxSlots;
 
-        return StringTableAddString(hStringTable, lpString, dwFlags);
+        return pSetupStringTableAddString(hStringTable, lpString, dwFlags);
     }
 
     /* Search for an empty slot */
@@ -280,7 +280,7 @@ StringTableAddString(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableAddStringEx [SETUPAPI.@]
+ * pSetupStringTableAddStringEx [SETUPAPI.@]
  *
  * Adds a new string plus extra data to the string table.
  *
@@ -302,11 +302,11 @@ StringTableAddString(HSTRING_TABLE hStringTable,
  *     this case.
  */
 DWORD WINAPI
-StringTableAddStringEx(HSTRING_TABLE hStringTable,
-                       LPWSTR lpString,
-                       DWORD dwFlags,
-                       LPVOID lpExtraData,
-                       DWORD dwExtraDataSize)
+pSetupStringTableAddStringEx(HSTRING_TABLE hStringTable,
+                             LPWSTR lpString,
+                             DWORD dwFlags,
+                             LPVOID lpExtraData,
+                             DWORD dwExtraDataSize)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
@@ -390,7 +390,7 @@ StringTableAddStringEx(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableDuplicate [SETUPAPI.@]
+ * pSetupStringTableDuplicate [SETUPAPI.@]
  *
  * Duplicates a given string table.
  *
@@ -403,7 +403,7 @@ StringTableAddStringEx(HSTRING_TABLE hStringTable,
  *
  */
 HSTRING_TABLE WINAPI
-StringTableDuplicate(HSTRING_TABLE hStringTable)
+pSetupStringTableDuplicate(HSTRING_TABLE hStringTable)
 {
     PSTRING_TABLE pSourceTable;
     PSTRING_TABLE pDestinationTable;
@@ -474,7 +474,7 @@ StringTableDuplicate(HSTRING_TABLE hStringTable)
 
 
 /**************************************************************************
- * StringTableGetExtraData [SETUPAPI.@]
+ * pSetupStringTableGetExtraData [SETUPAPI.@]
  *
  * Retrieves extra data from a given string table entry.
  *
@@ -489,10 +489,10 @@ StringTableDuplicate(HSTRING_TABLE hStringTable)
  *     Failure: FALSE
  */
 BOOL WINAPI
-StringTableGetExtraData(HSTRING_TABLE hStringTable,
-                        DWORD dwId,
-                        LPVOID lpExtraData,
-                        DWORD dwExtraDataSize)
+pSetupStringTableGetExtraData(HSTRING_TABLE hStringTable,
+                              DWORD dwId,
+                              LPVOID lpExtraData,
+                              DWORD dwExtraDataSize)
 {
     PSTRING_TABLE pStringTable;
 
@@ -527,7 +527,7 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableLookUpString [SETUPAPI.@]
+ * pSetupStringTableLookUpString [SETUPAPI.@]
  *
  * Searches a string table for a given string.
  *
@@ -542,9 +542,9 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable,
  *     Failure: -1
  */
 DWORD WINAPI
-StringTableLookUpString(HSTRING_TABLE hStringTable,
-                        LPWSTR lpString,
-                        DWORD dwFlags)
+pSetupStringTableLookUpString(HSTRING_TABLE hStringTable,
+                              LPWSTR lpString,
+                              DWORD dwFlags)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
@@ -581,7 +581,7 @@ StringTableLookUpString(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableLookUpStringEx [SETUPAPI.@]
+ * pSetupStringTableLookUpStringEx [SETUPAPI.@]
  *
  * Searches a string table and extra data for a given string.
  *
@@ -598,11 +598,11 @@ StringTableLookUpString(HSTRING_TABLE hStringTable,
  *     Failure: -1
  */
 DWORD WINAPI
-StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
-                          LPWSTR lpString,
-                          DWORD dwFlags,
-                          LPVOID lpExtraData,
-                          DWORD dwReserved)
+pSetupStringTableLookUpStringEx(HSTRING_TABLE hStringTable,
+                                LPWSTR lpString,
+                                DWORD dwFlags,
+                                LPVOID lpExtraData,
+                                DWORD dwReserved)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
@@ -647,7 +647,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableSetExtraData [SETUPAPI.@]
+ * pSetupStringTableSetExtraData [SETUPAPI.@]
  *
  * Sets extra data for a given string table entry.
  *
@@ -662,10 +662,10 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
  *     Failure: FALSE
  */
 BOOL WINAPI
-StringTableSetExtraData(HSTRING_TABLE hStringTable,
-                        DWORD dwId,
-                        LPVOID lpExtraData,
-                        DWORD dwExtraDataSize)
+pSetupStringTableSetExtraData(HSTRING_TABLE hStringTable,
+                              DWORD dwId,
+                              LPVOID lpExtraData,
+                              DWORD dwExtraDataSize)
 {
     PSTRING_TABLE pStringTable;
 
@@ -708,7 +708,7 @@ StringTableSetExtraData(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableStringFromId [SETUPAPI.@]
+ * pSetupStringTableStringFromId [SETUPAPI.@]
  *
  * Returns a pointer to a string for the given string ID.
  *
@@ -721,8 +721,8 @@ StringTableSetExtraData(HSTRING_TABLE hStringTable,
  *     Failure: NULL
  */
 LPWSTR WINAPI
-StringTableStringFromId(HSTRING_TABLE hStringTable,
-                        DWORD dwId)
+pSetupStringTableStringFromId(HSTRING_TABLE hStringTable,
+                              DWORD dwId)
 {
     PSTRING_TABLE pStringTable;
     static WCHAR empty[] = {0};
@@ -744,7 +744,7 @@ StringTableStringFromId(HSTRING_TABLE hStringTable,
 
 
 /**************************************************************************
- * StringTableStringFromIdEx [SETUPAPI.@]
+ * pSetupStringTableStringFromIdEx [SETUPAPI.@]
  *
  * Returns a string for the given string ID.
  *
@@ -759,10 +759,10 @@ StringTableStringFromId(HSTRING_TABLE hStringTable,
  *     Failure: FALSE
  */
 BOOL WINAPI
-StringTableStringFromIdEx(HSTRING_TABLE hStringTable,
-                          DWORD dwId,
-                          LPWSTR lpBuffer,
-                          LPDWORD lpBufferLength)
+pSetupStringTableStringFromIdEx(HSTRING_TABLE hStringTable,
+                                DWORD dwId,
+                                LPWSTR lpBuffer,
+                                LPDWORD lpBufferLength)
 {
     PSTRING_TABLE pStringTable;
     DWORD dwLength;
@@ -797,21 +797,3 @@ StringTableStringFromIdEx(HSTRING_TABLE hStringTable,
 
     return bResult;
 }
-
-
-/**************************************************************************
- * StringTableTrim [SETUPAPI.@]
- *
- * ...
- *
- * PARAMS
- *     hStringTable [I] Handle to the string table
- *
- * RETURNS
- *     None
- */
-VOID WINAPI
-StringTableTrim(HSTRING_TABLE hStringTable)
-{
-    FIXME("%p\n", hStringTable);
-}
index e2756f2..1f998c4 100644 (file)
@@ -1430,19 +1430,18 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
 
 WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR);
 
-WINSETUPAPI DWORD  WINAPI StringTableAddString(HSTRING_TABLE, LPWSTR, DWORD);
-WINSETUPAPI DWORD  WINAPI StringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
-WINSETUPAPI VOID   WINAPI StringTableDestroy(HSTRING_TABLE);
-WINSETUPAPI HSTRING_TABLE WINAPI StringTableDuplicate(HSTRING_TABLE);
-WINSETUPAPI BOOL   WINAPI StringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD);
-WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID);
-WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD);
-WINSETUPAPI DWORD  WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD);
-WINSETUPAPI DWORD  WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
-WINSETUPAPI BOOL   WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD);
-WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD);
-WINSETUPAPI BOOL   WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);
-WINSETUPAPI VOID   WINAPI StringTableTrim(HSTRING_TABLE);
+WINSETUPAPI DWORD  WINAPI pSetupStringTableAddString(HSTRING_TABLE, LPWSTR, DWORD);
+WINSETUPAPI DWORD  WINAPI pSetupStringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
+WINSETUPAPI VOID   WINAPI pSetupStringTableDestroy(HSTRING_TABLE);
+WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableDuplicate(HSTRING_TABLE);
+WINSETUPAPI BOOL   WINAPI pSetupStringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD);
+WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableInitialize(VOID);
+WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableInitializeEx(DWORD, DWORD);
+WINSETUPAPI DWORD  WINAPI pSetupStringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD);
+WINSETUPAPI DWORD  WINAPI pSetupStringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
+WINSETUPAPI BOOL   WINAPI pSetupStringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD);
+WINSETUPAPI LPWSTR WINAPI pSetupStringTableStringFromId(HSTRING_TABLE, DWORD);
+WINSETUPAPI BOOL   WINAPI pSetupStringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);
 
 WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR);
 WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);