Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[rharabien] 53940: [FREELDR] - Improve debug messages

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 2 20:09:07 2011 New Revision: 53940 URL: http://svn.reactos.org/svn/reactos?rev=53940&view=rev Log: [FREELDR] - Improve debug messages Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Oct 2 20:09:07 2011 @@ -18,8 +18,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); @@ -127,7 +125,7 @@ } // If we get here then the read failed - ERR("Disk Read Failed in LBA mode", RegsOut.b.ah); + ERR("Disk Read Failed in LBA mode: %x (DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d)\n", RegsOut.b.ah, DriveNumber, SectorNumber, SectorCount); return FALSE; } @@ -251,7 +249,7 @@ // If we retried 3 times then fail if (RetryCount >= 3) { - ERR("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); + ERR("Disk Read Failed in CHS mode, after retrying 3 times: %x\n", RegsOut.b.ah); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Oct 2 20:09:07 2011 @@ -145,7 +145,7 @@ } TimeOut = GetTimeOut(); - if (!UiInitialize(1)) + if (!UiInitialize(TRUE)) { UiMessageBoxCritical("Unable to initialize UI."); return;

13 years, 2 months

[tkreuzer] 53939: [ASM] Add data32 prefix for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 2 19:47:29 2011 New Revision: 53939 URL: http://svn.reactos.org/svn/reactos?rev=53939&view=rev Log: [ASM] Add data32 prefix for MSVC Modified: trunk/reactos/include/asm/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=53… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sun Oct 2 19:47:29 2011 @@ -155,6 +155,11 @@ DB 0EAh DW offset DW segment +ENDM + +data32 MACRO opcode:VARARG + DB 66h + opcode ENDM UNIMPLEMENTED MACRO name

13 years, 2 months

[tkreuzer] 53938: [EXT2] Fix remaining issues, bootsector compiles with GAS and ML. Sadly GAs sucks a bit and does neither allow to specify byte offsets, nor does it chose this itself to save space...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 2 19:45:41 2011 New Revision: 53938 URL: http://svn.reactos.org/svn/reactos?rev=53938&view=rev Log: [EXT2] Fix remaining issues, bootsector compiles with GAS and ML. Sadly GAs sucks a bit and does neither allow to specify byte offsets, nor does it chose this itself to save space. As a result the code gets several bytes larger and I had to trim the messages even more. Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/ext2.S Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sun Oct 2 19:45:41 2011 @@ -2,7 +2,7 @@ if(ARCH MATCHES i386 OR ARCH MATCHES amd64) CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) -#CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) +CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) @@ -13,11 +13,7 @@ add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all) add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all) - -if(NOT MSVC) - CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) - add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) -endif() +add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all) endif() Modified: trunk/reactos/boot/freeldr/bootsect/ext2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/ext2… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/ext2.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/ext2.S [iso-8859-1] Sun Oct 2 19:45:41 2011 @@ -7,6 +7,9 @@ // [bp-0x0c] Here we will store the size of the disk as the BIOS reports in CHS form // [bp-0x10] Here we will store the number of LBA sectors read +#include <asm.inc> +.code16 + SECTORS_PER_TRACK = HEX(04) NUMBER_OF_HEADS = HEX(08) BIOS_CHS_DRIVE_SIZE = HEX(0C) @@ -18,40 +21,46 @@ EXT2_S_IFREG = HEX(080) -org 7c00h - -segment .text - -bits 16 +//org 7c00h + start: jmp short main nop -BootDrive db HEX(80) +BootDrive: + .byte HEX(80) //BootPartition db 0 // Moved to end of boot sector to have a standard format across all boot sectors //SectorsPerTrack db 63 // Moved to [bp-SECTORS_PER_TRACK] //NumberOfHeads dw 16 // Moved to [bp-NUMBER_OF_HEADS] //BiosCHSDriveSize dd (1024 * 1024 * 63) // Moved to [bp-BIOS_CHS_DRIVE_SIZE] //LBASectorsRead dd 0 // Moved to [bp-LBA_SECTORS_READ] -Ext2VolumeStartSector dd 263088 // Start sector of the ext2 volume -Ext2BlockSize dd 2 // Block size in sectors -Ext2BlockSizeInBytes dd 1024 // Block size in bytes -Ext2PointersPerBlock dd 256 // Number of block pointers that can be contained in one block -Ext2GroupDescPerBlock dd 32 // Number of group descriptors per block -Ext2FirstDataBlock dd 1 // First data block (1 for 1024-byte blocks, 0 for bigger sizes) -Ext2InodesPerGroup dd 2048 // Number of inodes per group -Ext2InodesPerBlock dd 8 // Number of inodes per block +Ext2VolumeStartSector: + .long 263088 // Start sector of the ext2 volume +Ext2BlockSize: + .long 2 // Block size in sectors +Ext2BlockSizeInBytes: + .long 1024 // Block size in bytes +Ext2PointersPerBlock: + .long 256 // Number of block pointers that can be contained in one block +Ext2GroupDescPerBlock: + .long 32 // Number of group descriptors per block +Ext2FirstDataBlock: + .long 1 // First data block (1 for 1024-byte blocks, 0 for bigger sizes) +Ext2InodesPerGroup: + .long 2048 // Number of inodes per group +Ext2InodesPerBlock: + .long 8 // Number of inodes per block Ext2ReadEntireFileLoadSegment: - dw 0 + .word 0 Ext2InodeIndirectPointer: - dd 0 + .long 0 Ext2InodeDoubleIndirectPointer: - dd 0 + .long 0 Ext2BlocksLeftToRead: - dd 0 + .long 0 main: xor ax,ax // Setup segment registers @@ -61,16 +70,16 @@ mov bp, HEX(7c00) mov sp, HEX(7b00) // Setup a stack - - cmp byte ptr [bp+BootDrive], HEX(0ff) // If they have specified a boot drive then use it + mov si, offset BootDrive + cmp byte ptr [si], HEX(0ff) // If they have specified a boot drive then use it jne GetDriveParameters - mov [bp+BootDrive],dl // Save the boot drive + mov [si],dl // Save the boot drive GetDriveParameters: - mov ah,08h - mov dl,[bp+BootDrive] // Get boot drive in dl + mov ah, 8 + mov dl,[si] // Get boot drive in dl int HEX(13) // Request drive parameters from the bios jnc CalcDriveSize // If the call succeeded then calculate the drive size @@ -125,7 +134,7 @@ shl eax,5 // Group = (Group * sizeof(GROUP_DESCRIPTOR) /* 32 */) xor edx,edx div dword ptr [bp+Ext2GroupDescPerBlock] // Group = (Group / Ext2GroupDescPerBlock) - add eax, [bp+Ext2FirstDataBlock] // Group = Group + Ext2FirstDataBlock + 1 + add eax, dword ptr [bp+Ext2FirstDataBlock] // Group = Group + Ext2FirstDataBlock + 1 inc eax // EAX now has the group descriptor block number // EDX now has the group descriptor offset in the block @@ -142,10 +151,10 @@ // Instead of using the call instruction we will // just put Ext2ReadBlock right after this routine -// Reads ext2 block into [ES:BX] +// Reads ext2 block into ES:[BX] // EAX has logical block number to read Ext2ReadBlock: - mov ecx, [bp+Ext2BlockSize] + mov ecx, dword ptr [bp+Ext2BlockSize] mul ecx jmp ReadSectors @@ -193,11 +202,11 @@ ret -// Reads logical sectors into [ES:BX] +// Reads logical sectors into ES:[BX] // EAX has logical sector number to read // CX has number of sectors to read ReadSectors: - add eax, [bp+Ext2VolumeStartSector] // Add the start of the volume + add eax, dword ptr [bp+Ext2VolumeStartSector] // Add the start of the volume cmp eax, [bp-BIOS_CHS_DRIVE_SIZE] // Check if they are reading a sector outside CHS range jae ReadSectorsLBA // Yes - go to the LBA routine // If at all possible we want to use LBA routines because @@ -208,7 +217,7 @@ CheckInt13hExtensions: // Now check if this computer supports extended reads mov ah, HEX(41) // AH = 41h mov bx, HEX(55aa) // BX = 55AAh - mov dl,[bp+BootDrive] // DL = drive (80h-FFh) + mov dl, byte ptr [bp+BootDrive] // DL = drive (80h-FFh) int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK jc ReadSectorsCHS // CF set on error (extensions not supported) cmp bx, HEX(0aa55) // BX = AA55h if installed @@ -228,7 +237,7 @@ ReadSectorsSetupDiskAddressPacket: mov [bp-LBA_SECTORS_READ],cx mov word ptr [bp-LBA_SECTORS_READ+2],0 - o32 push 0 + data32 push 0 push eax // Put 64-bit logical block address on stack push es // Put transfer segment on stack push bx // Put transfer offset on stack @@ -237,9 +246,9 @@ mov si,sp // Setup disk address packet on stack - mov dl, [bp+BootDrive] // Drive number - mov ah,42h // Int 13h, AH = 42h - Extended Read - int 13h // Call BIOS + mov dl, byte ptr [bp+BootDrive] // Drive number + mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read + int HEX(13) // Call BIOS jc PrintDiskError // If the read failed then abort add sp, 16 // Remove disk address packet from stack @@ -247,7 +256,7 @@ popad // Restore sector count & logical sector number push bx - mov ebx,DWORD [bp-LBA_SECTORS_READ] + mov ebx, [bp-LBA_SECTORS_READ] add eax,ebx // Increment sector to read shl ebx,5 mov dx,es @@ -261,7 +270,7 @@ ret -// Reads logical sectors into [ES:BX] +// Reads logical sectors into ES:[BX] // EAX has logical sector number to read // CX has number of sectors to read ReadSectorsCHS: @@ -270,15 +279,15 @@ ReadSectorsCHSLoop: pushad xor edx,edx - mov ecx,DWORD [bp-SECTORS_PER_TRACK] + mov ecx, [bp-SECTORS_PER_TRACK] div ecx // Divide logical by SectorsPerTrack inc dl // Sectors numbering starts at 1 not 0 mov cl,dl // Sector in CL mov edx,eax shr edx,16 - div WORD [bp-NUMBER_OF_HEADS] // Divide logical by number of heads + div word ptr [bp-NUMBER_OF_HEADS] // Divide logical by number of heads mov dh,dl // Head in DH - mov dl,[bp+BootDrive] // Drive number in DL + mov dl, byte ptr [bp+BootDrive] // Drive number in DL mov ch,al // Cylinder in CX ror ah,2 // Low 8 bits of cylinder in CH, high 2 bits // in CL shifted to bits 6 & 7 @@ -316,8 +325,8 @@ mov si,msgAnyKey // Press any key message call PutChars // Display it xor ax,ax - int 16h // Wait for a keypress - int 19h // Reboot + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot PutChars: lodsb @@ -326,16 +335,16 @@ call PutCharsCallBios jmp short PutChars PutCharsCallBios: - mov ah,0eh - mov bx,07h - int 10h - retn + mov ah, HEX(0e) + mov bx, HEX(07) + int HEX(10) + ret Done: - mov al,0dh + mov al, HEX(0d) call PutCharsCallBios - mov al,0ah + mov al, HEX(0a) call PutCharsCallBios - retn + ret @@ -344,14 +353,15 @@ // Sorry, need the space... //msgAnyKey db 'Press any key to restart',0 msgAnyKey: - .ascii "Press any key", NUL - - times 509-($-$$) db 0 // Pad to 509 bytes + .ascii "Press key", NUL + +// times 509-($-$$) db 0 // Pad to 509 bytes + .org 509 BootPartition: - db 0 - - dw HEX(0aa55) // BootSector signature + .byte 0 + + .word HEX(0aa55) // BootSector signature // End of bootsector @@ -367,14 +377,14 @@ call Ext2ReadInode // Read in the inode // Point ES:DI to the inode structure at 6000:8000 - push WORD HEX(6000) + push HEX(6000) pop es mov di, HEX(8000) push di push es // Save these for later // Get root directory size from inode structure - mov eax, [es:di+4] + mov eax, es:[di+4] push eax // Now that the inode has been read in load @@ -410,7 +420,7 @@ jz FoundFile // Nope, didn't find it in this entry, keep looking - movzx ecx,word ptr [es:di+4] + movzx ecx,word ptr es:[di+4] add edx,ecx // Check to see if we have reached the @@ -420,14 +430,14 @@ jmp PrintFileNotFound FoundFile: - mov eax,[es:di] // Get inode number from directory entry + mov eax,es:[di] // Get inode number from directory entry call Ext2ReadInode // Read in the inode // Point ES:DI to the inode structure at 6000:8000 pop es pop di // These were saved earlier - mov cx,[es:di] // Get the file mode so we can make sure it's a regular file + mov cx, es:[di] // Get the file mode so we can make sure it's a regular file and ch,EXT2_S_IFMT // Mask off everything but the file type cmp ch,EXT2_S_IFREG // Make sure it's a regular file je LoadFreeLoader @@ -439,8 +449,8 @@ call Ext2ReadEntireFile // Read freeldr.sys to 0000:8000 - mov dl,[bp+BootDrive] - mov dh,[bp+BootPartition] + mov dl, byte ptr [bp+BootDrive] + mov dh, byte ptr [bp+BootPartition] push 0 // push segment (0x0000) mov eax, [HEX(8000) + HEX(0A8)] // load the RVA of the EntryPoint into eax add eax, HEX(8000) // RVA -> VA @@ -470,7 +480,7 @@ // We will do this by rounding the // file size up to the next block // size and then dividing by the block size - mov eax,DWORD [bp+Ext2BlockSizeInBytes] // Get the block size in bytes + mov eax, dword ptr [bp+Ext2BlockSizeInBytes] // Get the block size in bytes push eax dec eax // Ext2BlockSizeInBytes -= 1 add eax, es:[di+4] // Add the file size @@ -480,22 +490,22 @@ push eax // Make sure the file size isn't zero - cmp eax,byte 0 + cmp eax, 0 jnz Ext2ReadEntireFile2 jmp PrintFileSizeError Ext2ReadEntireFile2: // Save the indirect & double indirect pointers - mov edx,DWORD [es:di+ HEX(58)] // Get indirect pointer - mov [bp+Ext2InodeIndirectPointer],edx // Save indirect pointer - mov edx,DWORD [es:di+ HEX(5c)] // Get double indirect pointer - mov [bp+Ext2InodeDoubleIndirectPointer],edx // Save double indirect pointer + mov edx, es:[di+ HEX(58)] // Get indirect pointer + mov dword ptr [bp+Ext2InodeIndirectPointer], edx // Save indirect pointer + mov edx, es:[di+ HEX(5c)] // Get double indirect pointer + mov dword ptr [bp+Ext2InodeDoubleIndirectPointer],edx // Save double indirect pointer // Now copy the direct pointers to 7000:0000 // so that we can call Ext2ReadDirectBlocks push ds // Save DS push es - push WORD HEX(7000) + push HEX(7000) pop es pop ds mov si, HEX(8028) @@ -513,15 +523,15 @@ // Check to see if we actually have // blocks left to read - cmp eax,byte 0 + cmp eax, 0 jz Ext2ReadEntireFileDone // Now we have read all the direct blocks in // the inode. So now we have to read the indirect // block and read all it's direct blocks push eax // Save the total block count - mov eax,DWORD [BYTE bp+Ext2InodeIndirectPointer] // Get the indirect block pointer - push WORD HEX(7000) + mov eax, dword ptr [bp+Ext2InodeIndirectPointer] // Get the indirect block pointer + push HEX(7000) pop es xor bx,bx // Set the load address to 7000:0000 call Ext2ReadBlock // Read the block @@ -529,7 +539,7 @@ // Now we have all the block pointers from the // indirect block in the right location so read them in pop eax // Restore the total block count - mov ecx,DWORD [BYTE bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains + mov ecx, dword ptr [bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains call Ext2ReadDirectBlockList // Check to see if we actually have @@ -542,9 +552,9 @@ // we have to read the double indirect block // and read all it's indirect blocks // (whew, it's a good thing I don't support triple indirect blocks) - mov [bp+Ext2BlocksLeftToRead],eax // Save the total block count - mov eax,DWORD [bp+Ext2InodeDoubleIndirectPointer] // Get the double indirect block pointer - push WORD HEX(7800) + mov dword ptr [bp+Ext2BlocksLeftToRead],eax // Save the total block count + mov eax, dword ptr [bp+Ext2InodeDoubleIndirectPointer] // Get the double indirect block pointer + push HEX(7800) pop es push es // Save an extra copy of this value on the stack xor bx,bx // Set the load address to 7000:8000 @@ -554,28 +564,28 @@ xor di,di Ext2ReadIndirectBlock: - mov eax,DWORD [es:di] // Get indirect block pointer - add di,BYTE 4 // Update DI for next array index + mov eax, es:[di] // Get indirect block pointer + add di, 4 // Update DI for next array index push es push di - push WORD HEX(7000) + push HEX(7000) pop es xor bx,bx // Set the load address to 7000:0000 call Ext2ReadBlock // Read the indirect block // Now we have all the block pointers from the // indirect block in the right location so read them in - mov eax,DWORD [bp+Ext2BlocksLeftToRead] // Restore the total block count - mov ecx,DWORD [bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains + mov eax, dword ptr [bp+Ext2BlocksLeftToRead] // Restore the total block count + mov ecx, dword ptr [bp+Ext2PointersPerBlock] // Get the number of block pointers that one block contains call Ext2ReadDirectBlockList - mov [bp+Ext2BlocksLeftToRead],eax // Save the total block count + mov dword ptr [bp+Ext2BlocksLeftToRead],eax // Save the total block count pop di pop es // Check to see if we actually have // blocks left to read - cmp eax,byte 0 + cmp eax, 0 jnz Ext2ReadIndirectBlock Ext2ReadEntireFileDone: @@ -606,12 +616,12 @@ // CX contains the number of blocks to read Ext2ReadDirectBlocks: - push WORD HEX(7000) + push HEX(7000) pop es xor di,di // Set ES:DI = 7000:0000 Ext2ReadDirectBlocksLoop: - mov eax,[es:di] // Get direct block pointer from array + mov eax,es:[di] // Get direct block pointer from array add di, 4 // Update DI for next array index push cx // Save number of direct blocks left @@ -660,14 +670,17 @@ msgFreeLdr: .ascii "freeldr.sys not found", NUL msgFileSize: - .ascii "File size is 0", NUL + .ascii "File size 0", NUL msgRegFile: .ascii "freeldr.sys isnt a regular file", NUL filename: .ascii "freeldr.sys" msgLoading: - .ascii "Loading FreeLoader...", NUL - - times 1022-($-$$) db 0 // Pad to 1022 bytes - - dw HEX(0aa55) // BootSector signature + .ascii "Loading...", NUL + +// times 1022-($-$$) db 0 // Pad to 1022 bytes +.org 1022 + + .word HEX(0aa55) // BootSector signature + +END

