Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50342: [WIN32K] Improve NtGdiStretchDIBitsInternal, use _SEH2_YIELT instead of saving an NTSTATUS and handle the fast path in place instead of setting a BOOL variable. Fixes warnings abo...
by tkreuzer＠svn.reactos.org 09 Jan '11

09 Jan '11

Author: tkreuzer Date: Sun Jan 9 18:11:44 2011 New Revision: 50342 URL: http://svn.reactos.org/svn/reactos?rev=50342&view=rev Log: [WIN32K] Improve NtGdiStretchDIBitsInternal, use _SEH2_YIELT instead of saving an NTSTATUS and handle the fast path in place instead of setting a BOOL variable. Fixes warnings about uninitialized variables. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Jan 9 18:11:44 2011 @@ -1028,49 +1028,45 @@ WORD planes, bpp; DWORD compr, size; HBITMAP hBitmap; - BOOL fastpath = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - PBYTE safeBits ; + HBITMAP hOldBitmap; + HDC hdcMem; + PVOID pvBits; + PBYTE safeBits; if (!Bits || !BitsInfo) return 0; - safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); - if(!safeBits) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } + safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); + if(!safeBits) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } if (!(pdc = DC_LockDc(hDC))) - { - ExFreePoolWithTag(safeBits, TAG_DIB); - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } + { + ExFreePoolWithTag(safeBits, TAG_DIB); + EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } _SEH2_TRY { ProbeForRead(BitsInfo, cjMaxInfo, 1); ProbeForRead(Bits, cjMaxBits, 1); - if (DIB_GetBitmapInfo( &BitsInfo->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ) == -1) + if (DIB_GetBitmapInfo(&BitsInfo->bmiHeader, &width, &height, &planes, &bpp, &compr, &size) == -1) { DPRINT1("Invalid bitmap\n"); - Status = STATUS_INVALID_PARAMETER; - } - RtlCopyMemory(safeBits, Bits, cjMaxBits); + _SEH2_YIELD(goto cleanup;) + } + RtlCopyMemory(safeBits, Bits, cjMaxBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + DPRINT1("Error, failed to read the DIB bits\n"); + _SEH2_YIELD(goto cleanup;) } _SEH2_END - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Error, failed to read the DIB bits\n"); - goto cleanup; - } if (width < 0) { @@ -1086,54 +1082,47 @@ ROP == SRCCOPY) { BITMAP bmp; - if (IntGdiGetObject(hBitmap, sizeof(bmp), &bmp) == sizeof(bmp)) - { - if (bmp.bmBitsPixel == bpp && - bmp.bmWidth == SrcWidth && - bmp.bmHeight == SrcHeight && - bmp.bmPlanes == planes) - fastpath = TRUE; - } - } - - if (fastpath) - { - /* fast path */ - DPRINT1("using fast path\n"); - ret = IntSetDIBits( pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage); - } - else - { - /* slow path - need to use StretchBlt */ - HBITMAP hOldBitmap; - HDC hdcMem; - PVOID pvBits; - - hdcMem = NtGdiCreateCompatibleDC( hDC ); - hBitmap = DIB_CreateDIBSection(pdc, BitsInfo, Usage, &pvBits, NULL, 0, 0); - if(!hBitmap) - { - DPRINT1("Error, failed to create a DIB section\n"); - NtGdiDeleteObjectApp(hdcMem); - goto cleanup; - } - RtlCopyMemory(pvBits, safeBits, cjMaxBits); - hOldBitmap = NtGdiSelectBitmap( hdcMem, hBitmap ); - - /* Origin for DIBitmap may be bottom left (positive biHeight) or top - left (negative biHeight) */ - ret = NtGdiStretchBlt( hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(height) - SrcHeight - YSrc, - SrcWidth, SrcHeight, ROP, 0 ); - - if(ret) - ret = SrcHeight; - NtGdiSelectBitmap( hdcMem, hOldBitmap ); - NtGdiDeleteObjectApp( hdcMem ); - GreDeleteObject( hBitmap ); - } + ret = IntGdiGetObject(hBitmap, sizeof(bmp), &bmp) == sizeof(bmp); + if (ret && + bmp.bmBitsPixel == bpp && + bmp.bmWidth == SrcWidth && + bmp.bmHeight == SrcHeight && + bmp.bmPlanes == planes) + { + /* fast path */ + ret = IntSetDIBits(pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage); + goto cleanup; + } + } + + /* slow path - need to use StretchBlt */ + + hdcMem = NtGdiCreateCompatibleDC(hDC); + hBitmap = DIB_CreateDIBSection(pdc, BitsInfo, Usage, &pvBits, NULL, 0, 0); + if(!hBitmap) + { + DPRINT1("Error, failed to create a DIB section\n"); + NtGdiDeleteObjectApp(hdcMem); + goto cleanup; + } + + RtlCopyMemory(pvBits, safeBits, cjMaxBits); + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); + + /* Origin for DIBitmap may be bottom left (positive biHeight) or top + left (negative biHeight) */ + ret = NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, + hdcMem, XSrc, abs(height) - SrcHeight - YSrc, + SrcWidth, SrcHeight, ROP, 0); + + if(ret) + ret = SrcHeight; + NtGdiSelectBitmap(hdcMem, hOldBitmap); + NtGdiDeleteObjectApp(hdcMem); + GreDeleteObject(hBitmap); + cleanup: - ExFreePoolWithTag(safeBits, TAG_DIB); + ExFreePoolWithTag(safeBits, TAG_DIB); DC_UnlockDc(pdc); return ret; }

