Ros-dev June 2011

ros-dev@reactos.org

35 participants
42 discussions

Re: [ros-dev] [ros-diffs] [tkreuzer] 52133: [OBJ2BIN] - Add new tool obj2bin, that converts a coff object file into a raw binary file - Move pe/coff types into a common header file pecoff.h

by Alex Ionescu

Why is this needed? ie: what missing functionality of obj2dump does this tool add? I'm only asking because whenever I build ARM binaries with GCC I use obj2dump to do exactly this -- convert a PE/COFF to a raw binary for the boot-loader or firmware. So maybe I'm missing something? Best regards, Alex Ionescu On Tue, Jun 7, 2011 at 3:29 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Tue Jun 7 19:29:09 2011 > New Revision: 52133 > > URL: http://svn.reactos.org/svn/reactos?rev=52133&view=rev > Log: > [OBJ2BIN] > - Add new tool obj2bin, that converts a coff object file into a raw binary file > - Move pe/coff types into a common header file pecoff.h > > Added: > trunk/reactos/tools/obj2bin/ (with props) > trunk/reactos/tools/obj2bin/CMakeLists.txt (with props) > trunk/reactos/tools/obj2bin/obj2bin.c (with props) > trunk/reactos/tools/pecoff.h (with props) > Modified: > trunk/reactos/tools/CMakeLists.txt > trunk/reactos/tools/rsym/rsym.h > > Modified: trunk/reactos/tools/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… > ============================================================================== > --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -6,6 +6,7 @@ > add_subdirectory(gendib) > add_subdirectory(geninc) > add_subdirectory(mkhive) > +add_subdirectory(obj2bin) > add_subdirectory(spec2def) > add_subdirectory(unicode) > > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > --- bugtraq:logregex (added) > +++ bugtraq:logregex Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,2 @@ > +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? > +(\d+) > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:message = See issue #%BUGID% for more details. > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > tsvn:logminsize = 10 > > Added: trunk/reactos/tools/obj2bin/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/CMakeLists.t… > ============================================================================== > --- trunk/reactos/tools/obj2bin/CMakeLists.txt (added) > +++ trunk/reactos/tools/obj2bin/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,1 @@ > +add_executable(obj2bin obj2bin.c) > > Propchange: trunk/reactos/tools/obj2bin/CMakeLists.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/obj2bin/obj2bin.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… > ============================================================================== > --- trunk/reactos/tools/obj2bin/obj2bin.c (added) > +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,112 @@ > +#include <stdio.h> > +#include <stdlib.h> > +#include "../pecoff.h" > + > +static > +void > +Usage(void) > +{ > + printf("Converts a coff object file into a raw binary file.\n" > + "Syntax: obj2bin <source file> <dest file>\n"); > +} > + > +int main(int argc, char *argv[]) > +{ > + char *pszSourceFile; > + char *pszDestFile; > + FILE *pSourceFile, *pDestFile; > + IMAGE_FILE_HEADER FileHeader; > + IMAGE_SECTION_HEADER SectionHeader; > + unsigned int i, nSize; > + void *pData; > + > + if ((argc != 3) || (strcmp(argv[1], "--help") == 0)) Usage(); > + > + pszSourceFile = argv[1]; > + pszDestFile = argv[2]; > + > + pSourceFile = fopen(pszSourceFile, "rb"); > + if (!pSourceFile) > + { > + fprintf(stderr, "Couldn't open source file '%s'\n", pszSourceFile); > + return -1; > + } > + > + pDestFile = fopen(pszDestFile, "wb"); > + if (!pszDestFile) > + { > + fprintf(stderr, "Couldn't open dest file '%s'\n", pszDestFile); > + return -2; > + } > + > + /* Load the coff header */ > + nSize = fread(&FileHeader, 1, sizeof(FileHeader), pSourceFile); > + if (nSize != sizeof(FileHeader)) > + { > + fprintf(stderr, "Failed to read source file\n"); > + return -3; > + } > + > + /* Jump to section headers (skip optional header) */ > + if (fseek(pSourceFile, FileHeader.SizeOfOptionalHeader, SEEK_CUR)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -4; > + } > + > + /* Loop all sections */ > + for (i = 0; i < FileHeader.NumberOfSections; i++) > + { > + /* Read section header */ > + nSize = fread(&SectionHeader, 1, sizeof(SectionHeader), pSourceFile); > + if (nSize != sizeof(SectionHeader)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Check if this is '.text' section */ > + if (strcmp(SectionHeader.Name, ".text") == 0) break; > + } > + > + if (i == FileHeader.NumberOfSections) > + { > + fprintf(stderr, "No .text section found\n"); > + return -6; > + } > + > + /* Move file pointer to the start of the section*/ > + if (fseek(pSourceFile, SectionHeader.PointerToRawData, SEEK_SET)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -7; > + } > + > + /* Allocate memory for the section */ > + pData = malloc(SectionHeader.SizeOfRawData); > + if (!pData) > + { > + fprintf(stderr, "Failed to allocate %ld bytes\n", SectionHeader.SizeOfRawData); > + return -8; > + } > + > + /* Read section data */ > + if (!fread(pData, SectionHeader.SizeOfRawData, 1, pSourceFile)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Write the section to the destination file */ > + if (!fwrite(pData, SectionHeader.SizeOfRawData, 1, pDestFile)) > + { > + fprintf(stderr, "Failed to write data\n"); > + return -9; > + } > + > + fclose(pDestFile); > + fclose(pSourceFile); > + > + return 0; > +} > + > > Propchange: trunk/reactos/tools/obj2bin/obj2bin.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/pecoff.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pecoff.h?rev=52133&v… > ============================================================================== > --- trunk/reactos/tools/pecoff.h (added) > +++ trunk/reactos/tools/pecoff.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,207 @@ > +#pragma once > + > +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > + > +#define IMAGE_DOS_MAGIC 0x5a4d > +#define IMAGE_PE_MAGIC 0x00004550 > +#define IMAGE_SIZEOF_SHORT_NAME 8 > + > +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > + > +#define IMAGE_FILE_MACHINE_I386 0x14c > +#define IMAGE_FILE_MACHINE_AMD64 0x8664 > +#define IMAGE_FILE_MACHINE_IA64 0x0200 > + > +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > + > +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > +#define IMAGE_SCN_CNT_CODE 0x00000020 > +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > +#define IMAGE_SCN_LNK_OTHER 0x00000100 > +#define IMAGE_SCN_LNK_INFO 0x00000200 > +#define IMAGE_SCN_LNK_REMOVE 0x00000800 > +#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > +#define IMAGE_SCN_GPREL 0x00008000 > +#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > +#define IMAGE_SCN_MEM_LOCKED 0x00040000 > +#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > +#define IMAGE_SCN_MEM_SHARED 0x10000000 > +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > +#define IMAGE_SCN_MEM_READ 0x40000000 > +#define IMAGE_SCN_MEM_WRITE 0x80000000 > + > +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > + > +typedef unsigned char BYTE; > +typedef unsigned char UCHAR; > +typedef unsigned short WORD; > +typedef unsigned short USHORT; > +typedef unsigned long long ULONGLONG; > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef signed int LONG; > +typedef unsigned int ULONG; > +typedef unsigned int DWORD; > +#else > +typedef signed long LONG; > +typedef unsigned long ULONG; > +typedef unsigned long DWORD; > +#endif > +#if defined(_WIN64) > +typedef unsigned __int64 ULONG_PTR; > +#else > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef unsigned int ULONG_PTR; > +#else > +typedef unsigned long ULONG_PTR; > +#endif > +#endif > + > +#pragma pack(push,2) > +typedef struct _IMAGE_DOS_HEADER { > + WORD e_magic; > + WORD e_cblp; > + WORD e_cp; > + WORD e_crlc; > + WORD e_cparhdr; > + WORD e_minalloc; > + WORD e_maxalloc; > + WORD e_ss; > + WORD e_sp; > + WORD e_csum; > + WORD e_ip; > + WORD e_cs; > + WORD e_lfarlc; > + WORD e_ovno; > + WORD e_res[4]; > + WORD e_oemid; > + WORD e_oeminfo; > + WORD e_res2[10]; > + LONG e_lfanew; > +} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > +#pragma pack(pop) > + > +#pragma pack(push,4) > +typedef struct _IMAGE_FILE_HEADER { > + WORD Machine; > + WORD NumberOfSections; > + DWORD TimeDateStamp; > + DWORD PointerToSymbolTable; > + DWORD NumberOfSymbols; > + WORD SizeOfOptionalHeader; > + WORD Characteristics; > +} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > +#pragma pack(pop) > + > +typedef struct _IMAGE_DATA_DIRECTORY { > + DWORD VirtualAddress; > + DWORD Size; > +} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > + > +typedef struct _IMAGE_OPTIONAL_HEADER32 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + DWORD BaseOfData; > + DWORD ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + DWORD SizeOfStackReserve; > + DWORD SizeOfStackCommit; > + DWORD SizeOfHeapReserve; > + DWORD SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > + > +typedef struct _IMAGE_OPTIONAL_HEADER64 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + ULONGLONG ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + ULONGLONG SizeOfStackReserve; > + ULONGLONG SizeOfStackCommit; > + ULONGLONG SizeOfHeapReserve; > + ULONGLONG SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > + > +#ifdef _TARGET_PE64 > +typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > +#else > +typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > +#endif > + > +typedef struct _IMAGE_SECTION_HEADER { > + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > + union { > + DWORD PhysicalAddress; > + DWORD VirtualSize; > + } Misc; > + DWORD VirtualAddress; > + DWORD SizeOfRawData; > + DWORD PointerToRawData; > + DWORD PointerToRelocations; > + DWORD PointerToLinenumbers; > + WORD NumberOfRelocations; > + WORD NumberOfLinenumbers; > + DWORD Characteristics; > +} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > + > +#pragma pack(push,4) > +typedef struct _IMAGE_BASE_RELOCATION { > + DWORD VirtualAddress; > + DWORD SizeOfBlock; > + WORD TypeOffset[1]; > +} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > +#pragma pack(pop) > + > > Propchange: trunk/reactos/tools/pecoff.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/tools/rsym/rsym.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=5213… > ============================================================================== > --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) > +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,209 +1,7 @@ > /* rsym.h */ > > #pragma once > - > -#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > -#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > - > -#define IMAGE_DOS_MAGIC 0x5a4d > -#define IMAGE_PE_MAGIC 0x00004550 > -#define IMAGE_SIZEOF_SHORT_NAME 8 > - > -#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > -#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > - > -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > - > -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > -#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > -#define IMAGE_SCN_CNT_CODE 0x00000020 > -#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > -#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > -#define IMAGE_SCN_LNK_OTHER 0x00000100 > -#define IMAGE_SCN_LNK_INFO 0x00000200 > -#define IMAGE_SCN_LNK_REMOVE 0x00000800 > -#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > -#define IMAGE_SCN_GPREL 0x00008000 > -#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > -#define IMAGE_SCN_MEM_LOCKED 0x00040000 > -#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > -#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > -#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > -#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > -#define IMAGE_SCN_MEM_SHARED 0x10000000 > -#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > -#define IMAGE_SCN_MEM_READ 0x40000000 > -#define IMAGE_SCN_MEM_WRITE 0x80000000 > - > -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > - > -typedef unsigned char BYTE; > -typedef unsigned char UCHAR; > -typedef unsigned short WORD; > -typedef unsigned short USHORT; > -typedef unsigned long long ULONGLONG; > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef signed int LONG; > -typedef unsigned int ULONG; > -typedef unsigned int DWORD; > -#else > -typedef signed long LONG; > -typedef unsigned long ULONG; > -typedef unsigned long DWORD; > -#endif > -#if defined(_WIN64) > -typedef unsigned __int64 ULONG_PTR; > -#else > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef unsigned int ULONG_PTR; > -#else > -typedef unsigned long ULONG_PTR; > -#endif > -#endif > - > -#pragma pack(push,2) > - > -typedef struct _IMAGE_DOS_HEADER { > - WORD e_magic; > - WORD e_cblp; > - WORD e_cp; > - WORD e_crlc; > - WORD e_cparhdr; > - WORD e_minalloc; > - WORD e_maxalloc; > - WORD e_ss; > - WORD e_sp; > - WORD e_csum; > - WORD e_ip; > - WORD e_cs; > - WORD e_lfarlc; > - WORD e_ovno; > - WORD e_res[4]; > - WORD e_oemid; > - WORD e_oeminfo; > - WORD e_res2[10]; > - LONG e_lfanew; > -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > -#pragma pack(pop) > - > -#pragma pack(push,4) > -typedef struct _IMAGE_FILE_HEADER { > - WORD Machine; > - WORD NumberOfSections; > - DWORD TimeDateStamp; > - DWORD PointerToSymbolTable; > - DWORD NumberOfSymbols; > - WORD SizeOfOptionalHeader; > - WORD Characteristics; > -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > -#pragma pack(pop) > - > -typedef struct _IMAGE_DATA_DIRECTORY { > - DWORD VirtualAddress; > - DWORD Size; > -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > - > -typedef struct _IMAGE_OPTIONAL_HEADER32 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - DWORD BaseOfData; > - DWORD ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - DWORD SizeOfStackReserve; > - DWORD SizeOfStackCommit; > - DWORD SizeOfHeapReserve; > - DWORD SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > - > -typedef struct _IMAGE_OPTIONAL_HEADER64 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - ULONGLONG ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - ULONGLONG SizeOfStackReserve; > - ULONGLONG SizeOfStackCommit; > - ULONGLONG SizeOfHeapReserve; > - ULONGLONG SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > - > - > -#ifdef _TARGET_PE64 > -typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > -#else > -typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > -#endif > - > -typedef struct _IMAGE_SECTION_HEADER { > - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > - union { > - DWORD PhysicalAddress; > - DWORD VirtualSize; > - } Misc; > - DWORD VirtualAddress; > - DWORD SizeOfRawData; > - DWORD PointerToRawData; > - DWORD PointerToRelocations; > - DWORD PointerToLinenumbers; > - WORD NumberOfRelocations; > - WORD NumberOfLinenumbers; > - DWORD Characteristics; > -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > - > -#pragma pack(push,4) > -typedef struct _IMAGE_BASE_RELOCATION { > - DWORD VirtualAddress; > - DWORD SizeOfBlock; > - WORD TypeOffset[1]; > -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > -#pragma pack(pop) > +#include "../pecoff.h" > > typedef struct { > USHORT f_magic; /* magic number */ > > >

