advpack: Prepare the unicodification of advpack.dll.

dlls/advpack/advpack.c

@@ -248,7 +248,7 @@ BOOL WINAPI NeedReboot(DWORD dwRebootCheck)
 }
 
 /***********************************************************************
- *             OpenINFEngine    (ADVPACK.@)
+ *             OpenINFEngineA   (ADVPACK.@)
  *
  * Opens and returns a handle to an INF file to be used by
  * TranslateInfStringEx to continuously translate the INF file.
@@ -264,7 +264,7 @@ BOOL WINAPI NeedReboot(DWORD dwRebootCheck)
  *   Success: S_OK.
  *   Failure: E_FAIL.
  */
-HRESULT WINAPI OpenINFEngine(PCSTR pszInfFilename, PCSTR pszInstallSection,
+HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection,
                              DWORD dwFlags, HINF *phInf, PVOID pvReserved)
 {
     TRACE("(%p, %p, %ld, %p, %p)\n", pszInfFilename, pszInstallSection,
@@ -283,7 +283,7 @@ HRESULT WINAPI OpenINFEngine(PCSTR pszInfFilename, PCSTR pszInstallSection,
 }
 
 /***********************************************************************
- *             RebootCheckOnInstall    (ADVPACK.@)
+ *             RebootCheckOnInstallA   (ADVPACK.@)
  *
  * Checks if a reboot is required for an installed INF section.
  *
@@ -305,8 +305,8 @@ HRESULT WINAPI OpenINFEngine(PCSTR pszInfFilename, PCSTR pszInstallSection,
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI RebootCheckOnInstall(HWND hWnd, LPCSTR pszINF,
-                                    LPCSTR pszSec, DWORD dwReserved)
+HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF,
+                                    LPSTR pszSec, DWORD dwReserved)
 {
     FIXME("(%p, %p, %p, %ld) stub\n", hWnd, pszINF, pszSec, dwReserved);
 
@@ -358,7 +358,7 @@ void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
 }
 
 /***********************************************************************
- *             SetPerUserSecValues    (ADVPACK.@)
+ *             SetPerUserSecValuesA   (ADVPACK.@)
  *
  * Prepares the per-user stub values under IsInstalled\{GUID} that
  * control the per-user installation.
@@ -373,7 +373,7 @@ void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser)
+HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser)
 {
     FIXME("(%p) stub\n", pPerUser);
 
@@ -381,7 +381,7 @@ HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser)
 }
 
 /***********************************************************************
- *             TranslateInfString    (ADVPACK.@)
+ *             TranslateInfStringA   (ADVPACK.@)
  *
  * Translates the value of a specified key in an inf file into the
  * current locale by expanding string macros.
@@ -400,8 +400,8 @@ HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser)
  *   Success: S_OK.
  *   Failure: An hresult error code.
  */
-HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection,
-                PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer,
+HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSection,
+                LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer,
                 DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved)
 {
     HINF hInf;
@@ -435,7 +435,7 @@ HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection,
 }
 
 /***********************************************************************
- *             TranslateInfStringEx    (ADVPACK.@)
+ *             TranslateInfStringExA   (ADVPACK.@)
  *
  * Using a handle to an INF file opened with OpenINFEngine, translates
  * the value of a specified key in an inf file into the current locale
@@ -463,9 +463,9 @@ HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection,
  *   than calling TranslateInfString, because the INF file is only
  *   opened once.
  */
-HRESULT WINAPI TranslateInfStringEx(HINF hInf, PCSTR pszInfFilename,
-                                    PCSTR pszTranslateSection, PCSTR pszTranslateKey,
-                                    PSTR pszBuffer, DWORD dwBufferSize,
+HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename,
+                                    LPCSTR pszTranslateSection, LPCSTR pszTranslateKey,
+                                    LPSTR pszBuffer, DWORD dwBufferSize,
                                     PDWORD pdwRequiredSize, PVOID pvReserved)
 {
     TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, pszInfFilename,
@@ -485,10 +485,10 @@ HRESULT WINAPI TranslateInfStringEx(HINF hInf, PCSTR pszInfFilename,
 }
 
 /***********************************************************************
- *             UserInstStubWrapper    (ADVPACK.@)
+ *             UserInstStubWrapperA   (ADVPACK.@)
  */
-HRESULT WINAPI UserInstStubWrapper(HWND hWnd, HINSTANCE hInstance,
-                                   PSTR pszParms, INT nShow)
+HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance,
+                                   LPSTR pszParms, INT nShow)
 {
     FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow);
 
@@ -496,10 +496,10 @@ HRESULT WINAPI UserInstStubWrapper(HWND hWnd, HINSTANCE hInstance,
 }
 
 /***********************************************************************
- *             UserUnInstStubWrapper    (ADVPACK.@)
+ *             UserUnInstStubWrapperA   (ADVPACK.@)
  */
-HRESULT WINAPI UserUnInstStubWrapper(HWND hWnd, HINSTANCE hInstance,
-                                     PSTR pszParms, INT nShow)
+HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance,
+                                     LPSTR pszParms, INT nShow)
 {
     FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow);
 

