advpack: Make the header more consistent with the implementation and fix the winapi_check warnings.

[Francois Gouget]

---
 include/advpub.h       |    4 ++--
 tools/winapi/win32.api |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/advpub.h b/include/advpub.h
index 70f5907..e144d66 100644
--- a/include/advpub.h
+++ b/include/advpub.h
@@ -249,8 +249,8 @@ HRESULT WINAPI RunSetupCommandW(HWND hWnd,
      LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle,
      HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved);
 #define RunSetupCommand WINELIB_NAME_AW(RunSetupCommand)
-HRESULT WINAPI SetPerUserSecValuesA(PPERUSERSECTIONA pPerUser);
-HRESULT WINAPI SetPerUserSecValuesW(PPERUSERSECTIONW pPerUser);
+HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser);
+HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser);
 #define SetPerUserSecValues WINELIB_NAME_AW(SetPerUserSecValues)
 HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSection,
      LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer,
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 1bca4b2..8ae0231 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -193,15 +193,18 @@ INT
 %ptr
 
 CABINFOA *
+CABINFOW *
 HANDLE *
 HINF *
 LPDWORD
 LPVOID
 PDWORD
 PERUSERSECTIONA *
+PERUSERSECTIONW *
 PVOID
 SETUPCOMMAND_PARAMS *
 STRTABLEA *
+STRTABLEW *
 
 %str
 
@@ -213,10 +216,6 @@ LPSTR
 LPCWSTR
 LPWSTR
 
-%void
-
-void
-
 %%amstream.dll
 
 %long
-- 
1.4.4.3