shlwapi 2/2 [try 2]: implement IUnknown_CPContainerInvokeParam

[Andrey Turkin]

-------------- next part --------------
diff -Naurp wine-0.9.36-orig/dlls/shlwapi/ordinal.c wine-0.9.36/dlls/shlwapi/ordinal.c
--- wine-0.9.36-orig/dlls/shlwapi/ordinal.c	2007-04-30 23:02:36.390625000 +0400
+++ wine-0.9.36/dlls/shlwapi/ordinal.c	2007-04-30 23:05:48.703125000 +0400
@@ -2962,6 +2962,83 @@ HRESULT WINAPI IConnectionPoint_OnChange
 }
 
 /*************************************************************************
+ *      @	[SHLWAPI.286]
+ *
+ *  IUnknown_CPContainerInvokeParam
+ */
+HRESULT CDECL IUnknown_CPContainerInvokeParam(
+        IUnknown *container,
+        REFIID riid,
+        DISPID dispId,
+        VARIANTARG* buffer,
+        DWORD cParams, ...)
+{
+  HRESULT result;
+  IConnectionPoint *iCP;
+  IConnectionPointContainer *iCPC;
+
+  if (!container)
+    return E_NOINTERFACE;
+
+  result = IUnknown_QueryInterface(container, &IID_IConnectionPointContainer,(LPVOID*) &iCPC);
+  if (SUCCEEDED(result))
+  {
+    result = IConnectionPointContainer_FindConnectionPoint(iCPC, riid, &iCP);
+    IConnectionPointContainer_Release(iCPC);
+  }
+
+  if (SUCCEEDED(result))
+  {
+    ULONG cnt;
+    VARIANTARG *curvar = buffer+cParams-1;
+    DISPPARAMS dispParams = {buffer, NULL, cParams, 0};
+    va_list valist;
+
+    va_start(valist, cParams);
+    for(cnt=cParams;cnt>0;cnt--,curvar--) /* backwards for some reason */
+    {
+      VARENUM vt = va_arg(valist, VARENUM);
+      curvar->wReserved1 = curvar->wReserved2 = curvar->wReserved3 = 0;
+      if (vt & VT_BYREF)
+      {
+        curvar->vt = vt;
+        curvar->byref = va_arg(valist, LPVOID);
+      } else
+        switch(vt)
+        {
+        case VT_BSTR:
+          curvar->vt = vt;
+          curvar->bstrVal = va_arg(valist, BSTR);
+          break;
+        case VT_DISPATCH:
+          curvar->vt = vt;
+          curvar->pdispVal = va_arg(valist, IDispatch*);
+          break;
+        case VT_BOOL:
+          curvar->vt = vt;
+          curvar->boolVal = va_arg(valist, VARIANT_BOOL);
+          break;
+        case VT_UNKNOWN:
+          curvar->vt = vt;
+          curvar->punkVal = va_arg(valist, IUnknown*);
+          break;
+        case VT_I4:
+        default:
+          curvar->vt = VT_I4;
+          curvar->lVal = va_arg(valist, LONG);
+          break;
+        }
+    }
+    va_end(valist);
+
+    result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams);
+    IConnectionPoint_Release(iCP);
+  }
+
+  return result;
+}
+
+/*************************************************************************
  *      @	[SHLWAPI.287]
  *
  * Notify an IConnectionPointContainer object of changes.
diff -Naurp wine-0.9.36-orig/dlls/shlwapi/shlwapi.spec wine-0.9.36/dlls/shlwapi/shlwapi.spec
--- wine-0.9.36-orig/dlls/shlwapi/shlwapi.spec	2007-04-30 23:02:36.390625000 +0400
+++ wine-0.9.36/dlls/shlwapi/shlwapi.spec	2007-04-30 23:02:53.734375000 +0400
@@ -283,7 +283,7 @@
 283 stub -noname IConnectionPoint_InvokeWithCancel
 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr)
 285 stdcall -noname IConnectionPoint_OnChanged(ptr long)
-286 stub -noname IUnknown_CPContainerInvokeParam
+286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long)
 287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long)
 288 stub -noname IUnknown_CPContainerInvokeIndirect
 289 stdcall -noname PlaySoundWrapW(wstr long long)