Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[akhaldi] 48672: [CMAKE] - Add mini_hal to build.
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 23:48:26 2010 New Revision: 48672 URL: http://svn.reactos.org/svn/reactos?rev=48672&view=rev Log: [CMAKE] - Add mini_hal to build. Modified: branches/cmake-bringup/hal/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Tue Aug 31 23:48:26 2010 @@ -67,6 +67,41 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a libcntpr) +list(APPEND MINI_HAL_SOURCE + halx86/generic/legacy/bus/bushndlr.c + halx86/generic/legacy/bus/cmosbus.c + halx86/generic/legacy/bus/isabus.c + halx86/generic/legacy/bus/pcibus.c + halx86/generic/legacy/bus/pcidata.c + halx86/generic/legacy/bus/sysbus.c + halx86/generic/legacy/bussupp.c + halx86/generic/beep.c + halx86/generic/bios.c + halx86/generic/cmos.c + halx86/generic/dma.c + halx86/generic/display.c + halx86/generic/drive.c + halx86/generic/misc.c + halx86/generic/profil.c + halx86/generic/reboot.c + halx86/generic/spinlock.c + halx86/generic/sysinfo.c + halx86/generic/timer.c + halx86/generic/usage.c + halx86/up/halinit_up.c + halx86/up/pic.c + halx86/up/processor.c) + +if(ARCH MATCHES i386) +list(APPEND MINI_HAL_SOURCE + halx86/generic/i386/portio.c + halx86/generic/i386/systimer.S) +endif(ARCH MATCHES i386) + +add_library(mini_hal ${MINI_HAL_SOURCE}) +set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS _BLDR_ _MINIHAL_) +add_dependencies(mini_hal psdk bugcodes) + else() #TBD endif(ARCH MATCHES i386)

1 0

[akhaldi] 48671: [CMAKE] - libcntpr needs buildno.h
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 21:24:12 2010 New Revision: 48671 URL: http://svn.reactos.org/svn/reactos?rev=48671&view=rev Log: [CMAKE] - libcntpr needs buildno.h Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Aug 31 21:24:12 2010 @@ -560,4 +560,4 @@ add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) -add_dependencies(libcntpr psdk) +add_dependencies(libcntpr psdk buildno_header)

1 0

[jgardou] 48670: [WIN32K] - Get rid of old code, when surfaces didn't have palettes by default
by jgardou＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: jgardou Date: Tue Aug 31 20:38:49 2010 New Revision: 48670 URL: http://svn.reactos.org/svn/reactos?rev=48670&view=rev Log: [WIN32K] - Get rid of old code, when surfaces didn't have palettes by default Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue Aug 31 20:38:49 2010 @@ -328,7 +328,6 @@ PGDIOBJ apObj[2]; RECTL rcDest, rcSrc; SURFACE *BitmapDest, *BitmapSrc = NULL; - PPALETTE PalSourceGDI; ULONG TransparentColor = 0; BOOL Ret = FALSE; EXLATEOBJ exlo; @@ -394,25 +393,10 @@ goto done; } - if (BitmapSrc->ppal) - { - GDIOBJ_IncrementShareCount(&BitmapSrc->ppal->BaseObject); - PalSourceGDI = BitmapSrc->ppal ; - } - else - PalSourceGDI = PALETTE_ShareLockPalette(pPrimarySurface->devinfo.hpalDefault) ; - - if(!PalSourceGDI) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - goto done; - } - /* Translate Transparent (RGB) Color to the source palette */ - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, PalSourceGDI, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, BitmapSrc->ppal, 0, 0, 0); TransparentColor = XLATEOBJ_iXlate(&exlo.xlo, (ULONG)TransColor); EXLATEOBJ_vCleanup(&exlo); - PALETTE_ShareUnlockPalette(PalSourceGDI); EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue Aug 31 20:38:49 2010 @@ -430,7 +430,6 @@ BOOL bInRect = FALSE; SURFACE *psurf; SURFOBJ *pso; - PPALETTE ppal; EXLATEOBJ exlo; HBITMAP hBmpTmp; @@ -456,25 +455,8 @@ psurf = dc->dclevel.pSurface; if (psurf) { - pso = &psurf->SurfObj; - if (psurf->ppal) - { - ppal = psurf->ppal; - GDIOBJ_IncrementShareCount(&ppal->BaseObject); - } - else - ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); - - if (psurf->SurfObj.iBitmapFormat == BMF_1BPP && !psurf->hSecure) - { - /* FIXME: palette should be gpalMono already ! */ - EXLATEOBJ_vInitialize(&exlo, &gpalMono, &gpalRGB, 0, 0xffffff, 0); - } - else - { - EXLATEOBJ_vInitialize(&exlo, ppal, &gpalRGB, 0, 0xffffff, 0); - } - + pso = &psurf->SurfObj; + EXLATEOBJ_vInitialize(&exlo, psurf->ppal, &gpalRGB, 0, 0xffffff, 0); // check if this DC has a DIB behind it... if (pso->pvScan0) // STYPE_BITMAP == pso->iType { @@ -484,7 +466,6 @@ } EXLATEOBJ_vCleanup(&exlo); - PALETTE_ShareUnlockPalette(ppal); } } DC_UnlockDc(dc); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Tue Aug 31 20:38:49 2010 @@ -1061,7 +1061,6 @@ PDC dc; PDC_ATTR pdcattr; SURFACE *psurf = NULL; - PPALETTE ppal; EXLATEOBJ exlo; BOOL Ret = FALSE; RECTL DestRect; @@ -1106,16 +1105,7 @@ goto cleanup; } - if (psurf->ppal) - { - ppal = psurf->ppal; - GDIOBJ_IncrementShareCount(&ppal->BaseObject); - } - else - // Destination palette obtained from the hDC - ppal = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); - - EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0xffffff, 0); /* Only solid fills supported for now * How to support pattern brushes and non standard surfaces (not offering dib functions): @@ -1125,7 +1115,6 @@ Ret = DIB_XXBPP_FloodFillSolid(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, ConvColor, FillType); EXLATEOBJ_vCleanup(&exlo); - PALETTE_ShareUnlockPalette(ppal); cleanup: DC_UnlockDc(dc); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Tue Aug 31 20:38:49 2010 @@ -3173,7 +3173,6 @@ BOOLEAN Render; POINT Start; BOOL DoBreak = FALSE; - PPALETTE ppalDst; USHORT DxShift; // TODO: Write test-cases to exactly match real Windows in different @@ -3443,21 +3442,10 @@ psurf = dc->dclevel.pSurface ; SurfObj = &psurf->SurfObj ; - /* Create the xlateobj */ - if (psurf->ppal) - { - ppalDst = psurf->ppal; - GDIOBJ_IncrementShareCount(&ppalDst->BaseObject); - } - else - // Destination palette obtained from the hDC - ppalDst = PALETTE_ShareLockPalette(dc->ppdev->devinfo.hpalDefault); - ASSERT(ppalDst); - EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, ppalDst, 0, 0, 0); - EXLATEOBJ_vInitialize(&exloDst2RGB, ppalDst, &gpalRGB, 0, 0, 0); - PALETTE_ShareUnlockPalette(ppalDst); - - if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) + EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); + + if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; if(dc->pdcattr->ulDirty_ & DIRTY_TEXT)

1 0

