Skip to content

W
wine-winehq
Commit c129764a authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Fixed merge error.

parent bdd77388
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/ole32/storage32.c
View file @ c129764a
......@@ -5504,7 +5504,7 @@ HRESULT WINAPI StgOpenStorage(
DWORD shareMode;
DWORD accessMode;
WCHAR fullname[MAX_PATH];
WIN32_FILE_ATTRIBUTE_DATA Fad;
DWORD length;
TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
debugstr_w(pwcsName), pstgPriority, grfMode,
......@@ -5547,6 +5547,7 @@ HRESULT WINAPI StgOpenStorage(
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
0);
length = GetFileSize(hFile, NULL);
if (hFile==INVALID_HANDLE_VALUE)
{
......@@ -5599,7 +5600,7 @@ HRESULT WINAPI StgOpenStorage(
NULL,
grfMode,
TRUE,
!(Fad.nFileSizeHigh || Fad.nFileSizeLow) /* FALSE */ );
!length );
if (FAILED(hr))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment