advpack: Standardize the format of advpack parameter lists.

This commit is contained in:
James Hawkins 2006-04-11 00:08:54 -05:00 committed by Alexandre Julliard
parent fced68672f
commit cc6685f089
3 changed files with 10 additions and 10 deletions

View File

@ -162,7 +162,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
* RETURNS * RETURNS
* TRUE if user has admin rights, FALSE otherwise. * TRUE if user has admin rights, FALSE otherwise.
*/ */
BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) BOOL WINAPI IsNTAdmin(DWORD reserved, LPDWORD pReserved)
{ {
SID_IDENTIFIER_AUTHORITY SidAuthority = {SECURITY_NT_AUTHORITY}; SID_IDENTIFIER_AUTHORITY SidAuthority = {SECURITY_NT_AUTHORITY};
PTOKEN_GROUPS pTokenGroups; PTOKEN_GROUPS pTokenGroups;
@ -384,7 +384,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
/*********************************************************************** /***********************************************************************
* RegisterOCX (ADVPACK.@) * RegisterOCX (ADVPACK.@)
*/ */
void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
{ {
WCHAR wszBuff[MAX_PATH]; WCHAR wszBuff[MAX_PATH];
WCHAR* pwcComma; WCHAR* pwcComma;

View File

@ -191,8 +191,8 @@ UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification,
* See AdvInstallFileW. * See AdvInstallFileW.
*/ */
HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile,
LPCSTR lpszDestDir, LPCSTR lpszDestFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile,
DWORD dwFlags, DWORD dwReserved) DWORD dwFlags, DWORD dwReserved)
{ {
UNICODE_STRING sourcedir, sourcefile; UNICODE_STRING sourcedir, sourcefile;
UNICODE_STRING destdir, destfile; UNICODE_STRING destdir, destfile;
@ -396,7 +396,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
* *
* See DelNodeW. * See DelNodeW.
*/ */
HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags ) HRESULT WINAPI DelNodeA(LPCSTR pszFileOrDirName, DWORD dwFlags)
{ {
UNICODE_STRING fileordirname; UNICODE_STRING fileordirname;
HRESULT res; HRESULT res;
@ -430,7 +430,7 @@ HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags )
* - Native version apparently does a lot of checking to make sure * - Native version apparently does a lot of checking to make sure
* we're not trying to delete a system directory etc. * we're not trying to delete a system directory etc.
*/ */
HRESULT WINAPI DelNodeW( LPCWSTR pszFileOrDirName, DWORD dwFlags ) HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags)
{ {
WCHAR fname[MAX_PATH]; WCHAR fname[MAX_PATH];
HRESULT ret = E_FAIL; HRESULT ret = E_FAIL;
@ -705,8 +705,8 @@ static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR sz
* spaces, tabs, or colons can be before or after the list, but * spaces, tabs, or colons can be before or after the list, but
* the list itself must only be separated by colons. * the list itself must only be separated by colons.
*/ */
HRESULT WINAPI ExtractFilesA( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags,
LPCSTR FileList, LPVOID LReserved, DWORD Reserved) LPCSTR FileList, LPVOID LReserved, DWORD Reserved)
{ {
EXTRACTdest extractDest; EXTRACTdest extractDest;
HMODULE hCabinet; HMODULE hCabinet;

View File

@ -304,7 +304,7 @@ static HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE)
HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName,
LPCSTR szInfSection, LPCSTR szDir, LPCSTR szInfSection, LPCSTR szDir,
LPCSTR lpszTitle, HANDLE *phEXE, LPCSTR lpszTitle, HANDLE *phEXE,
DWORD dwFlags, LPVOID pvReserved ) DWORD dwFlags, LPVOID pvReserved)
{ {
UNICODE_STRING cmdname, infsec; UNICODE_STRING cmdname, infsec;
UNICODE_STRING dir, title; UNICODE_STRING dir, title;
@ -365,7 +365,7 @@ HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName,
HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName,
LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR szInfSection, LPCWSTR szDir,
LPCWSTR lpszTitle, HANDLE *phEXE, LPCWSTR lpszTitle, HANDLE *phEXE,
DWORD dwFlags, LPVOID pvReserved ) DWORD dwFlags, LPVOID pvReserved)
{ {
HINF hinf; HINF hinf;