dlls/advpack/advpack.spec

-@ stdcall AddDelBackupEntry(str str str long)
-@ stdcall AdvInstallFile(long str str str str long long)
+@ stdcall AddDelBackupEntryA(str str str long)
+# stdcall AddDelBackupEntryW(wstr wstr wstr long)
+@ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA
+@ stdcall AdvInstallFileA(long str str str str long long)
+# stdcall AdvInstallFileW(long wstr wstr wstr wstr long long)
+@ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA
 @ stdcall CloseINFEngine(long)
-@ stdcall DelNode(str long)
-@ stdcall DelNodeRunDLL32(ptr ptr str long)
+@ stdcall DelNodeA(str long)
+# stdcall DelNodeW(wstr long)
+@ stdcall DelNode(str long) DelNodeA
+@ stdcall DelNodeRunDLL32A(ptr ptr str long)
+# stdcall DelNodeRunDLL32W(ptr ptr wstr long)
+@ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A
 @ stdcall -private DllMain(long long ptr)
 @ stdcall DoInfInstall(ptr)
-@ stdcall ExecuteCab(ptr ptr ptr)
-@ stdcall ExtractFiles(str str long ptr ptr long)
-@ stdcall FileSaveMarkNotExist(str str str)
-@ stdcall FileSaveRestore(ptr str str str long)
-@ stdcall FileSaveRestoreOnINF(ptr str str str str str long)
-@ stdcall GetVersionFromFile(str ptr ptr long)
-@ stdcall GetVersionFromFileEx(str ptr ptr long)
+@ stdcall ExecuteCabA(ptr ptr ptr)
+# stdcall ExecuteCabW(ptr ptr ptr)
+@ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA
+@ stdcall ExtractFilesA(str str long ptr ptr long)
+# stdcall ExtractFilesW(wstr wstr long ptr ptr long)
+@ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA
+@ stdcall FileSaveMarkNotExistA(str str str)
+# stdcall FileSaveMarkNotExistW(wstr wstr wstr)
+@ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA
+@ stdcall FileSaveRestoreA(ptr str str str long)
+# stdcall FileSaveRestoreW(ptr wstr wstr wstr long)
+@ stdcall FileSaveRestore(ptr str str str long) FileSaveRestoreA
+@ stdcall FileSaveRestoreOnINFA(ptr str str str str str long)
+# stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long)
+@ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA
+@ stdcall GetVersionFromFileA(str ptr ptr long)
+# stdcall GetVersionFromFileW(wstr ptr ptr long)
+@ stdcall GetVersionFromFile(str ptr ptr long) GetVersionFromFileA
+@ stdcall GetVersionFromFileExA(str ptr ptr long)
+# stdcall GetVersionFromFileExW(wstr ptr ptr long)
+@ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA
 @ stdcall IsNTAdmin(long ptr)
-@ stdcall LaunchINFSection(ptr ptr str long)
-@ stdcall LaunchINFSectionEx(ptr ptr str long)
+@ stdcall LaunchINFSectionA(ptr ptr str long)
+# stdcall LaunchINFSectionW(ptr ptr wstr long)
+@ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA
+@ stdcall LaunchINFSectionExA(ptr ptr str long)
+# stdcall LaunchINFSectionExW(ptr ptr wstr long)
+@ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA
 @ stdcall NeedReboot(long)
 @ stdcall NeedRebootInit()
