mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 01:12:06 +00:00
[SXS_WINETEST]
* Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60414
This commit is contained in:
parent
c549f0f3f2
commit
8726317ef7
|
@ -1,14 +1,9 @@
|
|||
|
||||
add_definitions(
|
||||
-D__ROS_LONG64__
|
||||
-D_DLL -D__USE_CRTIMP)
|
||||
|
||||
add_executable(sxs_winetest
|
||||
cache.c
|
||||
name.c
|
||||
testlist.c)
|
||||
|
||||
target_link_libraries(sxs_winetest wine uuid)
|
||||
set_module_type(sxs_winetest win32cui)
|
||||
add_importlibs(sxs_winetest sxs msvcrt kernel32 ntdll)
|
||||
add_importlibs(sxs_winetest sxs msvcrt kernel32)
|
||||
add_cd_file(TARGET sxs_winetest DESTINATION reactos/bin FOR all)
|
||||
|
|
|
@ -104,17 +104,17 @@ static void test_QueryAssemblyInfo( void )
|
|||
|
||||
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine2W, NULL );
|
||||
ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) ||
|
||||
broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr );
|
||||
broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr );
|
||||
|
||||
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine3W, NULL );
|
||||
ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) ||
|
||||
broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr );
|
||||
broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr );
|
||||
|
||||
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine4W, NULL );
|
||||
todo_wine ok( hr == 0x80070490, "got %08x\n", hr );
|
||||
todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr );
|
||||
|
||||
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, NULL );
|
||||
todo_wine ok( hr == 0x80070490, "got %08x\n", hr );
|
||||
todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr );
|
||||
|
||||
GetWindowsDirectoryA( comctl_path1, MAX_PATH );
|
||||
lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" );
|
||||
|
@ -141,7 +141,7 @@ static void test_QueryAssemblyInfo( void )
|
|||
memset( &info, 0, sizeof(info) );
|
||||
info.cbAssemblyInfo = sizeof(info);
|
||||
hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, &info );
|
||||
todo_wine ok( hr == 0x80070490, "got %08x\n", hr );
|
||||
todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr );
|
||||
|
||||
memset( &info, 0, sizeof(info) );
|
||||
info.cbAssemblyInfo = sizeof(info);
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
/* Automatically generated file; DO NOT EDIT!! */
|
||||
|
||||
#define STANDALONE
|
||||
#include "wine/test.h"
|
||||
#include <wine/test.h>
|
||||
|
||||
extern void func_cache(void);
|
||||
extern void func_name(void);
|
||||
|
|
Loading…
Reference in a new issue