Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50344: [WIN32K] In GreCreateBitmapEx handle allocation failure in the rle hack path and set LastError, when failed to allocate bitmap bits.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 9 18:53:58 2011 New Revision: 50344 URL: http://svn.reactos.org/svn/reactos?rev=50344&view=rev Log: [WIN32K] In GreCreateBitmapEx handle allocation failure in the rle hack path and set LastError, when failed to allocate bitmap bits. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Jan 9 18:53:58 2011 @@ -107,6 +107,12 @@ sizl.cy = nHeight; pvCompressedBits = pvBits; pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + if (!pvBits) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } DecompressBitmap(sizl, pvCompressedBits, pvBits, pso->lDelta, iFormat); fjBitmap |= BMF_RLE_HACK; } @@ -119,6 +125,7 @@ { /* Bail out if that failed */ DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); SURFACE_FreeSurfaceByHandle(hbmp); return NULL; }

13 years, 8 months

[tkreuzer] 50343: [WIN32K] - In BitmapFormat, allow intermediate bpp values, use ULONG as parameter type, instead of WORD and DWORD - In NtGdiCreateBitmap get the real bpp value from the gajBitsPer...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 9 18:38:41 2011 New Revision: 50343 URL: http://svn.reactos.org/svn/reactos?rev=50343&view=rev Log: [WIN32K] - In BitmapFormat, allow intermediate bpp values, use ULONG as parameter type, instead of WORD and DWORD - In NtGdiCreateBitmap get the real bpp value from the gajBitsPerFormat array - Add back check of too large nWidth (needed to make sure, cjWidthBytes didn't overflow) - Merge all parameter checks - Check cPlanes and cBitsPixel paramters explicitly - Use GreCreateBitmapEx - Remove BITMAP_GetRealBitsPixel Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/surface.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun Jan 9 18:38:41 2011 @@ -37,28 +37,19 @@ }; -ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression) -{ - switch (Compression) +ULONG FASTCALL BitmapFormat(ULONG cBits, ULONG iCompression) +{ + switch (iCompression) { case BI_RGB: /* Fall through */ case BI_BITFIELDS: - switch (Bits) - { - case 1: - return BMF_1BPP; - case 4: - return BMF_4BPP; - case 8: - return BMF_8BPP; - case 16: - return BMF_16BPP; - case 24: - return BMF_24BPP; - case 32: - return BMF_32BPP; - } + if (cBits <= 1) return BMF_1BPP; + if (cBits <= 4) return BMF_4BPP; + if (cBits <= 8) return BMF_8BPP; + if (cBits <= 16) return BMF_16BPP; + if (cBits <= 24) return BMF_24BPP; + if (cBits <= 32) return BMF_32BPP; return 0; case BI_RLE4: Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Sun Jan 9 18:38:41 2011 @@ -11,7 +11,6 @@ INT APIENTRY BITMAP_GetObject(SURFACE * bmp, INT count, LPVOID buffer); HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); -UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); HBITMAP APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Sun Jan 9 18:38:41 2011 @@ -125,7 +125,7 @@ #define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions -ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression); +ULONG FASTCALL BitmapFormat(ULONG cBits, ULONG iCompression); extern UCHAR gajBitsPerFormat[]; #define BitsPerFormat(Format) gajBitsPerFormat[Format] Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Jan 9 18:38:41 2011 @@ -161,60 +161,47 @@ IN OPTIONAL LPBYTE pUnsafeBits) { HBITMAP hbmp; - ULONG cjWidthBytes, iFormat; - - /* NOTE: Windows also doesn't store nr. of planes separately! */ - cBitsPixel = BITMAP_GetRealBitsPixel(cBitsPixel * cPlanes); - - /* Calculate bitmap format */ - iFormat = BitmapFormat(cBitsPixel, BI_RGB); - - /* Check parameters */ - if (iFormat == 0 || nWidth <= 0 || nHeight <= 0) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - nWidth, nHeight, cBitsPixel); + ULONG cRealBpp, cjWidthBytes, iFormat; + ULONGLONG cjSize; + + /* Calculate bitmap format and real bits per pixel. */ + iFormat = BitmapFormat(cBitsPixel * cPlanes, BI_RGB); + cRealBpp = gajBitsPerFormat[iFormat]; + + /* Calculate width and image size in bytes */ + cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cRealBpp); + cjSize = cjWidthBytes * nHeight; + + /* Check parameters (possible overflow of cjWidthBytes!) */ + if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0 || + cBitsPixel > 32 || cPlanes > 32 || cjSize >= 0x100000000ULL) + { + DPRINT1("Invalid bitmap format! Width=%d, Height=%d, Bpp=%d, Planes=%d\n", + nWidth, nHeight, cBitsPixel, cPlanes); EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if(WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel)*nHeight >= 0x8000000) - { - /* I just can't get enough, I just can't get enough */ - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - /* Make sure that cjBits will not overflow */ - cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - nWidth, nHeight, cBitsPixel); - EngSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - /* cBitsPixel = cBitsPixel * cPlanes now! */ - hbmp = GreCreateBitmap(nWidth, nHeight, 1, cBitsPixel, NULL); - - if (pUnsafeBits) - { - PSURFACE psurf = SURFACE_LockSurface(hbmp); + /* Call internal function. */ + hbmp = GreCreateBitmapEx(nWidth, nHeight, 0, iFormat, 0, 0, NULL, DDB_SURFACE); + + if (pUnsafeBits && hbmp) + { + PSURFACE psurf = SURFACE_LockSurface(hbmp); _SEH2_TRY { - ProbeForRead(pUnsafeBits, cjWidthBytes * nHeight, 1); + ProbeForRead(pUnsafeBits, cjSize, 1); UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - SURFACE_UnlockSurface(psurf); + SURFACE_UnlockSurface(psurf); SURFACE_FreeSurfaceByHandle(hbmp); _SEH2_YIELD(return NULL;) } _SEH2_END - SURFACE_UnlockSurface(psurf); + SURFACE_UnlockSurface(psurf); } return hbmp; @@ -833,25 +820,6 @@ /* Internal Functions */ - -UINT FASTCALL -BITMAP_GetRealBitsPixel(UINT nBitsPixel) -{ - if (nBitsPixel <= 1) - return 1; - if (nBitsPixel <= 4) - return 4; - if (nBitsPixel <= 8) - return 8; - if (nBitsPixel <= 16) - return 16; - if (nBitsPixel <= 24) - return 24; - if (nBitsPixel <= 32) - return 32; - - return 0; -} HBITMAP FASTCALL BITMAP_CopyBitmap(HBITMAP hBitmap)

13 years, 8 months

[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

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; }

13 years, 8 months

[akhaldi] 50341: [CMAKE] - Add missing define.

by akhaldi＠svn.reactos.org

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)

13 years, 8 months

[akhaldi] 50340: [CMAKE] - Improve the warnings and compiler flags according to the different architectures we have.

by akhaldi＠svn.reactos.org

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)

13 years, 8 months

[dgorbachev] 50339: [FREELDR] Delete a duplicate line.

by dgorbachev＠svn.reactos.org

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;

13 years, 8 months

[spetreolle] 50338: [CMAKE] Get a proper bootcd for unix builds (3rd stage.) Thanks to Amine for his findings.

by spetreolle＠svn.reactos.org

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)

13 years, 8 months

[spetreolle] 50337: [CMAKE] -fshort-wchar is not related to inline, neither is i386 specific.

by spetreolle＠svn.reactos.org

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)

13 years, 8 months

[spetreolle] 50336: [CMAKE] Move -fshort-wchar defintion (gcc specific).

by spetreolle＠svn.reactos.org

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()

13 years, 8 months

[akhaldi] 50335: [CMAKE] - Prevent some status codes redefinitions.

by akhaldi＠svn.reactos.org

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 *);

13 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011