13 years, 4 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 52156: [BOOTSECTOR] - export obj2bin on gcc builds, too - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors wi...

by Timo Kreuzer

Am 09.06.2011 15:56, schrieb tkreuzer(a)svn.reactos.org: > Author: tkreuzer > Date: Thu Jun 9 13:56:44 2011 > New Revision: 52156 > > URL: http://svn.reactos.org/svn/reactos?rev=52156&view=rev > Log: > [BOOTSECTOR] > - export obj2bin on gcc builds, too > - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors with the new code one at a time, and in the end we can eventually drop nmake > - add wrapper isobtrt.S, which defines ROS_REGTEST and includes isoboot.S > I mean of course "drop nasm" not "drop nmake"

13 years, 4 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 52065: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopR...

by Alex Ionescu

The notification routine can change the list, as there is no lock involved. Therefore, you should grab the next entry before notifying the driver, to maintain a consistent list state. -- Best regards, Alex Ionescu On 2011-06-02, at 1:43 PM, pschweitzer(a)svn.reactos.org wrote: > + DriverNotificationRoutine(DeviceObject, TRUE); > + > + /* Go to the next entry */ > + ListEntry = ListEntry->Flink;

13 years, 4 months

Re: [ros-dev] [ros-diffs] [cgutman] 52125: [AFD] - Fix IoModifyAccess vs IoReadAccess confusion