-@ stdcall OpenINFEngine(str str long ptr ptr)
-@ stdcall RebootCheckOnInstall(long str str long)
-@ stdcall RegInstall(ptr str ptr)
-@ stdcall RegRestoreAll(ptr str long)
-@ stdcall RegSaveRestore(ptr str long str str str long)
-@ stdcall RegSaveRestoreOnINF(ptr str str str long long long)
+@ stdcall OpenINFEngineA(str str long ptr ptr)
+# stdcall OpenINFEngineW(wstr wstr long ptr ptr)
+@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA
+@ stdcall RebootCheckOnInstallA(long str str long)
+# stdcall RebootCheckOnInstallW(long wstr wstr long)
+@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA
+@ stdcall RegInstallA(ptr str ptr)
+# stdcall RegInstallW(ptr wstr ptr)
+@ stdcall RegInstall(ptr str ptr) RegInstallA
+@ stdcall RegRestoreAllA(ptr str long)
+# stdcall RegRestoreAllW(ptr wstr long)
+@ stdcall RegRestoreAll(ptr str long) RegRestoreAllA
+@ stdcall RegSaveRestoreA(ptr str long str str str long)
+# stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long)
+@ stdcall RegSaveRestore(ptr str long str str str long) RegSaveRestoreA
+@ stdcall RegSaveRestoreOnINFA(ptr str str str long long long)
+# stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long)
+@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA
 @ stdcall RegisterOCX(ptr ptr str long)
-@ stdcall RunSetupCommand(long str str str str ptr long ptr)
-@ stdcall SetPerUserSecValues(ptr)
-@ stdcall TranslateInfString(str str str str ptr long ptr ptr)
-@ stdcall TranslateInfStringEx(long str str str str long ptr ptr)
-@ stdcall UserInstStubWrapper(long long str long)
-@ stdcall UserUnInstStubWrapper(long long str long)
+@ stdcall RunSetupCommandA(long str str str str ptr long ptr)
+# stdcall RunSetupCommandW(long wstr wstr wstr wstr wptr long ptr)
+@ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA
+@ stdcall SetPerUserSecValuesA(ptr)
+# stdcall SetPerUserSecValuesW(ptr)
+@ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA
+@ stdcall TranslateInfStringA(str str str str ptr long ptr ptr)
+# stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr)
+@ stdcall TranslateInfString(str str str str ptr long ptr ptr) TranslateInfStringA
+@ stdcall TranslateInfStringExA(long str str str str long ptr ptr)
+# stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr)
+@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA
+@ stdcall UserInstStubWrapperA(long long str long)
+# stdcall UserInstStubWrapperW(long long wstr long)
+@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA
+@ stdcall UserUnInstStubWrapperA(long long str long)
+# stdcall UserUnInstStubWrapperW(long long wstr long)
+@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA

dlls/advpack/files.c

@@ -33,7 +33,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 /***********************************************************************
- *      AddDelBackupEntry (ADVPACK.@)
+ *      AddDelBackupEntryA (ADVPACK.@)
  *
  * Either appends the files in the file list to the backup section of
  * the specified INI, or deletes the entries from the INI file.
@@ -56,7 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack);
  *   If lpcszBackupDir is NULL, the INI file is assumed to exist in
  *   c:\windows or created there if it does not exist.
  */
-HRESULT WINAPI AddDelBackupEntry(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir,
+HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir,
                                  LPCSTR lpcszBaseName, DWORD dwFlags)
 {
     CHAR szIniPath[MAX_PATH];
@@ -125,7 +125,7 @@ UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification,
 }
 
 /***********************************************************************
- *      AdvInstallFile (ADVPACK.@)
+ *      AdvInstallFileA (ADVPACK.@)
  *
  * Copies a file from the source to a destination.
  *
@@ -146,7 +146,7 @@ UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification,
  *   If lpszDestFile is NULL, the destination filename is the same as
  *   lpszSourceFIle.
  */
-HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile,
+HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile,
                               LPCSTR lpszDestDir, LPCSTR lpszDestFile,
                               DWORD dwFlags, DWORD dwReserved)
 {
@@ -290,7 +290,7 @@ static HRESULT DELNODE_recurse_dirtree(LPSTR fname, DWORD flags)
 }
 
 /***********************************************************************
- *              DelNode    (ADVPACK.@)
+ *              DelNodeA   (ADVPACK.@)
  *
  * Deletes a file or directory
  *
@@ -307,7 +307,7 @@ static HRESULT DELNODE_recurse_dirtree(LPSTR fname, DWORD flags)
  *   - Native version apparently does a lot of checking to make sure
  *     we're not trying to delete a system directory etc.
  */