[akhaldi] 48669: [CMAKE] - Add boot sectors to build.
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 18:40:19 2010 New Revision: 48669 URL: http://svn.reactos.org/svn/reactos?rev=48669&view=rev Log: [CMAKE] - Add boot sectors to build. Added: branches/cmake-bringup/boot/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake 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] Tue Aug 31 18:40:19 2010 @@ -102,6 +102,7 @@ add_subdirectory(include/reactos/mc) add_subdirectory(base) +add_subdirectory(boot) add_subdirectory(dll) add_subdirectory(drivers) add_subdirectory(hal) 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] Tue Aug 31 18:40:19 2010 @@ -51,3 +51,27 @@ add_custom_target(${_target_name}_def ALL DEPENDS ${_def_file}) ENDMACRO(spec2def _target_name _spec_file _def_file) + +MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) + + get_filename_component(OBJECT_PATH ${_object_file} PATH) + file(MAKE_DIRECTORY ${OBJECT_PATH}) + get_directory_property(defines COMPILE_DEFINITIONS) + get_directory_property(includes INCLUDE_DIRECTORIES) + + foreach(arg ${defines}) + set(result_defs ${result_defs} -D${arg}) + endforeach(arg ${defines}) + + foreach(arg ${includes}) + set(result_incs -I${arg} ${result_incs}) + endforeach(arg ${includes}) + + add_custom_command( + OUTPUT ${_object_file} + COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file} + DEPENDS native-winebuild) + set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) + add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) + +ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file) Added: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt (added) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Tue Aug 31 18:40:19 2010 @@ -1,0 +1,7 @@ + +CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/dosmbr.bin) +CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/ext2.bin) +CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat32.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat32.bin) +CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin) +CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) +CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) Propchange: branches/cmake-bringup/boot/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48668: [CMAKE] - Add scsiport to build.
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 17:55:28 2010 New Revision: 48668 URL: http://svn.reactos.org/svn/reactos?rev=48668&view=rev Log: [CMAKE] - Add scsiport to build. Added: branches/cmake-bringup/drivers/storage/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt (with props) branches/cmake-bringup/drivers/storage/scsiport/scsiport_i386.def (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Tue Aug 31 17:55:28 2010 @@ -1,3 +1,4 @@ add_subdirectory(base) add_subdirectory(input) +add_subdirectory(storage) Added: branches/cmake-bringup/drivers/storage/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C… ============================================================================== --- branches/cmake-bringup/drivers/storage/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Tue Aug 31 17:55:28 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(scsiport) Propchange: branches/cmake-bringup/drivers/storage/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Tue Aug 31 17:55:28 2010 @@ -1,0 +1,13 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc) + +set_target_properties(scsiport PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(scsiport + ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(scsiport psdk bugcodes) Propchange: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/storage/scsiport/scsiport_i386.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/scsiport_i386.def (added) +++ branches/cmake-bringup/drivers/storage/scsiport/scsiport_i386.def [iso-8859-1] Tue Aug 31 17:55:28 2010 @@ -1,0 +1,49 @@ + +LIBRARY scsiport.sys + +EXPORTS + ScsiDebugPrint @1 + ScsiPortCompleteRequest@20 @2 + ScsiPortConvertPhysicalAddressToUlong@8 @3 + ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger @4 + ScsiPortFlushDma@4 @5 + ScsiPortFreeDeviceBase@8 @6 + ScsiPortGetBusData@24 @7 + ScsiPortGetDeviceBase@28 @8 + ScsiPortGetLogicalUnit@16 @9 + ScsiPortGetPhysicalAddress@16 @10 + ScsiPortGetSrb@20 @11 + ScsiPortGetUncachedExtension@12 @12 + ScsiPortGetVirtualAddress@12 @13 + ScsiPortInitialize@16 @14 + ScsiPortIoMapTransfer@16 @15 + ScsiPortLogError@28 @16 + ScsiPortMoveMemory@12 @17 + ScsiPortNotification @18 + ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR @19 + ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT @20 + ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG @21 + ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR @22 + ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT @23 + ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG @24 + ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR @25 + ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT @26 + ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG @27 + ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR @28 + ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT @29 + ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG @30 + ScsiPortSetBusDataByOffset@28 @31 + ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor @32 + ScsiPortValidateRange@28 @33 + ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR @34 + ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT @35 + ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG @36 + ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR @37 + ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT @38 + ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG @39 + ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR @40 + ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT @41 + ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG @42 + ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR @43 + ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT @44 + ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG @45 Propchange: branches/cmake-bringup/drivers/storage/scsiport/scsiport_i386.def ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 48667: [USER32] - Use GetSysColorBrush(...) instead of CreateSolidBrush(GetSysColor(...))
by jgardou＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: jgardou Date: Tue Aug 31 16:49:09 2010 New Revision: 48667 URL: http://svn.reactos.org/svn/reactos?rev=48667&view=rev Log: [USER32] - Use GetSysColorBrush(...) instead of CreateSolidBrush(GetSysColor(...)) Modified: branches/reactos-yarotows/dll/win32/user32/windows/draw.c Modified: branches/reactos-yarotows/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Aug 31 16:49:09 2010 @@ -1373,9 +1373,9 @@ } if (flags & DSS_DISABLED) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); + hbrtmp = GetSysColorBrush(COLOR_3DHILIGHT); else if (flags & DSS_DEFAULT) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) @@ -1388,13 +1388,11 @@ if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; SelectObject(hdc, hbsave); - DeleteObject(hbrtmp); - hbrtmp = 0; } if (flags & DSS_DISABLED) { - hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbr = hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); if(!hbrtmp) goto cleanup; } @@ -1418,8 +1416,6 @@ SelectObject(hdc, hbsave); if(hbmsave) SelectObject(memdc, hbmsave); - if(hbrtmp) - DeleteObject(hbrtmp); if(hbm) DeleteObject(hbm); if(memdc)

1 0