by Timo Kreuzer

I can't get the logic behind this change. Can you explain? Am 07.06.2011 00:55, schrieb cgutman(a)svn.reactos.org: > Author: cgutman > Date: Mon Jun 6 22:55:17 2011 > New Revision: 52125 > > URL: http://svn.reactos.org/svn/reactos?rev=52125&view=rev > Log: > [AFD] > - Fix IoModifyAccess vs IoReadAccess confusion > > Modified: > trunk/reactos/drivers/network/afd/afd/lock.c > > Modified: trunk/reactos/drivers/network/afd/afd/lock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… > ============================================================================== > --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Jun 6 22:55:17 2011 > @@ -123,7 +123,7 @@ > AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); > _SEH2_TRY { > MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, > - Write ? IoModifyAccess : IoReadAccess ); > + Write ? IoReadAccess : IoModifyAccess ); > } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { > LockFailed = TRUE; > } _SEH2_END; > > >

13 years, 4 months

Networking problems with windows slaves

by caemyr＠myopera.com

Hiya The today's failure of my slaves can be explained two-way. First, buildslaves (windows ones especially, but not only) seem to be very vulnerable to ping dropouts. A single icmp drop is resulting in build interruption. Second, the hetzner.de hosting is dropping packets from my provider (atman.pl) all the way from teleport to reactos host, at a rate of one every few minutes or even more. Combined those two, any build started at the moment is dropped after 2-3 minutes of runtime. I have no idea if the network issue is temporary or not, thus no chance to predict when we will continue with runtime, Any ideas? With best regards Caemyr

