Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[akhaldi] 68157: [UDFS] Remove definitions that exist in platform headers and use those instead.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 21:19:04 2015 New Revision: 68157 URL: http://svn.reactos.org/svn/reactos?rev=68157&view=rev Log: [UDFS] Remove definitions that exist in platform headers and use those instead. Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_hw.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -3540,36 +3540,6 @@ // DVD structure blocks -typedef struct _DVD_DESCRIPTOR_HEADER { - UCHAR Length[2]; - UCHAR Reserved[2]; -} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER; - -typedef struct _DVD_LAYER_DESCRIPTOR { - DVD_DESCRIPTOR_HEADER Header; -// UCHAR Length[2]; - UCHAR BookVersion : 4; // Part Version - UCHAR BookType : 4; // Disk Category - - UCHAR MinimumRate : 4; - UCHAR DiskSize : 4; - - UCHAR LayerType : 4; - UCHAR TrackPath : 1; - UCHAR NumberOfLayers : 2; - UCHAR Reserved1 : 1; - - UCHAR TrackDensity : 4; - UCHAR LinearDensity : 4; - - UCHAR StartingDataSector[4]; - UCHAR EndDataSector[4]; - UCHAR EndLayerZeroSector[4]; - UCHAR Reserved5 : 7; - UCHAR BCAFlag : 1; - UCHAR Reserved6; -} DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR; - #define DvdBookType_ROM 0 #define DvdBookType_RAM 1 #define DvdBookType_R 2 @@ -3649,21 +3619,6 @@ CDVD_KEY_DATA TitleKey; } CDVD_TITLE_KEY_HEADER, *PCDVD_TITLE_KEY_HEADER; -typedef struct _DVD_COPYRIGHT_DESCRIPTOR { - UCHAR CopyrightProtectionType; - UCHAR RegionManagementInformation; - UCHAR Reserved[2]; -} DVD_COPYRIGHT_DESCRIPTOR, *PDVD_COPYRIGHT_DESCRIPTOR; - -typedef struct _DVD_RPC_KEY { - UCHAR UserResetsAvailable:3; - UCHAR ManufacturerResetsAvailable:3; - UCHAR TypeCode:2; - UCHAR RegionMask; - UCHAR RpcScheme; - UCHAR Reserved2[1]; -} DVD_RPC_KEY, * PDVD_RPC_KEY; - #pragma pack(pop) #endif //__CDRW_DEVICE_H__ Modified: trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CDRW/cdrw_usr.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -29,6 +29,9 @@ #include "cdrw_hw.h" //#include "ntdddisk.h" +#include <ntddcdrm.h> +#include <ntddcdvd.h> + #ifndef CTL_CODE #pragma pack(push, 8) #include "winioctl.h" @@ -53,62 +56,9 @@ #define FILE_DEVICE_CDRW 0x00000999 #endif -#ifndef FILE_DEVICE_CD_ROM -#define FILE_DEVICE_CD_ROM 0x00000002 -#endif //FILE_DEVICE_CD_ROM - -#ifndef IOCTL_CDROM_BASE -#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM -#endif //IOCTL_CDROM_BASE - -#ifndef FILE_DEVICE_DVD -#define FILE_DEVICE_DVD 0x00000033 -#endif //FILE_DEVICE_DVD - -#ifndef IOCTL_DVD_BASE -#define IOCTL_DVD_BASE FILE_DEVICE_DVD -#endif //IOCTL_DVD_BASE - -#ifndef FILE_DEVICE_DISK -#define FILE_DEVICE_DISK 0x00000007 -#endif //FILE_DEVICE_DISK - -#ifndef IOCTL_DISK_BASE -#define IOCTL_DISK_BASE FILE_DEVICE_DISK -#endif //IOCTL_DISK_BASE - -#ifndef IOCTL_CDROM_UNLOAD_DRIVER -#define IOCTL_CDROM_UNLOAD_DRIVER CTL_CODE(IOCTL_CDROM_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_TOC CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_CONTROL CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_PLAY_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SEEK_AUDIO_MSF CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_STOP_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_PAUSE_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESUME_AUDIO CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_SET_VOLUME CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_READ_Q_CHANNEL CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_LAST_SESSION CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RAW_READ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS) -#define IOCTL_CDROM_DISK_TYPE CTL_CODE(IOCTL_CDROM_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_CDROM_CHECK_VERIFY CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_MEDIA_REMOVAL CTL_CODE(IOCTL_CDROM_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_EJECT_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_LOAD_MEDIA CTL_CODE(IOCTL_CDROM_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RESERVE CTL_CODE(IOCTL_CDROM_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, 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_READ_TOC_EX CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CDROM_GET_CONFIGURATION CTL_CODE(IOCTL_CDROM_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS) - -#endif //IOCTL_CDROM_UNLOAD_DRIVER #ifdef CDRW_RESTRICT_ACCESS @@ -1378,12 +1328,6 @@ //********************************************************************************************** -typedef enum _TRACK_MODE_TYPE { - YellowMode2, - XAForm2, - CDDA -} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE; - typedef struct _RAW_READ_USER_IN { LARGE_INTEGER DiskOffset; ULONG SectorCount; @@ -1406,49 +1350,6 @@ #define AudioStatus_PlayError 0x14 #define AudioStatus_NoStatus 0x15 -typedef struct _SUB_Q_HEADER { - UCHAR Reserved; - UCHAR AudioStatus; - UCHAR DataLength[2]; -} SUB_Q_HEADER, *PSUB_Q_HEADER; - -typedef struct _SUB_Q_CURRENT_POSITION { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Control : 4; - UCHAR ADR : 4; - UCHAR TrackNumber; - UCHAR IndexNumber; - UCHAR AbsoluteAddress[4]; - UCHAR TrackRelativeAddress[4]; -} SUB_Q_CURRENT_POSITION, *PSUB_Q_CURRENT_POSITION; - -typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved[3]; - UCHAR Reserved1 : 7; - UCHAR Mcval : 1; - UCHAR MediaCatalog[15]; -} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER; - -typedef struct _SUB_Q_TRACK_ISRC { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved0; - UCHAR Track; - UCHAR Reserved1; - UCHAR Reserved2 : 7; - UCHAR Tcval : 1; - UCHAR TrackIsrc[15]; -} SUB_Q_TRACK_ISRC, *PSUB_Q_TRACK_ISRC; - -typedef union _SUB_Q_CHANNEL_DATA_USER_OUT { - SUB_Q_CURRENT_POSITION CurrentPosition; - SUB_Q_MEDIA_CATALOG_NUMBER MediaCatalog; - SUB_Q_TRACK_ISRC TrackIsrc; -} SUB_Q_CHANNEL_DATA_USER_OUT, *PSUB_Q_CHANNEL_DATA_USER_OUT; - #define IOCTL_CDROM_SUB_Q_CHANNEL 0x00 #define IOCTL_CDROM_CURRENT_POSITION 0x01 #define IOCTL_CDROM_MEDIA_CATALOG 0x02 @@ -1491,18 +1392,6 @@ typedef READ_TOC_CD_TEXT READ_CD_TEXT_USER_OUT; typedef PREAD_TOC_CD_TEXT PREAD_CD_TEXT_USER_OUT; - -//********************************************************************************************** - -typedef struct _VOLUME_CONTROL { - UCHAR PortVolume[4]; -} VOLUME_CONTROL, *PVOLUME_CONTROL; - -typedef VOLUME_CONTROL VOLUME_CONTROL_USER_IN; -typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_IN; - -typedef VOLUME_CONTROL VOLUME_CONTROL_USER_OUT; -typedef PVOLUME_CONTROL PVOLUME_CONTROL_USER_OUT; //********************************************************************************************** @@ -1652,18 +1541,6 @@ //********************************************************************************************** - -//********************************************************************************************** - -typedef enum DVD_STRUCTURE_FORMAT { - DvdPhysicalDescriptor, - DvdCopyrightDescriptor, - DvdDiskKeyDescriptor, - DvdBCADescriptor, - DvdManufacturerDescriptor, - DvdMaxDescriptor -} DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT; - typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID; typedef struct _DVD_READ_STRUCTURE_USER_IN { @@ -1686,18 +1563,6 @@ } DVD_START_SESSION_USER_OUT, *PDVD_START_SESSION_USER_OUT; //********************************************************************************************** - -typedef enum { - DvdChallengeKey = 0x01, - DvdBusKey1, - DvdBusKey2, - DvdTitleKey, - DvdAsf, - DvdSetRpcKey = 0x6, - DvdGetRpcKey = 0x8, - DvdDiskKey = 0x80, - DvdInvalidateAGID = 0x3f -} DVD_KEY_TYPE; typedef struct _DVD_READ_KEY_USER_IN { ULONG KeyLength; @@ -1711,9 +1576,6 @@ // UCHAR KeyData[0]; } DVD_READ_KEY_USER_IN, *PDVD_READ_KEY_USER_IN; -typedef DVD_READ_KEY_USER_IN DVD_COPY_PROTECT_KEY; -typedef PDVD_READ_KEY_USER_IN PDVD_COPY_PROTECT_KEY; - typedef DVD_READ_KEY_USER_IN DVD_READ_KEY_USER_OUT; typedef PDVD_READ_KEY_USER_IN PDVD_READ_KEY_USER_OUT; @@ -1721,16 +1583,6 @@ typedef DVD_START_SESSION_USER_OUT DVD_END_SESSION_USER_IN; typedef PDVD_START_SESSION_USER_OUT PDVD_END_SESSION_USER_IN; - -//********************************************************************************************** - -typedef DVD_READ_KEY_USER_IN DVD_SEND_KEY_USER_IN; -typedef PDVD_READ_KEY_USER_IN PDVD_SEND_KEY_USER_IN; - -typedef struct _DVD_SET_RPC_KEY { - UCHAR PreferredDriveRegionCode; - UCHAR Reserved[3]; -} DVD_SET_RPC_KEY, * PDVD_SET_RPC_KEY; //********************************************************************************************** @@ -1760,9 +1612,6 @@ ULONG DiskData; } CDROM_DISK_DATA_USER_OUT, *PCDROM_DISK_DATA_USER_OUT; - -#define CDROM_DISK_AUDIO_TRACK (0x00000001) -#define CDROM_DISK_DATA_TRACK (0x00000002) //********************************************************************************************** Modified: trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/nt_native.h [iso-8859-1] Mon Jun 15 21:19:04 2015 @@ -577,50 +577,6 @@ #define DEVICE_TYPE ULONG -#define FILE_DEVICE_BEEP 0x00000001 -#define FILE_DEVICE_CD_ROM 0x00000002 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 -#define FILE_DEVICE_CONTROLLER 0x00000004 -#define FILE_DEVICE_DATALINK 0x00000005 -#define FILE_DEVICE_DFS 0x00000006 -#define FILE_DEVICE_DISK 0x00000007 -#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 -#define FILE_DEVICE_FILE_SYSTEM 0x00000009 -#define FILE_DEVICE_INPORT_PORT 0x0000000a -#define FILE_DEVICE_KEYBOARD 0x0000000b -#define FILE_DEVICE_MAILSLOT 0x0000000c -#define FILE_DEVICE_MIDI_IN 0x0000000d -#define FILE_DEVICE_MIDI_OUT 0x0000000e -#define FILE_DEVICE_MOUSE 0x0000000f -#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 -#define FILE_DEVICE_NAMED_PIPE 0x00000011 -#define FILE_DEVICE_NETWORK 0x00000012 -#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 -#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 -#define FILE_DEVICE_NULL 0x00000015 -#define FILE_DEVICE_PARALLEL_PORT 0x00000016 -#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 -#define FILE_DEVICE_PRINTER 0x00000018 -#define FILE_DEVICE_SCANNER 0x00000019 -#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a -#define FILE_DEVICE_SERIAL_PORT 0x0000001b -#define FILE_DEVICE_SCREEN 0x0000001c -#define FILE_DEVICE_SOUND 0x0000001d -#define FILE_DEVICE_STREAMS 0x0000001e -#define FILE_DEVICE_TAPE 0x0000001f -#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 -#define FILE_DEVICE_TRANSPORT 0x00000021 -#define FILE_DEVICE_UNKNOWN 0x00000022 -#define FILE_DEVICE_VIDEO 0x00000023 -#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 -#define FILE_DEVICE_WAVE_IN 0x00000025 -#define FILE_DEVICE_WAVE_OUT 0x00000026 -#define FILE_DEVICE_8042_PORT 0x00000027 -#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 -#define FILE_DEVICE_BATTERY 0x00000029 -#define FILE_DEVICE_BUS_EXTENDER 0x0000002a -#define FILE_DEVICE_MODEM 0x0000002b -#define FILE_DEVICE_VDM 0x0000002c // // Macro definition for defining IOCTL and FSCTL function control codes. Note // that function codes 0-2047 are reserved for Microsoft Corporation, and