13 years, 2 months

[akhaldi] 53937: [WIN32K] * Handle allocation failure.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 2 19:41:31 2011 New Revision: 53937 URL: http://svn.reactos.org/svn/reactos?rev=53937&view=rev Log: [WIN32K] * Handle allocation failure. Modified: trunk/reactos/subsystems/win32/win32k/objects/bezier.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bezier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bezier.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bezier.c [iso-8859-1] Sun Oct 2 19:41:31 2011 @@ -200,7 +200,12 @@ return NULL; } *nPtsOut = 0; + out = ExAllocatePoolWithTag(PagedPool, dwOut * sizeof(POINT), TAG_BEZIER); + if(!out) { + return NULL; + } + for(Bezier = 0; Bezier < (count-1)/3; Bezier++) { POINT ptBuf[4]; memcpy(ptBuf, Points + Bezier * 3, sizeof(POINT) * 4);

13 years, 2 months

[akhaldi] 53936: [SYSDM] * Revert r53934, this is a false positive from cppcheck. Spotted by Pierre.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 2 19:27:07 2011 New Revision: 53936 URL: http://svn.reactos.org/svn/reactos?rev=53936&view=rev Log: [SYSDM] * Revert r53934, this is a false positive from cppcheck. Spotted by Pierre. Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Sun Oct 2 19:27:07 2011 @@ -455,10 +455,7 @@ dwBufSize = GetSystemDrive(&szSystemDrive); if (dwBufSize == 0) - { - HeapFree(GetProcessHeap(), 0, szSystemDrive); - return FALSE; - } + return FALSE; wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); wcscat(pStartInfo->szFreeldrIni, L"\\freeldr.ini");