13 years, 4 months

Re: [ros-dev] [ros-diffs] [akhaldi] 52114: [CMAKE] * Fix several modules to compile with the recent gcc versions. * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. * Dedicated to dreimer.

by Alex Ionescu

Hello, With the move to 4.6.0, please consider building with -flto=<number of cores that the build script detects> Timo: This will enable Link Time Optimizations :D -- Best regards, Alex Ionescu On 2011-06-06, at 7:44 AM, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Mon Jun 6 11:44:58 2011 > New Revision: 52114 > > URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev > Log: > [CMAKE] > * Fix several modules to compile with the recent gcc versions. > * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. > * Dedicated to dreimer. > > Modified: > trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > trunk/reactos/dll/win32/kernel32/CMakeLists.txt > trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > trunk/reactos/dll/win32/msports/CMakeLists.txt > trunk/reactos/dll/win32/sti/CMakeLists.txt > trunk/reactos/dll/win32/ufatx/CMakeLists.txt > trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > trunk/reactos/lib/pseh/CMakeLists.txt > > Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -44,6 +44,7 @@ > rpcrt4 > ole32 > oleaut32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -114,7 +114,7 @@ > set_entrypoint(kernel32 DllMain@12) > set_image_base(kernel32 ${baseaddress_kernel32}) > > -target_link_libraries(kernel32 ${PSEH_LIB}) > +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) > > add_importlibs(kernel32 ntdll) > add_pch(kernel32 k32.h) > > Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -28,7 +28,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) > +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) > add_dependencies(lsasrv psdk) > add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) > add_importlib_target(lsasrv.spec) > > Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -18,7 +18,7 @@ > > target_link_libraries(msports wine) > > -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) > +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) > > add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > add_importlib_target(msports.spec) > > Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… > ============================================================================== > --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -36,6 +36,7 @@ > oleaut32 > rpcrt4 > advapi32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… > ============================================================================== > --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -9,8 +9,8 @@ > > set_entrypoint(ufatx 0) > > -target_link_libraries(ufatx vfatxlib -lgcc) > -add_importlibs(ufatx kernel32 ntdll) > +target_link_libraries(ufatx vfatxlib) > +add_importlibs(ufatx msvcrt kernel32 ntdll) > add_importlib_target(ufatx.spec) > add_dependencies(ufatx psdk) > add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) > > Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -17,7 +17,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) > +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) > add_importlib_target(wlanapi.spec) > > add_dependencies(wlanapi psdk) > > Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -1,4 +1,8 @@ > > add_library(vfatxlib fatx.c vfatxlib.c) > + > +if(NOT MSVC) > + target_link_libraries(vfatxlib -lgcc) > +endif() > + > add_dependencies(vfatxlib psdk) > - > > Modified: trunk/reactos/lib/pseh/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… > ============================================================================== > --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -14,6 +14,7 @@ > endif() > > add_library(pseh ${SOURCE}) > + target_link_libraries(pseh chkstk) > add_dependencies(pseh psdk) > > else() > >

