Mike McCormack : ole32: Only return S_FALSE in IPropertyStorage:: ReadMultiple if a property was not found.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jul 12 06:53:40 CDT 2006


Module: wine
Branch: master
Commit: 7f891787bcd7c2cca9d537b735a3e4f7db194862
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=7f891787bcd7c2cca9d537b735a3e4f7db194862

Author: Mike McCormack <mike at codeweavers.com>
Date:   Wed Jul 12 01:39:30 2006 +0900

ole32: Only return S_FALSE in IPropertyStorage::ReadMultiple if a property was not found.

---

 dlls/ole32/stg_prop.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index c59eba1..c7a7b6e 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -303,7 +303,7 @@ static HRESULT WINAPI IPropertyStorage_f
     PROPVARIANT rgpropvar[])
 {
     PropertyStorage_impl *This = (PropertyStorage_impl *)iface;
-    HRESULT hr = S_FALSE;
+    HRESULT hr = S_OK;
     ULONG i;
 
     TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
@@ -344,6 +344,8 @@ static HRESULT WINAPI IPropertyStorage_f
                     if (prop)
                         PropertyStorage_PropVariantCopy(&rgpropvar[i], prop,
                          GetACP(), This->codePage);
+                    else
+                        hr = S_FALSE;
                 }
             }
         }




More information about the wine-cvs mailing list