Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[spetreolle] 48880: [CMAKE] Add cmd to build.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 17:40:02 2010 New Revision: 48880 URL: http://svn.reactos.org/svn/reactos?rev=48880&view=rev Log: [CMAKE] Add cmd to build. Added: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -2,5 +2,5 @@ add_subdirectory(applications) #add_subdirectory(services) add_subdirectory(setup) -#add_subdirectory(shell) +add_subdirectory(shell) #add_subdirectory(system) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -1,4 +1,4 @@ -#add_subdirectory(cmd) +add_subdirectory(cmd) #add_subdirectory(explorer) #add_subdirectory(explorer_new) Added: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -1,0 +1,77 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-DANONYMOUSUNIONS) +add_definitions(-D_DEBUG_MEM) + +list(APPEND SOURCE + cmd.rc + main.c) + +add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) + +list(APPEND SOURCE + alias.c + assoc.c + attrib.c + batch.c + beep.c + call.c + chcp.c + choice.c + cls.c + cmd.c + cmddbg.c + cmdinput.c + cmdtable.c + color.c + console.c + copy.c + date.c + del.c + delay.c + dir.c + dirstack.c + echo.c + error.c + filecomp.c + for.c + free.c + goto.c + history.c + if.c + internal.c + label.c + locale.c + memory.c + misc.c + mklink.c + move.c + msgbox.c + parser.c + path.c + pause.c + prompt.c + redir.c + ren.c + replace.c + screen.c + set.c + setlocal.c + shift.c + start.c + strtoclr.c + time.c + timer.c + title.c + type.c + ver.c + verify.c + vol.c + where.c + window.c) + +add_executable(cmd ${CMAKE_CURRENT_BINARY_DIR}/cmd_precomp.h.gch ${SOURCE}) +set_module_type(cmd win32cui) +set_unicode(cmd yes) +target_link_libraries(cmd oldnames wine) +add_importlibs(cmd advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 48879: [win32k] - Cleanup UserSetCursorPos - UserSetCursorPos: set the new position after sending WM_MOUSEMOVE message now we pass all tests for SetCursorPos
by gadamopoulos＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: gadamopoulos Date: Sat Sep 25 16:59:53 2010 New Revision: 48879 URL: http://svn.reactos.org/svn/reactos?rev=48879&view=rev Log: [win32k] - Cleanup UserSetCursorPos - UserSetCursorPos: set the new position after sending WM_MOUSEMOVE message now we pass all tests for SetCursorPos Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Sat Sep 25 16:59:53 2010 @@ -22,15 +22,6 @@ ICONINFO IconInfo; } CURICON_OBJECT, *PCURICON_OBJECT; -typedef struct _CURSORCLIP_INFO -{ - BOOL IsClipped; - UINT Left; - UINT Top; - UINT Right; - UINT Bottom; -} CURSORCLIP_INFO, *PCURSORCLIP_INFO; - typedef struct _CURSORACCELERATION_INFO { UINT FirstThreshold; @@ -45,7 +36,8 @@ DWORD ClickLockTime; // BOOL SwapButtons; UINT ButtonsDown; - CURSORCLIP_INFO CursorClipInfo; + RECTL rcClip; + BOOL bClipped; PCURICON_OBJECT CurrentCursorObject; INT ShowingCursor; /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Sep 25 16:59:53 2010 @@ -60,7 +60,7 @@ gSysCursorInfo.Enabled = FALSE; gSysCursorInfo.ButtonsDown = 0; - gSysCursorInfo.CursorClipInfo.IsClipped = FALSE; + gSysCursorInfo.bClipped = FALSE; gSysCursorInfo.LastBtnDown = 0; gSysCursorInfo.CurrentCursorObject = NULL; gSysCursorInfo.ShowingCursor = 0; @@ -180,58 +180,51 @@ PSYSTEM_CURSORINFO CurInfo; HDC hDC; MSG Msg; + RECTL rcClip; + POINT pt; if(!(hDC = IntGetScreenDC())) { return FALSE; } + if(!(DesktopWindow = UserGetDesktopWindow())) + { + return FALSE; + } + CurInfo = IntGetSysCursorInfo(); - DesktopWindow = UserGetDesktopWindow(); - - if (DesktopWindow) - { - if(x >= DesktopWindow->Wnd->rcClient.right) - x = DesktopWindow->Wnd->rcClient.right - 1; - if(y >= DesktopWindow->Wnd->rcClient.bottom) - y = DesktopWindow->Wnd->rcClient.bottom - 1; - } - - if(x < 0) - x = 0; - if(y < 0) - y = 0; - - //Clip cursor position - if(CurInfo->CursorClipInfo.IsClipped) - { - if(x >= (LONG)CurInfo->CursorClipInfo.Right) - x = (LONG)CurInfo->CursorClipInfo.Right - 1; - if(x < (LONG)CurInfo->CursorClipInfo.Left) - x = (LONG)CurInfo->CursorClipInfo.Left; - if(y >= (LONG)CurInfo->CursorClipInfo.Bottom) - y = (LONG)CurInfo->CursorClipInfo.Bottom - 1; - if(y < (LONG)CurInfo->CursorClipInfo.Top) - y = (LONG)CurInfo->CursorClipInfo.Top; - } - - //Store the new cursor position - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; - - //Move the mouse pointer + /* Clip cursor position */ + if (!CurInfo->bClipped) + rcClip = DesktopWindow->Wnd->rcClient; + else + rcClip = CurInfo->rcClip; + + if(x >= rcClip.right) x = rcClip.right - 1; + if(x < rcClip.left) x = rcClip.left; + if(y >= rcClip.bottom) y = rcClip.bottom - 1; + if(y < rcClip.top) y = rcClip.top; + + pt.x = x; + pt.y = y; + + + if (SendMouseMoveMsg) + { + /* Generate a mouse move message */ + Msg.message = WM_MOUSEMOVE; + Msg.wParam = CurInfo->ButtonsDown; + Msg.lParam = MAKELPARAM(x, y); + Msg.pt = pt; + MsqInsertSystemMessage(&Msg); + } + + /* Store the new cursor position */ + gpsi->ptCursor = pt; + + /* Move the mouse pointer */ GreMovePointer(hDC, x, y); - - if (!SendMouseMoveMsg) - return TRUE; - - //Generate a mouse move message - Msg.message = WM_MOUSEMOVE; - Msg.wParam = CurInfo->ButtonsDown; - Msg.lParam = MAKELPARAM(x, y); - Msg.pt = gpsi->ptCursor; - MsqInsertSystemMessage(&Msg); return TRUE; } @@ -731,18 +724,14 @@ && DesktopWindow && UnsafeRect != NULL) { - CurInfo->CursorClipInfo.IsClipped = TRUE; - CurInfo->CursorClipInfo.Left = max(Rect.left, DesktopWindow->Wnd->rcWindow.left); - CurInfo->CursorClipInfo.Top = max(Rect.top, DesktopWindow->Wnd->rcWindow.top); - CurInfo->CursorClipInfo.Right = min(Rect.right, DesktopWindow->Wnd->rcWindow.right); - CurInfo->CursorClipInfo.Bottom = min(Rect.bottom, DesktopWindow->Wnd->rcWindow.bottom); - + CurInfo->bClipped = TRUE; + RECTL_bIntersectRect(&CurInfo->rcClip, &Rect, &DesktopWindow->Wnd->rcWindow); UserSetCursorPos(gpsi->ptCursor.x, gpsi->ptCursor.y, FALSE); RETURN(TRUE); } - CurInfo->CursorClipInfo.IsClipped = FALSE; + CurInfo->bClipped = FALSE; RETURN(TRUE); CLEANUP: @@ -843,12 +832,9 @@ RETURN(FALSE); CurInfo = IntGetSysCursorInfo(); - if (CurInfo->CursorClipInfo.IsClipped) - { - Rect.left = CurInfo->CursorClipInfo.Left; - Rect.top = CurInfo->CursorClipInfo.Top; - Rect.right = CurInfo->CursorClipInfo.Right; - Rect.bottom = CurInfo->CursorClipInfo.Bottom; + if (CurInfo->bClipped) + { + Rect = CurInfo->rcClip; } else {

