system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 15:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

msi: Fix the type of the ID parameter of MsiSourceListEnumMediaDisks.

Browse source
This commit is contained in:
James Hawkins 2008-03-20 00:04:49 -07:00 committed by Alexandre Julliard
parent e02322aef8
commit e94b065df3
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/msi/files.c
View file

@ -599,8 +599,7 @@ static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi)
WCHAR volume[MAX_PATH]; WCHAR volume[MAX_PATH];
WCHAR prompt[MAX_PATH]; WCHAR prompt[MAX_PATH];
DWORD volumesz, promptsz; DWORD volumesz, promptsz;
DWORD index, size; DWORD index, size, id;
WORD id;
UINT r; UINT r;
r = MsiSourceListGetInfoW(package->ProductCode, NULL, r = MsiSourceListGetInfoW(package->ProductCode, NULL,

4
dlls/msi/source.c
View file

@ -145,7 +145,7 @@ static UINT OpenURLSubkey(HKEY rootkey, HKEY *key, BOOL create)
*/ */
UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode, UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode,
LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext,
DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId,
LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel, LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel,
LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt) LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt)
{ {
@ -204,7 +204,7 @@ done:
*/ */
UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode,
LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext,
DWORD dwOptions, DWORD dwIndex, LPWORD pdwDiskId, DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId,
LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel, LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel,
LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt)
{ {

4
dlls/msi/tests/source.c
View file

@ -36,7 +36,7 @@ static UINT (WINAPI *pMsiSourceListAddMediaDiskA)
static UINT (WINAPI *pMsiSourceListAddSourceExA) static UINT (WINAPI *pMsiSourceListAddSourceExA)
(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, DWORD); (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, DWORD);
static UINT (WINAPI *pMsiSourceListEnumMediaDisksA) static UINT (WINAPI *pMsiSourceListEnumMediaDisksA)
(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, LPSTR, (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, LPSTR,
LPDWORD, LPSTR, LPDWORD); LPDWORD, LPSTR, LPDWORD);
static UINT (WINAPI *pMsiSourceListEnumSourcesA) static UINT (WINAPI *pMsiSourceListEnumSourcesA)
(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD);
@ -2297,7 +2297,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
DWORD labelsz, promptsz; DWORD labelsz, promptsz;
LPSTR usersid; LPSTR usersid;
DWORD val; DWORD val;
WORD id; DWORD id;
LONG res; LONG res;
UINT r; UINT r;

4
include/msi.h
View file

@ -545,9 +545,9 @@ UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR);
UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR);
#define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) #define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource)
UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD,
LPSTR, LPDWORD, LPSTR, LPDWORD); LPSTR, LPDWORD, LPSTR, LPDWORD);
UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWORD, UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD,
LPWSTR, LPDWORD, LPWSTR, LPDWORD); LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks) #define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks)