Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50562: [CMAKE] Link ole32 to iidlib. Fixes compilation on MSVC
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 17:58:43 2011 New Revision: 50562 URL: http://svn.reactos.org/svn/reactos?rev=50562&view=rev Log: [CMAKE] Link ole32 to iidlib. Fixes compilation on MSVC Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sat Jan 29 17:58:43 2011 @@ -1,3 +1,28 @@ + +spec2def(ole32.dll ole32.spec) +generate_idl_iids(dcom.idl) +add_idl_headers(ole32idl dcom.idl irot.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -D_OLE32_ + -DENTRY_PREFIX=OLE32_ + -DPROXY_CLSID=CLSID_PSFactoryBuffer + -DREGISTER_PROXY_DLL + -DCOM_NO_WINDOWS_H) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_rpcproxy_library(ole32proxy + dcom.idl + ole32_unknwn.idl + ole32_objidl.idl + ole32_oleidl.idl) list(APPEND SOURCE antimoniker.c @@ -37,32 +62,8 @@ stubmanager.c usrmarshal.c ole32res.rc + ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c ${CMAKE_CURRENT_BINARY_DIR}/ole32.def) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -add_definitions( - -D__WINESRC__ - -D_OLE32_ - -DENTRY_PREFIX=OLE32_ - -DPROXY_CLSID=CLSID_PSFactoryBuffer - -DREGISTER_PROXY_DLL - -DCOM_NO_WINDOWS_H) - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${REACTOS_SOURCE_DIR}/include/reactos/wine) - -add_idl_headers(ole32idl dcom.idl irot.idl) - -add_rpcproxy_library(ole32proxy - dcom.idl - ole32_unknwn.idl - ole32_objidl.idl - ole32_oleidl.idl) - -spec2def(ole32.dll ole32.spec) add_library(ole32 SHARED ${SOURCE}) @@ -74,9 +75,13 @@ irotrpc uuid ${PSEH_LIB}) - + +if(MSVC) + target_link_libraries(ole32 iidlib) +endif() + add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) - + add_dependencies(ole32 ole32idl) add_cab_target(ole32 1) add_importlib_target(ole32.spec)

1 0

[tkreuzer] 50561: [UUID] Remove duplicate iids
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 17:58:06 2011 New Revision: 50561 URL: http://svn.reactos.org/svn/reactos?rev=50561&view=rev Log: [UUID] Remove duplicate iids Modified: branches/cmake-bringup/lib/sdk/uuid/uuid.c Modified: branches/cmake-bringup/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/uuid… ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 29 17:58:06 2011 @@ -103,7 +103,7 @@ #if 0 /* FIXME */ #include "control.h" #endif - + /* GUIDs not declared in an exported header file */ DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); @@ -178,16 +178,6 @@ #ifdef _MSC_VER DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IStream, 0x0000000c, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IMoniker, 0x0000000f, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IEnumMoniker, 0x00000102, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IPersistStream, 0x00000109, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IPersistFile, 0x0000010b, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IPersist, 0x0000010c, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IDataObject, 0x0000010e, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IOleWindow, 0x00000114, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IParseDisplayName, 0x0000011a, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IDropTarget, 0x00000122, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83,0x9a,0x00,0xc0,0x4f,0xd9,0x18,0xd0); DEFINE_GUID(IID_IOleCommandTarget, 0xb722bccb, 0x4e68, 0x101b, 0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34,0x00,0xaa,0x00,0x60,0x09,0xfa); @@ -195,7 +185,6 @@ DEFINE_GUID(IID_IObjectWithSite, 0xFC4801A3, 0x2BA9, 0x11CF, 0xA2,0x29,0x00,0xAA,0x00,0x3D,0x73,0x52); DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89,0xB3,0x00,0xA0,0xC9,0x0A,0x90,0xAC); DEFINE_GUID(IID_IShellService, 0x5836FB00, 0x8187, 0x11CF, 0xA1,0x2B,0x00,0xAA,0x00,0x4A,0xE8,0x37); -DEFINE_GUID(IID_IPropertyBag, 0x55272A00, 0x42CB, 0x11CE, 0x81,0x35,0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(IID_IPersistPropertyBag, 0x37D84F60, 0x42CB, 0x11CE, 0x81,0x35,0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(IID_IEnumDMO, 0x2c3cd98a, 0x2bfa, 0x4a53, 0x9c,0x27,0x52,0x49,0xba,0x64,0xba,0x0f); DEFINE_GUID(IID_IWineD3DDeviceParent, 0xaeb62dfc, 0xbdcb, 0x4f02, 0x95,0x19, 0x1e,0xee,0xa0,0x0c,0x15,0xcd);

