Module: wine Branch: master Commit: b62d7e7a6607e8e88b1618e7f8590e00188250a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b62d7e7a6607e8e88b1618e7f8590e0...
Author: Hans Leidekker hans@codeweavers.com Date: Fri Jan 12 13:58:44 2024 +0100
sxs/tests: Get rid of workarounds for old Windows versions.
---
dlls/sxs/tests/cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index dc84aebc867..6c3869e7b58 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -47,16 +47,13 @@ static void test_QueryAssemblyInfo( void ) ok( hr == E_INVALIDARG, "got %08lx\n", hr );
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == E_INVALIDARG) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr );
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version="1.2.3.4"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr );
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version="1.2.3.4",type="win32"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr );
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version="1.2.3.4",type="win32",processorArchitecture="x86"", NULL );
-
Alexandre Julliard