[akhaldi] 48666: [CMAKE] - Add bootvid, kddll, kdcom, nmidebug and null drivers to build.
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 16:30:02 2010 New Revision: 48666 URL: http://svn.reactos.org/svn/reactos?rev=48666&view=rev Log: [CMAKE] - Add bootvid, kddll, kdcom, nmidebug and null drivers to build. Added: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt (with props) branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt (with props) branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt (with props) branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt (with props) branches/cmake-bringup/drivers/base/null/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/CMak… ============================================================================== --- branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,2 +1,12 @@ add_subdirectory(beep) +add_subdirectory(bootvid) + +if(_WINKD_ MATCHES 1) +add_subdirectory(kddll) +else() +add_subdirectory(kdcom) +endif(_WINKD_ MATCHES 1) + +add_subdirectory(nmidebug) +add_subdirectory(null) Added: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… ============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) + +list(APPEND SOURCE + ${ARCH}/bootvid.c + ${ARCH}/bootdata.c + bootvid.rc) + +if(ARCH MATCHES i386) +list(APPEND SOURCE i386/vga.c) +endif(ARCH MATCHES i386) + +add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE}) + +set_target_properties(bootvid PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") + +target_link_libraries(bootvid + ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes) Propchange: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco… ============================================================================== --- branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,0 +1,23 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(kdcom ${CMAKE_CURRENT_SOURCE_DIR}/kdcom.spec ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) + +if(ARCH MATCHES i386) +list(APPEND SOURCE i386/kdbg.c) +elseif(ARCH MATCHES amd64) +list(APPEND SOURCE i386/kdbg.c) +elseif(ARCH MATCHES arm) +list(APPEND SOURCE arm/kdbg.c) +endif(ARCH MATCHES i386) + +add_library(kdcom SHARED ${SOURCE}) + +set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") + +target_link_libraries(kdcom + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) Propchange: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(kdcom ${CMAKE_CURRENT_SOURCE_DIR}/kdcom.spec ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) + +add_library(kdcom SHARED + kdcom.c + kddll.c + kdserial.c) + +set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") + +target_link_libraries(kdcom + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) Propchange: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… ============================================================================== --- branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,0 +1,12 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(nmidebug SHARED nmidebug.c nmidebug.rc) + +set_target_properties(nmidebug PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(nmidebug + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(nmidebug psdk bugcodes) Propchange: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null… ============================================================================== --- branches/cmake-bringup/drivers/base/null/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Tue Aug 31 16:30:02 2010 @@ -1,0 +1,13 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(null SHARED null.c null.rc) + +set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(null + pseh + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(null psdk bugcodes) Propchange: branches/cmake-bringup/drivers/base/null/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 48665: [WIN32K] - Create the visible region upon DC initilization propely. This is a leftover from 48579 and 48660.
by jgardou＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: jgardou Date: Tue Aug 31 16:02:22 2010 New Revision: 48665 URL: http://svn.reactos.org/svn/reactos?rev=48665&view=rev Log: [WIN32K] - Create the visible region upon DC initilization propely. This is a leftover from 48579 and 48660. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Aug 31 16:02:22 2010 @@ -89,8 +89,6 @@ void DC_InitHack(PDC pdc) { - HRGN hVisRgn; - TextIntRealizeFont(pdc->pdcattr->hlfntNew,NULL); pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); @@ -98,14 +96,8 @@ ASSERT(pdc->dclevel.ppal); /* Select regions */ - // FIXME: too complicated, broken error handling pdc->rosdc.hClipRgn = NULL; pdc->rosdc.hGCClipRgn = NULL; - hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); - ASSERT(hVisRgn); - GdiSelectVisRgn(pdc->BaseObject.hHmgr, hVisRgn); - GreDeleteObject(hVisRgn); - ASSERT(pdc->prgnVis); } VOID @@ -234,8 +226,11 @@ /* Setup regions */ pdc->prgnAPI = NULL; - pdc->prgnVis = NULL; // FIXME - pdc->prgnRao = NULL; + pdc->prgnRao = NULL; + /* Allocate a Vis region */ + pdc->prgnVis = IntSysCreateRectpRgn(0, 0, pdc->dclevel.sizl.cx, pdc->dclevel.sizl.cy); + ASSERT(pdc->prgnVis); + GDIOBJ_CopyOwnership(pdc->BaseObject.hHmgr, pdc->prgnVis->BaseObject.hHmgr); /* Setup palette */ pdc->dclevel.hpal = StockObjects[DEFAULT_PALETTE];

