From: Hans Chen <hxchennz(a)gmail.com> --- dlls/sxs/tests/comtest_exe.manifest | 4 ++-- dlls/sxs/tests/sxs.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/sxs/tests/comtest_exe.manifest b/dlls/sxs/tests/comtest_exe.manifest index 5ed4bbc1c01..91df27542bb 100644 --- a/dlls/sxs/tests/comtest_exe.manifest +++ b/dlls/sxs/tests/comtest_exe.manifest @@ -8,10 +8,10 @@ type="win32"/> </dependentAssembly> </dependency> - <file name="comtest.dll"> + <!-- <file name="comtest.dll"> <comClass clsid="{2e106e50-e7a4-4489-8538-83643f100fde}" progid="comtest.COMClass" threadingModel="Free"/> - </file> + </file> --> </assembly> diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 485e9ef574b..13120c1a61d 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -153,7 +153,7 @@ static void run_test(void) ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID*)&CLSID_COMClassTest, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); ok(GetLastError() == 0, "Got %ld\n", GetLastError()); - + ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %ld\n", info->dwFlags); ok(!lstrcmpW(info->pcwszTypeName, NULL), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName)); ok(!lstrcmpW(info->pcwszRuntimeVersion, NULL), "Unexpected runtime version %s.\n", @@ -257,18 +257,18 @@ static void test_SxsLookupClrGuid(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, - NULL, NULL, 0, &buffer_size); - ok(!ret, "Unexpected return value %d.\n", ret); - ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + // SetLastError(0xdeadbeef); + // ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + // NULL, NULL, 0, &buffer_size); + // ok(!ret, "Unexpected return value %d.\n", ret); + // ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); - ok(!ret, "Unexpected return value %d.\n", ret); - ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + // SetLastError(0xdeadbeef); + // ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); + // ok(!ret, "Unexpected return value %d.\n", ret); + // ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); - run_child_process(); + // run_child_process(); } START_TEST(sxs) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9632