1 0

[akhaldi] 48878: [PSDK] - Add CDROM_TOC_SESSION_DATA structure. [DDK] - Add missing min and max macros.
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 15:51:42 2010 New Revision: 48878 URL: http://svn.reactos.org/svn/reactos?rev=48878&view=rev Log: [PSDK] - Add CDROM_TOC_SESSION_DATA structure. [DDK] - Add missing min and max macros. Modified: trunk/reactos/include/ddk/classpnp.h trunk/reactos/include/psdk/ntddcdrm.h Modified: trunk/reactos/include/ddk/classpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/classpnp.h?rev… ============================================================================== --- trunk/reactos/include/ddk/classpnp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/classpnp.h [iso-8859-1] Sat Sep 25 15:51:42 2010 @@ -12,6 +12,9 @@ #include <stdio.h> #include <scsi.h> + +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#define min(a,b) (((a) < (b)) ? (a) : (b)) #define SRB_CLASS_FLAGS_LOW_PRIORITY 0x10000000 #define SRB_CLASS_FLAGS_PERSISTANT 0x20000000 Modified: trunk/reactos/include/psdk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddcdrm.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] Sat Sep 25 15:51:42 2010 @@ -164,6 +164,13 @@ } CDROM_TOC, *PCDROM_TOC; #define CDROM_TOC_SIZE sizeof(CDROM_TOC) + +typedef struct _CDROM_TOC_SESSION_DATA { + UCHAR Length[2]; + UCHAR FirstCompleteSession; + UCHAR LastCompleteSession; + TRACK_DATA TrackData[1]; +} CDROM_TOC_SESSION_DATA, *PCDROM_TOC_SESSION_DATA; typedef struct _CDROM_TOC_ATIP_DATA_BLOCK { UCHAR CdrwReferenceSpeed : 3;

1 0