9 years, 6 months

[ekohl] 68156: [USETUP] Fix broken filesystem detection. - Treat FAT32 filesystems like FAT filesystems because we do not provide a FAT32 entry in the filesystemlist. - HACK: Do not try to check an...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jun 15 20:47:30 2015 New Revision: 68156 URL: http://svn.reactos.org/svn/reactos?rev=68156&view=rev Log: [USETUP] Fix broken filesystem detection. - Treat FAT32 filesystems like FAT filesystems because we do not provide a FAT32 entry in the filesystemlist. - HACK: Do not try to check an unidentified filesystem. CORE-9815 #resolve Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jun 15 20:47:30 2015 @@ -2938,20 +2938,17 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); CurrentFileSystem = PartEntry->FileSystem; - if (CurrentFileSystem->FileSystemName == NULL) + if (CurrentFileSystem == NULL || CurrentFileSystem->FileSystemName == NULL) { if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) + (PartEntry->PartitionType == PARTITION_XINT13) || + (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) { FileSystemName = L"FAT"; } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - FileSystemName = L"FAT32"; - } else if (PartEntry->PartitionType == PARTITION_EXT2) { FileSystemName = L"EXT2"; @@ -2960,13 +2957,22 @@ { FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ } + + DPRINT("FileSystemName: %S\n", FileSystemName); if (FileSystemName != NULL) CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); } - if (CurrentFileSystem == NULL || CurrentFileSystem->ChkdskFunc == NULL) + /* HACK: Do not try to check a partition with an unknown filesytem */ + if (CurrentFileSystem == NULL) + { + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; + } + + if (CurrentFileSystem->ChkdskFunc == NULL) { sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n"