13 years, 4 months

by Alex Ionescu

Hello, With the move to GCC 4.6.0, please consider using ms_hook_prologue. You will especially need this when synching with Wine, as they have moved to 4.6.0. This will add support for /hotpatch, which is a compatibility requirement. For example, Steam games use this feature. See http://www.mail-archive.com/wine-devel@winehq.org/msg58308.html. -- Best regards, Alex Ionescu On 2011-06-06, at 7:44 AM, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Mon Jun 6 11:44:58 2011 > New Revision: 52114 > > URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev > Log: > [CMAKE] > * Fix several modules to compile with the recent gcc versions. > * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. > * Dedicated to dreimer. > > Modified: > trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > trunk/reactos/dll/win32/kernel32/CMakeLists.txt > trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > trunk/reactos/dll/win32/msports/CMakeLists.txt > trunk/reactos/dll/win32/sti/CMakeLists.txt > trunk/reactos/dll/win32/ufatx/CMakeLists.txt > trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > trunk/reactos/lib/pseh/CMakeLists.txt > > Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -44,6 +44,7 @@ > rpcrt4 > ole32 > oleaut32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -114,7 +114,7 @@ > set_entrypoint(kernel32 DllMain@12) > set_image_base(kernel32 ${baseaddress_kernel32}) > > -target_link_libraries(kernel32 ${PSEH_LIB}) > +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) > > add_importlibs(kernel32 ntdll) > add_pch(kernel32 k32.h) > > Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -28,7 +28,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) > +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) > add_dependencies(lsasrv psdk) > add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) > add_importlib_target(lsasrv.spec) > > Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -18,7 +18,7 @@ > > target_link_libraries(msports wine) > > -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) > +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) > > add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > add_importlib_target(msports.spec) > > Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… > ============================================================================== > --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -36,6 +36,7 @@ > oleaut32 > rpcrt4 > advapi32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… > ============================================================================== > --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -9,8 +9,8 @@ > > set_entrypoint(ufatx 0) > > -target_link_libraries(ufatx vfatxlib -lgcc) > -add_importlibs(ufatx kernel32 ntdll) > +target_link_libraries(ufatx vfatxlib) > +add_importlibs(ufatx msvcrt kernel32 ntdll) > add_importlib_target(ufatx.spec) > add_dependencies(ufatx psdk) > add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) > > Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -17,7 +17,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) > +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) > add_importlib_target(wlanapi.spec) > > add_dependencies(wlanapi psdk) > > Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -1,4 +1,8 @@ > > add_library(vfatxlib fatx.c vfatxlib.c) > + > +if(NOT MSVC) > + target_link_libraries(vfatxlib -lgcc) > +endif() > + > add_dependencies(vfatxlib psdk) > - > > Modified: trunk/reactos/lib/pseh/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… > ============================================================================== > --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -14,6 +14,7 @@ > endif() > > add_library(pseh ${SOURCE}) > + target_link_libraries(pseh chkstk) > add_dependencies(pseh psdk) > > else() > >