[akhaldi] 48877: [PSDK] - Add missing ntddmmc.h definitions.
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 15:37:43 2010 New Revision: 48877 URL: http://svn.reactos.org/svn/reactos?rev=48877&view=rev Log: [PSDK] - Add missing ntddmmc.h definitions. Added: trunk/reactos/include/psdk/ntddmmc.h (with props) Added: trunk/reactos/include/psdk/ntddmmc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddmmc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddmmc.h (added) +++ trunk/reactos/include/psdk/ntddmmc.h [iso-8859-1] Sat Sep 25 15:37:43 2010 @@ -1,0 +1,656 @@ + +#pragma once + +#define __NTDDMMC__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define SCSI_GET_CONFIGURATION_REQUEST_TYPE_ALL 0x0 +#define SCSI_GET_CONFIGURATION_REQUEST_TYPE_CURRENT 0x1 +#define SCSI_GET_CONFIGURATION_REQUEST_TYPE_ONE 0x2 + +typedef struct _GET_CONFIGURATION_HEADER { + UCHAR DataLength[4]; + UCHAR Reserved[2]; + UCHAR CurrentProfile[2]; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR Data[0]; +#endif +} GET_CONFIGURATION_HEADER, *PGET_CONFIGURATION_HEADER; + +typedef struct _FEATURE_HEADER { + UCHAR FeatureCode[2]; + UCHAR Current:1; + UCHAR Persistent:1; + UCHAR Version:4; + UCHAR Reserved0:2; + UCHAR AdditionalLength; +} FEATURE_HEADER, *PFEATURE_HEADER; + +typedef enum _FEATURE_PROFILE_TYPE { + ProfileInvalid = 0x0000, + ProfileNonRemovableDisk = 0x0001, + ProfileRemovableDisk = 0x0002, + ProfileMOErasable = 0x0003, + ProfileMOWriteOnce = 0x0004, + ProfileAS_MO = 0x0005, + ProfileCdrom = 0x0008, + ProfileCdRecordable = 0x0009, + ProfileCdRewritable = 0x000a, + ProfileDvdRom = 0x0010, + ProfileDvdRecordable = 0x0011, + ProfileDvdRam = 0x0012, + ProfileDvdRewritable = 0x0013, + ProfileDvdRWSequential = 0x0014, + ProfileDvdDashRDualLayer = 0x0015, + ProfileDvdDashRLayerJump = 0x0016, + ProfileDvdPlusRW = 0x001A, + ProfileDvdPlusR = 0x001B, + ProfileDDCdrom = 0x0020, + ProfileDDCdRecordable = 0x0021, + ProfileDDCdRewritable = 0x0022, + ProfileDvdPlusRWDualLayer = 0x002A, + ProfileDvdPlusRDualLayer = 0x002B, + ProfileBDRom = 0x0040, + ProfileBDRSequentialWritable = 0x0041, + ProfileBDRRandomWritable = 0x0042, + ProfileBDRewritable = 0x0043, + ProfileHDDVDRom = 0x0050, + ProfileHDDVDRecordable = 0x0051, + ProfileHDDVDRam = 0x0052, + ProfileHDDVDRewritable = 0x0053, + ProfileHDDVDRDualLayer = 0x0058, + ProfileHDDVDRWDualLayer = 0x005A, + ProfileNonStandard = 0xffff +} FEATURE_PROFILE_TYPE, *PFEATURE_PROFILE_TYPE; + +typedef enum _FEATURE_NUMBER { + FeatureProfileList = 0x0000, + FeatureCore = 0x0001, + FeatureMorphing = 0x0002, + FeatureRemovableMedium = 0x0003, + FeatureWriteProtect = 0x0004, + FeatureRandomReadable = 0x0010, + FeatureMultiRead = 0x001D, + FeatureCdRead = 0x001E, + FeatureDvdRead = 0x001F, + FeatureRandomWritable = 0x0020, + FeatureIncrementalStreamingWritable = 0x0021, + FeatureSectorErasable = 0x0022, + FeatureFormattable = 0x0023, + FeatureDefectManagement = 0x0024, + FeatureWriteOnce = 0x0025, + FeatureRestrictedOverwrite = 0x0026, + FeatureCdrwCAVWrite = 0x0027, + FeatureMrw = 0x0028, + FeatureEnhancedDefectReporting = 0x0029, + FeatureDvdPlusRW = 0x002A, + FeatureDvdPlusR = 0x002B, + FeatureRigidRestrictedOverwrite = 0x002C, + FeatureCdTrackAtOnce = 0x002D, + FeatureCdMastering = 0x002E, + FeatureDvdRecordableWrite = 0x002F, + FeatureDDCDRead = 0x0030, + FeatureDDCDRWrite = 0x0031, + FeatureDDCDRWWrite = 0x0032, + FeatureLayerJumpRecording = 0x0033, + FeatureCDRWMediaWriteSupport = 0x0037, + FeatureBDRPseudoOverwrite = 0x0038, + FeatureDvdPlusRWDualLayer = 0x003A, + FeatureDvdPlusRDualLayer = 0x003B, + FeatureBDRead = 0x0040, + FeatureBDWrite = 0x0041, + FeatureTSR = 0x0042, + FeatureHDDVDRead = 0x0050, + FeatureHDDVDWrite = 0x0051, + FeatureHybridDisc = 0x0080, + FeaturePowerManagement = 0x0100, + FeatureSMART = 0x0101, + FeatureEmbeddedChanger = 0x0102, + FeatureCDAudioAnalogPlay = 0x0103, + FeatureMicrocodeUpgrade = 0x0104, + FeatureTimeout = 0x0105, + FeatureDvdCSS = 0x0106, + FeatureRealTimeStreaming = 0x0107, + FeatureLogicalUnitSerialNumber = 0x0108, + FeatureMediaSerialNumber = 0x0109, + FeatureDiscControlBlocks = 0x010A, + FeatureDvdCPRM = 0x010B, + FeatureFirmwareDate = 0x010C, + FeatureAACS = 0x010D, + FeatureVCPS = 0x0110, +} FEATURE_NUMBER, *PFEATURE_NUMBER; + +typedef struct _FEATURE_DATA_PROFILE_LIST_EX { + UCHAR ProfileNumber[2]; + UCHAR Current:1; + UCHAR Reserved1:7; + UCHAR Reserved2; +} FEATURE_DATA_PROFILE_LIST_EX, *PFEATURE_DATA_PROFILE_LIST_EX; + +typedef struct _FEATURE_DATA_PROFILE_LIST { + FEATURE_HEADER Header; +#if !defined(__midl) && !defined(__WIDL__) + FEATURE_DATA_PROFILE_LIST_EX Profiles[0]; +#endif +} FEATURE_DATA_PROFILE_LIST, *PFEATURE_DATA_PROFILE_LIST; + +typedef struct _FEATURE_DATA_CORE { + FEATURE_HEADER Header; + UCHAR PhysicalInterface[4]; + UCHAR DeviceBusyEvent:1; + UCHAR INQUIRY2:1; + UCHAR Reserved1:6; + UCHAR Reserved2[3]; +} FEATURE_DATA_CORE, *PFEATURE_DATA_CORE; + +typedef struct _FEATURE_DATA_MORPHING { + FEATURE_HEADER Header; + UCHAR Asynchronous:1; + UCHAR OCEvent:1; + UCHAR Reserved01:6; + UCHAR Reserved2[3]; +} FEATURE_DATA_MORPHING, *PFEATURE_DATA_MORPHING; + +typedef struct _FEATURE_DATA_REMOVABLE_MEDIUM { + FEATURE_HEADER Header; + UCHAR Lockable:1; + UCHAR Reserved1:1; + UCHAR DefaultToPrevent:1; + UCHAR Eject:1; + UCHAR Reserved2:1; + UCHAR LoadingMechanism:3; + UCHAR Reserved3[3]; +} FEATURE_DATA_REMOVABLE_MEDIUM, *PFEATURE_DATA_REMOVABLE_MEDIUM; + +typedef struct _FEATURE_DATA_WRITE_PROTECT { + FEATURE_HEADER Header; + UCHAR SupportsSWPPBit:1; + UCHAR SupportsPersistentWriteProtect:1; + UCHAR WriteInhibitDCB:1; + UCHAR DiscWriteProtectPAC:1; + UCHAR Reserved01:4; + UCHAR Reserved2[3]; +} FEATURE_DATA_WRITE_PROTECT, *PFEATURE_DATA_WRITE_PROTECT; + +typedef struct _FEATURE_DATA_RANDOM_READABLE { + FEATURE_HEADER Header; + UCHAR LogicalBlockSize[4]; + UCHAR Blocking[2]; + UCHAR ErrorRecoveryPagePresent:1; + UCHAR Reserved1:7; + UCHAR Reserved2; +} FEATURE_DATA_RANDOM_READABLE, *PFEATURE_DATA_RANDOM_READABLE; + +typedef struct _FEATURE_DATA_MULTI_READ { + FEATURE_HEADER Header; +} FEATURE_DATA_MULTI_READ, *PFEATURE_DATA_MULTI_READ; + +typedef struct _FEATURE_DATA_CD_READ { + FEATURE_HEADER Header; + UCHAR CDText:1; + UCHAR C2ErrorData:1; + UCHAR Reserved01:5; + UCHAR DigitalAudioPlay:1; + UCHAR Reserved2[3]; +} FEATURE_DATA_CD_READ, *PFEATURE_DATA_CD_READ; + +typedef struct _FEATURE_DATA_DVD_READ { + FEATURE_HEADER Header; + UCHAR Multi110:1; + UCHAR Reserved1:7; + UCHAR Reserved2; + UCHAR DualDashR:1; + UCHAR Reserved3:7; + UCHAR Reserved4; +} FEATURE_DATA_DVD_READ, *PFEATURE_DATA_DVD_READ; + +typedef struct _FEATURE_DATA_RANDOM_WRITABLE { + FEATURE_HEADER Header; + UCHAR LastLBA[4]; + UCHAR LogicalBlockSize[4]; + UCHAR Blocking[2]; + UCHAR ErrorRecoveryPagePresent:1; + UCHAR Reserved1:7; + UCHAR Reserved2; +} FEATURE_DATA_RANDOM_WRITABLE, *PFEATURE_DATA_RANDOM_WRITABLE; + +typedef struct _FEATURE_DATA_INCREMENTAL_STREAMING_WRITABLE { + FEATURE_HEADER Header; + UCHAR DataTypeSupported[2]; + UCHAR BufferUnderrunFree:1; + UCHAR AddressModeReservation:1; + UCHAR TrackRessourceInformation:1; + UCHAR Reserved01:5; + UCHAR NumberOfLinkSizes; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR LinkSize[0]; +#endif +} FEATURE_DATA_INCREMENTAL_STREAMING_WRITABLE, *PFEATURE_DATA_INCREMENTAL_STREAMING_WRITABLE; + +typedef struct _FEATURE_DATA_SECTOR_ERASABLE { + FEATURE_HEADER Header; +} FEATURE_DATA_SECTOR_ERASABLE, *PFEATURE_DATA_SECTOR_ERASABLE; + +typedef struct _FEATURE_DATA_FORMATTABLE { + FEATURE_HEADER Header; + UCHAR FullCertification:1; + UCHAR QuickCertification:1; + UCHAR SpareAreaExpansion:1; + UCHAR RENoSpareAllocated:1; + UCHAR Reserved1:4; + UCHAR Reserved2[3]; + UCHAR RRandomWritable:1; + UCHAR Reserved3:7; + UCHAR Reserved4[3]; +} FEATURE_DATA_FORMATTABLE, *PFEATURE_DATA_FORMATTABLE; + +typedef struct _FEATURE_DATA_DEFECT_MANAGEMENT { + FEATURE_HEADER Header; + UCHAR Reserved1:7; + UCHAR SupplimentalSpareArea:1; + UCHAR Reserved2[3]; +} FEATURE_DATA_DEFECT_MANAGEMENT, *PFEATURE_DATA_DEFECT_MANAGEMENT; + +typedef struct _FEATURE_DATA_WRITE_ONCE { + FEATURE_HEADER Header; + UCHAR LogicalBlockSize[4]; + UCHAR Blocking[2]; + UCHAR ErrorRecoveryPagePresent:1; + UCHAR Reserved1:7; + UCHAR Reserved2; +} FEATURE_DATA_WRITE_ONCE, *PFEATURE_DATA_WRITE_ONCE; + +typedef struct _FEATURE_DATA_RESTRICTED_OVERWRITE { + FEATURE_HEADER Header; +} FEATURE_DATA_RESTRICTED_OVERWRITE, *PFEATURE_DATA_RESTRICTED_OVERWRITE; + +typedef struct _FEATURE_DATA_CDRW_CAV_WRITE { + FEATURE_HEADER Header; + UCHAR Reserved1[4]; +} FEATURE_DATA_CDRW_CAV_WRITE, *PFEATURE_DATA_CDRW_CAV_WRITE; + +typedef struct _FEATURE_DATA_MRW { + FEATURE_HEADER Header; + UCHAR Write:1; + UCHAR DvdPlusRead:1; + UCHAR DvdPlusWrite:1; + UCHAR Reserved01:5; + UCHAR Reserved2[3]; +} FEATURE_DATA_MRW, *PFEATURE_DATA_MRW; + +typedef struct _FEATURE_ENHANCED_DEFECT_REPORTING { + FEATURE_HEADER Header; + UCHAR DRTDMSupported:1; + UCHAR Reserved0:7; + UCHAR NumberOfDBICacheZones; + UCHAR NumberOfEntries[2]; +} FEATURE_ENHANCED_DEFECT_REPORTING, *PFEATURE_ENHANCED_DEFECT_REPORTING; + +typedef struct _FEATURE_DATA_DVD_PLUS_RW { + FEATURE_HEADER Header; + UCHAR Write:1; + UCHAR Reserved1:7; + UCHAR CloseOnly:1; + UCHAR QuickStart:1; + UCHAR Reserved02:6; + UCHAR Reserved03[2]; +} FEATURE_DATA_DVD_PLUS_RW, *PFEATURE_DATA_DVD_PLUS_RW; + +typedef struct _FEATURE_DATA_DVD_PLUS_R { + FEATURE_HEADER Header; + UCHAR Write:1; + UCHAR Reserved1:7; + UCHAR Reserved2[3]; +} FEATURE_DATA_DVD_PLUS_R, *PFEATURE_DATA_DVD_PLUS_R; + +typedef struct _FEATURE_DATA_DVD_RW_RESTRICTED_OVERWRITE { + FEATURE_HEADER Header; + UCHAR Blank:1; + UCHAR Intermediate:1; + UCHAR DefectStatusDataRead:1; + UCHAR DefectStatusDataGenerate:1; + UCHAR Reserved0:4; + UCHAR Reserved1[3]; +} FEATURE_DATA_DVD_RW_RESTRICTED_OVERWRITE, *PFEATURE_DATA_DVD_RW_RESTRICTED_OVERWRITE; + +typedef struct _FEATURE_DATA_CD_TRACK_AT_ONCE { + FEATURE_HEADER Header; + UCHAR RWSubchannelsRecordable:1; + UCHAR CdRewritable:1; + UCHAR TestWriteOk:1; + UCHAR RWSubchannelPackedOk:1; + UCHAR RWSubchannelRawOk:1; + UCHAR Reserved1:1; + UCHAR BufferUnderrunFree:1; + UCHAR Reserved3:1; + UCHAR Reserved2; + UCHAR DataTypeSupported[2]; +} FEATURE_DATA_CD_TRACK_AT_ONCE, *PFEATURE_DATA_CD_TRACK_AT_ONCE; + +typedef struct _FEATURE_DATA_CD_MASTERING { + FEATURE_HEADER Header; + UCHAR RWSubchannelsRecordable:1; + UCHAR CdRewritable:1; + UCHAR TestWriteOk:1; + UCHAR RawRecordingOk:1; + UCHAR RawMultiSessionOk:1; + UCHAR SessionAtOnceOk:1; + UCHAR BufferUnderrunFree:1; + UCHAR Reserved1:1; + UCHAR MaximumCueSheetLength[3]; +} FEATURE_DATA_CD_MASTERING, *PFEATURE_DATA_CD_MASTERING; + +typedef struct _FEATURE_DATA_DVD_RECORDABLE_WRITE { + FEATURE_HEADER Header; + UCHAR Reserved1:1; + UCHAR DVD_RW:1; + UCHAR TestWrite:1; + UCHAR RDualLayer:1; + UCHAR Reserved02:2; + UCHAR BufferUnderrunFree:1; + UCHAR Reserved3:1; + UCHAR Reserved4[3]; +} FEATURE_DATA_DVD_RECORDABLE_WRITE, *PFEATURE_DATA_DVD_RECORDABLE_WRITE; + +typedef struct _FEATURE_DATA_DDCD_READ { + FEATURE_HEADER Header; +} FEATURE_DATA_DDCD_READ, *PFEATURE_DATA_DDCD_READ; + +typedef struct _FEATURE_DATA_DDCD_R_WRITE { + FEATURE_HEADER Header; + UCHAR Reserved1:2; + UCHAR TestWrite:1; + UCHAR Reserved2:5; + UCHAR Reserved3[3]; +} FEATURE_DATA_DDCD_R_WRITE, *PFEATURE_DATA_DDCD_R_WRITE; + +typedef struct _FEATURE_DATA_DDCD_RW_WRITE { + FEATURE_HEADER Header; + UCHAR Blank:1; + UCHAR Intermediate:1; + UCHAR Reserved1:6; + UCHAR Reserved2[3]; +} FEATURE_DATA_DDCD_RW_WRITE, *PFEATURE_DATA_DDCD_RW_WRITE; + +typedef struct _FEATURE_DATA_LAYER_JUMP_RECORDING { + FEATURE_HEADER Header; + UCHAR Reserved0[3]; + UCHAR NumberOfLinkSizes; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR LinkSizes[0]; +#endif +} FEATURE_DATA_LAYER_JUMP_RECORDING, *PFEATURE_DATA_LAYER_JUMP_RECORDING; + +typedef struct _FEATURE_CD_RW_MEDIA_WRITE_SUPPORT { + FEATURE_HEADER Header; + UCHAR Reserved1; + struct{ + UCHAR Subtype0:1; + UCHAR Subtype1:1; + UCHAR Subtype2:1; + UCHAR Subtype3:1; + UCHAR Subtype4:1; + UCHAR Subtype5:1; + UCHAR Subtype6:1; + UCHAR Subtype7:1; + } CDRWMediaSubtypeSupport; + UCHAR Reserved2[2]; +} FEATURE_CD_RW_MEDIA_WRITE_SUPPORT, *PFEATURE_CD_RW_MEDIA_WRITE_SUPPORT; + +typedef struct _FEATURE_BD_R_PSEUDO_OVERWRITE { + FEATURE_HEADER Header; + UCHAR Reserved[4]; +} FEATURE_BD_R_PSEUDO_OVERWRITE, *PFEATURE_BD_R_PSEUDO_OVERWRITE; + +typedef struct _FEATURE_DATA_DVD_PLUS_RW_DUAL_LAYER { + FEATURE_HEADER Header; + UCHAR Write:1; + UCHAR Reserved1:7; + UCHAR CloseOnly:1; + UCHAR QuickStart:1; + UCHAR Reserved2:6; + UCHAR Reserved3[2]; +} FEATURE_DATA_DVD_PLUS_RW_DUAL_LAYER, *PFEATURE_DATA_DVD_PLUS_RW_DUAL_LAYER; + +typedef struct _FEATURE_DATA_DVD_PLUS_R_DUAL_LAYER { + FEATURE_HEADER Header; + UCHAR Write:1; + UCHAR Reserved1:7; + UCHAR Reserved2[3]; +} FEATURE_DATA_DVD_PLUS_R_DUAL_LAYER, *PFEATURE_DATA_DVD_PLUS_R_DUAL_LAYER; + +typedef struct _BD_CLASS_SUPPORT_BITMAP { + UCHAR Version8:1; + UCHAR Version9:1; + UCHAR Version10:1; + UCHAR Version11:1; + UCHAR Version12:1; + UCHAR Version13:1; + UCHAR Version14:1; + UCHAR Version15:1; + UCHAR Version0:1; + UCHAR Version1:1; + UCHAR Version2:1; + UCHAR Version3:1; + UCHAR Version4:1; + UCHAR Version5:1; + UCHAR Version6:1; + UCHAR Version7:1; +} BD_CLASS_SUPPORT_BITMAP, *PBD_CLASS_SUPPORT_BITMAP; + +typedef struct _FEATURE_BD_READ { + FEATURE_HEADER Header; + UCHAR Reserved[4]; + BD_CLASS_SUPPORT_BITMAP Class0BitmapBDREReadSupport; + BD_CLASS_SUPPORT_BITMAP Class1BitmapBDREReadSupport; + BD_CLASS_SUPPORT_BITMAP Class2BitmapBDREReadSupport; + BD_CLASS_SUPPORT_BITMAP Class3BitmapBDREReadSupport; + BD_CLASS_SUPPORT_BITMAP Class0BitmapBDRReadSupport; + BD_CLASS_SUPPORT_BITMAP Class1BitmapBDRReadSupport; + BD_CLASS_SUPPORT_BITMAP Class2BitmapBDRReadSupport; + BD_CLASS_SUPPORT_BITMAP Class3BitmapBDRReadSupport; + BD_CLASS_SUPPORT_BITMAP Class0BitmapBDROMReadSupport; + BD_CLASS_SUPPORT_BITMAP Class1BitmapBDROMReadSupport; + BD_CLASS_SUPPORT_BITMAP Class2BitmapBDROMReadSupport; + BD_CLASS_SUPPORT_BITMAP Class3BitmapBDROMReadSupport; +} FEATURE_BD_READ, *PFEATURE_BD_READ; + +typedef struct _FEATURE_BD_WRITE { + FEATURE_HEADER Header; + UCHAR SupportsVerifyNotRequired:1; + UCHAR Reserved1:7; + UCHAR Reserved2[3]; + BD_CLASS_SUPPORT_BITMAP Class0BitmapBDREWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class1BitmapBDREWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class2BitmapBDREWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class3BitmapBDREWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class0BitmapBDRWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class1BitmapBDRWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class2BitmapBDRWriteSupport; + BD_CLASS_SUPPORT_BITMAP Class3BitmapBDRWriteSupport; +} FEATURE_BD_WRITE, *PFEATURE_BD_WRITE; + +typedef struct _FEATURE_TSR { + FEATURE_HEADER Header; +} FEATURE_TSR, *PFEATURE_TSR; + +typedef struct _FEATURE_DATA_HDDVD_READ { + FEATURE_HEADER Header; + UCHAR Recordable:1; + UCHAR Reserved0:7; + UCHAR Reserved1; + UCHAR Rewritable:1; + UCHAR Reserved2:7; + UCHAR Reserved3; +} FEATURE_DATA_HDDVD_READ, *PFEATURE_DATA_HDDVD_READ; + +typedef struct _FEATURE_DATA_HDDVD_WRITE { + FEATURE_HEADER Header; + UCHAR Recordable:1; + UCHAR Reserved0:7; + UCHAR Reserved1; + UCHAR Rewritable:1; + UCHAR Reserved2:7; + UCHAR Reserved3; +} FEATURE_DATA_HDDVD_WRITE, *PFEATURE_DATA_HDDVD_WRITE; + +typedef struct _FEATURE_HYBRID_DISC { + FEATURE_HEADER Header; + UCHAR ResetImmunity:1; + UCHAR Reserved1:7; + UCHAR Reserved2[3]; +} FEATURE_HYBRID_DISC, *PFEATURE_HYBRID_DISC; + +typedef struct _FEATURE_DATA_POWER_MANAGEMENT { + FEATURE_HEADER Header; +} FEATURE_DATA_POWER_MANAGEMENT, *PFEATURE_DATA_POWER_MANAGEMENT; + +typedef struct _FEATURE_DATA_SMART { + FEATURE_HEADER Header; + UCHAR FaultFailureReportingPagePresent:1; + UCHAR Reserved1:7; + UCHAR Reserved02[3]; +} FEATURE_DATA_SMART, *PFEATURE_DATA_SMART; + +typedef struct _FEATURE_DATA_EMBEDDED_CHANGER { + FEATURE_HEADER Header; + UCHAR Reserved1:2; + UCHAR SupportsDiscPresent:1; + UCHAR Reserved2:1; + UCHAR SideChangeCapable:1; + UCHAR Reserved3:3; + UCHAR Reserved4[2]; + UCHAR HighestSlotNumber:5; + UCHAR Reserved:3; +} FEATURE_DATA_EMBEDDED_CHANGER, *PFEATURE_DATA_EMBEDDED_CHANGER; + +typedef struct _FEATURE_DATA_CD_AUDIO_ANALOG_PLAY { + FEATURE_HEADER Header; + UCHAR SeperateVolume:1; + UCHAR SeperateChannelMute:1; + UCHAR ScanSupported:1; + UCHAR Reserved1:5; + UCHAR Reserved2; + UCHAR NumerOfVolumeLevels[2]; +} FEATURE_DATA_CD_AUDIO_ANALOG_PLAY, *PFEATURE_DATA_CD_AUDIO_ANALOG_PLAY; + +typedef struct _FEATURE_DATA_MICROCODE_UPDATE { + FEATURE_HEADER Header; + UCHAR M5:1; + UCHAR Reserved1:7; + UCHAR Reserved2[3]; +} FEATURE_DATA_MICROCODE_UPDATE, *PFEATURE_DATA_MICROCODE_UPDATE; + +typedef struct _FEATURE_DATA_TIMEOUT { + FEATURE_HEADER Header; + UCHAR Group3:1; + UCHAR Reserved1:7; + UCHAR Reserved2; + UCHAR UnitLength[2]; +} FEATURE_DATA_TIMEOUT, *PFEATURE_DATA_TIMEOUT; + +typedef struct _FEATURE_DATA_DVD_CSS { + FEATURE_HEADER Header; + UCHAR Reserved1[3]; + UCHAR CssVersion; +} FEATURE_DATA_DVD_CSS, *PFEATURE_DATA_DVD_CSS; + +typedef struct _FEATURE_DATA_REAL_TIME_STREAMING { + FEATURE_HEADER Header; + UCHAR StreamRecording:1; + UCHAR WriteSpeedInGetPerf:1; + UCHAR WriteSpeedInMP2A:1; + UCHAR SetCDSpeed:1; + UCHAR ReadBufferCapacityBlock:1; + UCHAR Reserved1:3; + UCHAR Reserved2[3]; +} FEATURE_DATA_REAL_TIME_STREAMING, *PFEATURE_DATA_REAL_TIME_STREAMING; + +typedef struct _FEATURE_DATA_LOGICAL_UNIT_SERIAL_NUMBER { + FEATURE_HEADER Header; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR SerialNumber[0]; +#endif +} FEATURE_DATA_LOGICAL_UNIT_SERIAL_NUMBER, *PFEATURE_DATA_LOGICAL_UNIT_SERIAL_NUMBER; + +typedef struct _FEATURE_MEDIA_SERIAL_NUMBER { + FEATURE_HEADER Header; +} FEATURE_MEDIA_SERIAL_NUMBER, *PFEATURE_MEDIA_SERIAL_NUMBER; + +typedef struct _FEATURE_DATA_DISC_CONTROL_BLOCKS_EX { + UCHAR ContentDescriptor[4]; +} FEATURE_DATA_DISC_CONTROL_BLOCKS_EX, *PFEATURE_DATA_DISC_CONTROL_BLOCKS_EX; + +typedef struct _FEATURE_DATA_DISC_CONTROL_BLOCKS { + FEATURE_HEADER Header; +#if !defined(__midl) && !defined(__WIDL__) + FEATURE_DATA_DISC_CONTROL_BLOCKS_EX Data[0]; +#endif +} FEATURE_DATA_DISC_CONTROL_BLOCKS, *PFEATURE_DATA_DISC_CONTROL_BLOCKS; + +typedef struct _FEATURE_DATA_DVD_CPRM { + FEATURE_HEADER Header; + UCHAR Reserved0[3]; + UCHAR CPRMVersion; +} FEATURE_DATA_DVD_CPRM, *PFEATURE_DATA_DVD_CPRM; + +typedef struct _FEATURE_DATA_FIRMWARE_DATE { + FEATURE_HEADER Header; + UCHAR Year[4]; + UCHAR Month[2]; + UCHAR Day[2]; + UCHAR Hour[2]; + UCHAR Minute[2]; + UCHAR Seconds[2]; + UCHAR Reserved[2]; +} FEATURE_DATA_FIRMWARE_DATE, *PFEATURE_DATA_FIRMWARE_DATE; + +typedef struct _FEATURE_DATA_AACS { + FEATURE_HEADER Header; + UCHAR BindingNonceGeneration:1; + UCHAR Reserved0:7; + UCHAR BindingNonceBlockCount; + UCHAR NumberOfAGIDs:4; + UCHAR Reserved1:4; + UCHAR AACSVersion; +} FEATURE_DATA_AACS, *PFEATURE_DATA_AACS; + +typedef struct _FEATURE_VCPS { + FEATURE_HEADER Header; + UCHAR Reserved[4]; +} FEATURE_VCPS, *PFEATURE_VCPS; + +typedef struct _FEATURE_DATA_RESERVED { + FEATURE_HEADER Header; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR Data[0]; +#endif +} FEATURE_DATA_RESERVED, *PFEATURE_DATA_RESERVED; + +typedef struct _FEATURE_DATA_VENDOR_SPECIFIC { + FEATURE_HEADER Header; +#if !defined(__midl) && !defined(__WIDL__) + UCHAR VendorSpecificData[0]; +#endif +} FEATURE_DATA_VENDOR_SPECIFIC, *PFEATURE_DATA_VENDOR_SPECIFIC; + +typedef struct _GET_CONFIGURATION_IOCTL_INPUT { + FEATURE_NUMBER Feature; + ULONG RequestType; + PVOID Reserved[2]; +} GET_CONFIGURATION_IOCTL_INPUT, *PGET_CONFIGURATION_IOCTL_INPUT; + +#if defined(_WIN64) +typedef struct _GET_CONFIGURATION_IOCTL_INPUT32 { + FEATURE_NUMBER Feature; + ULONG RequestType; + VOID* UPOINTER_32 Reserved[2]; +} GET_CONFIGURATION_IOCTL_INPUT32, *PGET_CONFIGURATION_IOCTL_INPUT32; +#endif + +#ifdef __cplusplus +} +#endif Propchange: trunk/reactos/include/psdk/ntddmmc.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 48876: [CMAKE] Add add_minicd_target and add_minicd macros.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 15:36:17 2010 New Revision: 48876 URL: http://svn.reactos.org/svn/reactos?rev=48876&view=rev Log: [CMAKE] Add add_minicd_target and add_minicd macros. Modified: branches/cmake-bringup/CMakeMacros.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 Sep 25 15:36:17 2010 @@ -1,4 +1,4 @@ - + MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) # Add the precompiled header to the build @@ -56,6 +56,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) get_filename_component(OBJECT_PATH ${_object_file} PATH) + get_filename_component(OBJECT_NAME ${_object_file} NAME) file(MAKE_DIRECTORY ${OBJECT_PATH}) get_directory_property(defines COMPILE_DEFINITIONS) get_directory_property(includes INCLUDE_DIRECTORIES) @@ -114,3 +115,27 @@ ENDFOREACH() ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) ENDMACRO() + +MACRO(add_minicd_target _targetname _dir _nameoncd) + get_target_property(FILENAME ${_targetname} LOCATION) + + add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd/${_dir}/${_nameoncd} + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + + add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(${_targetname}_minicd ${_targetname}) + add_dependencies(minicd ${_targetname}_minicd) +ENDMACRO(add_minicd_target _targetname _dir _nameoncd) + +MACRO(add_minicd FILENAME _dir _nameoncd) + add_custom_command( + OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd} + DEPENDS ${FILENAME} + COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + + add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) + + add_dependencies(minicd ${_nameoncd}_minicd) +ENDMACRO(add_minicd)