1 0

[akhaldi] 50341: [CMAKE] - Add missing define.
by akhaldi＠svn.reactos.org 09 Jan '11

09 Jan '11

Author: akhaldi Date: Sun Jan 9 17:24:39 2011 New Revision: 50341 URL: http://svn.reactos.org/svn/reactos?rev=50341&view=rev Log: [CMAKE] - Add missing define. Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Sun Jan 9 17:24:39 2011 @@ -1,5 +1,7 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D_DLL -D__USE_CRTIMP + -Dlint) add_executable(ftp cmds.c @@ -12,11 +14,11 @@ ftp.rc) set_module_type(ftp win32cui) +add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) -add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) if(MSVC) -target_link_libraries(ftp oldnames) -add_importlibs(ftp ntdll) + target_link_libraries(ftp oldnames) + add_importlibs(ftp ntdll) endif() add_cab_target(ftp 1)

1 0

[akhaldi] 50340: [CMAKE] - Improve the warnings and compiler flags according to the different architectures we have.
by akhaldi＠svn.reactos.org 09 Jan '11

09 Jan '11

Author: akhaldi Date: Sun Jan 9 16:49:10 2011 New Revision: 50340 URL: http://svn.reactos.org/svn/reactos?rev=50340&view=rev Log: [CMAKE] - Improve the warnings and compiler flags according to the different architectures we have. Modified: branches/cmake-bringup/config.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config.cmake?rev=… ============================================================================== --- branches/cmake-bringup/config.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/config.cmake [iso-8859-1] Sun Jan 9 16:49:10 2011 @@ -12,7 +12,7 @@ set(TUNE "i686" CACHE STRING "Which CPU ReactOS should be optimized for.") -set (OPTIMIZE "1" CACHE STRING +set(OPTIMIZE "1" CACHE STRING "What level of optimisation to use. 0 = off 1 = Default option, optimize for size (-Os) with some additional options Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=503… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Jan 9 16:49:10 2011 @@ -27,18 +27,53 @@ endif() # Warnings + add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) +if(ARCH MATCHES amd64) + add_definitions(-Wno-format) +elseif(ARCH MATCHES arm) + add_definitions(-Wno-attributes) +endif() + # Optimizations + +if(OPTIMIZE STREQUAL "1") + add_definitions(-Os) +elseif(OPTIMIZE STREQUAL "2") + add_definitions(-Os) +elseif(OPTIMIZE STREQUAL "3") + add_definitions(-O1) +elseif(OPTIMIZE STREQUAL "4") + add_definitions(-O2) +elseif(OPTIMIZE STREQUAL "5") + add_definitions(-O3) +endif() + +add_definitions(-fno-strict-aliasing) + if(ARCH MATCHES i386) - add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) + add_definitions(-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) + if(OPTIMIZE STREQUAL "1") + add_definitions(-ftracer -momit-leaf-frame-pointer) + endif() elseif(ARCH MATCHES amd64) - add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=4) + add_definitions(-mpreferred-stack-boundary=4) + if(OPTIMIZE STREQUAL "1") + add_definitions(-ftracer -momit-leaf-frame-pointer) + endif() +elseif(ARCH MATCHES arm) + if(OPTIMIZE STREQUAL "1") + add_definitions(-ftracer) + endif() endif() # Other if(ARCH MATCHES amd64) -add_definitions(-U_X86_ -UWIN32) + add_definitions(-U_X86_ -UWIN32) +elseif(ARCH MATCHES arm) + add_definitions(-U_UNICODE -UUNICODE) + add_definitions(-D__MSVCRT__) # DUBIOUS endif() # alternative arch name @@ -280,4 +315,4 @@ #pseh lib, needed with mingw set(PSEH_LIB "pseh") -endif() +endif(CMAKE_CROSSCOMPILING) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=503… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Jan 9 16:49:10 2011 @@ -5,31 +5,41 @@ add_definitions(-Dinline=__inline) -if(NOT CMAKE_CROSSCOMPILING) - -else() +if(CMAKE_CROSSCOMPILING) + +if(OPTIMIZE STREQUAL "1") + add_definitions(/O1) +elseif(OPTIMIZE STREQUAL "2") + add_definitions(/O2) +elseif(OPTIMIZE STREQUAL "3") + add_definitions(/Ot /Ox /GS-) +elseif(OPTIMIZE STREQUAL "4") + add_definitions(/Os /Ox /GS-) +elseif(OPTIMIZE STREQUAL "5") + add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) +endif() add_definitions(/GS- /Zl /Zi) add_definitions(-Dinline=__inline -D__STDC__=1) -IF(${_MACHINE_ARCH_FLAG} MATCHES X86) - SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") - SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") - SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") -ENDIF() +if(${_MACHINE_ARCH_FLAG} MATCHES X86) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") +endif() link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") -MACRO(add_pch _target_name _header_filename _src_list) +macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") add_custom_command( OUTPUT ${_gch_filename} COMMAND echo Ignoring precompiled header DEPENDS ${_header_filename}) -ENDMACRO(add_pch _target_name _header_filename _src_list) +endmacro() macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) @@ -70,7 +80,7 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common msvcsup) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) @@ -80,17 +90,17 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common msvcsup) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken set_entrypoint(${MODULE} DllMainCRTStartup@12) - if(DEFINED baseaddress_${MODULE}) - set_image_base(${MODULE} ${baseaddress_${MODULE}}) - else() - message(STATUS "${MODULE} has no base address") - endif() - target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(STATUS "${MODULE} has no base address") + endif() + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES win32ocx) @@ -105,15 +115,14 @@ target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") endif() - if(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) - set_subsystem(${MODULE} native) + if(${TYPE} MATCHES kernelmodedriver) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + set_entrypoint(${MODULE} DriverEntry@8) + set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER") - add_dependencies(${MODULE} bugcodes) - endif() - + add_dependencies(${MODULE} bugcodes) + endif() endmacro() macro(set_unicode) @@ -213,4 +222,4 @@ #pseh workaround set(PSEH_LIB "") -endif() +endif(CMAKE_CROSSCOMPILING)