1 0

[tkreuzer] 50560: [CMAKE] Add iidlib, a library containing all iids from the idl files
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 17:57:34 2011 New Revision: 50560 URL: http://svn.reactos.org/svn/reactos?rev=50560&view=rev Log: [CMAKE] Add iidlib, a library containing all iids from the idl files Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sat Jan 29 17:57:34 2011 @@ -111,3 +111,20 @@ add_idl_headers(psdk ${SOURCE}) add_typelib(stdole2 stdole2.idl) + +# These don't contain iids or only duplicates +list(REMOVE_ITEM SOURCE + activaut.idl + devenum.idl + icftypes.idl + msinkaut.idl + msxml2.idl + msxml6.idl + shdeprecated.idl + shtypes.idl + structuredquerycondition.idl + wia_lh.idl + winsxs.idl + wtypes.idl) + +add_iid_library(iidlib ${SOURCE})

1 0

[tkreuzer] 50559: [CMAKE] - Add a macro add_iid_library to generate a static lib containing iids - Fix get_includes and get_defines
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 17:45:45 2011 New Revision: 50559 URL: http://svn.reactos.org/svn/reactos?rev=50559&view=rev Log: [CMAKE] - Add a macro add_iid_library to generate a static lib containing iids - Fix get_includes and get_defines Modified: branches/cmake-bringup/cmake/idl-support.cmake Modified: branches/cmake-bringup/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/idl-support… ============================================================================== --- branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/idl-support.cmake [iso-8859-1] Sat Jan 29 17:45:45 2011 @@ -36,6 +36,7 @@ macro(get_includes OUTPUT_VAR) + set(${OUTPUT_VAR} "") get_directory_property(_includes INCLUDE_DIRECTORIES) foreach(arg ${_includes}) set(${OUTPUT_VAR} -I${arg} ${${OUTPUT_VAR}}) @@ -43,6 +44,7 @@ endmacro() macro(get_defines OUTPUT_VAR) + set(${OUTPUT_VAR} "") get_directory_property(_defines COMPILE_DEFINITIONS) foreach(arg ${_defines}) set(${OUTPUT_VAR} ${${OUTPUT_VAR}} -D${arg}) @@ -149,3 +151,12 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) endmacro() + +macro(add_iid_library TARGET) + foreach(IDL_FILE ${ARGN}) + get_filename_component(NAME ${IDL_FILE} NAME_WE) + generate_idl_iids(${IDL_FILE}) + list(APPEND IID_SOURCES ${NAME}_i.c) + endforeach() + add_library(${TARGET} ${IID_SOURCES}) +endmacro()

1 0

[tkreuzer] 50558: [CLASSPNP] Fix build with MSVC
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 15:12:40 2011 New Revision: 50558 URL: http://svn.reactos.org/svn/reactos?rev=50558&view=rev Log: [CLASSPNP] Fix build with MSVC Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/drivers/storage/classpnp/class.c branches/cmake-bringup/drivers/storage/classpnp/obsolete.c Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sat Jan 29 15:12:40 2011 @@ -9,8 +9,12 @@ -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) -if(NOT MSVC) - add_definitions(-mrtd -fno-builtin -w) +if(ARCH MATCHES i386) + if(MSVC) + add_definitions(/Gz) + else() + add_definitions(-mrtd -fno-builtin -w) + endif() endif() spec2def(classpnp.sys class.spec) Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] Sat Jan 29 15:12:40 2011 @@ -2485,7 +2485,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. Modified: branches/cmake-bringup/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sat Jan 29 15:12:40 2011 @@ -161,7 +161,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. If the class driver has supplied a StartIo,

1 0

[tkreuzer] 50557: [FRAMEBUF_NEW] Fix build with MSVC
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 15:02:53 2011 New Revision: 50557 URL: http://svn.reactos.org/svn/reactos?rev=50557&view=rev Log: [FRAMEBUF_NEW] Fix build with MSVC Modified: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt Modified: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sat Jan 29 15:02:53 2011 @@ -13,7 +13,9 @@ add_library(framebuf_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new_driver.h.gch ${SOURCE}) if(ARCH MATCHES i386) - if(NOT MSVC) + if(MSVC) + set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "/Gz") + else() set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif() endif()

1 0

