[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:03:15 UTC 2012
The following commit has been merged in the wheezy branch:
commit 9bfb3d9646a7fe94b5e4657acb7244d65fe3fcc8
Author: Robert van Herk <mijnspamboxje at hotmail.com>
Date: Thu Apr 5 13:08:08 2012 +0200
msi: Fixed MsiGetFileHashW for empty files.
(cherry picked from commit f87c4a36ddc1a32af392e45b0af1feff8c388852)
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 4022b3a..18fbeb0 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -4013,24 +4013,34 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions,
}
length = GetFileSize( handle, NULL );
- mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL );
- if (mapping)
+ if (length)
{
- p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length );
- if (p)
+ mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL );
+ if (mapping)
{
- MD5_CTX ctx;
+ p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length );
+ if (p)
+ {
+ MD5_CTX ctx;
- MD5Init( &ctx );
- MD5Update( &ctx, p, length );
- MD5Final( &ctx );
- UnmapViewOfFile( p );
+ MD5Init( &ctx );
+ MD5Update( &ctx, p, length );
+ MD5Final( &ctx );
+ UnmapViewOfFile( p );
- memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData );
- r = ERROR_SUCCESS;
+ memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData );
+ r = ERROR_SUCCESS;
+ }
+ CloseHandle( mapping );
}
- CloseHandle( mapping );
}
+ else
+ {
+ /* Empty file -> set hash to 0 */
+ memset( pHash->dwData, 0, sizeof pHash->dwData );
+ r = ERROR_SUCCESS;
+ }
+
CloseHandle( handle );
return r;
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list