Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 08:54:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix last setupapi stringtable winetest

Browse source 
svn path=/trunk/; revision=40563
This commit is contained in:
Christoph von Wittich 2009-04-17 20:50:04 +00:00
parent fe9f8bcea5
commit a51e10cbb8
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/setupapi/stringtable.c
View file

@ -602,13 +602,13 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
LPWSTR lpString, LPWSTR lpString,
DWORD dwFlags, DWORD dwFlags,
LPVOID lpExtraData, LPVOID lpExtraData,
LPDWORD lpReserved) DWORD dwReserved)
{ {
PSTRING_TABLE pStringTable; PSTRING_TABLE pStringTable;
DWORD i; DWORD i;
TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags, TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags,
lpExtraData, lpReserved); lpExtraData, dwReserved);
pStringTable = (PSTRING_TABLE)hStringTable; pStringTable = (PSTRING_TABLE)hStringTable;
if (pStringTable == NULL) if (pStringTable == NULL)
@ -627,11 +627,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString))
{ {
if (lpExtraData) if (lpExtraData)
{ memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved);
memcpy(lpExtraData,
pStringTable->pSlots[i].pData,
pStringTable->pSlots[i].dwSize);
}
return i + 1; return i + 1;
} }
} }
@ -640,18 +636,13 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable,
if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString))
{ {
if (lpExtraData) if (lpExtraData)
{ memcpy(lpExtraData, pStringTable->pSlots[i].pData, dwReserved);
memcpy(lpExtraData,
pStringTable->pSlots[i].pData,
pStringTable->pSlots[i].dwSize);
}
return i + 1; return i + 1;
} }
} }
} }
} }
return ~0u;
return (DWORD)-1;
} }

2
reactos/include/psdk/setupapi.h
View file

@ -1434,7 +1434,7 @@ WINSETUPAPI BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID,
WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID); WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID);
WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD); WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD);
WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD);
WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD);
WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD);
WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD);
WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD);