From db855ce89eca0da2abf1ad2351e7edf30af05aa0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 16 Sep 2013 15:16:11 +0000 Subject: [PATCH] [FUSION_WINETEST] * Sync with Wine 1.7.1. svn path=/trunk/; revision=60170 --- rostests/winetests/fusion/CMakeLists.txt | 7 +------ rostests/winetests/fusion/asmcache.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rostests/winetests/fusion/CMakeLists.txt b/rostests/winetests/fusion/CMakeLists.txt index 841c52c7dca..830a9f2054e 100644 --- a/rostests/winetests/fusion/CMakeLists.txt +++ b/rostests/winetests/fusion/CMakeLists.txt @@ -9,11 +9,6 @@ list(APPEND SOURCE testlist.c) add_executable(fusion_winetest ${SOURCE}) -target_link_libraries(fusion_winetest wine) set_module_type(fusion_winetest win32cui) -add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) +add_importlibs(fusion_winetest user32 msvcrt kernel32) add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(fusion_winetest) -endif() diff --git a/rostests/winetests/fusion/asmcache.c b/rostests/winetests/fusion/asmcache.c index 07f704759e8..1d9e04ce067 100644 --- a/rostests/winetests/fusion/asmcache.c +++ b/rostests/winetests/fusion/asmcache.c @@ -830,11 +830,11 @@ static void create_assembly(LPCSTR file) assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; - U1(assembly.labelres).Name = 0x10; + U(assembly.labelres).Name = 0x10; U2(assembly.labelres).OffsetToData = 0x80000018; - U1(assembly.label11res).Name = 0x1; + U(assembly.label11res).Name = 0x1; U2(assembly.label11res).OffsetToData = 0x80000030; - U1(assembly.label10res).Name = 0x0; + U(assembly.label10res).Name = 0x0; U2(assembly.label10res).OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);