13 years, 4 months

Re: [ros-dev] [ros-diffs] [sir_richard] 52098: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms wou...

by Cameron Gutman

> ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Sun Jun 5 20:48:34 2011 > @@ -30,7 +30,6 @@ > { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER > { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER > { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video > - { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory > #elif __arm__ // This needs to be done per-platform specific way > > #endif This part breaks boot with AC97. > Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Jun 5 20:48:34 2011 > @@ -307,9 +322,9 @@ > case MemorySpecialMemory: > { > // > - // Special reserved memory > - // > - MemoryMapPageAllocated = LoaderSpecialMemory; > + // OS Loader Stack > + // > + MemoryMapPageAllocated = LoaderOsloaderStack; > break; > } > default: I assume this is also related. Cameron Gutman

13 years, 4 months

by Alex Ionescu

Hello, With the move to 4.6.0, please look into building with -Ofast. -- Best regards, Alex Ionescu On 2011-06-06, at 7:44 AM, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Mon Jun 6 11:44:58 2011 > New Revision: 52114 > > URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev > Log: > [CMAKE] > * Fix several modules to compile with the recent gcc versions. > * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. > * Dedicated to dreimer. > > Modified: > trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > trunk/reactos/dll/win32/kernel32/CMakeLists.txt > trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > trunk/reactos/dll/win32/msports/CMakeLists.txt > trunk/reactos/dll/win32/sti/CMakeLists.txt > trunk/reactos/dll/win32/ufatx/CMakeLists.txt > trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > trunk/reactos/lib/pseh/CMakeLists.txt > > Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -44,6 +44,7 @@ > rpcrt4 > ole32 > oleaut32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -114,7 +114,7 @@ > set_entrypoint(kernel32 DllMain@12) > set_image_base(kernel32 ${baseaddress_kernel32}) > > -target_link_libraries(kernel32 ${PSEH_LIB}) > +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) > > add_importlibs(kernel32 ntdll) > add_pch(kernel32 k32.h) > > Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -28,7 +28,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) > +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) > add_dependencies(lsasrv psdk) > add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) > add_importlib_target(lsasrv.spec) > > Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -18,7 +18,7 @@ > > target_link_libraries(msports wine) > > -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) > +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) > > add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > add_importlib_target(msports.spec) > > Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… > ============================================================================== > --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -36,6 +36,7 @@ > oleaut32 > rpcrt4 > advapi32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… > ============================================================================== > --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -9,8 +9,8 @@ > > set_entrypoint(ufatx 0) > > -target_link_libraries(ufatx vfatxlib -lgcc) > -add_importlibs(ufatx kernel32 ntdll) > +target_link_libraries(ufatx vfatxlib) > +add_importlibs(ufatx msvcrt kernel32 ntdll) > add_importlib_target(ufatx.spec) > add_dependencies(ufatx psdk) > add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) > > Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -17,7 +17,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) > +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) > add_importlib_target(wlanapi.spec) > > add_dependencies(wlanapi psdk) > > Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -1,4 +1,8 @@ > > add_library(vfatxlib fatx.c vfatxlib.c) > + > +if(NOT MSVC) > + target_link_libraries(vfatxlib -lgcc) > +endif() > + > add_dependencies(vfatxlib psdk) > - > > Modified: trunk/reactos/lib/pseh/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… > ============================================================================== > --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -14,6 +14,7 @@ > endif() > > add_library(pseh ${SOURCE}) > + target_link_libraries(pseh chkstk) > add_dependencies(pseh psdk) > > else() > >