9 years, 6 months

[akhaldi] 68155: [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 20:42:08 2015 New Revision: 68155 URL: http://svn.reactos.org/svn/reactos?rev=68155&view=rev Log: [THEMEUI] Revert r67304 (Leverage add_registry_inf() as suggested by Timo). Figuring out why that doesn't work is left as an exercise for the reader. See CORE-5984 for details. Removed: trunk/reactos/dll/win32/themeui/themeui_reg.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/themeui/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Mon Jun 15 20:42:08 2015 @@ -284,6 +284,18 @@ HKCR,"sysfile","NoOpen",0x00000000,"" HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; MS Styles (Themes) +HKCR,".msstyles","",0x00000000,"msstylesfile" +HKCR,"msstylesfile","",0x00000000,"Visual Style File" +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" + +; Theme File +HKCR,".theme","",0x00000000,"themefile" +HKCR,"themefile","",0x00000000,"Theme File" +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" Modified: trunk/reactos/dll/win32/themeui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/themeui/CMakeLists.txt [iso-8859-1] Mon Jun 15 20:42:08 2015 @@ -1,5 +1,4 @@ add_library(themeui SHARED themeui.rc) set_module_type(themeui win32dll ENTRYPOINT 0) -add_registry_inf(themeui_reg.inf) add_cd_file(TARGET themeui DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/themeui/themeui_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui_… ============================================================================== --- trunk/reactos/dll/win32/themeui/themeui_reg.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/themeui/themeui_reg.inf (removed) @@ -1,11 +0,0 @@ -; MS Styles (Themes) -HKCR,".msstyles","",0x00000000,"msstylesfile" -HKCR,"msstylesfile","",0x00000000,"Visual Style File" -HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" - -; Theme File -HKCR,".theme","",0x00000000,"themefile" -HKCR,"themefile","",0x00000000,"Theme File" -HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" -HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1"""

9 years, 6 months

[akhaldi] 68154: [CMAKE] Use a separate set for the optimization level in GCC release builds. We should revisit this to see if we need this rbuild era block nowadays.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 18:59:46 2015 New Revision: 68154 URL: http://svn.reactos.org/svn/reactos?rev=68154&view=rev Log: [CMAKE] Use a separate set for the optimization level in GCC release builds. We should revisit this to see if we need this rbuild era block nowadays. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68154&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 18:59:46 2015 @@ -129,20 +129,25 @@ endif() # Optimizations -if(OPTIMIZE STREQUAL "1") - add_compile_flags("-Os -ftracer") -elseif(OPTIMIZE STREQUAL "2") - add_compile_flags("-Os") -elseif(OPTIMIZE STREQUAL "3") - add_compile_flags("-Og") -elseif(OPTIMIZE STREQUAL "4") - add_compile_flags("-O1") -elseif(OPTIMIZE STREQUAL "5") - add_compile_flags("-O2") -elseif(OPTIMIZE STREQUAL "6") +# FIXME: Revisit this to see if we even need these levels +if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("-O3") -elseif(OPTIMIZE STREQUAL "7") - add_compile_flags("-Ofast") +else() + if(OPTIMIZE STREQUAL "1") + add_compile_flags("-Os -ftracer") + elseif(OPTIMIZE STREQUAL "2") + add_compile_flags("-Os") + elseif(OPTIMIZE STREQUAL "3") + add_compile_flags("-Og") + elseif(OPTIMIZE STREQUAL "4") + add_compile_flags("-O1") + elseif(OPTIMIZE STREQUAL "5") + add_compile_flags("-O2") + elseif(OPTIMIZE STREQUAL "6") + add_compile_flags("-O3") + elseif(OPTIMIZE STREQUAL "7") + add_compile_flags("-Ofast") + endif() endif() # Link-time code generation

9 years, 6 months

[akhaldi] 68153: [CMAKE] Disable treating warnings as errors in GCC release builds, at least until we get everything under control, for example CORE-7885.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 18:48:38 2015 New Revision: 68153 URL: http://svn.reactos.org/svn/reactos?rev=68153&view=rev Log: [CMAKE] Disable treating warnings as errors in GCC release builds, at least until we get everything under control, for example CORE-7885. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68153&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 18:48:38 2015 @@ -111,7 +111,7 @@ endif() # Warnings, errors -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") +if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_compile_flags("-Werror") endif()

9 years, 6 months

[tfaber] 68152: [NTOS:CC] - Properly stub CcCanIWrite, CcDeferWrite, CcFastCopyRead, CcFastCopyWrite CORE-9624

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jun 15 18:44:08 2015 New Revision: 68152 URL: http://svn.reactos.org/svn/reactos?rev=68152&view=rev Log: [NTOS:CC] - Properly stub CcCanIWrite, CcDeferWrite, CcFastCopyRead, CcFastCopyWrite CORE-9624 Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=681… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Mon Jun 15 18:44:08 2015 @@ -342,8 +342,8 @@ { CCTRACE(CC_API_DEBUG, "FileObject=%p BytesToWrite=%lu Wait=%d Retrying=%d\n", FileObject, BytesToWrite, Wait, Retrying); - UNIMPLEMENTED; - return FALSE; + + return TRUE; } /* @@ -422,7 +422,7 @@ CCTRACE(CC_API_DEBUG, "FileObject=%p PostRoutine=%p Context1=%p Context2=%p BytesToWrite=%lu Retrying=%d\n", FileObject, PostRoutine, Context1, Context2, BytesToWrite, Retrying); - UNIMPLEMENTED; + PostRoutine(Context1, Context2); } /* @@ -438,11 +438,24 @@ OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus) { + LARGE_INTEGER LargeFileOffset; + BOOLEAN Success; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu PageCount=%lu Buffer=%p\n", FileObject, FileOffset, Length, PageCount, Buffer); - UNIMPLEMENTED; -} + DBG_UNREFERENCED_PARAMETER(PageCount); + + LargeFileOffset.QuadPart = FileOffset; + Success = CcCopyRead(FileObject, + &LargeFileOffset, + Length, + TRUE, + Buffer, + IoStatus); + NT_ASSERT(Success == TRUE); +} + /* * @unimplemented */ @@ -454,10 +467,19 @@ IN ULONG Length, IN PVOID Buffer) { + LARGE_INTEGER LargeFileOffset; + BOOLEAN Success; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu Buffer=%p\n", FileObject, FileOffset, Length, Buffer); - UNIMPLEMENTED; + LargeFileOffset.QuadPart = FileOffset; + Success = CcCopyWrite(FileObject, + &LargeFileOffset, + Length, + TRUE, + Buffer); + NT_ASSERT(Success == TRUE); } /*

9 years, 6 months

[akhaldi] 68151: [NDK][NTDLL][PSAPI] Correct the the names of two LDR_DATA_TABLE_ENTRY fields. Brought to you by Mike Nordell aka tamlin. CORE-9817

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 18:38:57 2015 New Revision: 68151 URL: http://svn.reactos.org/svn/reactos?rev=68151&view=rev Log: [NDK][NTDLL][PSAPI] Correct the the names of two LDR_DATA_TABLE_ENTRY fields. Brought to you by Mike Nordell aka tamlin. CORE-9817 Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -476,7 +476,7 @@ while (NextEntry != ListHead) { /* Get the entry and NT Headers */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks); NtHeader = RtlImageNtHeader(LdrEntry->DllBase); if (NtHeader) { @@ -1036,7 +1036,7 @@ while (InitEntry != InitListHead) { - InitModule = CONTAINING_RECORD(InitEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + InitModule = CONTAINING_RECORD(InitEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* Increase the index */ ModulePtr->InitOrderIndex++; @@ -1384,7 +1384,7 @@ /* Get the entry */ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Remove flag */ @@ -1408,8 +1408,8 @@ /* Unlink it */ CurrentEntry = LdrEntry; - RemoveEntryList(&CurrentEntry->InInitializationOrderModuleList); - RemoveEntryList(&CurrentEntry->InMemoryOrderModuleList); + RemoveEntryList(&CurrentEntry->InInitializationOrderLinks); + RemoveEntryList(&CurrentEntry->InMemoryOrderLinks); RemoveEntryList(&CurrentEntry->HashLinks); /* If there's more then one active unload */ @@ -1417,7 +1417,7 @@ { /* Flush the cached DLL handle and clear the list */ LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + CurrentEntry->InMemoryOrderLinks.Flink = NULL; } /* Add the entry on the unload list */ @@ -1443,7 +1443,7 @@ /* Set the entry and clear it from the list */ CurrentEntry = LdrEntry; LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + CurrentEntry->InMemoryOrderLinks.Flink = NULL; /* Move it from the global to the local list */ RemoveEntryList(&CurrentEntry->HashLinks); Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -526,7 +526,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks); /* Make sure it's not ourselves */ if (Peb->ImageBaseAddress != LdrEntry->DllBase) @@ -674,7 +674,7 @@ while (NextEntry != ListHead) { /* Get the Data Entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* Check if we have a Root Entry */ if (LdrRootEntry) @@ -840,7 +840,7 @@ while (NextEntry != ListHead) { /* Get the Data Entrry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); /* FIXME: Verify NX Compat */ // LdrpCheckNXCompatibility() @@ -932,7 +932,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Make sure it's not ourselves */ @@ -1037,7 +1037,7 @@ while (NextEntry != ListHead) { /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderLinks); NextEntry = NextEntry->Blink; /* Make sure it's not ourselves */ @@ -1927,7 +1927,7 @@ /* Link the Init Order List */ InsertHeadList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrpNtDllDataTableEntry->InInitializationOrderModuleList); + &LdrpNtDllDataTableEntry->InInitializationOrderLinks); /* Initialize Wine's active context implementation for the current process */ actctx_init(); Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -318,7 +318,7 @@ { /* Add it to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &DllLdrEntry->InInitializationOrderModuleList); + &DllLdrEntry->InInitializationOrderLinks); } /* Check if the Bound Entry is now invalid */ @@ -381,7 +381,7 @@ { /* Add it to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &ForwarderLdrEntry->InInitializationOrderModuleList); + &ForwarderLdrEntry->InInitializationOrderLinks); } } @@ -590,7 +590,7 @@ { /* Add the DLL to our list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &DllLdrEntry->InInitializationOrderModuleList); + &DllLdrEntry->InInitializationOrderLinks); } /* Now snap the IAT Entry */ @@ -850,7 +850,7 @@ { /* Add it to the in-init-order list in case of failure */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &(*DataTableEntry)->InInitializationOrderModuleList); + &(*DataTableEntry)->InInitializationOrderLinks); } return Status; Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -1273,7 +1273,7 @@ { /* Remove the DLL from the lists */ RemoveEntryList(&LdrEntry->InLoadOrderLinks); - RemoveEntryList(&LdrEntry->InMemoryOrderModuleList); + RemoveEntryList(&LdrEntry->InMemoryOrderLinks); RemoveEntryList(&LdrEntry->HashLinks); /* Remove the LDR Entry */ @@ -1341,7 +1341,7 @@ CandidateEnd = CandidateBase + CandidateEntry->SizeOfImage; /* Make sure this entry isn't unloading */ - if (!CandidateEntry->InMemoryOrderModuleList.Flink) continue; + if (!CandidateEntry->InMemoryOrderLinks.Flink) continue; /* Check if our regions are colliding */ if ((ImageBase >= CandidateBase && ImageBase <= CandidateEnd) || @@ -1465,7 +1465,7 @@ { /* Remove it from the lists */ RemoveEntryList(&LdrEntry->InLoadOrderLinks); - RemoveEntryList(&LdrEntry->InMemoryOrderModuleList); + RemoveEntryList(&LdrEntry->InMemoryOrderLinks); RemoveEntryList(&LdrEntry->HashLinks); /* Unmap it, clear the entry */ @@ -1576,7 +1576,7 @@ /* Insert into other lists */ InsertTailList(&PebData->InLoadOrderModuleList, &LdrEntry->InLoadOrderLinks); - InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderModuleList); + InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderLinks); } VOID @@ -1630,7 +1630,7 @@ InLoadOrderLinks); /* Make sure it's not unloading and check for a match */ - if ((Current->InMemoryOrderModuleList.Flink) && (Base == Current->DllBase)) + if ((Current->InMemoryOrderLinks.Flink) && (Base == Current->DllBase)) { /* Save in cache */ LdrpLoadedDllHandleCache = Current; @@ -2097,7 +2097,7 @@ ListEntry = ListEntry->Flink; /* Check if it's being unloaded */ - if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + if (!CurEntry->InMemoryOrderLinks.Flink) continue; /* Check if name matches */ if (RtlEqualUnicodeString(&FullDllName, @@ -2195,7 +2195,7 @@ ListEntry = ListEntry->Flink; /* Check if it's in the process of being unloaded */ - if (!CurEntry->InMemoryOrderModuleList.Flink) continue; + if (!CurEntry->InMemoryOrderLinks.Flink) continue; /* The header is untrusted, use SEH */ _SEH2_TRY @@ -2362,7 +2362,7 @@ Entry = NtCurrentPeb()->Ldr->InInitializationOrderModuleList.Blink; LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); /* Make sure we didn't process it yet*/ if (!(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) @@ -2536,7 +2536,7 @@ /* Clear entrypoint, and insert into list */ LdrEntry->EntryPoint = NULL; InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderModuleList); + &LdrEntry->InInitializationOrderLinks); /* Cancel the load */ LdrpClearLoadInProgress(); @@ -2563,7 +2563,7 @@ /* Insert it into the list */ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderModuleList); + &LdrEntry->InInitializationOrderLinks); /* If we have to run the entrypoint, make sure the DB is ready */ if (CallInit && LdrpLdrDatabaseIsSetup) @@ -2653,7 +2653,7 @@ /* Get the loader entry */ LdrEntry = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, - InInitializationOrderModuleList); + InInitializationOrderLinks); /* Clear load in progress flag */ LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS; Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -187,7 +187,7 @@ { /* Load module data */ if (!ReadProcessMemory(hProcess, - CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList), + CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks), Module, sizeof(*Module), NULL)) @@ -208,7 +208,7 @@ } /* Get to next listed module */ - ListEntry = Module->InMemoryOrderModuleList.Flink; + ListEntry = Module->InMemoryOrderLinks.Flink; } SetLastError(ERROR_INVALID_HANDLE); Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Jun 15 18:38:57 2015 @@ -128,11 +128,14 @@ // // Loader Data Table Entry // +// NOTE: The field 'InMemoryOrderLinks' MUST have that name. +// It's hard-coded into WinDbg for PEB dumping! +// typedef struct _LDR_DATA_TABLE_ENTRY { LIST_ENTRY InLoadOrderLinks; - LIST_ENTRY InMemoryOrderModuleList; - LIST_ENTRY InInitializationOrderModuleList; + LIST_ENTRY InMemoryOrderLinks; + LIST_ENTRY InInitializationOrderLinks; PVOID DllBase; PVOID EntryPoint; ULONG SizeOfImage;

9 years, 6 months

[akhaldi] 68150: [CMAKE] Add some FIXMEs so these won't be forgotten.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 17:45:24 2015 New Revision: 68150 URL: http://svn.reactos.org/svn/reactos?rev=68150&view=rev Log: [CMAKE] Add some FIXMEs so these won't be forgotten. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68150&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:45:24 2015 @@ -241,11 +241,13 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release")) + # FIXME: Set this once Clang toolchain works with it set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") endif() -SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>") -SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") +set(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>") +# FIXME: Once the GCC toolchain bugs are fixed, add _compress_debug_sections_flag to CXX too +set(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>")