-HRESULT WINAPI DelNode( LPCSTR pszFileOrDirName, DWORD dwFlags )
+HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags )
 {
     CHAR fname[MAX_PATH];
     HRESULT ret = E_FAIL;
@@ -355,7 +355,7 @@ static LPSTR get_parameter(LPSTR szParameters, CHAR cSeparator, DWORD dwIndex)
 }
 
 /***********************************************************************
- *             DelNodeRunDLL32    (ADVPACK.@)
+ *             DelNodeRunDLL32A   (ADVPACK.@)
  *
  * Deletes a file or directory, WinMain style.
  *
@@ -369,7 +369,7 @@ static LPSTR get_parameter(LPSTR szParameters, CHAR cSeparator, DWORD dwIndex)
  *   Success: S_OK.
  *   Failure: E_FAIL.
  */
-HRESULT WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
+HRESULT WINAPI DelNodeRunDLL32A( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
 {
     LPSTR szFilename, szFlags;
     DWORD dwFlags;
@@ -383,7 +383,7 @@ HRESULT WINAPI DelNodeRunDLL32( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT s
 
     dwFlags = atol(szFlags);
 
-    res = DelNode(szFilename, dwFlags);
+    res = DelNodeA(szFilename, dwFlags);
 
     HeapFree(GetProcessHeap(), 0, szFilename);
     HeapFree(GetProcessHeap(), 0, szFlags);
@@ -538,7 +538,7 @@ static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR sz
 }
 
 /***********************************************************************
- *             ExtractFiles    (ADVPACK.@)
+ *             ExtractFilesA    (ADVPACK.@)
  *
  * Extracts the specified files from a cab archive into
  * a destination directory.
@@ -562,7 +562,7 @@ static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR sz
  *   spaces, tabs, or colons can be before or after the list, but
  *   the list itself must only be separated by colons.
  */
-HRESULT WINAPI ExtractFiles ( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags,
+HRESULT WINAPI ExtractFilesA( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags,
                               LPCSTR FileList, LPVOID LReserved, DWORD Reserved)
 {   
     EXTRACTdest extractDest;
@@ -625,7 +625,7 @@ done:
 }
 
 /***********************************************************************
- *      FileSaveMarkNotExist (ADVPACK.@)
+ *      FileSaveMarkNotExistA (ADVPACK.@)
  *
  * Marks the files in the file list as not existing so they won't be
  * backed up during a save.
@@ -639,15 +639,15 @@ done:
  *   Success: S_OK.
  *   Failure: E_FAIL.
  */
-HRESULT WINAPI FileSaveMarkNotExist(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName)
+HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName)
 {
     TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName);
 
-    return AddDelBackupEntry(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY);
+    return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY);
 }
 
 /***********************************************************************
- *      FileSaveRestore (ADVPACK.@)
+ *      FileSaveRestoreA (ADVPACK.@)
  *
  * Saves or restores the files in the specified file list.
  *
@@ -668,7 +668,7 @@ HRESULT WINAPI FileSaveMarkNotExist(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBa
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI FileSaveRestore(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
+HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
                                LPSTR pszBaseName, DWORD dwFlags)
 {
     FIXME("(%p, %p, %p, %p, %ld) stub\n", hDlg, pszFileList, pszDir,
@@ -678,7 +678,7 @@ HRESULT WINAPI FileSaveRestore(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
 }
 
 /***********************************************************************
- *      FileSaveRestoreOnINF (ADVPACK.@)
+ *      FileSaveRestoreOnINFA (ADVPACK.@)
  *
  *
  * PARAMS
@@ -700,9 +700,9 @@ HRESULT WINAPI FileSaveRestore(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI FileSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF,
-                                    PCSTR pszSection, PCSTR pszBackupDir,
-                                    PCSTR pszBaseBackupFile, DWORD dwFlags)
+HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF,
+                                    LPCSTR pszSection, LPCSTR pszBackupDir,
+                                    LPCSTR pszBaseBackupFile, DWORD dwFlags)
 {
     FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF,
           pszSection, pszBackupDir, pszBaseBackupFile, dwFlags);
@@ -711,15 +711,15 @@ HRESULT WINAPI FileSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF,
 }
 
 /***********************************************************************
- *             GetVersionFromFile      (ADVPACK.@)
+ *             GetVersionFromFileA     (ADVPACK.@)
  *
  * See GetVersionFromFileEx.
  */
