[OLE32_WINETEST]

* Sync with Wine 1.5.26.

svn path=/trunk/; revision=58587

rostests/winetests/ole32/clipboard.c

@@ -18,18 +18,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 #define NONAMELESSUNION
 
-#include <stdarg.h>
+//#include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <wingdi.h>
+#include <ole2.h>
+//#include "objbase.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define InitFormatEtc(fe, cf, med) \
         {\

rostests/winetests/ole32/compobj.c

@@ -18,22 +18,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 
 #include <stdarg.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
+#include <winreg.h>
 #define USE_COM_CONTEXT_DEF
-#include "initguid.h"
+//#include "initguid.h"
-#include "objbase.h"
+//#include "objbase.h"
-#include "shlguid.h"
+//#include "shlguid.h"
-#include "urlmon.h" /* for CLSID_FileProtocol */
+#include <ole2.h>
+//#include "urlmon.h" /* for CLSID_FileProtocol */
 
-#include "ctxtcall.h"
+#include <ctxtcall.h>
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern const IID GUID_NULL;
 
@@ -709,7 +715,7 @@ static void test_CoRegisterPSClsid(void)
     CLSID clsid;
 
     hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer);
-    ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returened CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
+    ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
 
     pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 

rostests/winetests/ole32/defaulthandler.c

@@ -18,17 +18,61 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <stdarg.h>
+//#include <stdarg.h>
+#include <stdio.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <ole2.h>
+//#include "objbase.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
+#define DEFINE_EXPECT(func) \
+    static BOOL expect_ ## func = FALSE, called_ ## func = FALSE
+
+#define SET_EXPECT(func) \
+    expect_ ## func = TRUE
+
+#define CHECK_EXPECT2(func) \
+    do { \
+        ok(expect_ ##func, "unexpected call " #func "\n"); \
+        called_ ## func = TRUE; \
+    }while(0)
+
+#define CHECK_EXPECT(func) \
+    do { \
+        CHECK_EXPECT2(func); \
+        expect_ ## func = FALSE; \
+    }while(0)
+
+#define CHECK_CALLED(func) \
+    do { \
+        ok(called_ ## func, "expected " #func "\n"); \
+        expect_ ## func = called_ ## func = FALSE; \
+    }while(0)
+
+DEFINE_EXPECT(CF_QueryInterface_ClassFactory);
+DEFINE_EXPECT(CF_CreateInstance);
+
+static const char *debugstr_guid(REFIID riid)
+{
+    static char buf[50];
+
+    sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+            riid->Data1, riid->Data2, riid->Data3, riid->Data4[0],
+            riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4],
+            riid->Data4[5], riid->Data4[6], riid->Data4[7]);
+
+    return buf;
+}
 
 static HRESULT create_storage(IStorage **stg)
 {
@@ -100,11 +144,159 @@ static void test_olestream(void)
     IStorage_Release(stg);
 }
 