1 0

[dgorbachev] 50339: [FREELDR] Delete a duplicate line.
by dgorbachev＠svn.reactos.org 09 Jan '11

09 Jan '11

Author: dgorbachev Date: Sun Jan 9 15:11:49 2011 New Revision: 50339 URL: http://svn.reactos.org/svn/reactos?rev=50339&view=rev Log: [FREELDR] Delete a duplicate line. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun Jan 9 15:11:49 2011 @@ -23,7 +23,7 @@ PcMachInit(const char *CmdLine) { EnableA20(); - + /* Setup vtbl */ MachVtbl.ConsPutChar = PcConsPutChar; MachVtbl.ConsKbHit = PcConsKbHit; @@ -32,7 +32,6 @@ MachVtbl.VideoSetDisplayMode = PcVideoSetDisplayMode; MachVtbl.VideoGetDisplaySize = PcVideoGetDisplaySize; MachVtbl.VideoGetBufferSize = PcVideoGetBufferSize; - MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; MachVtbl.VideoSetTextCursorPosition = PcVideoSetTextCursorPosition; MachVtbl.VideoHideShowTextCursor = PcVideoHideShowTextCursor; MachVtbl.VideoPutChar = PcVideoPutChar;

1 0

[spetreolle] 50338: [CMAKE] Get a proper bootcd for unix builds (3rd stage.) Thanks to Amine for his findings.
by spetreolle＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: spetreolle Date: Sat Jan 8 23:25:58 2011 New Revision: 50338 URL: http://svn.reactos.org/svn/reactos?rev=50338&view=rev Log: [CMAKE] Get a proper bootcd for unix builds (3rd stage.) Thanks to Amine for his findings. Modified: branches/cmake-bringup/ros_cd.cmake Modified: branches/cmake-bringup/ros_cd.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ros_cd.cmake?rev=… ============================================================================== --- branches/cmake-bringup/ros_cd.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/ros_cd.cmake [iso-8859-1] Sat Jan 8 23:25:58 2011 @@ -9,6 +9,9 @@ string(REGEX REPLACE "^(.*)\t.*" "\\1" _targetname ${ENTRY}) string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) get_target_property(_FILENAME ${_targetname} LOCATION) + if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(_FILENAME '\"${_FILENAME}\"') + endif() add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.dff COMMAND ${CMAKE_COMMAND} -E echo ${_FILENAME} ${_dir_num} >> ${REACTOS_BINARY_DIR}/boot/reactos.dff @@ -20,9 +23,14 @@ foreach(ENTRY ${CAB_TARGET_ENTRIES}) string(REGEX REPLACE "^(.*)\t.*" "\\1" _FILENAME ${ENTRY}) string(REGEX REPLACE "^.*\t(.)" "\\1" _dir_num ${ENTRY}) - add_custom_command( + if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(QUOTED_FILENAME '\"${_FILENAME}\"') + else() + set(QUOTED_FILENAME ${_FILENAME}) + endif() + add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.dff - COMMAND ${CMAKE_COMMAND} -E echo ${_FILENAME} ${_dir_num} >> ${REACTOS_BINARY_DIR}/boot/reactos.dff + COMMAND ${CMAKE_COMMAND} -E echo ${QUOTED_FILENAME} ${_dir_num} >> ${REACTOS_BINARY_DIR}/boot/reactos.dff DEPENDS ${_FILENAME} APPEND) endforeach() @@ -30,11 +38,11 @@ #reactos.cab add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.inf - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot -I + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.dff) add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/reactos.inf -L ${REACTOS_BINARY_DIR}/boot -N + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/reactos.inf -L ${REACTOS_BINARY_DIR}/boot -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.inf) #bootcd target @@ -148,4 +156,4 @@ DEPENDS ${LIVECD_FILES}) add_dependencies(livecd isoboot livecd_hives vgafonts) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso) +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso)