1 0

[jgardou] 48875: [CMAKE] - improve cacls build file - add charmap, dbgprint, doskey, find, hostname, lodctr, more, reg and xcopy build files - add win32cui module type to msc toolchain find is comm...
by jgardou＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: jgardou Date: Sat Sep 25 15:31:18 2010 New Revision: 48875 URL: http://svn.reactos.org/svn/reactos?rev=48875&view=rev Log: [CMAKE] - improve cacls build file - add charmap, dbgprint, doskey, find, hostname, lodctr, more, reg and xcopy build files - add win32cui module type to msc toolchain find is commented out for now. Added: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libloadperf.a (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,8 +1,8 @@ add_subdirectory(cacls) add_subdirectory(calc) -#add_subdirectory(charmap) -#add_subdirectory(cmdutils) +add_subdirectory(charmap) +add_subdirectory(cmdutils) #add_subdirectory(control) #add_subdirectory(dxdiag) #add_subdirectory(extrac32) Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,5 +1,3 @@ - -add_definitions(-DUNICODE -D_UNICODE) add_executable(cacls cacls.c @@ -7,6 +5,8 @@ set_module_type(cacls win32cui) +set_unicode(cacls yes) + add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) add_dependencies(cacls psdk) Added: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,19 @@ + +list(APPEND SOURCE + about.c + charmap.c + lrgcell.c + map.c + charmap.rc) + +add_executable(charmap + ${CMAKE_CURRENT_BINARY_DIR}/charmap_precomp.h.gch + ${SOURCE}) + +add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_unicode(charmap yes) + +set_module_type(charmap win32gui) + +add_importlibs(charmap user32 gdi32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,9 +1,8 @@ - -#add_subdirectory(dbgprint) -#add_subdirectory(doskey) +add_subdirectory(dbgprint) +add_subdirectory(doskey) #add_subdirectory(find) -#add_subdirectory(hostname) -#add_subdirectory(lodctr) -#add_subdirectory(more) -#add_subdirectory(reg) -#add_subdirectory(xcopy) +add_subdirectory(hostname) +add_subdirectory(lodctr) +add_subdirectory(more) +add_subdirectory(reg) +add_subdirectory(xcopy) Added: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,7 @@ +add_executable(dbgprint dbgprint.c) + +set_module_type(dbgprint win32cui) + +set_unicode(dbgprint no) + +add_importlibs(dbgprint msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,9 @@ +add_executable(doskey + doskey.c + doskey.rc) + +set_module_type(doskey win32cui) + +set_unicode(doskey yes) + +add_importlibs(doskey user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,9 @@ +add_executable(find + find.c + find.rc) + +set_module_type(find win32cui) + +set_unicode(find no) + +add_importlibs(find user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,9 @@ +add_executable(hostname + hostname.c + hostname.rc) + +set_module_type(hostname win32cui) + +set_unicode(hostname no) + +add_importlibs(hostname msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,7 @@ +add_executable(lodctr lodctr_main.c) + +set_module_type(lodctr win32cui) + +set_unicode(lodctr yes) + +add_importlibs(lodctr loadperf msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,9 @@ +add_executable(more + more.c + more.rc) + +set_module_type(more win32cui) + +set_unicode(more no) + +add_importlibs(more ntdll user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,11 @@ +add_definitions(-D_WIN32_WINNT=0x600) + +add_executable(reg + reg.c + rsrc.rc) + +set_module_type(reg win32cui) + +set_unicode(reg yes) + +add_importlibs(reg advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -1,0 +1,11 @@ +add_executable(xcopy + xcopy.c + rsrc.rc) + +set_module_type(xcopy win32cui) + +set_unicode(xcopy yes) + +add_importlibs(xcopy shell32 user32 msvcrt) + +target_link_libraries(xcopy wine) Propchange: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libloadperf.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libloa… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libloadperf.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Sep 25 15:31:18 2010 @@ -36,6 +36,10 @@ if (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) endif () + if (${TYPE} MATCHES win32cui) + set_subsystem(${MODULE} windows) + set_entrypoint(${MODULE} mainCRTStartup) + endif () endmacro() endif()