-HRESULT WINAPI GetVersionFromFile( LPSTR Filename, LPDWORD MajorVer,
+HRESULT WINAPI GetVersionFromFileA(LPCSTR Filename, LPDWORD MajorVer,
                                    LPDWORD MinorVer, BOOL Version )
 {
     TRACE("(%s, %p, %p, %d)\n", Filename, MajorVer, MinorVer, Version);
-    return GetVersionFromFileEx(Filename, MajorVer, MinorVer, Version);
+    return GetVersionFromFileExA(Filename, MajorVer, MinorVer, Version);
 }
 
 /* data for GetVersionFromFileEx */
@@ -730,7 +730,7 @@ typedef struct tagLANGANDCODEPAGE
 } LANGANDCODEPAGE;
 
 /***********************************************************************
- *             GetVersionFromFileEx    (ADVPACK.@)
+ *             GetVersionFromFileExA   (ADVPACK.@)
  *
  * Gets the files version or language information.
  *
@@ -747,7 +747,7 @@ typedef struct tagLANGANDCODEPAGE
  *   If bVersion is TRUE, version information is retrieved, else
  *   pdwMSVer gets the language ID and pdwLSVer gets the codepage ID.
  */
-HRESULT WINAPI GetVersionFromFileEx( LPSTR lpszFilename, LPDWORD pdwMSVer,
+HRESULT WINAPI GetVersionFromFileExA(LPCSTR lpszFilename, LPDWORD pdwMSVer,
                                      LPDWORD pdwLSVer, BOOL bVersion )
 {
     VS_FIXEDFILEINFO *pFixedVersionInfo;

dlls/advpack/install.c

@@ -79,7 +79,7 @@ HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup)
 }
 
 /***********************************************************************
- *             ExecuteCab    (ADVPACK.@)
+ *             ExecuteCabA    (ADVPACK.@)
  * 
  * Installs the INF file extracted from a specified cabinet file.
  * 
@@ -95,14 +95,14 @@ HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup)
  * BUGS
  *   Unimplemented
  */
-HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved )
+HRESULT WINAPI ExecuteCabA( HWND hwnd, CABINFOA* pCab, LPVOID pReserved )
 {
     FIXME("(%p %p %p): stub\n", hwnd, pCab, pReserved);
     return E_FAIL;
 }
 
 /***********************************************************************
- *      LaunchINFSection  (ADVPACK.@)
+ *      LaunchINFSectionA   (ADVPACK.@)
  *
  * Installs an INF section without BACKUP/ROLLBACK capabilities.
  *
@@ -122,14 +122,14 @@ HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved )
  * BUGS
  *  Unimplemented.
  */
-INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
+INT WINAPI LaunchINFSectionA( 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.@)
+ *      LaunchINFSectionExA (ADVPACK.@)
  *
  * Installs an INF section with BACKUP/ROLLBACK capabilities.
  *
@@ -149,14 +149,14 @@ INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show
  * BUGS
  *  Unimplemented.
  */
-HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
+HRESULT WINAPI LaunchINFSectionExA( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show )
 {
     FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show );
     return E_FAIL;
 }
 
 /***********************************************************************
- *      RunSetupCommand  (ADVPACK.@)
+ *      RunSetupCommandA  (ADVPACK.@)
  *
  * Executes an install section in an INF file or a program.
  *
@@ -183,7 +183,7 @@ HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, IN
  * BUGS
  *   Unimplemented
  */
-HRESULT WINAPI RunSetupCommand( HWND hWnd, LPCSTR szCmdName,
+HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName,
                                 LPCSTR szInfSection, LPCSTR szDir,
                                 LPCSTR lpszTitle, HANDLE *phEXE,
                                 DWORD dwFlags, LPVOID pvReserved )

dlls/advpack/reg.c

@@ -98,7 +98,7 @@ error:
 }
 
 /***********************************************************************
- *          RegInstall (advpack.@)
+ *          RegInstallA (advpack.@)
  *
  * Loads an INF from a string resource, adds entries to the string
  * substitution table, and executes the INF.
@@ -112,7 +112,7 @@ error:
  *   Success: S_OK.
  *   Failure: E_FAIL.
  */
-HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable)
+HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable)
 {
     int i;
     WCHAR tmp_ini_path[MAX_PATH];
@@ -189,7 +189,7 @@ HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable)
 }
 
 /***********************************************************************
- *          RegRestoreAll (advpack.@)
+ *          RegRestoreAllA (advpack.@)
  *
  * Restores all saved registry entries.
  *
@@ -205,7 +205,7 @@ HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable)
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey)
+HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey)
 {
     FIXME("(%p, %p, %p) stub\n", hWnd, pszTitleString, hkBackupKey);
     
@@ -213,7 +213,7 @@ HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey)
 }
 
 /***********************************************************************
- *          RegSaveRestore (advpack.@)
+ *          RegSaveRestoreA (advpack.@)
  *
  * Saves or restores the specified registry value.
  *
@@ -233,9 +233,9 @@ HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey)
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey,
-                              PCSTR pcszRootKey, PCSTR pcszSubKey,
-                              PCSTR pcszValueName, DWORD dwFlags)
+HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKey,
+                              LPCSTR pcszRootKey, LPCSTR pcszSubKey,
+                              LPCSTR pcszValueName, DWORD dwFlags)
 {
     FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitleString,
           hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags);
@@ -244,7 +244,7 @@ HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey,
 }
 
 /***********************************************************************
- *          RegSaveRestoreOnINF (advpack.@)
+ *          RegSaveRestoreOnINFA (advpack.@)
  *
  * Saves or restores the specified INF Reg section.
  *
@@ -264,8 +264,8 @@ HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey,
  * BUGS
  *   Unimplemented.
  */
-HRESULT WINAPI RegSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF,
-                                   PCSTR pszSection, HKEY hHKLMBackKey,
+HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF,
+                                   LPCSTR pszSection, HKEY hHKLMBackKey,
                                    HKEY hHKCUBackKey, DWORD dwFlags)
 {
     FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF,

dlls/mshtml/main.c

@@ -258,9 +258,9 @@ static HRESULT register_server(BOOL do_register)
 {
     HRESULT hres;
     HMODULE hAdvpack;
-    typeof(RegInstall) *pRegInstall;
-    STRTABLE strtable;
-    STRENTRY pse[35];
+    typeof(RegInstallA) *pRegInstall;
+    STRTABLEA strtable;
+    STRENTRYA pse[35];
     static CLSID const *clsids[35];
     int i = 0;
     
@@ -316,7 +316,7 @@ static HRESULT register_server(BOOL do_register)
     strtable.pse = pse;
 
     hAdvpack = LoadLibraryW(wszAdvpack);
-    pRegInstall = (typeof(RegInstall)*)GetProcAddress(hAdvpack, "RegInstall");
+    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA");
 
     hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable);
 

dlls/urlmon/regsvr.c

@@ -580,9 +580,9 @@ static HRESULT register_inf(BOOL doregister)
 {
     HRESULT hres;
     HMODULE hAdvpack;
-    typeof(RegInstall) *pRegInstall;
-    STRTABLE strtable;
-    STRENTRY pse[7];
+    typeof(RegInstallA) *pRegInstall;
+    STRTABLEA strtable;
+    STRENTRYA pse[7];
     static CLSID const *clsids[34];
     int i = 0;
 
@@ -608,7 +608,7 @@ static HRESULT register_inf(BOOL doregister)
     strtable.pse = pse;
 
     hAdvpack = LoadLibraryW(wszAdvpack);
-    pRegInstall = (typeof(RegInstall)*)GetProcAddress(hAdvpack, "RegInstall");
+    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA");
 
     hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);
 

tools/winapi/win32.api

@@ -177,6 +177,8 @@ WCHAR *
 BOOL
 DWORD
 HINSTANCE
+HKEY
+HINF
 HMODULE
 HRESULT
 HWND
@@ -184,21 +186,21 @@ INT
 
 %ptr
 
+CABINFOA *
 HANDLE *
-LPCSTRTABLE
+HINF *
 LPDWORD
 LPVOID
-PCABINFO
 PDWORD
+PERUSERSECTIONA *
 PVOID
 SETUPCOMMAND_PARAMS *
+STRTABLEA *
 
 %str
 
 LPCSTR
 LPSTR
-PCSTR
-PSTR
 
 %void