Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[pschweitzer] 49858: [NTOSKRNL/NEWCC] Init Dummy var even if just used for debug to suppress warning
by pschweitzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: pschweitzer Date: Sun Nov 28 22:33:19 2010 New Revision: 49858 URL: http://svn.reactos.org/svn/reactos?rev=49858&view=rev Log: [NTOSKRNL/NEWCC] Init Dummy var even if just used for debug to suppress warning Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Nov 28 22:33:19 2010 @@ -750,6 +750,8 @@ #ifndef NEWCC /* Flush dirty cache pages */ CcRosFlushDirtyPages(-1, &Dummy); +#else + Dummy = 0; #endif /* Flush all volumes and the registry */

1 0

[tkreuzer] 49857: [CMAKE] remove /GR from c++ options, it's on by default and we get a warning when additionally specifiying /GR-
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 21:49:54 2010 New Revision: 49857 URL: http://svn.reactos.org/svn/reactos?rev=49857&view=rev Log: [CMAKE] remove /GR from c++ options, it's on by default and we get a warning when additionally specifiying /GR- Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sun Nov 28 21:49:54 2010 @@ -215,7 +215,7 @@ SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") ENDIF() - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR") + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") @@ -229,7 +229,7 @@ IF(CMAKE_USING_VC_FREE_TOOLS) MESSAGE(STATUS "Using FREE VC TOOLS, NO DEBUG available") SET(CMAKE_BUILD_TYPE_INIT Release) - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG") @@ -241,7 +241,7 @@ SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG") ELSE(CMAKE_USING_VC_FREE_TOOLS) SET(CMAKE_BUILD_TYPE_INIT Debug) - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") + SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")

1 0

[tkreuzer] 49856: [CMAKE] Make rpcproxy macro portable
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 20:16:40 2010 New Revision: 49856 URL: http://svn.reactos.org/svn/reactos?rev=49856&view=rev Log: [CMAKE] Make rpcproxy macro portable Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010 @@ -172,8 +172,8 @@ get_filename_component(FILE ${_in_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl) + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c PROPERTIES GENERATED TRUE) @@ -184,17 +184,17 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) endforeach(_in_FILE ${ARGN}) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} - DEPENDS native-widl) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c - PROPERTIES GENERATED TRUE) - - add_library(${TARGET}_proxy ${SOURCE}) - add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_DLLDATA_ARG}${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} + DEPENDS ${IDLS}) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c + PROPERTIES GENERATED TRUE) + + add_library(${TARGET}_proxy ${SOURCE}) + add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) endmacro(rpcproxy) macro (MACRO_IDL_FILES) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010 @@ -190,6 +190,8 @@ set(IDL_TYPELIB_ARG -t -T) #.tlb set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library +set(IDL_PROXY_ARG -p -P) +set(IDL_DLLDATA_ARG --dlldata-only --dlldata=) macro(add_importlib_target _def_file) # empty for now, while import libs are shipped Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 28 20:16:40 2010 @@ -136,6 +136,8 @@ set(IDL_TYPELIB_ARG /tlb) #.tlb set(IDL_SERVER_ARG /sstub) #.c for stub server library set(IDL_CLIENT_ARG /cstub) #.c for stub client library +set(IDL_PROXY_ARG /proxy) +set(IDL_DLLDATA_ARG /dlldata ) # Thanks MS for creating a stupid linker macro(add_importlib_target _spec_file)

1 0

[tkreuzer] 49855: [CMAKE] Get rid of the stubs file for quartz, it was a mistake.
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 20:12:05 2010 New Revision: 49855 URL: http://svn.reactos.org/svn/reactos?rev=49855&view=rev Log: [CMAKE] Get rid of the stubs file for quartz, it was a mistake. Removed: branches/cmake-bringup/dll/directx/quartz/stubs.c Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun Nov 28 20:12:05 2010 @@ -39,7 +39,6 @@ enummedia.c control.c avisplit.c - stubs.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) Removed: branches/cmake-bringup/dll/directx/quartz/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/stubs.c (removed) @@ -1,12 +1,0 @@ - -typedef void* ProxyFileInfo; -typedef void* CLSID; -#define RPC_ENTRY - -void -RPC_ENTRY -GetProxyDllInfo(const ProxyFileInfo *** pInfo, const CLSID ** pId) -{ - *pInfo = 0; - *pId = 0; -};

1 0