1 0

[akhaldi] 48874: [PSDK] - Add some missing IOCTL_* definitions.
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 14:45:03 2010 New Revision: 48874 URL: http://svn.reactos.org/svn/reactos?rev=48874&view=rev Log: [PSDK] - Add some missing IOCTL_* definitions. Modified: trunk/reactos/include/psdk/ntddcdrm.h trunk/reactos/include/psdk/ntddcdvd.h Modified: trunk/reactos/include/psdk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddcdrm.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] Sat Sep 25 14:45:03 2010 @@ -37,11 +37,17 @@ #define IOCTL_CDROM_FIND_NEW_DEVICES \ CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CDROM_GET_CONFIGURATION \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_CDROM_GET_CONTROL \ CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_GET_DRIVE_GEOMETRY \ CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX \ + CTL_CODE(IOCTL_CDROM_BASE, 0x0014, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_GET_LAST_SESSION \ CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) Modified: trunk/reactos/include/psdk/ntddcdvd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddcdvd.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddcdvd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddcdvd.h [iso-8859-1] Sat Sep 25 14:45:03 2010 @@ -31,11 +31,17 @@ #define IOCTL_DVD_BASE FILE_DEVICE_DVD +#define IOCTL_STORAGE_SET_READ_AHEAD \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0100, METHOD_BUFFERED, FILE_READ_ACCESS) + #define IOCTL_DVD_END_SESSION \ CTL_CODE(IOCTL_DVD_BASE, 0x0403, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DVD_GET_REGION \ CTL_CODE(IOCTL_DVD_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_DVD_SEND_KEY2 \ + CTL_CODE(IOCTL_DVD_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_DVD_READ_KEY \ CTL_CODE(IOCTL_DVD_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)