13 years, 4 months

Problems with unhidden quotes... final

by Olaf Siejka

Yes. You are not, sorry for the outburst. It occurs that my problem was due to GMail scripts targetting Opera specifically. Got an addon for it to pose as Firefox and guess what? Problem's gone. Thank you gmail, i`m moving away. Regards 2011/6/5 Riccardo Bestetti <riccardo.kyogre(a)live.it> > Yes, I probably missed his previous email, but this isn’t a good reason > to say that I am deficient. > Now please, let’s stop to discuss [image: Sorriso] > > *From:* Ameen Ross <a.ross(a)amdev.eu> > *Sent:* Sunday, June 05, 2011 4:04 PM > *To:* ros-dev(a)reactos.org > *Subject:* Re: [ros-dev] 1294 [dreimer] Fix clean for cmake trees. ... > > You missed his previous mail ;) > He said that he emails with lots of replies were almost unreadable and > requested to remove what's not needed. > > On 06/05/2011 03:58 PM, Riccardo Bestetti wrote: > > I wasn’t talking to you, we was talking about browsers and I told what IE > does on my PC. > Here the deficient is you. > > *From:* Olaf Siejka <caemyr(a)gmail.com> > *Sent:* Sunday, June 05, 2011 3:07 PM > *To:* ReactOS Development List <ros-dev(a)reactos.org> > *Subject:* Re: [ros-dev] 1294 [dreimer] Fix clean for cmake trees. ... > > Are you being a person intellectually deficient? Or just provoking me on > any purpose? > > 2011/6/5 Riccardo Bestetti <riccardo.kyogre(a)live.it> > >> I can’t start IE on a Turion X2 @2GHz, 4GB ram (win 7), because it >> literally eats my CPU. >> It crashes my PC. It is terrible. >> Firefox works fine. >> > [whole bunch of trash deleted] > ------------------------------ > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing listRos-dev@reactos.orghttp://www.reactos.org/mailman/listinfo/ros-dev > > ------------------------------ > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

13 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev June 2011