[tkreuzer] 50556: [VGA_NEW] Fix build with msvc
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 14:57:40 2011 New Revision: 50556 URL: http://svn.reactos.org/svn/reactos?rev=50556&view=rev Log: [VGA_NEW] Fix build with msvc Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vga_new/vga.c Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sat Jan 29 14:57:40 2011 @@ -11,7 +11,11 @@ target_link_libraries(vga libcntpr) +if(MSVC) +set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz") +else() set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") +endif() set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga_new/vga.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Sat Jan 29 14:57:40 2011 @@ -93,7 +93,7 @@ PVIDEO_PALETTE_DATA PaletteBuffer, ULONG PaletteBufferSize ); - + VP_STATUS VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, @@ -846,10 +846,10 @@ case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: { - VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); - PVIDEO_PUBLIC_ACCESS_RANGES portAccess; ULONG physicalPortLength; + + VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n")); if (RequestPacket->OutputBufferLength < sizeof(VIDEO_PUBLIC_ACCESS_RANGES)) @@ -882,7 +882,7 @@ // eVb: 1.17 [END] VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress)); } - + break; case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: @@ -891,7 +891,7 @@ status = ERROR_INVALID_FUNCTION; break; - + // // if we get here, an invalid IoControlCode was specified. // @@ -1371,7 +1371,7 @@ { PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode; USHORT i; - + // // Check if the size of the data in the input buffer is large enough. // @@ -1400,9 +1400,9 @@ // // Check SVGA mode // - + if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer); -// eVb: 1.14 [END] +// eVb: 1.14 [END] // // Path for VGA mode // @@ -1507,11 +1507,11 @@ { VP_STATUS Status = NO_ERROR; ULONG Ranges, i; - + // // Try exclusive ranges (vga + ati) // - + Ranges = NUM_VGA_ACCESS_RANGES; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) @@ -1519,14 +1519,14 @@ // // Not worked, try vga only // - + Ranges = 3; if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) { // // Still not, try shared ranges // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); if (Status == NO_ERROR) @@ -1534,7 +1534,7 @@ // // It did work // - + VideoPortVerifyAccessRanges(DeviceExtension, 0, 0); Status = NO_ERROR; } @@ -1546,7 +1546,7 @@ // // Worked with exclusive, also try shared // - + for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); }

1 0

[tkreuzer] 50555: [NTDLL_APITEST] Make syntax of ZwContinue.S ML compatible
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 14:47:29 2011 New Revision: 50555 URL: http://svn.reactos.org/svn/reactos?rev=50555&view=rev Log: [NTDLL_APITEST] Make syntax of ZwContinue.S ML compatible Modified: trunk/rostests/apitests/ntdll/i386/ZwContinue.S Modified: trunk/rostests/apitests/ntdll/i386/ZwContinue.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.S [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.S [iso-8859-1] Sat Jan 29 14:47:29 2011 @@ -4,9 +4,9 @@ // cpu 486 -.text +.code -extern _check +EXTERN _check:PROC PUBLIC _continuePoint _continuePoint:

1 0

[tkreuzer] 50554: [PSDK] Fix include of windows.h from rpc.h
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 14:41:18 2011 New Revision: 50554 URL: http://svn.reactos.org/svn/reactos?rev=50554&view=rev Log: [PSDK] Fix include of windows.h from rpc.h Modified: branches/cmake-bringup/include/psdk/rpc.h Modified: branches/cmake-bringup/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpc.… ============================================================================== --- branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] Sat Jan 29 14:41:18 2011 @@ -1,14 +1,8 @@ #if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) -#if defined (_OLE32_) -#ifndef RC_INVOKED -#include <stdarg.h> -#endif -#include <windef.h> -#include <winbase.h> -#else +#ifndef _INC_WINDOWS #include <windows.h> -#endif +#endif /* _INC_WINDOWS */ #endif #ifndef RC_INVOKED

1 0

[tkreuzer] 50553: [CMAKE] Don't compile w32kdll and w32knapi test on MSVC
by tkreuzer＠svn.reactos.org 29 Jan '11

29 Jan '11

Author: tkreuzer Date: Sat Jan 29 14:08:44 2011 New Revision: 50553 URL: http://svn.reactos.org/svn/reactos?rev=50553&view=rev Log: [CMAKE] Don't compile w32kdll and w32knapi test on MSVC Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Jan 29 14:08:44 2011 @@ -6,9 +6,11 @@ add_subdirectory(ntdll) add_subdirectory(user32) +if(NOT MSVC) if(ARCH MATCHES i386) add_subdirectory(w32kdll) add_subdirectory(w32knapi) endif() +endif() add_subdirectory(ws2_32)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs