Prepare the unicodification of advpack.dll
Francois Gouget
fgouget at free.fr
Fri Feb 24 09:09:42 CST 2006
Changelog:
* include/advpub.h
dlls/advpack/advpack.spec
dlls/advpack/advpack.c
dlls/advpack/files.c
dlls/advpack/install.c
dlls/advpack/reg.c
dlls/mshtml/main.c
dlls/urlmon/regsvr.c
tools/winapi/win32.api
Francois Gouget <fgouget at free.fr>
Prepare the unicodification of advpack.dll:
All functions that manipulate strings should have an Ansi and a
Unicode variant.
Forward the unqualified dll entry points to the Ansi variant for
backward compatibility.
We're not allowed to use unqualified entry points in Wine, so change
RegInstall() calls to RegInstallA().
Update win32.api.
--
Francois Gouget <fgouget at free.fr> http://fgouget.free.fr/
Linux: the choice of a GNU generation
-------------- next part --------------
Index: include/advpub.h
===================================================================
RCS file: /home/wine/wine/include/advpub.h,v
retrieving revision 1.15
diff -u -p -r1.15 advpub.h
--- include/advpub.h 21 Jan 2006 18:31:36 -0000 1.15
+++ include/advpub.h 24 Feb 2006 10:57:16 -0000
@@ -18,48 +18,94 @@
#ifndef __WINE_ADVPUB_H
#define __WINE_ADVPUB_H
+#include <setupapi.h>
+/* FIXME: #include <cfgmgr32.h> */
+
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct _CabInfo {
- PSTR pszCab;
- PSTR pszInf;
- PSTR pszSection;
- char szSrcPath[MAX_PATH];
- DWORD dwFlags;
-} CABINFO, *PCABINFO;
-
-typedef struct _PERUSERSECTION {
- char szGUID[39 /*MAX_GUID_STRING_LEN*/ + 20];
- char szDispName[128];
- char szLocale[10];
- char szStub[MAX_PATH * 4];
- char szVersion[32];
- char szCompID[128];
+typedef struct _CabInfoA
+{
+ LPSTR pszCab;
+ LPSTR pszInf;
+ LPSTR pszSection;
+ CHAR szSrcPath[MAX_PATH];
+ DWORD dwFlags;
+} CABINFOA, *PCABINFOA;
+
+typedef struct _CabInfoW
+{
+ LPWSTR pszCab;
+ LPWSTR pszInf;
+ LPWSTR pszSection;
+ WCHAR szSrcPath[MAX_PATH];
+ DWORD dwFlags;
+} CABINFOW, *PCABINFOW;
+
+DECL_WINELIB_TYPE_AW(CABINFO)
+DECL_WINELIB_TYPE_AW(PCABINFO)
+
+typedef struct _PERUSERSECTIONA
+{
+ CHAR szGUID[39 /*MAX_GUID_STRING_LEN*/ + 20];
+ CHAR szDispName[128];
+ CHAR szLocale[10];
+ CHAR szStub[MAX_PATH * 4];
+ CHAR szVersion[32];
+ CHAR szCompID[128];
+ DWORD dwIsInstalled;
+ BOOL bRollback;
+} PERUSERSECTIONA, *PPERUSERSECTIONA;
+
+typedef struct _PERUSERSECTIONW
+{
+ WCHAR szGUID[39 /*MAX_GUID_STRING_LEN*/ + 20];
+ WCHAR szDispName[128];
+ WCHAR szLocale[10];
+ WCHAR szStub[MAX_PATH * 4];
+ WCHAR szVersion[32];
+ WCHAR szCompID[128];
DWORD dwIsInstalled;
BOOL bRollback;
-} PERUSERSECTION, *PPERUSERSECTION;
+} PERUSERSECTIONW, *PPERUSERSECTIONW;
-typedef struct _StrEntry {
+DECL_WINELIB_TYPE_AW(PERUSERSECTION)
+DECL_WINELIB_TYPE_AW(PPERUSERSECTION)
+
+typedef struct _StrEntryA
+{
LPSTR pszName;
LPSTR pszValue;
-} STRENTRY, *LPSTRENTRY;
+} STRENTRYA, *LPSTRENTRYA;
-typedef const STRENTRY CSTRENTRY;
-typedef CSTRENTRY *LPCSTRENTRY;
+typedef struct _StrEntryW
+{
+ LPWSTR pszName;
+ LPWSTR pszValue;
+} STRENTRYW, *LPSTRENTRYW;
-typedef struct _StrTable {
- DWORD cEntries;
- LPSTRENTRY pse;
-} STRTABLE, *LPSTRTABLE;
+DECL_WINELIB_TYPE_AW(STRENTRY)
+DECL_WINELIB_TYPE_AW(LPSTRENTRY)
-typedef const STRTABLE CSTRTABLE;
-typedef CSTRTABLE *LPCSTRTABLE;
+typedef struct _StrTableA
+{
+ DWORD cEntries;
+ STRENTRYA* pse;
+} STRTABLEA, *LPSTRTABLEA;
+typedef const STRTABLEA CSTRTABLEA, *LPCSTRTABLEA;
-#ifndef _INC_SETUPAPI
-typedef PVOID HINF;
-#endif
+typedef struct _StrTableW
+{
+ DWORD cEntries;
+ STRENTRYW* pse;
+} STRTABLEW, *LPSTRTABLEW;
+typedef const STRTABLEW CSTRTABLEW, *LPCSTRTABLEW;
+
+DECL_WINELIB_TYPE_AW(STRTABLE)
+DECL_WINELIB_TYPE_AW(CSTRTABLE)
+DECL_WINELIB_TYPE_AW(LPSTRTABLE)
+DECL_WINELIB_TYPE_AW(LPCSTRTABLE)
/* Flags for AddDelBackupEntry */
#define AADBE_ADD_ENTRY 0x01
@@ -115,49 +161,113 @@ typedef PVOID HINF;
#define AFSR_USEREFCNT IE4_USEREFCNT
#define AFSR_EXTRAINCREFCNT IE4_EXTRAINCREFCNT
-HRESULT WINAPI AddDelBackupEntry(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir,
+HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir,
LPCSTR lpcszBaseName, DWORD dwFlags);
-HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir,
+HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir,
+ LPCWSTR lpcszBaseName, DWORD dwFlags);
+#define AddDelBackupEntry WINELIB_NAME_AW(AddDelBackupEntry)
+HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir,
LPCSTR lpszSourceFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile,
DWORD dwFlags, DWORD dwReserved);
+HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir,
+ LPCWSTR lpszSourceFile, LPCWSTR lpszDestDir, LPCWSTR lpszDestFile,
+ DWORD dwFlags, DWORD dwReserved);
+#define AdvInstallFile WINELIB_NAME_AW(AdvInstallFile)
HRESULT WINAPI CloseINFEngine(HINF hInf);
-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 FileSaveMarkNotExist(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName);
-HRESULT WINAPI FileSaveRestore(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
+HRESULT WINAPI DelNodeA(LPCSTR pszFileOrDirName, DWORD dwFlags);
+HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags);
+#define DelNode WINELIB_NAME_AW(DelNode)
+HRESULT WINAPI DelNodeRunDLL32A(HWND,HINSTANCE,LPSTR,INT);
+HRESULT WINAPI DelNodeRunDLL32W(HWND,HINSTANCE,LPWSTR,INT);
+#define DelNodeRunDLL32 WINELIB_NAME_AW(DelNodeRunDLL32)
+HRESULT WINAPI ExecuteCabA( HWND hwnd, CABINFOA* pCab, LPVOID pReserved );
+HRESULT WINAPI ExecuteCabW( HWND hwnd, CABINFOW* pCab, LPVOID pReserved );
+#define ExecuteCab WINELIB_NAME_AW(ExecuteCab)
+HRESULT WINAPI ExtractFilesA(LPCSTR,LPCSTR,DWORD,LPCSTR,LPVOID,DWORD);
+HRESULT WINAPI ExtractFilesW(LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPVOID,DWORD);
+#define ExtractFiles WINELIB_NAME_AW(ExtractFiles)
+HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName);
+HRESULT WINAPI FileSaveMarkNotExistW(LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName);
+#define FileSaveMarkNotExist WINELIB_NAME_AW(FileSaveMarkNotExist)
+HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir,
LPSTR pszBaseName, DWORD dwFlags);
-HRESULT WINAPI FileSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF,
- PCSTR pszSection, PCSTR pszBackupDir, PCSTR pszBaseBackupFile, DWORD dwFlags);
-HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
-HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+HRESULT WINAPI FileSaveRestoreW(HWND hDlg, LPWSTR pszFileList, LPWSTR pszDir,
+ LPWSTR pszBaseName, DWORD dwFlags);
+#define FileSaveRestore WINELIB_NAME_AW(FileSaveRestore)
+HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF,
+ LPCSTR pszSection, LPCSTR pszBackupDir, LPCSTR pszBaseBackupFile, DWORD dwFlags);
+HRESULT WINAPI FileSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF,
+ LPCWSTR pszSection, LPCWSTR pszBackupDir, LPCWSTR pszBaseBackupFile, DWORD dwFlags);
+#define FileSaveRestoreOnINF WINELIB_NAME_AW(FileSaveRestoreOnINF)
+HRESULT WINAPI GetVersionFromFileA(LPCSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+HRESULT WINAPI GetVersionFromFileW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+#define GetVersionFromFile WINELIB_NAME_AW(GetVersionFromFile)
+HRESULT WINAPI GetVersionFromFileExA(LPCSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion);
+#define GetVersionFromFileEx WINELIB_NAME_AW(GetVersionFromFileEx)
BOOL WINAPI IsNTAdmin(DWORD,LPDWORD);
-INT WINAPI LaunchINFSection(HWND,HINSTANCE,LPSTR,INT);
-HRESULT WINAPI LaunchINFSectionEx(HWND,HINSTANCE,LPSTR,INT);
+INT WINAPI LaunchINFSectionA(HWND,HINSTANCE,LPSTR,INT);
+INT WINAPI LaunchINFSectionW(HWND,HINSTANCE,LPWSTR,INT);
+#define LaunchINFSection WINELIB_NAME_AW(LaunchINFSection)
+HRESULT WINAPI LaunchINFSectionExA(HWND,HINSTANCE,LPSTR,INT);
+HRESULT WINAPI LaunchINFSectionExW(HWND,HINSTANCE,LPWSTR,INT);
+#define LaunchINFSectionEx WINELIB_NAME_AW(LaunchINFSectionEx)
DWORD WINAPI NeedRebootInit(VOID);
BOOL WINAPI NeedReboot(DWORD dwRebootCheck);
-HRESULT WINAPI OpenINFEngine(PCSTR pszInfFilename, PCSTR pszInstallSection,
+HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection,
+ DWORD dwFlags, HINF *phInf, PVOID pvReserved);
+HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection,
DWORD dwFlags, HINF *phInf, PVOID pvReserved);
-HRESULT WINAPI RebootCheckOnInstall(HWND hWnd, LPCSTR pszINF, LPCSTR pszSec, DWORD dwReserved);
-HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable);
-HRESULT WINAPI RegRestoreAll(HWND hWnd, PSTR pszTitleString, HKEY hkBackupKey);
-HRESULT WINAPI RegSaveRestore(HWND hWnd, PCSTR pszTitleString, HKEY hkBackupKey,
- PCSTR pcszRootKey, PCSTR pcszSubKey, PCSTR pcszValueName, DWORD dwFlags);
-HRESULT WINAPI RegSaveRestoreOnINF(HWND hWnd, PCSTR pszTitle, PCSTR pszINF,
- PCSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags);
-HRESULT WINAPI RunSetupCommand(HWND hWnd,
+#define OpenINFEngine WINELIB_NAME_AW(OpenINFEngine)
+HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, LPSTR pszSec, DWORD dwReserved);
+HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPWSTR pszSec, DWORD dwReserved);
+#define RebootCheckOnInstall WINELIB_NAME_AW(RebootCheckOnInstall)
+HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
+HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable);
+#define RegInstall WINELIB_NAME_AW(RegInstall)
+HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey);
+HRESULT WINAPI RegRestoreAllW(HWND hWnd, LPWSTR pszTitleString, HKEY hkBackupKey);
+#define RegRestoreAll WINELIB_NAME_AW(RegRestoreAll)
+HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKey,
+ LPCSTR pcszRootKey, LPCSTR pcszSubKey, LPCSTR pcszValueName, DWORD dwFlags);
+HRESULT WINAPI RegSaveRestoreW(HWND hWnd, LPCWSTR pszTitleString, HKEY hkBackupKey,
+ LPCWSTR pcszRootKey, LPCWSTR pcszSubKey, LPCWSTR pcszValueName, DWORD dwFlags);
+#define RegSaveRestore WINELIB_NAME_AW(RegSaveRestore)
+HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF,
+ LPCSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags);
+HRESULT WINAPI RegSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF,
+ LPCWSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags);
+#define RegSaveRestoreOnINF WINELIB_NAME_AW(RegSaveRestoreOnINF)
+HRESULT WINAPI RunSetupCommandA(HWND hWnd,
LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle,
HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved);
-HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser);
-HRESULT WINAPI TranslateInfString(PCSTR pszInfFilename, PCSTR pszInstallSection,
- PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer,
+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);
+#define SetPerUserSecValues WINELIB_NAME_AW(SetPerUserSecValues)
+HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSection,
+ LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer,
+ DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);
+HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection,
+ LPCWSTR pszTranslateSection, LPCWSTR pszTranslateKey, LPWSTR pszBuffer,
DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);
-HRESULT WINAPI TranslateInfStringEx(HINF hInf, PCSTR pszInfFilename,
- PCSTR pszTranslateSection, PCSTR pszTranslateKey, PSTR pszBuffer,
+#define TranslateInfString WINELIB_NAME_AW(TranslateInfString)
+HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename,
+ LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, LPSTR pszBuffer,
+ DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);
+HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename,
+ LPCWSTR pszTranslateSection, LPCWSTR pszTranslateKey, LPWSTR pszBuffer,
DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved);
-HRESULT WINAPI UserInstStubWrapper(HWND hWnd, HINSTANCE hInstance, PSTR pszParms, INT nShow);
-HRESULT WINAPI UserUnInstStubWrapper(HWND hWnd, HINSTANCE hInstance, PSTR pszParms, INT nShow);
+#define TranslateInfStringEx WINELIB_NAME_AW(TranslateInfStringEx)
+HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, LPSTR pszParms, INT nShow);
+HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, LPWSTR pszParms, INT nShow);
+#define UserInstStubWrapper WINELIB_NAME_AW(UserInstStubWrapper)
+HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, LPSTR pszParms, INT nShow);
+HRESULT WINAPI UserUnInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, LPWSTR pszParms, INT nShow);
+#define UserUnInstStubWrapper WINELIB_NAME_AW(UserUnInstStubWrapper)
#ifdef __cplusplus
}
Index: dlls/advpack/advpack.spec
===================================================================
RCS file: /home/wine/wine/dlls/advpack/advpack.spec,v
retrieving revision 1.19
diff -u -p -r1.19 advpack.spec
--- dlls/advpack/advpack.spec 21 Jan 2006 18:31:36 -0000 1.19
+++ dlls/advpack/advpack.spec 24 Feb 2006 10:56:54 -0000
@@ -1,32 +1,82 @@
-@ 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) advpack.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) advpack.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) advpack.DelNodeA
+@ stdcall DelNodeRunDLL32A(ptr ptr str long)
+# stdcall DelNodeRunDLL32W(ptr ptr wstr long)
+@ stdcall DelNodeRunDLL32(ptr ptr str long) advpack.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) advpack.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) advpack.ExtractFilesA
+@ stdcall FileSaveMarkNotExistA(str str str)
+# stdcall FileSaveMarkNotExistW(wstr wstr wstr)
+@ stdcall FileSaveMarkNotExist(str str str) advpack.FileSaveMarkNotExistA
+@ stdcall FileSaveRestoreA(ptr str str str long)
+# stdcall FileSaveRestoreW(ptr wstr wstr wstr long)
+@ stdcall FileSaveRestore(ptr str str str long) advpack.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) advpack.FileSaveRestoreOnINFA
+@ stdcall GetVersionFromFileA(str ptr ptr long)
+# stdcall GetVersionFromFileW(wstr ptr ptr long)
+@ stdcall GetVersionFromFile(str ptr ptr long) advpack.GetVersionFromFileA
+@ stdcall GetVersionFromFileExA(str ptr ptr long)
+# stdcall GetVersionFromFileExW(wstr ptr ptr long)
+@ stdcall GetVersionFromFileEx(str ptr ptr long) advpack.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) advpack.LaunchINFSectionA
+@ stdcall LaunchINFSectionExA(ptr ptr str long)
+# stdcall LaunchINFSectionExW(ptr ptr wstr long)
+@ stdcall LaunchINFSectionEx(ptr ptr str long) advpack.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) advpack.OpenINFEngineA
+@ stdcall RebootCheckOnInstallA(long str str long)
+# stdcall RebootCheckOnInstallW(long wstr wstr long)
+@ stdcall RebootCheckOnInstall(long str str long) advpack.RebootCheckOnInstallA
+@ stdcall RegInstallA(ptr str ptr)
+# stdcall RegInstallW(ptr wstr ptr)
+@ stdcall RegInstall(ptr str ptr) advpack.RegInstallA
+@ stdcall RegRestoreAllA(ptr str long)
+# stdcall RegRestoreAllW(ptr wstr long)
+@ stdcall RegRestoreAll(ptr str long) advpack.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) advpack.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) advpack.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) advpack.RunSetupCommandA
+@ stdcall SetPerUserSecValuesA(ptr)
+# stdcall SetPerUserSecValuesW(ptr)
+@ stdcall SetPerUserSecValues(ptr) advpack.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) advpack.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) advpack.TranslateInfStringExA
+@ stdcall UserInstStubWrapperA(long long str long)
+# stdcall UserInstStubWrapperW(long long wstr long)
+@ stdcall UserInstStubWrapper(long long str long) advpack.UserInstStubWrapperA
+@ stdcall UserUnInstStubWrapperA(long long str long)
+# stdcall UserUnInstStubWrapperW(long long wstr long)
+@ stdcall UserUnInstStubWrapper(long long str long) advpack.UserUnInstStubWrapperA
Index: dlls/advpack/advpack.c
===================================================================
RCS file: /home/wine/wine/dlls/advpack/advpack.c,v
retrieving revision 1.35
diff -u -p -r1.35 advpack.c
--- dlls/advpack/advpack.c 21 Feb 2006 11:06:08 -0000 1.35
+++ dlls/advpack/advpack.c 24 Feb 2006 10:56:54 -0000
@@ -248,7 +248,7 @@ BOOL WINAPI NeedReboot(DWORD dwRebootChe
}
/***********************************************************************
- * 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 dwRebootChe
* 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 pszIn
}
/***********************************************************************
- * RebootCheckOnInstall (ADVPACK.@)
+ * RebootCheckOnInstallA (ADVPACK.@)
*
* Checks if a reboot is required for an installed INF section.
*
@@ -305,8 +305,8 @@ HRESULT WINAPI OpenINFEngine(PCSTR pszIn
* 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, HINS
}
/***********************************************************************
- * 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, HINS
* BUGS
* Unimplemented.
*/
-HRESULT WINAPI SetPerUserSecValues(PPERUSERSECTION pPerUser)
+HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser)
{
FIXME("(%p) stub\n", pPerUser);
@@ -381,7 +381,7 @@ HRESULT WINAPI SetPerUserSecValues(PPERU
}
/***********************************************************************
- * 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(PPERU
* 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
}
/***********************************************************************
- * 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
* 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
}
/***********************************************************************
- * 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
}
/***********************************************************************
- * 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);
Index: dlls/advpack/files.c
===================================================================
RCS file: /home/wine/wine/dlls/advpack/files.c,v
retrieving revision 1.10
diff -u -p -r1.10 files.c
--- dlls/advpack/files.c 21 Feb 2006 11:06:11 -0000 1.10
+++ dlls/advpack/files.c 24 Feb 2006 10:56:54 -0000
@@ -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 Conte
}
/***********************************************************************
- * AdvInstallFile (ADVPACK.@)
+ * AdvInstallFileA (ADVPACK.@)
*
* Copies a file from the source to a destination.
*
@@ -146,7 +146,7 @@ UINT CALLBACK pQueueCallback(PVOID Conte
* 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(L
}
/***********************************************************************
- * DelNode (ADVPACK.@)
+ * DelNodeA (ADVPACK.@)
*
* Deletes a file or directory
*
@@ -307,7 +307,7 @@ static HRESULT DELNODE_recurse_dirtree(L
* - 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 szParam
}
/***********************************************************************
- * DelNodeRunDLL32 (ADVPACK.@)
+ * DelNodeRunDLL32A (ADVPACK.@)
*
* Deletes a file or directory, WinMain style.
*
@@ -369,7 +369,7 @@ static LPSTR get_parameter(LPSTR szParam
* 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 hWn
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
}
/***********************************************************************
- * 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
* 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(LPST
* 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
}
/***********************************************************************
- * FileSaveRestoreOnINF (ADVPACK.@)
+ * FileSaveRestoreOnINFA (ADVPACK.@)
*
*
* PARAMS
@@ -700,9 +700,9 @@ HRESULT WINAPI FileSaveRestore(HWND hDlg
* 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
}
/***********************************************************************
- * 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;
Index: dlls/advpack/install.c
===================================================================
RCS file: /home/wine/wine/dlls/advpack/install.c,v
retrieving revision 1.1
diff -u -p -r1.1 install.c
--- dlls/advpack/install.c 21 Feb 2006 11:06:08 -0000 1.1
+++ dlls/advpack/install.c 24 Feb 2006 10:56:54 -0000
@@ -79,7 +79,7 @@ HRESULT WINAPI DoInfInstall(const SETUPC
}
/***********************************************************************
- * ExecuteCab (ADVPACK.@)
+ * ExecuteCabA (ADVPACK.@)
*
* Installs the INF file extracted from a specified cabinet file.
*
@@ -95,14 +95,14 @@ HRESULT WINAPI DoInfInstall(const SETUPC
* 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, PC
* 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,
* 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
* 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 )
Index: dlls/advpack/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/advpack/reg.c,v
retrieving revision 1.4
diff -u -p -r1.4 reg.c
--- dlls/advpack/reg.c 12 Jan 2006 12:48:24 -0000 1.4
+++ dlls/advpack/reg.c 24 Feb 2006 10:56:54 -0000
@@ -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, LP
}
/***********************************************************************
- * RegRestoreAll (advpack.@)
+ * RegRestoreAllA (advpack.@)
*
* Restores all saved registry entries.
*
@@ -205,7 +205,7 @@ HRESULT WINAPI RegInstall(HMODULE hm, LP
* 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,
}
/***********************************************************************
- * RegSaveRestore (advpack.@)
+ * RegSaveRestoreA (advpack.@)
*
* Saves or restores the specified registry value.
*
@@ -233,9 +233,9 @@ HRESULT WINAPI RegRestoreAll(HWND hWnd,
* 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,
}
/***********************************************************************
- * RegSaveRestoreOnINF (advpack.@)
+ * RegSaveRestoreOnINFA (advpack.@)
*
* Saves or restores the specified INF Reg section.
*
@@ -264,8 +264,8 @@ HRESULT WINAPI RegSaveRestore(HWND hWnd,
* 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,
Index: dlls/mshtml/main.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/main.c,v
retrieving revision 1.22
diff -u -p -r1.22 main.c
--- dlls/mshtml/main.c 12 Aug 2005 10:33:13 -0000 1.22
+++ dlls/mshtml/main.c 24 Feb 2006 10:57:03 -0000
@@ -258,9 +258,9 @@ static HRESULT register_server(BOOL do_r
{
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_r
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);
Index: dlls/urlmon/regsvr.c
===================================================================
RCS file: /home/wine/wine/dlls/urlmon/regsvr.c,v
retrieving revision 1.4
diff -u -p -r1.4 regsvr.c
--- dlls/urlmon/regsvr.c 9 Sep 2005 09:09:22 -0000 1.4
+++ dlls/urlmon/regsvr.c 24 Feb 2006 10:57:09 -0000
@@ -580,9 +580,9 @@ static HRESULT register_inf(BOOL doregis
{
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 doregis
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);
Index: tools/winapi/win32.api
===================================================================
RCS file: /home/wine/wine/tools/winapi/win32.api,v
retrieving revision 1.68
diff -u -p -r1.68 win32.api
--- tools/winapi/win32.api 7 Feb 2006 20:22:19 -0000 1.68
+++ tools/winapi/win32.api 24 Feb 2006 10:57:23 -0000
@@ -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
More information about the wine-patches
mailing list