+static HRESULT WINAPI test_class_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
+{
+    if(IsEqualGUID(riid, &IID_IUnknown)) {
+        *ppv = iface;
+        return S_OK;
+    }else if(IsEqualGUID(riid, &IID_IOleObject)) {
+        ok(0, "unexpected query for IOleObject interface\n");
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI test_class_AddRef(IUnknown *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI test_class_Release(IUnknown *iface)
+{
+    return 1;
+}
+
+static IUnknownVtbl test_class_vtbl = {
+    test_class_QueryInterface,
+    test_class_AddRef,
+    test_class_Release,
+};
+
+static IUnknown test_class = { &test_class_vtbl };
+
+static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
+{
+    if(IsEqualGUID(riid, &IID_IUnknown)) {
+        *ppv = iface;
+        return S_OK;
+    }else if(IsEqualGUID(riid, &IID_IMarshal)) {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }else if(IsEqualGUID(riid, &IID_IClassFactory)) {
+        CHECK_EXPECT(CF_QueryInterface_ClassFactory);
+        *ppv = iface;
+        return S_OK;
+    }
+
+    ok(0, "unexpected interface: %s\n", debugstr_guid(riid));
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface,
+        IUnknown *pUnkOuter, REFIID riid, void **ppv)
+{
+    CHECK_EXPECT(CF_CreateInstance);
+
+    ok(pUnkOuter == NULL, "pUnkOuter != NULL\n");
+    todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid));
+    if(IsEqualGUID(riid, &IID_IOleObject)) {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    *ppv = &test_class;
+    return S_OK;
+}
+
+static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static IClassFactoryVtbl ClassFactoryVtbl = {
+    ClassFactory_QueryInterface,
+    ClassFactory_AddRef,
+    ClassFactory_Release,
+    ClassFactory_CreateInstance,
+    ClassFactory_LockServer
+};
+
+static IClassFactory ClassFactory = { &ClassFactoryVtbl };
+
+static void test_default_handler_run(void)
+{
+    const CLSID test_server_clsid = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}};
+
+    IUnknown *unk;
+    IRunnableObject *ro;
+    DWORD class_reg;
+    HRESULT hres;
+
+    if(!GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) {
+        win_skip("skipping OleCreateDefaultHandler tests\n");
+        return;
+    }
+
+    hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory,
+            CLSCTX_INPROC_SERVER, 0, &class_reg);
+    ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres);
+
+    hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk);
+    ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres);
+
+    hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro);
+    ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres);
+    IUnknown_Release(unk);
+
+    hres = IRunnableObject_Run(ro, NULL);
+    ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres);
+    IRunnableObject_Release(ro);
+
+    CoRevokeClassObject(class_reg);
+
+    hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory,
+            CLSCTX_LOCAL_SERVER, 0, &class_reg);
+    ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres);
+
+    hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk);
+    ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres);
+
+    hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro);
+    ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres);
+    IUnknown_Release(unk);
+
+    SET_EXPECT(CF_QueryInterface_ClassFactory);
+    SET_EXPECT(CF_CreateInstance);
+    hres = IRunnableObject_Run(ro, NULL);
+    todo_wine ok(hres == S_OK, "Run failed: %x\n", hres);
+    CHECK_CALLED(CF_QueryInterface_ClassFactory);
+    CHECK_CALLED(CF_CreateInstance);
+    IRunnableObject_Release(ro);
+
+    CoRevokeClassObject(class_reg);
+}
+
 START_TEST(defaulthandler)
 {
     OleInitialize(NULL);
 
     test_olestream();
+    test_default_handler_run();
 
     OleUninitialize();
 }

rostests/winetests/ole32/dragdrop.c

@@ -18,18 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define _WIN32_DCOM
 #define COBJMACROS
 #define CONST_VTABLE
 
 #include <stdarg.h>
-#include <stdio.h>
+//#include <stdio.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <ole2.h>
+//#include "objbase.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 static int droptarget_refs;
 

rostests/winetests/ole32/errorinfo.c

@@ -18,16 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 
 #include <stdarg.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <ole2.h>
+//#include "objbase.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
 

rostests/winetests/ole32/hglobalstream.c

@@ -18,15 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 
 #include <stdarg.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <ole2.h>
+//#include "objbase.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
 

rostests/winetests/ole32/marshal.c

@@ -18,22 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define _WIN32_DCOM
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <stdarg.h>
+//#include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <winreg.h>
-#include "olectl.h"
+#include <winnls.h>
-#include "shlguid.h"
+#include <ole2.h>
-#include "shobjidl.h"
+//#include "objbase.h"
-#include "initguid.h"
+//#include "olectl.h"
+#include <shlguid.h>
+//#include "shobjidl.h"
+//#include "initguid.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
 DEFINE_GUID(CLSID_ManualResetEvent,       0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

rostests/winetests/ole32/moniker.c

@@ -18,22 +18,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define _WIN32_DCOM
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <stdarg.h>
+//#include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <winnls.h>
-#include "ocidl.h"
+#include <ole2.h>
-#include "initguid.h"
+//#include "objbase.h"
-#include "comcat.h"
+//#include "ocidl.h"
-#include "olectl.h"
+//#include "initguid.h"
+#include <comcat.h>
+#include <olectl.h>
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks)
 #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks)

