marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Return -1 on open failure in FDI callbacks.

oldstable
Kohei Takahashi 2013-10-16 01:08:38 +09:00 committed by Alexandre Julliard
parent 63092712c9
commit 953359c73f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msi/media.c
View File

@ -137,7 +137,6 @@ static void CDECL cabinet_free(void *pv)
static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode)
{
HANDLE handle;
DWORD dwAccess = 0;
DWORD dwShareMode = 0;
DWORD dwCreateDisposition = OPEN_EXISTING;
@ -163,12 +162,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode)
else if (oflag & _O_CREAT)
dwCreateDisposition = CREATE_ALWAYS;
handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL,
dwCreateDisposition, 0, NULL);
if (handle == INVALID_HANDLE_VALUE)
return 0;
return (INT_PTR)handle;
return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL,
dwCreateDisposition, 0, NULL);
}
static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb)
@ -225,12 +220,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode )
if (!cab)
{
WARN("failed to get cabinet stream\n");
return 0;
return -1;
}
if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 )))
{
WARN("failed to encode stream name\n");
return 0;
return -1;
}
if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS)
{
@ -239,7 +234,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode )
{
WARN("failed to open stream 0x%08x\n", hr);
msi_free( encoded );
return 0;
return -1;
}
}
msi_free( encoded );