[ekohl] 50844: [SETUPAPI] - Add 'pSetup'-Prefix to the string table functions according to the new naming convention. - Remove the obsolete function StringTableTrim.
Author: ekohl Date: Sun Feb 20 22:13:59 2011 New Revision: 50844
URL: http://svn.reactos.org/svn/reactos?rev=50844&view=rev Log: [SETUPAPI] - Add 'pSetup'-Prefix to the string table functions according to the new naming convention. - Remove the obsolete function StringTableTrim.
Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/rpc.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/include/psdk/setupapi.h
Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c... ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -268,7 +268,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -392,7 +392,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -508,18 +508,18 @@ } 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 @@ return CR_FAILURE; }
- lpParentDevInst = StringTableStringFromId(StringTable, dnParent); + lpParentDevInst = pSetupStringTableStringFromId(StringTable, dnParent); if (lpParentDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -650,7 +650,7 @@
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 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -832,7 +832,7 @@ 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 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1161,7 +1161,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1289,7 +1289,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1313,7 +1313,7 @@
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 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1773,7 +1773,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1861,7 +1861,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -1978,10 +1978,10 @@ 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 @@ return CR_FAILURE; }
- DeviceId = StringTableStringFromId(StringTable, dnDevInst); + DeviceId = pSetupStringTableStringFromId(StringTable, dnDevInst); if (DeviceId == NULL) { *pulLen = 0; @@ -2438,7 +2438,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -2798,7 +2798,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -2875,7 +2875,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -2996,7 +2996,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -3020,7 +3020,7 @@
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 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -3152,7 +3152,7 @@
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 @@
if (ret == CR_SUCCESS) { - *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1); + *pdnDevInst = pSetupStringTableAddString(StringTable, DeviceIdBuffer, 1); if (*pdnDevInst == -1) ret = CR_FAILURE; } @@ -3531,11 +3531,11 @@ 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 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnAncestor); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnAncestor); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -3952,7 +3952,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -4109,7 +4109,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -4280,7 +4280,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -4508,7 +4508,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -4798,7 +4798,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
@@ -4866,7 +4866,7 @@ return CR_FAILURE; }
- lpDevInst = StringTableStringFromId(StringTable, dnPhantom); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnPhantom); if (lpDevInst == NULL) return CR_INVALID_DEVNODE;
Modified: trunk/reactos/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/rpc.c?re... ============================================================================== --- trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -79,17 +79,17 @@ 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 @@ RPC_STATUS PnpUnbindLocalBindingHandle(VOID) { - StringTableDestroy(LocalStringTable); + pSetupStringTableDestroy(LocalStringTable); LocalStringTable = NULL; return PnpUnbindRpc(&LocalBindingHandle); }
Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi... ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -584,19 +584,19 @@ @ 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 @@ -627,7 +627,6 @@ @ stdcall RetreiveFileSecurity(wstr ptr) @ stub SearchForInfFile @ stdcall StampFileSecurity(wstr ptr) -@ stdcall StringTableTrim(ptr) @ stdcall TakeOwnershipOfFile(wstr) @ stub pSetupDirectoryIdToPath @ stub pSetupGetOsLoaderDriveAndPath
Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringta... ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -41,7 +41,7 @@
/************************************************************************** - * StringTableInitialize [SETUPAPI.@] + * pSetupStringTableInitialize [SETUPAPI.@] * * Creates a new string table and initializes it. * @@ -53,7 +53,7 @@ * Failure: NULL */ HSTRING_TABLE WINAPI -StringTableInitialize(VOID) +pSetupStringTableInitialize(VOID) { PSTRING_TABLE pStringTable;
@@ -88,7 +88,7 @@
/************************************************************************** - * StringTableInitializeEx [SETUPAPI.@] + * pSetupStringTableInitializeEx [SETUPAPI.@] * * Creates a new string table and initializes it. * @@ -101,8 +101,8 @@ * Failure: NULL */ HSTRING_TABLE WINAPI -StringTableInitializeEx(DWORD dwMaxExtraDataSize, - DWORD dwReserved) +pSetupStringTableInitializeEx(DWORD dwMaxExtraDataSize, + DWORD dwReserved) { PSTRING_TABLE pStringTable;
@@ -133,7 +133,7 @@
/************************************************************************** - * StringTableDestroy [SETUPAPI.@] + * pSetupStringTableDestroy [SETUPAPI.@] * * Destroys a string table. * @@ -144,7 +144,7 @@ * None */ VOID WINAPI -StringTableDestroy(HSTRING_TABLE hStringTable) +pSetupStringTableDestroy(HSTRING_TABLE hStringTable) { PSTRING_TABLE pStringTable; DWORD i; @@ -175,7 +175,7 @@
/************************************************************************** - * StringTableAddString [SETUPAPI.@] + * pSetupStringTableAddString [SETUPAPI.@] * * Adds a new string to the string table. * @@ -195,9 +195,9 @@ * 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 @@ MyFree(pNewSlots); pStringTable->dwMaxSlots = dwNewMaxSlots;
- return StringTableAddString(hStringTable, lpString, dwFlags); + return pSetupStringTableAddString(hStringTable, lpString, dwFlags); }
/* Search for an empty slot */ @@ -280,7 +280,7 @@
/************************************************************************** - * StringTableAddStringEx [SETUPAPI.@] + * pSetupStringTableAddStringEx [SETUPAPI.@] * * Adds a new string plus extra data to the string table. * @@ -302,11 +302,11 @@ * 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 @@
/************************************************************************** - * StringTableDuplicate [SETUPAPI.@] + * pSetupStringTableDuplicate [SETUPAPI.@] * * Duplicates a given string table. * @@ -403,7 +403,7 @@ * */ HSTRING_TABLE WINAPI -StringTableDuplicate(HSTRING_TABLE hStringTable) +pSetupStringTableDuplicate(HSTRING_TABLE hStringTable) { PSTRING_TABLE pSourceTable; PSTRING_TABLE pDestinationTable; @@ -474,7 +474,7 @@
/************************************************************************** - * StringTableGetExtraData [SETUPAPI.@] + * pSetupStringTableGetExtraData [SETUPAPI.@] * * Retrieves extra data from a given string table entry. * @@ -489,10 +489,10 @@ * 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 @@
/************************************************************************** - * StringTableLookUpString [SETUPAPI.@] + * pSetupStringTableLookUpString [SETUPAPI.@] * * Searches a string table for a given string. * @@ -542,9 +542,9 @@ * 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 @@
/************************************************************************** - * StringTableLookUpStringEx [SETUPAPI.@] + * pSetupStringTableLookUpStringEx [SETUPAPI.@] * * Searches a string table and extra data for a given string. * @@ -598,11 +598,11 @@ * 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 @@
/************************************************************************** - * StringTableSetExtraData [SETUPAPI.@] + * pSetupStringTableSetExtraData [SETUPAPI.@] * * Sets extra data for a given string table entry. * @@ -662,10 +662,10 @@ * 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 @@
/************************************************************************** - * StringTableStringFromId [SETUPAPI.@] + * pSetupStringTableStringFromId [SETUPAPI.@] * * Returns a pointer to a string for the given string ID. * @@ -721,8 +721,8 @@ * 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 @@
/************************************************************************** - * StringTableStringFromIdEx [SETUPAPI.@] + * pSetupStringTableStringFromIdEx [SETUPAPI.@] * * Returns a string for the given string ID. * @@ -759,10 +759,10 @@ * 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 @@
return bResult; } - - -/************************************************************************** - * StringTableTrim [SETUPAPI.@] - * - * ... - * - * PARAMS - * hStringTable [I] Handle to the string table - * - * RETURNS - * None - */ -VOID WINAPI -StringTableTrim(HSTRING_TABLE hStringTable) -{ - FIXME("%p\n", hStringTable); -}
Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?rev... ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -1430,19 +1430,18 @@
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);
-
ekohl＠svn.reactos.org