From 69ff6f74b25866d55a8c13053836796243902c43 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 30 Jun 2014 13:40:02 -0500 Subject: [PATCH] ole32: Simplify the FileMonikerImpl_BindToStorage code. --- dlls/ole32/filemoniker.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 06c47987566..c7bbb6641cc 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -605,22 +605,11 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef /* get the file name */ IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); - /* verify if the file contains a storage object */ - res=StgIsStorageFile(filePath); + res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if(res==S_OK){ + if (SUCCEEDED(res)) + *ppvObject=pstg; - res=StgOpenStorage(filePath,NULL,STGM_READWRITE|STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - - if (SUCCEEDED(res)){ - - *ppvObject=pstg; - - IStorage_AddRef(pstg); - - return res; - } - } CoTaskMemFree(filePath); } else -- 2.11.4.GIT