[tkreuzer] 49854: [CMAKE] Don't compile CRT_fp8.c, CRT_fp10.c and xtxtmode.c. we don't need those and MSVC complains about duplicate symbols, as it's exported from msvcrt already.
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 19:28:03 2010 New Revision: 49854 URL: http://svn.reactos.org/svn/reactos?rev=49854&view=rev Log: [CMAKE] Don't compile CRT_fp8.c, CRT_fp10.c and xtxtmode.c. we don't need those and MSVC complains about duplicate symbols, as it's exported from msvcrt already. Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Nov 28 19:28:03 2010 @@ -13,8 +13,6 @@ binmode.c charmax.c cinitexe.c - CRT_fp10.c - CRT_fp8.c CRT_glob.c crt_handler.c dllentry.c @@ -64,6 +62,7 @@ add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk) +if (NOT MSVC) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a @@ -72,6 +71,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +endif() add_library(getopt getopt.c) set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL1 __USE_CRTIMP)

1 0

[tkreuzer] 49853: [UUID] Add IID_IStream and IID_IEnumDMO for MSVC
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 19:05:03 2010 New Revision: 49853 URL: http://svn.reactos.org/svn/reactos?rev=49853&view=rev Log: [UUID] Add IID_IStream and IID_IEnumDMO for MSVC 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] Sun Nov 28 19:05:03 2010 @@ -177,15 +177,16 @@ #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_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_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); @@ -196,5 +197,6 @@ 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); -#endif - +DEFINE_GUID(IID_IEnumDMO, 0x2c3cd98a, 0x2bfa, 0x4a53, 0x9c,0x27,0x52,0x49,0xba,0x64,0xba,0x0f); +#endif +

1 0

[tkreuzer] 49852: [DXSDK] Put coclass MediaDet into the library DexterLib
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 16:53:47 2010 New Revision: 49852 URL: http://svn.reactos.org/svn/reactos?rev=49852&view=rev Log: [DXSDK] Put coclass MediaDet into the library DexterLib Modified: branches/cmake-bringup/include/dxsdk/qedit.idl Modified: branches/cmake-bringup/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/qed… ============================================================================== --- branches/cmake-bringup/include/dxsdk/qedit.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/qedit.idl [iso-8859-1] Sun Nov 28 16:53:47 2010 @@ -160,9 +160,16 @@ }; [ - uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), + uuid(78530B68-61F9-11D2-8CAD-00A024580902), + version(1.0), ] -coclass MediaDet +library DexterLib { - [default] interface IMediaDet; + [ + uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), + ] + coclass MediaDet + { + [default] interface IMediaDet; + }; };

1 0

[pschweitzer] 49851: [DDK] FsRtlRemoveBaseMcbEntry() return is VOID
by pschweitzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: pschweitzer Date: Sun Nov 28 16:43:40 2010 New Revision: 49851 URL: http://svn.reactos.org/svn/reactos?rev=49851&view=rev Log: [DDK] FsRtlRemoveBaseMcbEntry() return is VOID Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=49… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Nov 28 16:43:40 2010 @@ -7344,7 +7344,7 @@ IN LONGLONG SectorCount); NTKERNELAPI -BOOLEAN +VOID NTAPI FsRtlRemoveBaseMcbEntry( IN PBASE_MCB Mcb,

1 0

[akhaldi] 49850: [NTOSKRNL/MM] - Fix the use of an uninitialized variable.
by akhaldi＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: akhaldi Date: Sun Nov 28 16:38:51 2010 New Revision: 49850 URL: http://svn.reactos.org/svn/reactos?rev=49850&view=rev Log: [NTOSKRNL/MM] - Fix the use of an uninitialized variable. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Nov 28 16:38:51 2010 @@ -248,7 +248,7 @@ NTAPI ExpCheckPoolBlocks(IN PVOID Block) { - BOOLEAN FoundBlock; + BOOLEAN FoundBlock = FALSE; SIZE_T Size = 0; PPOOL_HEADER Entry;

1 0

[tkreuzer] 49849: [WINE] Add a dummy DECL_GLOBAL_CONSTRUCTOR for MSVC
by tkreuzer＠svn.reactos.org 28 Nov '10

28 Nov '10

Author: tkreuzer Date: Sun Nov 28 16:37:46 2010 New Revision: 49849 URL: http://svn.reactos.org/svn/reactos?rev=49849&view=rev Log: [WINE] Add a dummy DECL_GLOBAL_CONSTRUCTOR for MSVC Modified: branches/cmake-bringup/include/reactos/wine/port.h Modified: branches/cmake-bringup/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/port.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/port.h [iso-8859-1] Sun Nov 28 16:37:46 2010 @@ -150,7 +150,11 @@ /* Constructor functions */ -#ifdef __GNUC__ +#ifdef _MSC_VER // ReactOS +#pragma message("DECL_GLOBAL_CONSTRUCTOR is not properly defined") +# define DECL_GLOBAL_CONSTRUCTOR(func) \ + static void func(void) +#elif defined(__GNUC__) # define DECL_GLOBAL_CONSTRUCTOR(func) \ static void func(void) __attribute__((constructor)); \ static void func(void)

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 November 2010