13 years, 2 months

[akhaldi] 53935: [SHELL32] * Fix a memory leak.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 2 19:18:03 2011 New Revision: 53935 URL: http://svn.reactos.org/svn/reactos?rev=53935&view=rev Log: [SHELL32] * Fix a memory leak. Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp Modified: trunk/reactos/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.cpp [iso-8859-1] Sun Oct 2 19:18:03 2011 @@ -237,7 +237,10 @@ /* open key */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Entry); return; + } /* FIXME check for duplicates */

13 years, 2 months

[akhaldi] 53934: [SYSDM] * Fix a memory leak.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 2 19:14:45 2011 New Revision: 53934 URL: http://svn.reactos.org/svn/reactos?rev=53934&view=rev Log: [SYSDM] * Fix a memory leak. Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Sun Oct 2 19:14:45 2011 @@ -455,7 +455,10 @@ dwBufSize = GetSystemDrive(&szSystemDrive); if (dwBufSize == 0) + { + HeapFree(GetProcessHeap(), 0, szSystemDrive); return FALSE; + } wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); wcscat(pStartInfo->szFreeldrIni, L"\\freeldr.ini");

13 years, 2 months

[tfaber] 53933: [NTOSKRNL] - Fix MSVC build [INCLUDE/C++] - Fix some typos in (obviously never used) typeinfo header [MSVCRTEX] - Use _DLL instead of _M_CEE_PURE

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 2 19:08:11 2011 New Revision: 53933 URL: http://svn.reactos.org/svn/reactos?rev=53933&view=rev Log: [NTOSKRNL] - Fix MSVC build [INCLUDE/C++] - Fix some typos in (obviously never used) typeinfo header [MSVCRTEX] - Use _DLL instead of _M_CEE_PURE Modified: trunk/reactos/include/c++/typeinfo trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/include/c++/typeinfo URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/typeinfo?r… ============================================================================== --- trunk/reactos/include/c++/typeinfo [iso-8859-1] (original) +++ trunk/reactos/include/c++/typeinfo [iso-8859-1] Sun Oct 2 19:08:11 2011 @@ -13,7 +13,7 @@ class type_info { public: virtual ~type_info(); - bool before (const type_info& rhs) const; + bool before (const type_info& arg) const { return __name < __arg.__name; } bool operator==(const type_info& __arg) const { return __name == __arg.__name; } Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Oct 2 19:08:11 2011 @@ -62,7 +62,7 @@ endif() add_library(msvcrtex ${MSVCRTEX_SOURCE}) -add_target_compile_definitions(msvcrtex _M_CEE_PURE) +add_target_compile_definitions(msvcrtex _DLL) set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) if(NOT MSVC) Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sun Oct 2 19:08:11 2011 @@ -1289,7 +1289,7 @@ fdiv Value2 fmul Value2 fld Value1 - fsubp + fsubp st(1), st(0) fistp ErrataPresent }; #endif