rostests/winetests/ole32/ole2.c

@@ -18,18 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 #define WIN32_LEAN_AND_MEAN
 
 #include <stdarg.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <winnls.h>
-#include "shlguid.h"
+#include <wingdi.h>
+#include <ole2.h>
+//#include "objbase.h"
+//#include "shlguid.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
 
@@ -1701,6 +1708,9 @@ static void test_default_handler(void)
     hr = IOleObject_GetClientSite(pObject, &pClientSite);
     ok_ole_success(hr, "IOleObject_GetClientSite");
 
+    hr = IOleObject_SetClientSite(pObject, pClientSite);
+    ok_ole_success(hr, "IOleObject_SetClientSite");
+
     hr = IOleObject_GetClipboardData(pObject, 0, &pDataObject);
     ok(hr == OLE_E_NOTRUNNING,
        "IOleObject_GetClipboardData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n",
@@ -1923,6 +1933,14 @@ static const IUnknownVtbl UnknownVtbl =
 
 static IUnknown unknown = { &UnknownVtbl };
 
+static void test_OleRun(void)
+{
+    HRESULT hr;
+
+    hr = OleRun(&unknown);
+    ok(hr == S_OK, "OleRun failed 0x%08x\n", hr);
+}
+
 static void test_OleLockRunning(void)
 {
     HRESULT hr;
@@ -1981,6 +1999,7 @@ START_TEST(ole2)
     test_data_cache();
     test_default_handler();
     test_runnable();
+    test_OleRun();
     test_OleLockRunning();
     test_OleDraw();
 

rostests/winetests/ole32/propvariant.c

@@ -18,9 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windows.h"
+//#include "windows.h"
 
-#include "wine/test.h"
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winnls.h>
+#include <ddeml.h>
+#include <ole2.h>
+
+#include <wine/test.h>
 
 /* invalid in all versions */
 #define PROP_INV 0x7f

rostests/winetests/ole32/stg_prop.c

@@ -15,11 +15,19 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <stdio.h>
+
+#include <windef.h>
+#include <winbase.h>
 #define COBJMACROS
-#include "objbase.h"
+#include <objbase.h>
-#include "wine/test.h"
+#include <wine/test.h>
-#include "initguid.h"
+//#include "initguid.h"
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9);

rostests/winetests/ole32/storage32.c

@@ -18,16 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+//#include <stdio.h>
 
 #define COBJMACROS
 
-#include <windows.h>
+//#include <windows.h>
-#include "wine/test.h"
+#include <wine/test.h>
-
+#include <winnls.h>
-#include "ole2.h"
+#include <ole2.h>
-#include "objidl.h"
+//#include "objidl.h"
-#include "initguid.h"
+#include <initguid.h>
 
 DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0);
 

rostests/winetests/ole32/testlist.c

@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_clipboard(void);
 extern void func_compobj(void);

rostests/winetests/ole32/usrmarshal.c

@@ -18,16 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 #include <stdarg.h>
 
-#include "windef.h"
+#include <windef.h>
-#include "winbase.h"
+#include <winbase.h>
-#include "objbase.h"
+#include <wingdi.h>
-#include "objidl.h"
+#include <ole2.h>
+//#include "objbase.h"
+//#include "objidl.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 ULONG __RPC_USER HMETAFILE_UserSize(ULONG *, ULONG, HMETAFILE *);
 unsigned char * __RPC_USER HMETAFILE_UserMarshal(ULONG *, unsigned char *, HMETAFILE *);