From: Hans Chen <hxchennz(a)gmail.com> --- dlls/sxs/tests/sxs.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 13120c1a61d..1f3e15bdec9 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -148,18 +148,18 @@ static void run_test(void) ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = malloc(buffer_size); - SetLastError(0xdeadbeef); - 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()); + // info = malloc(buffer_size); + // SetLastError(0xdeadbeef); + // 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", - wine_dbgstr_w(info->pcwszRuntimeVersion)); + // 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", + // wine_dbgstr_w(info->pcwszRuntimeVersion)); - free(info); + // free(info); } static void prepare_and_run_test(void) @@ -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