1 0

[akhaldi] 48664: [CMAKE] - Add input drivers (i8042prt, kbdclass, mouclass and sermouse) to build.
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 14:05:07 2010 New Revision: 48664 URL: http://svn.reactos.org/svn/reactos?rev=48664&view=rev Log: [CMAKE] - Add input drivers (i8042prt, kbdclass, mouclass and sermouse) to build. Added: branches/cmake-bringup/drivers/input/CMakeLists.txt (with props) branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt (with props) branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt (with props) branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,2 +1,3 @@ add_subdirectory(base) +add_subdirectory(input) Added: branches/cmake-bringup/drivers/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/CMa… ============================================================================== --- branches/cmake-bringup/drivers/input/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/input/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,0 +1,5 @@ + +add_subdirectory(i8042prt) +add_subdirectory(kbdclass) +add_subdirectory(mouclass) +add_subdirectory(sermouse) Propchange: branches/cmake-bringup/drivers/input/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80… ============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,0 +1,23 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(i8042prt SHARED + createclose.c + i8042prt.c + keyboard.c + misc.c + mouse.c + pnp.c + ps2pp.c + readwrite.c + registry.c + setup.c + i8042prt.rc) + +set_target_properties(i8042prt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(i8042prt + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(i8042prt psdk bugcodes) Propchange: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd… ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,0 +1,17 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(kbdclass SHARED + kbdclass.c + misc.c + setup.c + kbdclass.rc) + +set_target_properties(kbdclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(kbdclass + pseh + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(kbdclass psdk bugcodes) Propchange: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mou… ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(mouclass SHARED + misc.c + mouclass.c + mouclass.rc) + +set_target_properties(mouclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(mouclass + pseh + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(mouclass psdk bugcodes) Propchange: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/ser… ============================================================================== --- branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] Tue Aug 31 14:05:07 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(sermouse SHARED + createclose.c + detect.c + fdo.c + internaldevctl.c + misc.c + readmouse.c + sermouse.c + sermouse.rc) + +set_target_properties(sermouse PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") + +target_link_libraries(sermouse + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(sermouse psdk bugcodes) Propchange: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48663: [CMAKE] - Improve handling buildno.h
by akhaldi＠svn.reactos.org 31 Aug '10

31 Aug '10

Author: akhaldi Date: Tue Aug 31 13:25:10 2010 New Revision: 48663 URL: http://svn.reactos.org/svn/reactos?rev=48663&view=rev Log: [CMAKE] - Improve handling buildno.h Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/tools/buildno/CMakeLists.txt branches/cmake-bringup/tools/winebuild/CMakeLists.txt branches/cmake-bringup/tools/wpp/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] Tue Aug 31 13:25:10 2010 @@ -21,11 +21,12 @@ include_directories(include) include_directories(include/reactos) include_directories(include/reactos/wine) +include_directories(${REACTOS_BINARY_DIR}/include) add_subdirectory(tools) add_subdirectory(lib) -export(TARGETS widl winebuild nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild nci buildno FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() @@ -143,5 +144,11 @@ ADD_CUSTOM_TARGET(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) ADD_CUSTOM_TARGET(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) +file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) +ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + COMMAND native-buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) +ADD_CUSTOM_TARGET(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) + endif() Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Tue Aug 31 13:25:10 2010 @@ -17,4 +17,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/acledit.def ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) -add_dependencies(acledit acledit_def psdk) +add_dependencies(acledit acledit_def psdk buildno_header) Modified: branches/cmake-bringup/tools/buildno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/buildno/CMa… ============================================================================== --- branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] Tue Aug 31 13:25:10 2010 @@ -4,8 +4,10 @@ target_link_libraries(buildno xml) +file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) + ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h - COMMAND buildno ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h + COMMAND buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h ) ADD_CUSTOM_TARGET(build_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C… ============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Tue Aug 31 13:25:10 2010 @@ -3,8 +3,8 @@ file(GLOB_RECURSE SOURCE "*.c") -add_executable(winebuild ${SOURCE} ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h) +add_executable(winebuild ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) -SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) ADD_DEPENDENCIES(winebuild build_header) Modified: branches/cmake-bringup/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wpp/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] Tue Aug 31 13:25:10 2010 @@ -1,7 +1,7 @@ file(GLOB_RECURSE SOURCE "*.c") -SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) +SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) add_library(wpp ${SOURCE})

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010