1 0

[akhaldi] 48873: [CMAKE] - Improve acpi, isapnp, pci, pcix and pcmcia (import libs, dependencies...etc)
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 14:39:51 2010 New Revision: 48873 URL: http://svn.reactos.org/svn/reactos?rev=48873&view=rev Log: [CMAKE] - Improve acpi, isapnp, pci, pcix and pcmcia (import libs, dependencies...etc) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:39:51 2010 @@ -1,5 +1,3 @@ - - include_directories(include) include_directories(acpica/include) @@ -143,8 +141,7 @@ target_link_libraries(acpi wdmguid - acpica - -lntoskrnl - -lhal) + acpica) +add_importlibs(acpi ntoskrnl hal) add_dependencies(acpi psdk bugcodes) Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn… ============================================================================== --- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:39:51 2010 @@ -1,5 +1,3 @@ - - add_library(isapnp SHARED isapnp.c @@ -10,8 +8,5 @@ set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") -target_link_libraries(isapnp - -lntoskrnl - -lhal) - -add_dependencies(isapnp psdk bugcodes) +add_importlibs(isapnp ntoskrnl hal) +add_dependencies(isapnp psdk bugcodes buildno_header) Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:39:51 2010 @@ -1,5 +1,3 @@ - - add_library(pci SHARED fdo.c @@ -9,8 +7,5 @@ set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") -target_link_libraries(pci - -lntoskrnl - -lhal) - +add_importlibs(pci ntoskrnl hal) add_dependencies(pci psdk bugcodes buildno_header) Modified: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:39:51 2010 @@ -1,5 +1,3 @@ - - list(APPEND SOURCE arb/ar_busno.c @@ -42,9 +40,7 @@ set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") -target_link_libraries(pcix - -lntoskrnl - -lhal) +add_importlibs(pcix ntoskrnl hal) add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) -add_dependencies(pcix pcix_def psdk pciclass) +add_dependencies(pcix pcix_def psdk pciclass buildno_header) Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:39:51 2010 @@ -1,5 +1,3 @@ - - add_library(pcmcia SHARED fdo.c @@ -9,8 +7,5 @@ set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") -target_link_libraries(pcmcia - -lntoskrnl - -lhal) - +add_importlibs(pcmcia ntoskrnl hal) add_dependencies(pcmcia psdk bugcodes buildno_header)

