[ros-diffs] [cwittich] 40563: fix last setupapi stringtable winetest

[cwittich]

Author: cwittich
Date: Sat Apr 18 00:50:04 2009
New Revision: 40563

URL: http://svn.reactos.org/svn/reactos?rev=40563&view=rev
Log:
fix last setupapi stringtable winetest

Modified:
    trunk/reactos/dll/win32/setupapi/stringtable.c
    trunk/reactos/include/psdk/setupapi.h

Modified: trunk/reactos/dll/win32/setupapi/stringtable.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringtable.c?rev=40563&r1=40562&r2=40563&view=diff
==============================================================================
--- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Sat Apr 18 
00:50:04 2009
@@ -602,13 +602,13 @@
                           LPWSTR lpString,
                           DWORD dwFlags,
                           LPVOID lpExtraData,
-                          LPDWORD lpReserved)
+                          DWORD dwReserved)
 {
     PSTRING_TABLE pStringTable;
     DWORD i;
 
     TRACE("%p %s %x %p, %x\n", hStringTable, debugstr_w(lpString), dwFlags,
-          lpExtraData, lpReserved);
+          lpExtraData, dwReserved);
 
     pStringTable = (PSTRING_TABLE)hStringTable;
     if (pStringTable == NULL)
@@ -627,11 +627,7 @@
                 if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString))
                 {
                     if (lpExtraData)
-                    {
-                        memcpy(lpExtraData,
-                               pStringTable->pSlots[i].pData,
-                               pStringTable->pSlots[i].dwSize);
-                    }
+                        memcpy(lpExtraData, pStringTable->pSlots[i].pData, 
dwReserved);
                     return i + 1;
                 }
             }
@@ -640,18 +636,13 @@
                 if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString))
                 {
                     if (lpExtraData)
-                    {
-                        memcpy(lpExtraData,
-                               pStringTable->pSlots[i].pData,
-                               pStringTable->pSlots[i].dwSize);
-                    }
+                        memcpy(lpExtraData, pStringTable->pSlots[i].pData, 
dwReserved);
                     return i + 1;
                 }
             }
         }
     }
-
-    return (DWORD)-1;
+    return ~0u;
 }
 
 

Modified: trunk/reactos/include/psdk/setupapi.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?rev=40563&r1=40562&r2=40563&view=diff
==============================================================================
--- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sat Apr 18 00:50:04 2009
@@ -1434,7 +1434,7 @@
 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, LPDWORD);
+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);