[PATCH v2 5/9] dlls/oleaut32: fn(Is|Find)Name should set szNameBuf with correct case

[Edward O'Callaghan]

From: Edward O'Callaghan

Both the ::IsName() and ::FindName() methods should do case-insensitive
searches however should fix up the szNameBuf param with any case diff
upon a match.

Signed-off-by: Edward O'Callaghan 
---
 dlls/oleaut32/typelib.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 1274a1c833f..cfab8cdf640 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -1285,6 +1285,11 @@ static inline BSTR TLB_get_bstr(const TLBString *str)
     return str != NULL ? str->str : NULL;
 }

+static inline void TLB_set_bstr(LPOLESTR s, const TLBString *str)
+{
+    lstrcpyW(s, str->str);
+}
+
 static inline const GUID *TLB_get_guidref(const TLBGuid *guid)
 {
     return guid != NULL ? &guid->guid : NULL;
@@ -5027,25 +5032,33 @@ static HRESULT WINAPI ITypeLib2_fnIsName(
         ITypeInfoImpl *pTInfo = This->typeinfos[tic];
         UINT fdc;

-        if(!lstrcmpiW(TLB_get_bstr(pTInfo->Name), szNameBuf))
+        if(!lstrcmpiW(TLB_get_bstr(pTInfo->Name), szNameBuf)) {
+            TLB_set_bstr(szNameBuf, pTInfo->Name);
             goto ITypeLib2_fnIsName_exit;
+        }

for(fdc = 0; fdc < pTInfo->typeattr.cFuncs; ++fdc) {
             TLBFuncDesc *pFDesc = &pTInfo->funcdescs[fdc];

-            if(!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szNameBuf))
+            if(!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szNameBuf)) {
+                TLB_set_bstr(szNameBuf, pFDesc->Name);
                 goto ITypeLib2_fnIsName_exit;
+            }

int pc;
             for(pc=0; pc < pFDesc->funcdesc.cParams; pc++){
-                if(!lstrcmpiW(TLB_get_bstr(pFDesc->pParamDesc[pc].Name), szNameBuf))
+                if(!lstrcmpiW(TLB_get_bstr(pFDesc->pParamDesc[pc].Name), szNameBuf)) {
+                    TLB_set_bstr(szNameBuf, pFDesc->pParamDesc[pc].Name);
                     goto ITypeLib2_fnIsName_exit;
+                }
             }
         }

TLBVarDesc *pVDesc = TLB_get_vardesc_by_name(pTInfo, szNameBuf);
-        if (pVDesc)
+        if (pVDesc) {
+            TLB_set_bstr(szNameBuf, pVDesc->Name);
             goto ITypeLib2_fnIsName_exit;
+        }

}
     *pfName=FALSE;
@@ -5087,6 +5100,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName(

if(!lstrcmpiW(TLB_get_bstr(pTInfo->Name), szNameBuf)) {
             memid[count] = MEMBERID_NIL;
+            TLB_set_bstr(szNameBuf, pTInfo->Name);
             goto ITypeLib2_fnFindName_exit;
         }

@@ -5095,6 +5109,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName(

if(!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szNameBuf)) {
                 memid[count] = pFDesc->funcdesc.memid;
+                TLB_set_bstr(szNameBuf, pFDesc->Name);
                 goto ITypeLib2_fnFindName_exit;
             }
         }
@@ -5102,6 +5117,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName(
         TLBVarDesc *pVDesc = TLB_get_vardesc_by_name(pTInfo, szNameBuf);
         if (pVDesc) {
             memid[count] = pVDesc->vardesc.memid;
+            TLB_set_bstr(szNameBuf, pVDesc->Name);
             goto ITypeLib2_fnFindName_exit;
         }