msi/tests: Improve COM test.

Test for a class that Wine actually supports, and also make sure our apartment is uninitialized. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi/tests: Improve COM test.
fdb9bdc8 · Zebediah Figura · Alexandre Julliard · bb2d13b4 · fdb9bdc8
Commit fdb9bdc8 authored Apr 18, 2018 by Zebediah Figura Committed by Alexandre Julliard Apr 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

custom.c dlls/msi/tests/custom.c +9 -5

No files found.
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -24,8 +24,7 @@
 #include <windef.h>
 #include <winbase.h>
 #define COBJMACROS
-#include <objbase.h>
-#include <unknwn.h>
+#include <msxml.h>
 #include <msi.h>
 #include <msiquery.h>

@@ -248,14 +247,19 @@ UINT WINAPI main_test(MSIHANDLE hinst)
 {
    UINT res;
    IUnknown *unk = NULL;
-    HRESULT hres;
+    HRESULT hr;

    /* Test for an MTA apartment */
-    hres = CoCreateInstance(&CLSID_Picture_Metafile, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);
-    todo_wine_ok(hinst, hres == S_OK, "CoCreateInstance failed with %08x\n", hres);
+    hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);
+    todo_wine_ok(hinst, hr == S_OK, "CoCreateInstance failed with %08x\n", hr);

    if (unk) IUnknown_Release(unk);

+    /* but ours is uninitialized */
+    hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+    ok(hinst, hr == S_OK, "got %#x\n", hr);
+    CoUninitialize();
+
    /* Test MsiGetDatabaseState() */
    res = MsiGetDatabaseState(hinst);
    todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res);