13 years, 2 months

[pschweitzer] 53932: [MSFS] Fix memory leak

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 2 19:02:35 2011 New Revision: 53932 URL: http://svn.reactos.org/svn/reactos?rev=53932&view=rev Log: [MSFS] Fix memory leak Modified: trunk/reactos/drivers/filesystems/msfs/create.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sun Oct 2 19:02:35 2011 @@ -198,6 +198,7 @@ { ExFreePool(Fcb->Name.Buffer); ExFreePool(Fcb); + ExFreePool(Ccb); KeUnlockMutex(&DeviceExtension->FcbListLock);

13 years, 2 months

[tfaber] 53931: [CMAKE] - Use the new macros for link flags and compile definitions some more. No semantic changes

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 2 18:59:33 2011 New Revision: 53931 URL: http://svn.reactos.org/svn/reactos?rev=53931&view=rev Log: [CMAKE] - Use the new macros for link flags and compile definitions some more. No semantic changes Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/compilerflags.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/nls/idndl/CMakeLists.txt trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -166,10 +166,10 @@ add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) if(NOT MSVC) - set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") + add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") else() - set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") + add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") endif() @@ -229,12 +229,13 @@ add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) if(NOT MSVC) - set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") else() - set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() +add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP) set_image_base(setupldr_pe 0x10000) set_subsystem(setupldr_pe native) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -233,7 +233,7 @@ function(add_importlibs _module) add_dependency_node(${_module}) foreach(LIB ${ARGN}) - if ("${LIB}" MATCHES "msvcrt") + if("${LIB}" MATCHES "msvcrt") add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) endif() Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -8,11 +8,11 @@ list(APPEND _list_properties COMPILE_DEFINITIONS INCLUDE_DIRECTORIES) set(_newvalue "") get_target_property(_oldvalue ${_module} ${_propname}) - if (_oldvalue) + if(_oldvalue) set(_newvalue ${_oldvalue}) endif() list(FIND _list_properties ${_propname} _list_index) - if (NOT _list_index EQUAL -1) + if(NOT _list_index EQUAL -1) # list property list(APPEND _newvalue ${ARGN}) else() @@ -37,7 +37,7 @@ # add_target_compile_definitions(mymodule WIN32 _WIN32 INLINE=inline) # add_target_include_directories(mymodule include ../include) function(add_compile_flags _flags) - if (${ARGC} GREATER 1) + if(${ARGC} GREATER 1) message(STATUS "Excess arguments to add_compile_flags! Args ${ARGN}") endif() # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS @@ -47,14 +47,14 @@ endfunction() function(add_target_compile_flags _module _flags) - if (${ARGC} GREATER 2) + if(${ARGC} GREATER 2) message(STATUS "Excess arguments to add_target_compile_flags! Module ${_module}, args ${ARGN}") endif() add_target_property(${_module} COMPILE_FLAGS ${_flags}) endfunction() function(add_target_link_flags _module _flags) - if (${ARGC} GREATER 2) + if(${ARGC} GREATER 2) message(STATUS "Excess arguments to add_target_link_flags! Module ${_module}, args ${ARGN}") endif() add_target_property(${_module} LINK_FLAGS ${_flags}) Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53931&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -118,7 +118,7 @@ add_target_link_flags(${MODULE} "-Wl,-entry,0") elseif(ARCH MATCHES i386) set(_entrysymbol _${ENTRYPOINT}) - if (${ARGC} GREATER 2) + if(${ARGC} GREATER 2) set(_entrysymbol ${_entrysymbol}@${ARGV2}) endif() add_target_link_flags(${MODULE} "-Wl,-entry,${_entrysymbol}") @@ -191,7 +191,7 @@ endif() endif() - if (${_extension} STREQUAL ".spec") + if(${_extension} STREQUAL ".spec") # Normal importlib creation add_custom_command( @@ -276,7 +276,7 @@ # This gets any specific definitions that were added with set-target-property get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS) - if (_target_defs) + if(_target_defs) foreach(item ${_target_defs}) list(APPEND ${_out_compile_flags} -D${item}) endforeach() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53931… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -64,7 +64,7 @@ add_target_link_flags(${_module} "/NOENTRY") elseif(ARCH MATCHES i386) set(_entrysymbol ${_entrypoint}) - if (${ARGC} GREATER 2) + if(${ARGC} GREATER 2) set(_entrysymbol ${_entrysymbol}@${ARGV2}) endif() add_target_link_flags(${_module} "/ENTRY:${_entrysymbol}") Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -31,10 +31,10 @@ set_entrypoint(ksproxy 0) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") if(MSVC) - set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-") + add_target_compile_flags(ksproxy "/GR-") else() #FIXME : can't build if this is enabled, check if this is needed - #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames) endif() Modified: trunk/reactos/dll/nls/idndl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/nls/idndl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -11,7 +11,7 @@ set_entrypoint(idndl 0) if(NOT MSVC) - set_target_properties(idndl PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + add_target_compile_flags(idndl "-fno-exceptions -fno-rtti") endif(NOT MSVC) add_importlibs(idndl kernel32) Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -14,9 +14,9 @@ if(ARCH MATCHES i386) if(MSVC) - set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "/Gz") + add_target_compile_flags(framebuf_new "/Gz") else() - set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") + add_target_compile_flags(framebuf_new "-mrtd -fno-builtin") endif() endif() Modified: trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -12,8 +12,8 @@ <file>framebuf_new.rc</file> <if property="ARCH" value="i386"> <group compilerset="gcc"> - <compilerflag>-mrtd</compilerflag> - <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-mrtd</compilerflag> + <compilerflag>-fno-builtin</compilerflag> <compilerflag>-Wno-unused-variable</compilerflag> </group> </if> Modified: trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -12,9 +12,9 @@ target_link_libraries(vga libcntpr) if(MSVC) -set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz") + add_target_compile_flags(vga "/Gz") else() -set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") + add_target_compile_flags(vga "-mrtd -fno-builtin") endif() set_module_type(vga kernelmodedriver) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -57,10 +57,10 @@ ${PSEH_LIB}) if(MSVC) - set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-") + add_target_compile_flags(portcls "/GR-") else() target_link_libraries(portcls -lgcc) - set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") endif(MSVC) add_pch(portcls private.hpp) Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -138,7 +138,7 @@ set_entrypoint(halacpi HalInitSystem@8) set_subsystem(halacpi native) set_image_base(halacpi 0x00010000) - set_property(TARGET halacpi PROPERTY COMPILE_DEFINITIONS CONFIG_ACPI) + add_target_compile_definitions(halacpi CONFIG_ACPI) add_cd_file(TARGET halacpi DESTINATION reactos/system32 NO_CAB FOR all) if(MSVC) add_target_link_flags(halacpi "/ignore:4216 /ignore:4078") @@ -146,7 +146,7 @@ # mini_hal add_library(mini_hal ${MINI_HAL_SOURCE}) - set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") + add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) elseif(ARCH MATCHES amd64) Modified: trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CMakeLi… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -47,19 +47,19 @@ target_link_libraries(mingw_common oldnames) endif() -set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) +add_target_compile_definitions(mingw_common _M_CEE_PURE) add_dependencies(mingw_common psdk) add_library(mingw_main crt0_c.c crtexe.c dllargv.c) -set_property(TARGET mingw_main PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_target_compile_definitions(mingw_main _DLL __USE_CRTIMP) add_dependencies(mingw_main psdk) add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c) -set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE) +add_target_compile_definitions(mingw_wmain WPRFLAG UNICODE _UNICODE) add_dependencies(mingw_wmain psdk) add_library(mingw_dllmain crtdll.c dllargv.c) -set_property(TARGET mingw_dllmain PROPERTY COMPILE_DEFINITIONS CRTDLL _WINDOWS_) +add_target_compile_definitions(mingw_dllmain CRTDLL _WINDOWS_) add_dependencies(mingw_dllmain psdk) if(NOT MSVC) @@ -73,5 +73,5 @@ endif() add_library(getopt getopt.c) -set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -37,8 +37,8 @@ string/mbstowcs_nt.c string/wcstombs_nt.c) -set_property(TARGET user32_wsprintf PROPERTY COMPILE_DEFINITIONS _USER32_WSPRINTF) +add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF) add_library(getopt misc/getopt.c) -set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -442,6 +442,6 @@ add_library(crt ${CRT_SOURCE}) target_link_libraries(crt chkstk) -set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) +add_target_compile_definitions(crt __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) #add_pch(crt precomp.h) add_dependencies(crt psdk asm) Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -175,5 +175,5 @@ endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) -set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) +add_target_compile_definitions(libcntpr NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) add_dependencies(libcntpr psdk asm) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Oct 2 18:59:33 2011 @@ -36,24 +36,23 @@ ) if(NOT MSVC) -list(APPEND MSVCRTEX_SOURCE - startup/pseudo-reloc.c - startup/pseudo-reloc-list.c) + list(APPEND MSVCRTEX_SOURCE + startup/pseudo-reloc.c + startup/pseudo-reloc-list.c) endif() if(ARCH MATCHES i386) -list(APPEND MSVCRTEX_SOURCE - except/i386/chkstk_asm.s - except/i386/chkstk_ms.s - math/i386/ci.c - math/i386/ftol2_asm.s - math/i386/alldiv_asm.s -) + list(APPEND MSVCRTEX_SOURCE + except/i386/chkstk_asm.s + except/i386/chkstk_ms.s + math/i386/ci.c + math/i386/ftol2_asm.s + math/i386/alldiv_asm.s) elseif(ARCH MATCHES amd64) -list(APPEND MSVCRTEX_SOURCE - except/amd64/chkstk_asm.s - except/amd64/chkstk_ms.s - math/amd64/alldiv.S) + list(APPEND MSVCRTEX_SOURCE + except/amd64/chkstk_asm.s + except/amd64/chkstk_ms.s + math/amd64/alldiv.S) endif() if(MSVC) @@ -63,7 +62,7 @@ endif() add_library(msvcrtex ${MSVCRTEX_SOURCE}) -set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) +add_target_compile_definitions(msvcrtex _M_CEE_PURE) set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) if(NOT MSVC)

13 years, 2 months

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 October 2011