ChangeSet ID: 21038 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:56:55 Modified files: include : msi.h dlls/msi : msi.spec msi.c Log message: Mike McCormack <mike(a)codeweavers.com> Stub implementation for MsiGetFileHashA/W. Patch: http://cvs.winehq.org/patch.py?id=21038 Old revision New revision Changes Path 1.33 1.34 +9 -0 wine/include/msi.h 1.48 1.49 +2 -2 wine/dlls/msi/msi.spec 1.111 1.112 +20 -0 wine/dlls/msi/msi.c Index: wine/include/msi.h diff -u -p wine/include/msi.h:1.33 wine/include/msi.h:1.34 --- wine/include/msi.h:1.33 2 Nov 2005 10:56:55 -0000 +++ wine/include/msi.h 2 Nov 2005 10:56:55 -0000 @@ -183,6 +183,11 @@ typedef enum tagMSICODE MSICODE_PATCH = 0x40000000L } MSICODE; +typedef struct _MSIFILEHASHINFO { + ULONG dwFileHashInfoSize; + ULONG dwData[4]; +} MSIFILEHASHINFO, *PMSIFILEHASHINFO; + #define MAX_FEATURE_CHARS 38 /* Strings defined in msi.h */ @@ -531,6 +536,10 @@ UINT WINAPI MsiEnumPatchesA(LPCSTR, DWOR UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, DWORD*); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) +UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); +UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); +#define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); Index: wine/dlls/msi/msi.spec diff -u -p wine/dlls/msi/msi.spec:1.48 wine/dlls/msi/msi.spec:1.49 --- wine/dlls/msi/msi.spec:1.48 2 Nov 2005 10:56:55 -0000 +++ wine/dlls/msi/msi.spec 2 Nov 2005 10:56:55 -0000 @@ -211,8 +211,8 @@ 215 stub MsiIsProductElevatedW 216 stdcall MsiGetShortcutTargetA(str ptr ptr ptr) 217 stdcall MsiGetShortcutTargetW(wstr ptr ptr ptr) -218 stub MsiGetFileHashA -219 stub MsiGetFileHashW +218 stdcall MsiGetFileHashA(str long ptr) +219 stdcall MsiGetFileHashW(wstr long ptr) 220 stub MsiEnumComponentCostsA 221 stub MsiEnumComponentCostsW 222 stdcall MsiCreateAndVerifyInstallerDirectory(long) Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.111 wine/dlls/msi/msi.c:1.112 --- wine/dlls/msi/msi.c:1.111 2 Nov 2005 10:56:55 -0000 +++ wine/dlls/msi/msi.c 2 Nov 2005 10:56:55 -0000 @@ -1988,3 +1988,23 @@ UINT WINAPI MsiEnumPatchesW( LPCWSTR szP iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); return ERROR_NO_MORE_ITEMS; } + +/*********************************************************************** + * MsiGetFileHashW [MSI.@] + */ +UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, + PMSIFILEHASHINFO pHash ) +{ + FIXME("%s %08lx %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * MsiGetFileHashA [MSI.@] + */ +UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions, + PMSIFILEHASHINFO pHash ) +{ + FIXME("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash ); + return ERROR_CALL_NOT_IMPLEMENTED; +}