1 0

[akhaldi] 48872: [CMAKE] - Improve uuid and add psdk dependency.
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 14:30:47 2010 New Revision: 48872 URL: http://svn.reactos.org/svn/reactos?rev=48872&view=rev Log: [CMAKE] - Improve uuid and add psdk dependency. Modified: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/CMak… ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:30:47 2010 @@ -1,3 +1,3 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(uuid ${SOURCE}) +add_library(uuid uuid.c) +add_dependencies(uuid psdk)

1 0

[spetreolle] 48871: [CMAKE] Add set_unicode macro. Add win32dll module type. Set CMAKE_CXX_LINK_EXECUTABLE. Clear CMAKE_CXX_STANDARD_LIBRARIES. Improve calc.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 14:22:16 2010 New Revision: 48871 URL: http://svn.reactos.org/svn/reactos?rev=48871&view=rev Log: [CMAKE] Add set_unicode macro. Add win32dll module type. Set CMAKE_CXX_LINK_EXECUTABLE. Clear CMAKE_CXX_STANDARD_LIBRARIES. Improve calc. Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Sep 25 14:22:16 2010 @@ -12,7 +12,7 @@ resource.rc) set_module_type(calc win32gui) - +set_unicode(calc yes) add_importlibs(calc advapi32 user32 gdi32 msvcrt) add_dependencies(calc psdk) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Sep 25 14:22:16 2010 @@ -10,6 +10,7 @@ # Linking link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -lstdc++ -lsupc++ -lgcc -lmingwex -lmingw32 <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") # Compiler Core @@ -30,7 +31,7 @@ add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) # C++ Flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") # Macros macro(set_entrypoint MODULE ENTRYPOINT) @@ -48,20 +49,38 @@ endmacro() macro(set_module_type MODULE TYPE) - target_link_libraries(${MODULE} mingw_wmain mingw_common) + + add_dependencies(${MODULE} builno_header psdk) + if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) endif() if(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} wWinMainCRTStartup) + set_entrypoint(${MODULE} WinMainCRTStartup) endif() if(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} mainCRTStartup) endif() + if(${TYPE} MATCHES win32dll) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) + set_entrypoint(${MODULE} DllMain@12) + endif() endmacro() endif() +macro(set_unicode MODULE STATE) + if(${STATE} MATCHES yes) + add_definitions(-DUNICODE -D_UNICODE) + target_link_libraries(${MODULE} mingw_wmain) + else() + target_link_libraries(${MODULE} mingw_main) + endif() + + target_link_libraries(${MODULE} mingw_common) +endmacro() + + Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sat Sep 25 14:22:16 2010 @@ -32,7 +32,11 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc") + +MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) +set(CMAKE_CXX_STANDARD_LIBRARIES "") + if(ARCH MATCHES i386) set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") elseif(ARCH MATCHES amd64)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

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