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

urlmon: Use INVALID_HANDLE_VALUE instead of NULL for uninitialized file handle in file protocol handler.

This commit is contained in:
Jacek Caban 2010-09-02 00:23:35 +02:00 committed by Alexandre Julliard
parent 77a5b635aa
commit d442442e3e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/urlmon/file.c
View File

@ -79,7 +79,7 @@ static ULONG WINAPI FileProtocol_Release(IInternetProtocol *iface)
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
if(This->file) if(This->file != INVALID_HANDLE_VALUE)
CloseHandle(This->file); CloseHandle(This->file);
heap_free(This); heap_free(This);
@ -133,7 +133,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
if(!(grfBINDF & BINDF_FROMURLMON)) if(!(grfBINDF & BINDF_FROMURLMON))
IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL);
if(!This->file) { if(This->file == INVALID_HANDLE_VALUE) {
WCHAR *ptr; WCHAR *ptr;
first_call = TRUE; first_call = TRUE;
@ -163,7 +163,6 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if(This->file == INVALID_HANDLE_VALUE) { if(This->file == INVALID_HANDLE_VALUE) {
This->file = NULL;
IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND,
GetLastError(), NULL); GetLastError(), NULL);
heap_free(url); heap_free(url);
@ -245,7 +244,7 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocol *iface, void *pv,
if (pcbRead) if (pcbRead)
*pcbRead = 0; *pcbRead = 0;
if(!This->file) if(This->file == INVALID_HANDLE_VALUE)
return INET_E_DATA_NOT_AVAILABLE; return INET_E_DATA_NOT_AVAILABLE;
if (!ReadFile(This->file, pv, cb, &read, NULL)) if (!ReadFile(This->file, pv, cb, &read, NULL))
@ -364,7 +363,7 @@ HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
ret->lpIInternetProtocolVtbl = &FileProtocolVtbl; ret->lpIInternetProtocolVtbl = &FileProtocolVtbl;
ret->lpInternetPriorityVtbl = &FilePriorityVtbl; ret->lpInternetPriorityVtbl = &FilePriorityVtbl;
ret->file = NULL; ret->file = INVALID_HANDLE_VALUE;
ret->priority = 0; ret->priority = 0;
ret->ref = 1; ret->ref = 1;