9 years, 6 months

[akhaldi] 68149: [CMAKE] Disable debug sections compression in GCC release builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 17:35:29 2015 New Revision: 68149 URL: http://svn.reactos.org/svn/reactos?rev=68149&view=rev Log: [CMAKE] Disable debug sections compression in GCC release builds. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68149&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:35:29 2015 @@ -240,7 +240,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") +if((NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (NOT CMAKE_BUILD_TYPE STREQUAL "Release")) set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") endif()

9 years, 6 months

[akhaldi] 68148: [CMAKE] Disable debugging related GCC flags in release mode.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 15 17:26:04 2015 New Revision: 68148 URL: http://svn.reactos.org/svn/reactos?rev=68148&view=rev Log: [CMAKE] Disable debugging related GCC flags in release mode. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=68148&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jun 15 17:26:04 2015 @@ -87,12 +87,14 @@ endif() # Debugging -if(SEPARATE_DBG) - add_compile_flags("-gdwarf-2 -ggdb") -else() - add_compile_flags("-gdwarf-2 -gstrict-dwarf") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") + if(SEPARATE_DBG) + add_compile_flags("-gdwarf-2 -ggdb") + else() + add_compile_flags("-gdwarf-2 -gstrict-dwarf") + if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_flags("-femit-struct-debug-detailed=none -feliminate-unused-debug-symbols") + endif() endif() endif()

9 years, 6 months

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015