wine/ include/advpub.h dlls/advpack/advpack.c

[Alexandre Julliard]

ChangeSet ID:	21367
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/21 07:33:52

Modified files:
    include        : advpub.h 
    dlls/advpack   : advpack.c

Log message:
    Vincent Béron 
    Add/correct prototypes for some already defined functions in advpack.

Patch: http://cvs.winehq.org/patch.py?id=21367

Old revision  New revision  Changes     Path
 1.5           1.6           +10 -5      wine/include/advpub.h
 1.14          1.15          +7 -4       wine/dlls/advpack/advpack.c

Index: wine/include/advpub.h
diff -u -p wine/include/advpub.h:1.5 wine/include/advpub.h:1.6
--- wine/include/advpub.h:1.5	21 Nov 2005 13:33:52 -0000
+++ wine/include/advpub.h	21 Nov 2005 13:33:52 -0000
@@ -60,16 +60,21 @@ typedef CSTRTABLE *LPCSTRTABLE;
 #define ADN_DONT_DEL_SUBDIRS        0x00000002
 #define ADN_DONT_DEL_DIR            0x00000004

-HRESULT WINAPI RunSetupCommand(HWND hWnd,
-     LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle,
-     HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved);
 HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags);
+HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT);
 HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved );
+HRESULT WINAPI ExtractFiles(LPCSTR,LPCSTR,DWORD,LPCSTR,LPVOID,DWORD);
+HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+BOOL WINAPI IsNTAdmin(DWORD,LPDWORD);
+INT WINAPI LaunchINFSection(HWND,HINSTANCE,LPSTR,INT);
+HRESULT WINAPI LaunchINFSectionEx(HWND,HINSTANCE,LPSTR,INT);
 DWORD WINAPI NeedRebootInit(VOID);
 BOOL WINAPI NeedReboot(DWORD dwRebootCheck);
 HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable);
-HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
-HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+HRESULT WINAPI RunSetupCommand(HWND hWnd,
+     LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle,
+     HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved);
 HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection,
      PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer,
      DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);
Index: wine/dlls/advpack/advpack.c
diff -u -p wine/dlls/advpack/advpack.c:1.14 wine/dlls/advpack/advpack.c:1.15
--- wine/dlls/advpack/advpack.c:1.14	21 Nov 2005 13:33:52 -0000
+++ wine/dlls/advpack/advpack.c	21 Nov 2005 13:33:52 -0000
@@ -93,17 +93,19 @@ HRESULT WINAPI RunSetupCommand( HWND hWn
 /***********************************************************************
  *		LaunchINFSection  (ADVPACK.@)
  */
-void WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
+INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
 {
     FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show );
+    return 0;
 }

/***********************************************************************
  *		LaunchINFSectionEx  (ADVPACK.@)
  */
-void WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
+HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
 {
     FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show );
+    return E_FAIL;
 }

/* this structure very closely resembles parameters of RunSetupCommand() */
@@ -146,7 +148,7 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM
 /***********************************************************************
  *              IsNTAdmin	(ADVPACK.@)
  */
-BOOL WINAPI IsNTAdmin( DWORD reserved, PDWORD pReserved )
+BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved )
 {
     FIXME("(0x%08lx, %p): stub\n", reserved, pReserved);
     return TRUE;
@@ -375,9 +377,10 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr
  * BUGS
  *   Unimplemented
  */
-void WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
+HRESULT WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
 {
     FIXME("(%s): stub\n", debugstr_a(cmdline));
+    return E_FAIL;
 }

/***********************************************************************