[PATCH 0/1] MR6727: wintypes/tests: Add tests for RoResolveNamespace().

[PATCH 1/1] wintypes/tests: Add tests for RoResolveNamespace().

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/wintypes/Makefile.in       |  5 +--
 dlls/wintypes/tests/Makefile.in |  2 +-
 dlls/wintypes/tests/wintypes.c  | 63 +++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/dlls/wintypes/Makefile.in b/dlls/wintypes/Makefile.in
index b2f099b4076..b8958cdcd15 100644
--- a/dlls/wintypes/Makefile.in
+++ b/dlls/wintypes/Makefile.in
@@ -1,5 +1,6 @@
-MODULE = wintypes.dll
-IMPORTS = combase
+MODULE    = wintypes.dll
+IMPORTLIB = wintypes
+IMPORTS   = combase

SOURCES = \
    classes.idl \
diff --git a/dlls/wintypes/tests/Makefile.in b/dlls/wintypes/tests/Makefile.in
index e177cd8b42b..c5ae17c4694 100644
--- a/dlls/wintypes/tests/Makefile.in
+++ b/dlls/wintypes/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL = wintypes.dll
-IMPORTS = combase uuid
+IMPORTS = wintypes combase uuid

SOURCES = \
    wintypes.c \
diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c
index ff98774ef8c..cb24dee77cf 100644
--- a/dlls/wintypes/tests/wintypes.c
+++ b/dlls/wintypes/tests/wintypes.c
@@ -25,6 +25,7 @@

#include "initguid.h"
 #include "roapi.h"
+#include "rometadataresolution.h"

#define WIDL_using_Windows_Foundation
 #define WIDL_using_Windows_Foundation_Metadata
@@ -33,6 +34,8 @@

#include "wine/test.h"

+static BOOL is_wow64;
+
 static void test_IApiInformationStatics(void)
 {
     static const struct
@@ -754,8 +757,68 @@ static void test_IPropertyValueStatics(void)
     RoUninitialize();
 }

+static void test_RoResolveNamespace(void)
+{
+    static const WCHAR foundation[] = L"c:\windows\system32\winmetadata\windows.foundation.winmd";
+    static const WCHAR foundation_wow64[] = L"c:\windows\sysnative\winmetadata\windows.foundation.winmd";
+    static const WCHAR networking[] = L"c:\windows\system32\winmetadata\windows.networking.winmd";
+    static const WCHAR networking_wow64[] = L"c:\windows\sysnative\winmetadata\windows.networking.winmd";
+    HSTRING name, *paths;
+    DWORD count, i;
+    HRESULT hr;
+    static const struct
+    {
+        const WCHAR *namespace;
+        DWORD        len_namespace;
+        const WCHAR *path;
+        const WCHAR *path_wow64;
+    }
+    tests[] =
+    {
+        { L"Windows.Networking.Connectivity", ARRAY_SIZE(L"Windows.Networking.Connectivity") - 1,
+          networking, networking_wow64 },
+        { L"Windows.Foundation", ARRAY_SIZE(L"Windows.Foundation") - 1,
+          foundation, foundation_wow64 },
+    };
+
+    hr = RoInitialize(RO_INIT_MULTITHREADED);
+    ok(hr == S_OK, "got %#lx\n", hr);
+
+    for (i = 0; i < ARRAY_SIZE(tests); i++)
+    {
+        winetest_push_context("%lu: ", i);
+        hr = WindowsCreateString(tests[i].namespace, tests[i].len_namespace, &name);
+        ok(hr == S_OK, "got %#lx\n", hr);
+
+        count = 0;
+        hr = RoResolveNamespace(name, NULL, 0, NULL, &count, &paths, 0, NULL);
+        todo_wine ok(hr == S_OK, "got %#lx\n", hr);
+        if (hr == S_OK)
+        {
+            const WCHAR *str = WindowsGetStringRawBuffer(paths[0], NULL);
+
+            ok(count == 1, "got %lu\n", count);
+            ok((!is_wow64 && !wcsicmp( str, tests[i].path )) ||
+               (is_wow64 && !wcsicmp( str, tests[i].path_wow64 )) ||
+               broken(is_wow64 && !wcsicmp( str, tests[i].path )) /* win8, win10 1507 */,
+               "got %s\n", wine_dbgstr_w(str) );
+
+            WindowsDeleteString(paths[0]);
+            CoTaskMemFree(paths);
+        }
+
+        WindowsDeleteString(name);
+        winetest_pop_context();
+    }
+
+    RoUninitialize();
+}
+
 START_TEST(wintypes)
 {
+    IsWow64Process(GetCurrentProcess(), &is_wow64);
+
     test_IApiInformationStatics();
     test_IPropertyValueStatics();
+    test_RoResolveNamespace();
 }

[PATCH 1/1] wintypes/tests: Add tests for RoResolveNamespace().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149270

Your paranoid android.

=== debian11b (64 bit WoW report) ===

wmvcore:
wmvcore.c:2824: Test succeeded inside todo block: Got pts 2780000.