Changeset 6952 for trunk/src/oleaut32

Timestamp:

Oct 6, 2001, 10:56:18 AM (24 years ago)

Author:

sandervl

Message:

Wine 20011004 resync

Location:

trunk/src/oleaut32

Files:

• typelib.c (modified) (16 diffs)
• variant.c (modified) (1 diff)

trunk/src/oleaut32/typelib.c

@@ -123 +123 @@
         return S_OK;
 }
-#endif
- 
+#endif 
 /****************************************************************************
  *              QueryPathOfRegTypeLib   [OLEAUT32.164]
@@ -558 +557 @@
 }
 
-#ifdef __WIN32OS2__
+#ifndef __WIN32OS2__
 /****************************************************************************
  *      OaBuildVersion                          (TYPELIB.15)
@@ -596 +595 @@
 }
 #endif
+
 /* for better debugging info leave the static out for the time being */
 #define static
@@ -780 +780 @@
 //#define TYPELIBDEBUG
 #if defined(__WIN32OS2__) && defined(TYPELIBDEBUG)
+
 /*
  debug
@@ -1883 +1884 @@
           {
             *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength);
-            ITypeLib2_AddRef(*ppTypeLib);
           }
           else if ( dwSignature == SLTG_SIGNATURE)
           {
             *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength);
-            ITypeLib2_AddRef(*ppTypeLib);
           }
           UnmapViewOfFile(pBase);
@@ -1921 +1920 @@
               {
                   *ppTypeLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength);
-                  ITypeLib2_AddRef(*ppTypeLib);
               }
               else if ( dwSignature == SLTG_SIGNATURE)
               {
                   *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength);
-                  ITypeLib2_AddRef(*ppTypeLib);
               }
               else
@@ -2415 +2412 @@
 }
 
-static char *SLTG_DoImpls(SLTG_ImplInfo *info, ITypeInfoImpl *pTI,
+static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI,
                           BOOL OneOnly)
 {
+    SLTG_ImplInfo *info;
     TLBImplType **ppImplType = &pTI->impltypelist;
-
+    /* I don't really get this structure, usually it's 0x16 bytes
+       long, but iuser.tlb contains some that are 0x18 bytes long.
+       That's ok because we can use the next ptr to jump to the next
+       one. But how do we know the length of the last one?  The WORD
+       at offs 0x8 might be the clue.  For now I'm just assuming that
+       the last one is the regular 0x16 bytes. */
+
+    info = (SLTG_ImplInfo*)pBlk;
     while(1) {
         *ppImplType = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@@ -2432 +2437 @@
         if(OneOnly)
             FIXME("Interface inheriting more than one interface\n");
-        info++;
-    }
-    info++;
+        info = (SLTG_ImplInfo*)(pBlk + info->next);
+    }
+    info++; /* see comment at top of function */
     return (char*)info;
 }
@@ -2456 +2461 @@
 
     if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls((SLTG_ImplInfo*)pFirstItem, pTI, FALSE);
+        pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE);
     }
 
@@ -2483 +2488 @@
 
     if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) {
-        pNextItem = SLTG_DoImpls((SLTG_ImplInfo*)pFirstItem, pTI, TRUE);
+        pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE);
     }
 
@@ -3847 +3852 @@
     TLBVarDesc * pVDesc; 
     HRESULT ret=S_OK;
-        UINT nNameLen = SysStringLen(*rgszNames);
-        
+
     TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames),
             cNames);
     for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) {
         int i, j;
-        if( !memcmp(*rgszNames, pFDesc->Name, nNameLen)) {
+        if(!lstrcmpiW(*rgszNames, pFDesc->Name)) {
             if(cNames) *pMemId=pFDesc->funcdesc.memid;
             for(i=1; i < cNames; i++){
-                                UINT nParamLen = SysStringLen(rgszNames[i]);
                 for(j=0; j<pFDesc->funcdesc.cParams; j++)
-                    if(memcmp(rgszNames[i],pFDesc->pParamDesc[j].Name, nParamLen))
+                    if(!lstrcmpiW(rgszNames[i],pFDesc->pParamDesc[j].Name))
                             break;
                 if( j<pFDesc->funcdesc.cParams)
@@ -3869 +3872 @@
     }   
     for(pVDesc=This->varlist; pVDesc; pVDesc=pVDesc->next) {
-        if( !memcmp(*rgszNames, pVDesc->Name, nNameLen)) {
+        if(!lstrcmpiW(*rgszNames, pVDesc->Name)) {
             if(cNames) *pMemId=pVDesc->vardesc.memid;
             return ret;
@@ -3984 +3987 @@
     for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next)
         if (pFDesc->funcdesc.memid == memid) {
-            if (pFDesc->funcdesc.invkind & (dwFlags & ~DISPATCH_METHOD))
+            if (pFDesc->funcdesc.invkind & dwFlags)
                 break;
         }
@@ -4000 +4003 @@
                 if (i<pDispParams->cArgs) {
                     TRACE("set %d to disparg type %d vs %d\n",i,
-                            V_VT(pDispParams->rgvarg+i),
+                            V_VT(&pDispParams->rgvarg[pDispParams->cArgs-i-1]),
                             pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt
                     );
-                    args[i+1] = V_UNION(pDispParams->rgvarg+i,lVal);
+                    args[i+1] = V_UNION(&pDispParams->rgvarg[pDispParams->cArgs-i-1],lVal);
                 } else {
                     TYPEDESC *tdesc = &(pFDesc->funcdesc.lprgelemdescParam[i].tdesc);
@@ -4084 +4087 @@
         }
     } else {
-        FIXME("variable based invoking not supported yet.\n");
         for(pVDesc=This->varlist; pVDesc; pVDesc=pVDesc->next) {
             if (pVDesc->vardesc.memid == memid) {
-                FIXME("varseek: Found memid name %s\n",debugstr_w(((LPWSTR)pVDesc->Name)));
+                FIXME("varseek: Found memid name %s, but variable-based invoking not supported\n",debugstr_w(((LPWSTR)pVDesc->Name)));
                 dump_TLBVarDesc(pVDesc);
                 break;
@@ -4093 +4095 @@
         }
     }
-    FIXME("Did not find member id %d!\n",(int)memid);
+    /* not found, look for it in inherited interfaces */
+    if (This->TypeAttr.typekind==TKIND_INTERFACE && This->TypeAttr.cImplTypes) {
+        /* recursive search */
+        ITypeInfo *pTInfo;
+        HRESULT hr;
+        hr=ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, &pTInfo);
+        if(SUCCEEDED(hr)){
+            hr=ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr);
+            ITypeInfo_Release(pTInfo);
+            return hr;
+        }
+        WARN("Could not search inherited interface!\n");
+    }
+    ERR("did not find member id %d, flags %d!\n", (int)memid, dwFlags);
     return DISP_E_MEMBERNOTFOUND;
 }

trunk/src/oleaut32/variant.c

@@ -1577 +1577 @@
         break;
 
+        case( VT_UNKNOWN ):
+            if (vtFrom == VT_DISPATCH)
+            {
+                res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd));
+            }
+            else
+            {
+                res = DISP_E_TYPEMISMATCH;
+                FIXME("Coercion from %d to %d\n", vtFrom, vt );
+            }
+            break;
+
         default:
                 res = DISP_E_TYPEMISMATCH;