ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed merge error.

This commit is contained in:
Mike McCormack 2002-02-28 20:46:31 +00:00 committed by Alexandre Julliard
parent bdd77388b9
commit c129764af1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ole32/storage32.c
View File

@ -5504,7 +5504,7 @@ HRESULT WINAPI StgOpenStorage(
DWORD shareMode; DWORD shareMode;
DWORD accessMode; DWORD accessMode;
WCHAR fullname[MAX_PATH]; WCHAR fullname[MAX_PATH];
WIN32_FILE_ATTRIBUTE_DATA Fad; DWORD length;
TRACE("(%s, %p, %lx, %p, %ld, %p)\n", TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
debugstr_w(pwcsName), pstgPriority, grfMode, debugstr_w(pwcsName), pstgPriority, grfMode,
@ -5547,6 +5547,7 @@ HRESULT WINAPI StgOpenStorage(
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS,
0); 0);
length = GetFileSize(hFile, NULL);
if (hFile==INVALID_HANDLE_VALUE) if (hFile==INVALID_HANDLE_VALUE)
{ {
@ -5599,7 +5600,7 @@ HRESULT WINAPI StgOpenStorage(
NULL, NULL,
grfMode, grfMode,
TRUE, TRUE,
!(Fad.nFileSizeHigh || Fad.nFileSizeLow) /* FALSE */ ); !length );
if (FAILED(hr)) if (FAILED(hr))
{ {