1 0

[spetreolle] 50337: [CMAKE] -fshort-wchar is not related to inline, neither is i386 specific.
by spetreolle＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: spetreolle Date: Sat Jan 8 23:22:54 2011 New Revision: 50337 URL: http://svn.reactos.org/svn/reactos?rev=50337&view=rev Log: [CMAKE] -fshort-wchar is not related to inline, neither is i386 specific. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Jan 8 23:22:54 2011 @@ -25,8 +25,6 @@ if(ARCH MATCHES i386) if(MSVC) add_definitions(-Dinline=__inline) - else() - add_definitions(-fshort-wchar) endif() endif() @@ -37,6 +35,10 @@ include/reactos include/reactos/wine ${REACTOS_BINARY_DIR}/include) + + if(NOT MSVC) + add_definitions(-fshort-wchar) + endif() add_subdirectory(tools) add_subdirectory(lib)

1 0

[spetreolle] 50336: [CMAKE] Move -fshort-wchar defintion (gcc specific).
by spetreolle＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: spetreolle Date: Sat Jan 8 22:33:22 2011 New Revision: 50336 URL: http://svn.reactos.org/svn/reactos?rev=50336&view=rev Log: [CMAKE] Move -fshort-wchar defintion (gcc specific). Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Jan 8 22:33:22 2011 @@ -20,13 +20,13 @@ if(NOT CMAKE_CROSSCOMPILING) - add_definitions(-fshort-wchar) - add_definitions(-DTARGET_${ARCH}) if(ARCH MATCHES i386) if(MSVC) add_definitions(-Dinline=__inline) + else() + add_definitions(-fshort-wchar) endif() endif()

1 0

[akhaldi] 50335: [CMAKE] - Prevent some status codes redefinitions.
by akhaldi＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: akhaldi Date: Sat Jan 8 21:41:12 2011 New Revision: 50335 URL: http://svn.reactos.org/svn/reactos?rev=50335&view=rev Log: [CMAKE] - Prevent some status codes redefinitions. Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Sat Jan 8 21:41:12 2011 @@ -95,7 +95,12 @@ # endif # if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_) +/* Define WIN32_NO_STATUS to prevent status codes redefinitions */ +# if !defined(WIN32_NO_STATUS) +# define WIN32_NO_STATUS +# endif # include <windef.h> + #ifndef InterlockedIncrement _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(IN OUT LONG volatile *);

1 0

[akhaldi] 50334: [CMAKE] - Improve message headers handling.
by akhaldi＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: akhaldi Date: Sat Jan 8 20:44:41 2011 New Revision: 50334 URL: http://svn.reactos.org/svn/reactos?rev=50334&view=rev Log: [CMAKE] - Improve message headers handling. Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/base/applications/rapps/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/include/reactos/mc/CMakeLists.txt 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] Sat Jan 8 20:44:41 2011 @@ -268,3 +268,19 @@ macro(add_dependency_footer) file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") endmacro() + +macro(add_message_headers) + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + macro_mc(${FILE}) + add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h + COMMAND ${COMMAND_MC} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + set_source_files_properties( + ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc + PROPERTIES GENERATED TRUE) + add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) + endforeach() +endmacro() + Modified: branches/cmake-bringup/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Jan 8 20:44:41 2011 @@ -19,8 +19,10 @@ winmain.c rapps.rc) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${REACTOS_BINARY_DIR}/include/reactos) +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${REACTOS_BINARY_DIR}/include/reactos) + set_rc_compiler() add_executable(rapps ${SOURCE}) @@ -29,40 +31,5 @@ add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll) add_dependencies(rapps rappsmsg) - -#FIXME : move this to cmakemacros + gcc/msvc.cmake - -if(MSVC) -MACRO(MACRO_MC FILE) - set (COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) -ENDMACRO() -else() -MACRO(MACRO_MC FILE) - set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) -ENDMACRO() -endif() - -MACRO (MACRO_ADD_MESSAGE_HEADERS) - - FOREACH(_in_FILE ${ARGN}) - - get_filename_component(FILE ${_in_FILE} NAME_WE) - MACRO_MC(${FILE}) - add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND ${COMMAND_MC} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc - ) - set_source_files_properties( - ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc - PROPERTIES GENERATED TRUE - ) - add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) - - ENDFOREACH(_in_FILE ${ARGN}) - -ENDMACRO (MACRO_ADD_MESSAGE_HEADERS) - -MACRO_ADD_MESSAGE_HEADERS(rappsmsg.mc) - +add_message_headers(rappsmsg.mc) add_cab_target(rapps 1) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=503… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Jan 8 20:44:41 2011 @@ -273,6 +273,10 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() +macro(macro_mc FILE) + set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) +endmacro() + #pseh lib, needed with mingw set(PSEH_LIB "pseh") Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Sat Jan 8 20:44:41 2011 @@ -1,34 +1,3 @@ - -if(MSVC) -macro(MACRO_MC FILE) - set (COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) -endmacro() -else() -macro(MACRO_MC FILE) - set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) -endmacro() -endif() - -macro (MACRO_ADD_MESSAGE_HEADERS) - - foreach(_in_FILE ${ARGN}) - - get_filename_component(FILE ${_in_FILE} NAME_WE) - MACRO_MC(${FILE}) - add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h - COMMAND ${COMMAND_MC} - DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc - ) - set_source_files_properties( - ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc - PROPERTIES GENERATED TRUE - ) - add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) - - endforeach(_in_FILE ${ARGN}) - -endmacro (MACRO_ADD_MESSAGE_HEADERS) list(APPEND SOURCE bugcodes.mc @@ -36,4 +5,5 @@ neteventmsg.mc ntstatus.mc pciclass.mc) -MACRO_ADD_MESSAGE_HEADERS(${SOURCE}) + +add_message_headers(${SOURCE}) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=503… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Jan 8 20:44:41 2011 @@ -204,6 +204,10 @@ spec2def(${_dllname} ${_spec_file}) endmacro() +macro(macro_mc FILE) + set(COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) +endmacro() + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) #pseh workaround

1 0

[akhaldi] 50333: [CMAKE] - Prevent cmake from escaping preprocessor definition values added via add_definitions. - Fix a FIXME in oleaut32 and urlmon builds.
by akhaldi＠svn.reactos.org 08 Jan '11

08 Jan '11

Author: akhaldi Date: Sat Jan 8 20:01:33 2011 New Revision: 50333 URL: http://svn.reactos.org/svn/reactos?rev=50333&view=rev Log: [CMAKE] - Prevent cmake from escaping preprocessor definition values added via add_definitions. - Fix a FIXME in oleaut32 and urlmon builds. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Jan 8 20:01:33 2011 @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 2.6) project(REACTOS) + +# Don't escape preprocessor definition values added via add_definitions +cmake_policy(SET CMP0005 OLD) if(NOT ARCH) set(ARCH i386) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Jan 8 20:01:33 2011 @@ -24,9 +24,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -#FIXME: this should be quotes enclosed -add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}) -#add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}") +add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}") add_definitions( -D__WINESRC__ Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Jan 8 20:01:33 2011 @@ -66,9 +66,7 @@ -DREGISTER_PROXY_DLL -D_URLMON_) -# FIXME : this should be quotes enclosed -add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) -#add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") +add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") add_cab_target(urlmon 1) add_importlib_target(urlmon.spec)

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