Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59297: [CONSRV] Start to separate better the CSR console server layer from the pure set of console functions (which will constitute a future console driver called... condrv :) ), and rew...
by hbelusca＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: hbelusca Date: Sun Jun 23 00:18:47 2013 New Revision: 59297 URL: http://svn.reactos.org/svn/reactos?rev=59297&view=rev Log: [CONSRV] Start to separate better the CSR console server layer from the pure set of console functions (which will constitute a future console driver called... condrv :) ), and rework the terminal frontends interface. Now load the frontends by order : - the tui if we're in console mode - the gui, otherwise. (It's a temporary solution) More modifications to come ! Added: trunk/reactos/win32ss/user/consrv/condrv/ (with props) trunk/reactos/win32ss/user/consrv/condrv/console.c - copied, changed from r59261, trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/condrv/graphics.c - copied unchanged from r59261, trunk/reactos/win32ss/user/consrv/graphics.c trunk/reactos/win32ss/user/consrv/frontendctl.c (with props) trunk/reactos/win32ss/user/consrv/frontends/input.c (with props) Removed: trunk/reactos/win32ss/user/consrv/graphics.c Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/coninput.h trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/conoutput.h trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/console.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/include/console.h trunk/reactos/win32ss/user/consrv/init.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… Copied: trunk/reactos/win32ss/user/consrv/condrv/console.c (from r59261, trunk/reactos/win32ss/user/consrv/console.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/condrv… Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Modified: trunk/reactos/win32ss/user/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Added: trunk/reactos/win32ss/user/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Removed: trunk/reactos/win32ss/user/consrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/graphi… Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c…

1 0

[aandrejevic] 59296: [NTVDM] Remove whitespace from empty lines.
by aandrejevic＠svn.reactos.org 23 Jun '13

23 Jun '13

Author: aandrejevic Date: Sun Jun 23 00:11:45 2013 New Revision: 59296 URL: http://svn.reactos.org/svn/reactos?rev=59296&view=rev Log: [NTVDM] Remove whitespace from empty lines. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Jun 23 00:11:45 2013 @@ -55,27 +55,27 @@ CursorRow = ConsoleInfo.dwCursorPosition.Y; ConsoleWidth = ConsoleInfo.dwSize.X; ConsoleHeight = ConsoleInfo.dwSize.Y; - + /* Initialize the PIC */ PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); PicWriteCommand(PIC_SLAVE_CMD, PIC_ICW1 | PIC_ICW1_ICW4); - + /* Set the interrupt offsets */ PicWriteData(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT); PicWriteData(PIC_SLAVE_DATA, BIOS_PIC_SLAVE_INT); - + /* Tell the master PIC there is a slave at IRQ 2 */ PicWriteData(PIC_MASTER_DATA, 1 << 2); PicWriteData(PIC_SLAVE_DATA, 2); - + /* Make sure the PIC is in 8086 mode */ PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086); PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086); - + /* Clear the masks for both PICs */ PicWriteData(PIC_MASTER_DATA, 0x00); PicWriteData(PIC_SLAVE_DATA, 0x00); - + PitWriteCommand(0x34); PitWriteData(0, 0x00); PitWriteData(0, 0x00); @@ -230,7 +230,7 @@ Position.X = Rect.Left; if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax); else Position.Y = Rect.Top + LOBYTE(Eax); - + ScrollConsoleScreenBuffer(ConsoleOutput, &Rect, &Rect, Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Jun 23 00:11:45 2013 @@ -581,7 +581,7 @@ (Eax & 0xFFFFFF00) | SystemTime.wDayOfWeek); break; } - + /* Set system date */ case 0x2B: { @@ -589,7 +589,7 @@ SystemTime.wYear = LOWORD(Ecx); SystemTime.wMonth = HIBYTE(Edx); SystemTime.wDay = LOBYTE(Edx); - + if (SetLocalTime(&SystemTime)) { /* Return success */ @@ -600,7 +600,7 @@ /* Return failure */ EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); } - + break; } @@ -618,7 +618,7 @@ | (SystemTime.wMilliseconds / 10)); break; } - + /* Set system time */ case 0x2D: { @@ -627,7 +627,7 @@ SystemTime.wMinute = LOBYTE(Ecx); SystemTime.wSecond = HIBYTE(Edx); SystemTime.wMilliseconds = LOBYTE(Edx) * 10; - + if (SetLocalTime(&SystemTime)) { /* Return success */ @@ -638,7 +638,7 @@ /* Return failure */ EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); } - + break; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Jun 23 00:11:45 2013 @@ -64,7 +64,7 @@ *Buffer = PicReadCommand(Address); break; } - + case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { @@ -77,7 +77,7 @@ static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { BYTE Byte = *Buffer; - + switch (Address) { case PIT_COMMAND_PORT: @@ -85,7 +85,7 @@ PitWriteCommand(Byte); break; } - + case PIT_DATA_PORT(0): case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): @@ -93,14 +93,14 @@ PitWriteData(Address - PIT_DATA_PORT(0), Byte); break; } - + case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { PicWriteCommand(Address, Byte); break; } - + case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { @@ -147,7 +147,7 @@ VdmRunning = FALSE; return; } - + /* Check if this was an PIC IRQ */ if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) { Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Sun Jun 23 00:11:45 2013 @@ -61,15 +61,15 @@ { return FALSE; } - + /* Insert the value in the queue */ KeyboardQueue[KeyboardQueueEnd] = ScanCode; KeyboardQueueEnd++; KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; - + /* Since we inserted a value, it's not empty anymore */ KeyboardQueueEmpty = FALSE; - + return TRUE; } @@ -78,20 +78,20 @@ { /* Make sure the keyboard queue is not empty */ if (KeyboardQueueEmpty) return FALSE; - + /* Get the scan code */ *ScanCode = KeyboardQueue[KeyboardQueueStart]; - + /* Remove the value from the queue */ KeyboardQueueStart++; KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; - + /* Check if the queue is now empty */ if (KeyboardQueueStart == KeyboardQueueEnd) { KeyboardQueueEmpty = TRUE; } - + return TRUE; } #endif @@ -101,11 +101,11 @@ BYTE PicReadCommand(BYTE Port) { PPIC Pic; - + /* Which PIC are we accessing? */ if (Port == PIC_MASTER_CMD) Pic = &MasterPic; else Pic = &SlavePic; - + if (Pic->ReadIsr) { /* Read the in-service register */ @@ -122,11 +122,11 @@ VOID PicWriteCommand(BYTE Port, BYTE Value) { PPIC Pic; - + /* Which PIC are we accessing? */ if (Port == PIC_MASTER_CMD) Pic = &MasterPic; else Pic = &SlavePic; - + if (Value & PIC_ICW1) { /* Start initialization */ @@ -136,7 +136,7 @@ Pic->ConfigRegister = Value; return; } - + if (Value & PIC_OCW3) { /* This is an OCR3 */ @@ -145,10 +145,10 @@ /* Return the ISR on next read from command port */ Pic->ReadIsr = TRUE; } - + return; } - + /* This is an OCW2 */ if (Value & PIC_OCW2_EOI) { @@ -175,11 +175,11 @@ VOID PicWriteData(BYTE Port, BYTE Value) { PPIC Pic; - + /* Which PIC are we accessing? */ if (Port == PIC_MASTER_DATA) Pic = &MasterPic; else Pic = &SlavePic; - + /* Is the PIC ready? */ if (!Pic->Initialization) { @@ -187,13 +187,13 @@ Pic->MaskRegister = Value; return; } - + /* Has the interrupt offset been set? */ if (Pic->IntOffset == 0xFF) { /* This is an ICW2, set the offset (last three bits always zero) */ Pic->IntOffset = Value & 0xF8; - + /* Check if we are in single mode and don't need an ICW4 */ if ((Pic->ConfigRegister & PIC_ICW1_SINGLE) && !(Pic->ConfigRegister & PIC_ICW1_ICW4)) @@ -203,14 +203,14 @@ } return; } - + /* Check if we are in cascade mode and the cascade register was not set */ if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) && !Pic->CascadeRegisterSet) { /* This is an ICW3 */ Pic->CascadeRegister = Value; Pic->CascadeRegisterSet = TRUE; - + /* Check if we need an ICW4 */ if (!(Pic->ConfigRegister & PIC_ICW1_ICW4)) { @@ -219,22 +219,22 @@ } return; } - + /* This must be an ICW4, we will ignore the 8086 bit (assume always set) */ if (Value & PIC_ICW4_AEOI) { /* Use automatic end-of-interrupt */ Pic->AutoEoi = TRUE; } - + /* Done initializing */ Pic->Initialization = FALSE; } VOID PicInterruptRequest(BYTE Number) -{ +{ BYTE i; - + if (Number >= 0 && Number < 8) { /* Check if any of the higher-priorirty interrupts are busy */ @@ -242,10 +242,10 @@ { if (MasterPic.InServiceRegister & (1 << Number)) return; } - + /* Check if the interrupt is masked */ if (MasterPic.MaskRegister & (1 << Number)) return; - + /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; EmulatorInterrupt(MasterPic.IntOffset + Number); @@ -253,7 +253,7 @@ else if (Number >= 8 && Number < 16) { Number -= 8; - + /* * The slave PIC is connected to IRQ 2, always! If the master PIC * was misconfigured, don't do anything. @@ -263,20 +263,20 @@ { return; } - + /* Check if any of the higher-priorirty interrupts are busy */ if (MasterPic.InServiceRegister != 0) return; for (i = 0; i <= Number ; i++) { if (SlavePic.InServiceRegister & (1 << Number)) return; } - + /* Check if the interrupt is masked */ if (SlavePic.MaskRegister & (1 << Number)) return; /* Set the IRQ 2 bit in the master ISR */ if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; - + /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; EmulatorInterrupt(SlavePic.IntOffset + Number); @@ -287,7 +287,7 @@ { BYTE Channel = Value >> 6; BYTE Mode = (Value >> 1) & 0x07; - + /* Check if this is a counter latch command */ if (((Value >> 4) & 3) == 0) { @@ -295,14 +295,14 @@ PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue; return; } - + /* Set the access mode and reset flip-flops */ PitChannels[Channel].AccessMode = (Value >> 4) & 3; PitChannels[Channel].Pulsed = FALSE; PitChannels[Channel].LatchSet = FALSE; PitChannels[Channel].InputFlipFlop = FALSE; PitChannels[Channel].OutputFlipFlop = FALSE; - + switch (Mode) { case 0: @@ -315,13 +315,13 @@ PitChannels[Channel].Mode = Mode; break; } - + case 6: { PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; break; } - + case 7: { PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; @@ -339,20 +339,20 @@ if (PitChannels[Channel].LatchSet) { CurrentValue = PitChannels[Channel].LatchedValue; - + if (AccessMode == 1 || AccessMode == 2) { /* The latched value was read as one byte */ PitChannels[Channel].LatchSet = FALSE; } } - + /* Use the flip-flop for access mode 3 */ if (AccessMode == 3) { AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; - + /* Check if this was the last read for the latched value */ if (!PitChannels[Channel].InputFlipFlop) { @@ -360,7 +360,7 @@ PitChannels[Channel].LatchSet = FALSE; } } - + switch (AccessMode) { case 1: @@ -368,14 +368,14 @@ /* Low byte */ return CurrentValue & 0x00FF; } - + case 2: { /* High byte */ return CurrentValue >> 8; } } - + /* Shouldn't get here */ return 0; } @@ -383,14 +383,14 @@ VOID PitWriteData(BYTE Channel, BYTE Value) { BYTE AccessMode = PitChannels[Channel].AccessMode; - + /* Use the flip-flop for access mode 3 */ if (PitChannels[Channel].AccessMode == 3) { AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; } - + switch (AccessMode) { case 1: @@ -400,7 +400,7 @@ PitChannels[Channel].ReloadValue |= Value; break; } - + case 2: { /* High byte */ @@ -413,7 +413,7 @@ VOID PitDecrementCount() { INT i; - + for (i = 0; i < PIT_CHANNELS; i++) { switch (PitChannels[i].Mode) @@ -422,7 +422,7 @@ { /* Decrement the value */ PitChannels[i].CurrentValue--; - + /* Did it fall to the terminal count? */ if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) { @@ -432,40 +432,40 @@ } break; } - + case PIT_MODE_RATE_GENERATOR: { /* Decrement the value */ PitChannels[i].CurrentValue--; - + /* Did it fall to zero? */ if (PitChannels[i].CurrentValue != 0) break; /* Yes, raise the output line and reload */ if (i == 0) PicInterruptRequest(0); PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; - + break; } - + case PIT_MODE_SQUARE_WAVE: { /* Decrement the value by 2 */ PitChannels[i].CurrentValue -= 2; - + /* Did it fall to zero? */ if (PitChannels[i].CurrentValue != 0) break; - + /* Yes, toggle the flip-flop */ PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; - + /* Did this create a rising edge in the signal? */ if (PitChannels[i].OutputFlipFlop) { /* Yes, IRQ 0 if this is channel 0 */ if (i == 0) PicInterruptRequest(0); } - + /* Reload the value, but make sure it's even */ if (PitChannels[i].ReloadValue % 2) { @@ -477,16 +477,16 @@ /* It was even */ PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; } - + break; } - + case PIT_MODE_SOFTWARE_STROBE: { // TODO: NOT IMPLEMENTED break; } - + case PIT_MODE_HARDWARE_ONE_SHOT: case PIT_MODE_HARDWARE_STROBE: { @@ -503,42 +503,42 @@ HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); DWORD i, j, Count, TotalEvents; BYTE ScanCode; - + /* Get the number of input events */ if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return; if (Count == 0) return; - + /* Allocate the buffer */ Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count * sizeof(INPUT_RECORD)); if (Buffer == NULL) return; - + /* Peek the input events */ if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup; - + for (i = 0; i < TotalEvents; i++) { /* Check if this is a key event */ if (Buffer[i].EventType != KEY_EVENT) continue; - + /* Get the scan code */ ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; - + /* If this is a key release, set the highest bit in the scan code */ if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; - + /* Push the scan code onto the keyboard queue */ for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++) { KeyboardQueuePush(ScanCode); } - + /* Yes, IRQ 1 */ PicInterruptRequest(1); - + /* Stop the loop */ break; } - + Cleanup: HeapFree(GetProcessHeap(), 0, Buffer); }

1 0

[spetreolle] 59295: [RTL] Update WIN32 to NT errors table. Patch by Samuel Serapion. CORE-7206 #resolve
by spetreolle＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: spetreolle Date: Sat Jun 22 23:42:54 2013 New Revision: 59295 URL: http://svn.reactos.org/svn/reactos?rev=59295&view=rev Log: [RTL] Update WIN32 to NT errors table. Patch by Samuel Serapion. CORE-7206 #resolve Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=59295&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Sat Jun 22 23:42:54 2013 @@ -3,6 +3,7 @@ * * Copyright 2000 Alexandre Julliard * Copyright 2002 Andriy Palamarchuk + * Copyright 2010 AndrÃ© Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -251,10 +252,10 @@ ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY /* 00000121 (STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY) */ }; -static const DWORD table_40000002[12] = +static const DWORD table_40000002[36] = { ERROR_INVALID_PARAMETER, /* 40000002 (STATUS_WORKING_SET_LIMIT_RANGE) */ - 0, /* 40000003 (STATUS_IMAGE_NOT_AT_BASE) */ + ERROR_IMAGE_NOT_AT_BASE, /* 40000003 (STATUS_IMAGE_NOT_AT_BASE) */ 0, /* 40000004 (STATUS_RXACT_STATE_CREATED) */ 0, /* 40000005 (STATUS_SEGMENT_NOTIFICATION) */ ERROR_LOCAL_USER_SESSION_KEY, /* 40000006 (STATUS_LOCAL_USER_SESSION_KEY) */ @@ -264,7 +265,31 @@ 0, /* 4000000a (STATUS_FT_READ_RECOVERY_FROM_BACKUP) */ 0, /* 4000000b (STATUS_FT_WRITE_RECOVERY) */ ERROR_COUNTER_TIMEOUT, /* 4000000c (STATUS_SERIAL_COUNTER_TIMEOUT) */ - ERROR_NULL_LM_PASSWORD /* 4000000d (STATUS_NULL_LM_PASSWORD) */ + ERROR_NULL_LM_PASSWORD, /* 4000000d (STATUS_NULL_LM_PASSWORD) */ + ERROR_IMAGE_MACHINE_TYPE_MISMATCH, /* 4000000e (STATUS_IMAGE_MACHINE_TYPE_MISMATCH) */ + ERROR_RECEIVE_PARTIAL, /* 4000000f (STATUS_RECEIVE_PARTIAL) */ + ERROR_RECEIVE_EXPEDITED, /* 40000010 (STATUS_RECEIVE_EXPEDITED) */ + ERROR_RECEIVE_PARTIAL_EXPEDITED, /* 40000011 (STATUS_RECEIVE_PARTIAL_EXPEDITED) */ + ERROR_EVENT_DONE, /* 40000012 (STATUS_EVENT_DONE) */ + ERROR_EVENT_PENDING, /* 40000013 (STATUS_EVENT_PENDING) */ + ERROR_CHECKING_FILE_SYSTEM, /* 40000014 (STATUS_CHECKING_FILE_SYSTEM) */ + ERROR_FATAL_APP_EXIT, /* 40000015 (STATUS_FATAL_APP_EXIT) */ + ERROR_PREDEFINED_HANDLE, /* 40000016 (STATUS_PREDEFINED_HANDLE) */ + ERROR_WAS_UNLOCKED, /* 40000017 (STATUS_WAS_UNLOCKED) */ + ERROR_SERVICE_NOTIFICATION, /* 40000018 (STATUS_SERVICE_NOTIFICATION) */ + ERROR_WAS_LOCKED, /* 40000019 (STATUS_WAS_LOCKED) */ + ERROR_LOG_HARD_ERROR, /* 4000001a (STATUS_LOG_HARD_ERROR) */ + ERROR_ALREADY_WIN32, /* 4000001b (STATUS_ALREADY_WIN32) */ + 0, /* 4000001c (STATUS_WX86_UNSIMULATE) */ + 0, /* 4000001d (STATUS_WX86_CONTINUE) */ + 0, /* 4000001e (STATUS_WX86_SINGLE_STEP) */ + 0, /* 4000001f (STATUS_WX86_BREAKPOINT) */ + 0, /* 40000020 (STATUS_WX86_EXCEPTION_CONTINUE) */ + 0, /* 40000021 (STATUS_WX86_EXCEPTION_LASTCHANCE) */ + 0, /* 40000022 (STATUS_WX86_EXCEPTION_CHAIN) */ + ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE, /* 40000023 (STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE) */ + ERROR_NO_YIELD_PERFORMED, /* 40000024 (STATUS_NO_YIELD_PERFORMED) */ + ERROR_TIMER_RESUME_IGNORED /* 40000025 (STATUS_TIMER_RESUME_IGNORED) */ }; static const DWORD table_40000370[1] = @@ -293,7 +318,7 @@ 0, /* 80000007 (STATUS_WAKE_SYSTEM_DEBUGGER) */ 0, /* 80000008 */ 0, /* 80000009 */ - 0, /* 8000000a (STATUS_HANDLES_CLOSED) */ + ERROR_HANDLES_CLOSED, /* 8000000a (STATUS_HANDLES_CLOSED) */ ERROR_NO_INHERITANCE, /* 8000000b (STATUS_NO_INHERITANCE) */ 0, /* 8000000c (STATUS_GUID_SUBSTITUTION_MADE) */ ERROR_PARTIAL_COPY, /* 8000000d (STATUS_PARTIAL_COPY) */ @@ -710,9 +735,9 @@ 0, /* c0000115 (STATUS_ABIOS_SELECTOR_NOT_AVAILABLE) */ 0, /* c0000116 (STATUS_ABIOS_INVALID_SELECTOR) */ ERROR_INVALID_THREAD_ID, /* c0000117 (STATUS_NO_LDT) */ - 0, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ - 0, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ - 0, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ + ERROR_INVALID_LDT_SIZE, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ + ERROR_INVALID_LDT_OFFSET, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ + ERROR_INVALID_LDT_DESCRIPTOR, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ ERROR_BAD_EXE_FORMAT, /* c000011b (STATUS_INVALID_IMAGE_NE_FORMAT) */ ERROR_RXACT_INVALID_STATE, /* c000011c (STATUS_RXACT_INVALID_STATE) */ ERROR_RXACT_COMMIT_FAILURE, /* c000011d (STATUS_RXACT_COMMIT_FAILURE) */ @@ -740,11 +765,11 @@ ERROR_TIME_SKEW, /* c0000133 (STATUS_TIME_DIFFERENCE_AT_DC) */ 0, /* c0000134 (STATUS_SYNCHRONIZATION_REQUIRED) */ ERROR_MOD_NOT_FOUND, /* c0000135 (STATUS_DLL_NOT_FOUND) */ - 0, /* c0000136 (STATUS_OPEN_FAILED) */ - 0, /* c0000137 (STATUS_IO_PRIVILEGE_FAILED) */ + ERROR_NET_OPEN_FAILED, /* c0000136 (STATUS_OPEN_FAILED) */ + ERROR_IO_PRIVILEGE_FAILED, /* c0000137 (STATUS_IO_PRIVILEGE_FAILED) */ ERROR_INVALID_ORDINAL, /* c0000138 (STATUS_ORDINAL_NOT_FOUND) */ ERROR_PROC_NOT_FOUND, /* c0000139 (STATUS_ENTRYPOINT_NOT_FOUND) */ - 0, /* c000013a (STATUS_CONTROL_C_EXIT) */ + ERROR_CONTROL_C_EXIT, /* c000013a (STATUS_CONTROL_C_EXIT) */ ERROR_NETNAME_DELETED, /* c000013b (STATUS_LOCAL_DISCONNECT) */ ERROR_NETNAME_DELETED, /* c000013c (STATUS_REMOTE_DISCONNECT) */ ERROR_REM_NOT_LIST, /* c000013d (STATUS_REMOTE_RESOURCES) */ @@ -753,18 +778,18 @@ ERROR_UNEXP_NET_ERR, /* c0000140 (STATUS_INVALID_CONNECTION) */ ERROR_UNEXP_NET_ERR, /* c0000141 (STATUS_INVALID_ADDRESS) */ ERROR_DLL_INIT_FAILED, /* c0000142 (STATUS_DLL_INIT_FAILED) */ - 0, /* c0000143 (STATUS_MISSING_SYSTEMFILE) */ - 0, /* c0000144 (STATUS_UNHANDLED_EXCEPTION) */ - 0, /* c0000145 (STATUS_APP_INIT_FAILURE) */ - 0, /* c0000146 (STATUS_PAGEFILE_CREATE_FAILED) */ - 0, /* c0000147 (STATUS_NO_PAGEFILE) */ + ERROR_MISSING_SYSTEMFILE, /* c0000143 (STATUS_MISSING_SYSTEMFILE) */ + ERROR_UNHANDLED_EXCEPTION, /* c0000144 (STATUS_UNHANDLED_EXCEPTION) */ + ERROR_APP_INIT_FAILURE, /* c0000145 (STATUS_APP_INIT_FAILURE) */ + ERROR_PAGEFILE_CREATE_FAILED, /* c0000146 (STATUS_PAGEFILE_CREATE_FAILED) */ + ERROR_NO_PAGEFILE, /* c0000147 (STATUS_NO_PAGEFILE) */ ERROR_INVALID_LEVEL, /* c0000148 (STATUS_INVALID_LEVEL) */ ERROR_INVALID_PASSWORD, /* c0000149 (STATUS_WRONG_PASSWORD_CORE) */ - 0, /* c000014a (STATUS_ILLEGAL_FLOAT_CONTEXT) */ + ERROR_ILLEGAL_FLOAT_CONTEXT, /* c000014a (STATUS_ILLEGAL_FLOAT_CONTEXT) */ ERROR_BROKEN_PIPE, /* c000014b (STATUS_PIPE_BROKEN) */ ERROR_BADDB, /* c000014c (STATUS_REGISTRY_CORRUPT) */ ERROR_REGISTRY_IO_FAILED, /* c000014d (STATUS_REGISTRY_IO_FAILED) */ - 0, /* c000014e (STATUS_NO_EVENT_PAIR) */ + ERROR_NO_EVENT_PAIR, /* c000014e (STATUS_NO_EVENT_PAIR) */ ERROR_UNRECOGNIZED_VOLUME, /* c000014f (STATUS_UNRECOGNIZED_VOLUME) */ ERROR_SERIAL_NO_DEVICE, /* c0000150 (STATUS_SERIAL_NO_DEVICE_INITED) */ ERROR_NO_SUCH_ALIAS, /* c0000151 (STATUS_NO_SUCH_ALIAS) */ @@ -780,7 +805,7 @@ ERROR_LOGON_TYPE_NOT_GRANTED, /* c000015b (STATUS_LOGON_TYPE_NOT_GRANTED) */ ERROR_NOT_REGISTRY_FILE, /* c000015c (STATUS_NOT_REGISTRY_FILE) */ ERROR_NT_CROSS_ENCRYPTION_REQUIRED, /* c000015d (STATUS_NT_CROSS_ENCRYPTION_REQUIRED) */ - 0, /* c000015e (STATUS_DOMAIN_CTRLR_CONFIG_ERROR) */ + ERROR_DOMAIN_CTRLR_CONFIG_ERROR, /* c000015e (STATUS_DOMAIN_CTRLR_CONFIG_ERROR) */ ERROR_IO_DEVICE, /* c000015f (STATUS_FT_MISSING_MEMBER) */ 0, /* c0000160 (STATUS_ILL_FORMED_SERVICE_ENTRY) */ 0, /* c0000161 (STATUS_ILLEGAL_CHARACTER) */ @@ -886,8 +911,8 @@ 0, /* c0000227 (STATUS_RECOVERY_FAILURE) */ 0, /* c0000228 (STATUS_STACK_OVERFLOW_READ) */ ERROR_INVALID_PARAMETER, /* c0000229 (STATUS_FAIL_CHECK) */ - STATUS_DUPLICATE_OBJECTID, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ - STATUS_OBJECTID_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022a (STATUS_DUPLICATE_OBJECTID) */ + ERROR_OBJECT_ALREADY_EXISTS, /* c000022b (STATUS_OBJECTID_EXISTS) */ 0, /* c000022c (STATUS_CONVERT_TO_LARGE) */ ERROR_RETRY, /* c000022d (STATUS_RETRY) */ 0, /* c000022e (STATUS_FOUND_OUT_OF_SCOPE) */ @@ -927,7 +952,7 @@ 0, /* c0000250 (STATUS_INSUFFICIENT_LOGON_INFO) */ 0, /* c0000251 (STATUS_BAD_DLL_ENTRYPOINT) */ 0, /* c0000252 (STATUS_BAD_SERVICE_ENTRYPOINT) */ - ERROR_INTERNAL_ERROR, /* c0000253 (STATUS_LPC_REPLY_LOST) */ + ERROR_CONNECTION_ABORTED, /* c0000253 (STATUS_LPC_REPLY_LOST) */ 0, /* c0000254 (STATUS_IP_ADDRESS_CONFLICT1) */ 0, /* c0000255 (STATUS_IP_ADDRESS_CONFLICT2) */ 0, /* c0000256 (STATUS_REGISTRY_QUOTA_LIMIT) */ @@ -1460,7 +1485,7 @@ ERROR_CLUSTER_NETWORK_NOT_INTERNAL /* c0130016 (STATUS_CLUSTER_NETWORK_NOT_INTERNAL) */ }; -static const DWORD table_c0150001[14] = +static const DWORD table_c0150001[39] = { ERROR_SXS_SECTION_NOT_FOUND, /* c0150001 (STATUS_SXS_SECTION_NOT_FOUND) */ ERROR_SXS_CANT_GEN_ACTCTX, /* c0150002 (STATUS_SXS_CANT_GEN_ACTCTX) */ @@ -1470,18 +1495,43 @@ ERROR_SXS_MANIFEST_PARSE_ERROR, /* c0150006 (STATUS_SXS_MANIFEST_PARSE_ERROR) */ ERROR_SXS_ACTIVATION_CONTEXT_DISABLED, /* c0150007 (STATUS_SXS_ACTIVATION_CONTEXT_DISABLED) */ ERROR_SXS_KEY_NOT_FOUND, /* c0150008 (STATUS_SXS_KEY_NOT_FOUND) */ - 0, /* c0150009 (STATUS_SXS_VERSION_CONFLICT) */ + ERROR_SXS_VERSION_CONFLICT, /* c0150009 (STATUS_SXS_VERSION_CONFLICT) */ ERROR_SXS_WRONG_SECTION_TYPE, /* c015000a (STATUS_SXS_WRONG_SECTION_TYPE) */ ERROR_SXS_THREAD_QUERIES_DISABLED, /* c015000b (STATUS_SXS_THREAD_QUERIES_DISABLED) */ - 0, /* c015000c (STATUS_SXS_ASSEMBLY_MISSING) */ + ERROR_SXS_ASSEMBLY_MISSING, /* c015000c (STATUS_SXS_ASSEMBLY_MISSING) */ 0, /* c015000d */ - ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET /* c015000e (STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET) */ + ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET, /* c015000e (STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET) */ + ERROR_SXS_EARLY_DEACTIVATION, /* c015000f (STATUS_SXS_EARLY_DEACTIVATION) */ + ERROR_SXS_INVALID_DEACTIVATION, /* c0150010 (STATUS_SXS_INVALID_DEACTIVATION) */ + ERROR_SXS_MULTIPLE_DEACTIVATION, /* c0150011 (STATUS_SXS_MULTIPLE_DEACTIVATION) */ + ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY, /* c0150012 (STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY) */ + ERROR_SXS_PROCESS_TERMINATION_REQUESTED, /* c0150013 (STATUS_SXS_PROCESS_TERMINATION_REQUESTED) */ + ERROR_SXS_CORRUPT_ACTIVATION_STACK, /* c0150014 (STATUS_SXS_CORRUPT_ACTIVATION_STACK) */ + ERROR_SXS_CORRUPTION, /* c0150015 (STATUS_SXS_CORRUPTION) */ + ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE, /* c0150016 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE) */ + ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME, /* c0150017 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME) */ + ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE, /* c0150018 (STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE) */ + ERROR_SXS_IDENTITY_PARSE_ERROR, /* c0150019 (STATUS_SXS_IDENTITY_PARSE_ERROR) */ + ERROR_SXS_COMPONENT_STORE_CORRUPT, /* c015001a (STATUS_SXS_COMPONENT_STORE_CORRUPT) */ + ERROR_SXS_FILE_HASH_MISMATCH, /* c015001b (STATUS_SXS_FILE_HASH_MISMATCH) */ + ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT, /* c015001c (STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT) */ + ERROR_SXS_IDENTITIES_DIFFERENT, /* c015001d (STATUS_SXS_IDENTITIES_DIFFERENT) */ + ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT, /* c015001e (STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT) */ + ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY, /* c015001f (STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY) */ + ERROR_ADVANCED_INSTALLER_FAILED, /* c0150020 (STATUS_ADVANCED_INSTALLER_FAILED) */ + ERROR_XML_ENCODING_MISMATCH, /* c0150021 (STATUS_XML_ENCODING_MISMATCH) */ + ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ + ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ + ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ + ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; static const struct error_table error_table[] = { { 0x00000102, 0x00000122, table_00000102 }, - { 0x40000002, 0x4000000e, table_40000002 }, + { 0x40000002, 0x40000026, table_40000002 }, { 0x40000370, 0x40000371, table_40000370 }, { 0x40020056, 0x40020057, table_40020056 }, { 0x400200af, 0x400200b0, table_400200af }, @@ -1498,7 +1548,6 @@ { 0xc0030059, 0xc0030062, table_c0030059 }, { 0xc00a0001, 0xc00a0037, table_c00a0001 }, { 0xc0130001, 0xc0130017, table_c0130001 }, - { 0xc0150001, 0xc015000f, table_c0150001 }, - { 0, 0, 0 } /* last entry */ -}; - + { 0xc0150001, 0xc0150028, table_c0150001 }, + { 0, 0, NULL } /* last entry */ +};

1 0

[spetreolle] 59294: [VERSION] Replace binary tool in repository by a Windows one to get current date. (supported since Windows XP/2003)
by spetreolle＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: spetreolle Date: Sat Jun 22 22:33:49 2013 New Revision: 59294 URL: http://svn.reactos.org/svn/reactos?rev=59294&view=rev Log: [VERSION] Replace binary tool in repository by a Windows one to get current date. (supported since Windows XP/2003) Removed: trunk/reactos/tools/getdate.c trunk/reactos/tools/getdate.cmd trunk/reactos/tools/getdate.exe Modified: trunk/reactos/include/reactos/version.cmake Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Sat Jun 22 22:33:49 2013 @@ -1,7 +1,9 @@ macro(today RESULT) if(CMAKE_HOST_WIN32) - execute_process(COMMAND "${REACTOS_SOURCE_DIR}/tools/getdate.exe" OUTPUT_VARIABLE ${RESULT}) - string(STRIP ${${RESULT}} ${RESULT}) + execute_process(COMMAND wmic os get LocalDateTime OUTPUT_VARIABLE RAWDATE) + string(REPLACE "\n" ";" RAWDATE ${RAWDATE}) + LIST(GET RAWDATE 1 RAWDATE) + string(SUBSTRING ${RAWDATE} 0 8 ${RESULT}) elseif(CMAKE_HOST_UNIX) execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT}) string(STRIP ${${RESULT}} ${RESULT}) Removed: trunk/reactos/tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/getdate.c?rev=59293&… ============================================================================== --- trunk/reactos/tools/getdate.c [iso-8859-1] (original) +++ trunk/reactos/tools/getdate.c (removed) @@ -1,13 +0,0 @@ -#include <stdio.h> -#include <time.h> -void main() -{ - char curdate[9]; - time_t now; - struct tm *tm_now; - - time(&now); - tm_now=localtime(&now); - strftime(curdate, sizeof(curdate), "%Y%m%d", tm_now); - printf("%s", curdate); -} Removed: trunk/reactos/tools/getdate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/getdate.cmd?rev=5929… ============================================================================== --- trunk/reactos/tools/getdate.cmd [iso-8859-1] (original) +++ trunk/reactos/tools/getdate.cmd (removed) @@ -1 +0,0 @@ -gcc getdate.c -o getdate.exe -s Removed: trunk/reactos/tools/getdate.exe URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/getdate.exe?rev=5929… ============================================================================== Binary file - no diff available.

1 0

[tfaber] 59293: [CPPRT] - Apply VS asm file hack. Spotted by Dominik Hornung
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 19:32:27 2013 New Revision: 59293 URL: http://svn.reactos.org/svn/reactos?rev=59293&view=rev Log: [CPPRT] - Apply VS asm file hack. Spotted by Dominik Hornung Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sat Jun 22 19:32:27 2013 @@ -1,4 +1,9 @@ set_cpp(WITH_EXCEPTIONS) -add_library(cpprt ehvec.cpp typeinfo.cpp i386/cpprt.s) +list(APPEND SOURCE + ehvec.cpp + typeinfo.cpp) + +add_asm_files(cpprt_asm i386/cpprt.s) +add_library(cpprt ${SOURCE} ${cpprt_asm})

1 0

[tfaber] 59292: [ROSAUTOTEST] - Remove an unnecessary hack that makes the app useless on MSVC
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 17:16:25 2013 New Revision: 59292 URL: http://svn.reactos.org/svn/reactos?rev=59292&view=rev Log: [ROSAUTOTEST] - Remove an unnecessary hack that makes the app useless on MSVC Modified: trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Sat Jun 22 17:16:25 2013 @@ -57,10 +57,3 @@ string StringOut(const string& String, bool forcePrint = true); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); - - -/* Lazy HACK to allow compiling/debugging with MSVC while we lack support - for linking against "debugsup_ntdll" in MSVC */ -#ifdef _MSC_VER - #define DbgPrint -#endif

1 0

[tfaber] 59291: [C++] - Enable MSVC build of mesa, telnet, explorer and rosautotest CORE-6950 #resolve
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 16:38:27 2013 New Revision: 59291 URL: http://svn.reactos.org/svn/reactos?rev=59291&view=rev Log: [C++] - Enable MSVC build of mesa, telnet, explorer and rosautotest CORE-6950 #resolve Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/base/applications/network/telnet/CMakeLists.txt trunk/reactos/base/applications/network/telnet/src/precomp.h trunk/reactos/base/shell/CMakeLists.txt trunk/reactos/dll/opengl/CMakeLists.txt trunk/rostests/CMakeLists.txt trunk/rostests/rosautotest/precomp.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -10,9 +10,7 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) -if(NOT MSVC) - add_subdirectory(telnet) # FIXME: fix msvc build -endif() +add_subdirectory(telnet) add_subdirectory(tracert) add_subdirectory(whois) add_subdirectory(wlanconf) Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -1,5 +1,5 @@ -set_cpp(WITH_STL) +set_cpp(WITH_EXCEPTIONS WITH_STL) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) @@ -27,7 +27,7 @@ set_module_type(telnet win32cui) add_pch(telnet src/precomp.h) -add_importlibs(telnet ws2_32 user32 msvcrt kernel32) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all) if(NOT MSVC) Modified: trunk/reactos/base/applications/network/telnet/src/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/precomp.h [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -18,7 +18,7 @@ //#include <stdio.h> //#include <stdarg.h> //#include <string.h> -//#include <locale.h> +#include <locale.h> #include <io.h> #include <time.h> //#include <ctype.h> Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -1,7 +1,4 @@ add_subdirectory(cmd) -if(NOT MSVC) add_subdirectory(explorer) -endif() add_subdirectory(explorer-new) - Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… ============================================================================== --- trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -1,5 +1,3 @@ add_subdirectory(glu32) -if(NOT MSVC) - add_subdirectory(mesa) -endif() +add_subdirectory(mesa) add_subdirectory(opengl32) Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=59291&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -5,9 +5,7 @@ #add_subdirectory(dxtest) add_subdirectory(kmtests) #add_subdirectory(regtests) -if(NOT MSVC) # FIXME: msvc build - add_subdirectory(rosautotest) -endif() +add_subdirectory(rosautotest) add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Sat Jun 22 16:38:27 2013 @@ -2,6 +2,7 @@ #include <iostream> #include <memory> #include <sstream> +#include <string> #include <vector> #include <iomanip>

1 0

[tfaber] 59290: [C++] - Enable STLPort build on MSVC - Configure STLPort not to generate static constant definitions (which MSVC doesn't like) - Link C++ modules to stlport and cpprt as appropriate...
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 15:57:36 2013 New Revision: 59290 URL: http://svn.reactos.org/svn/reactos?rev=59290&view=rev Log: [C++] - Enable STLPort build on MSVC - Configure STLPort not to generate static constant definitions (which MSVC doesn't like) - Link C++ modules to stlport and cpprt as appropriate - Fix comsupp and atl C++ options CORE-6950 Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/include/c++/stlport/stl/config/_reactos.h trunk/reactos/lib/3rdparty/CMakeLists.txt trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt trunk/reactos/lib/atl/CMakeLists.txt trunk/reactos/lib/sdk/comsupp/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59290… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -112,7 +112,9 @@ if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) message(FATAL_ERROR "Use of STL in kernelmodedriver or wdmdriver type module prohibited") endif() - #target_link_libraries(${MODULE} stlport oldnames) + target_link_libraries(${MODULE} cpprt stlport oldnames) + elseif(CPP_USE_RT) + target_link_libraries(${MODULE} cpprt) endif() if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) add_target_link_flags(${MODULE} "/DLL") Modified: trunk/reactos/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -214,7 +214,7 @@ // Uncomment to indicate that the compiler do not like static constant // definition. // Meaningfull only if _STLP_STATIC_CONST_INIT_BUG is not defined. -// # define _STLP_NO_STATIC_CONST_DEFINITION +# define _STLP_NO_STATIC_CONST_DEFINITION // Define if default constructor for builtin integer type fails to initialize it to 0 // In expression like new(&char) char(): Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -9,6 +9,8 @@ add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) -# add_subdirectory(stlport) FIXME: Add proper STL support +if(MSVC) + add_subdirectory(stlport) +endif() add_subdirectory(strmbase) add_subdirectory(zlib) Modified: trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -1,13 +1,13 @@ #uncomment this if you want to test c++ compilation #add_subdirectory(test) + +set_cpp(WITH_RTTI WITH_EXCEPTIONS WITH_STL) add_definitions( -D_STLP_USE_EXCEPTIONS -D_DLL -D__USE_CRTIMP -D_BUILD_STLPORT) - -set_cpp() list(APPEND SOURCE src/allocators.cpp Modified: trunk/reactos/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/atl/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -1,7 +1,5 @@ -if(NOT MSVC) - set_cpp(WITH_RTTI) -endif() +set_cpp(WITH_RTTI) add_definitions( -DUNICODE -D_UNICODE Modified: trunk/reactos/lib/sdk/comsupp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/comsupp/CMakeLists… ============================================================================== --- trunk/reactos/lib/sdk/comsupp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/comsupp/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:57:36 2013 @@ -1,5 +1,5 @@ -set_cpp(WITH_EXCEPTIONS) +set_cpp(WITH_EXCEPTIONS WITH_STL) add_library(comsupp comsupp.cpp) add_dependencies(comsupp psdk)

1 0

[tfaber] 59289: [CPPRT] - Add C++ runtime library for MSVC (analogous to GCC's libsupc++) CORE-6950
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 15:40:20 2013 New Revision: 59289 URL: http://svn.reactos.org/svn/reactos?rev=59289&view=rev Log: [CPPRT] - Add C++ runtime library for MSVC (analogous to GCC's libsupc++) CORE-6950 Added: trunk/reactos/lib/sdk/cpprt/ (with props) trunk/reactos/lib/sdk/cpprt/CMakeLists.txt (with props) trunk/reactos/lib/sdk/cpprt/ehvec.cpp (with props) trunk/reactos/lib/sdk/cpprt/i386/ (with props) trunk/reactos/lib/sdk/cpprt/i386/cpprt.s (with props) trunk/reactos/lib/sdk/cpprt/typeinfo.cpp (with props) Modified: trunk/reactos/lib/sdk/CMakeLists.txt Modified: trunk/reactos/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/sdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:40:20 2013 @@ -1,5 +1,8 @@ add_subdirectory(comsupp) +if(MSVC) + add_subdirectory(cpprt) +endif() add_subdirectory(crt) add_subdirectory(delayimp) add_subdirectory(dxguid) Propchange: trunk/reactos/lib/sdk/cpprt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jun 22 15:40:20 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt (added) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sat Jun 22 15:40:20 2013 @@ -0,0 +1,4 @@ + +set_cpp(WITH_EXCEPTIONS) + +add_library(cpprt ehvec.cpp typeinfo.cpp i386/cpprt.s) Propchange: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/cpprt/ehvec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/ehvec.cpp?re… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/ehvec.cpp (added) +++ trunk/reactos/lib/sdk/cpprt/ehvec.cpp [iso-8859-1] Sat Jun 22 15:40:20 2013 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS c++ runtime library + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Exception-handling vector ctor/dtor iterator implementation + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <stddef.h> + +void __stdcall MSVCRTEX_eh_vector_constructor_iterator(void *pMem, size_t sizeOfItem, int nItems, void (__thiscall *ctor)(void *), void (__thiscall *dtor)(void *)) +{ + char *pEnd = static_cast<char *>(pMem) + nItems * sizeOfItem; + for (char *pItem = static_cast<char *>(pMem); + pItem < pEnd; + pItem += sizeOfItem) + { + try + { + ctor(pItem); + } + catch (...) + { + for (pItem -= sizeOfItem; pItem >= pMem; pItem -= sizeOfItem) + dtor(pItem); + throw; + } + } +} + +void __stdcall MSVCRTEX_eh_vector_destructor_iterator(void *pMem, size_t sizeOfItem, int nItems, void (__thiscall *dtor)(void *)) +{ + char *pEnd = static_cast<char *>(pMem) + nItems * sizeOfItem; + for (char *pItem = pEnd - sizeOfItem; + pItem >= pMem; + pItem -= sizeOfItem) + { + try + { + dtor(pItem); + } + catch (...) + { + for (pItem -= sizeOfItem; pItem >= pMem; pItem -= sizeOfItem) + dtor(pItem); + throw; + } + } +} Propchange: trunk/reactos/lib/sdk/cpprt/ehvec.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/cpprt/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jun 22 15:40:20 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s (added) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Sat Jun 22 15:40:20 2013 @@ -0,0 +1,16 @@ +#include <asm.inc> + +.code + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) +DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z + +; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) +DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z + +END Propchange: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/cpprt/typeinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/typeinfo.cpp… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/typeinfo.cpp (added) +++ trunk/reactos/lib/sdk/cpprt/typeinfo.cpp [iso-8859-1] Sat Jun 22 15:40:20 2013 @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS c++ runtime library + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Type info stub implementation + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +/* TODO: #include <exception> instead */ +class type_info { +public: + __declspec(dllimport) virtual ~type_info(); +private: + type_info(const type_info &); + type_info &operator=(const type_info &); +}; + +/* These stubs don't need to do anything (those private functions are never + * called). They need to be in cpprt, though, in order to have the vtable + * and generated destructor thunks available to programs */ +type_info::type_info(const type_info &) +{ +} + +type_info &type_info::operator=(const type_info &) +{ + return *this; +} Propchange: trunk/reactos/lib/sdk/cpprt/typeinfo.cpp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 59288: [CMAKE] - rework set_cpp to allow fine-grained control over enabled language features CORE-6950
by tfaber＠svn.reactos.org 22 Jun '13

22 Jun '13

Author: tfaber Date: Sat Jun 22 14:44:56 2013 New Revision: 59288 URL: http://svn.reactos.org/svn/reactos?rev=59288&view=rev Log: [CMAKE] - rework set_cpp to allow fine-grained control over enabled language features CORE-6950 Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/network/telnet/CMakeLists.txt trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/opengl/glu32/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/netshell/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/drivers/usb/usbohci/CMakeLists.txt trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt trunk/reactos/lib/atl/CMakeLists.txt trunk/reactos/lib/drivers/libusb/CMakeLists.txt trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt trunk/reactos/lib/sdk/comsupp/CMakeLists.txt trunk/rostests/rosautotest/CMakeLists.txt Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C… ============================================================================== --- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,4 +1,6 @@ + set_cpp() + add_definitions(-DUSER_MODE) include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata) add_executable(atactl atactl.cpp atactl.rc) @@ -9,7 +11,6 @@ # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #allow_warnings(atactl) set_source_files_properties(atactl.cpp PROPERTIES COMPILE_FLAGS "-Wno-error") - target_link_libraries(atactl gcc) endif() add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,7 +1,9 @@ -set_cpp() +set_cpp(WITH_RUNTIME) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR}) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib + ${CMAKE_CURRENT_SOURCE_DIR}) add_executable(spider spider.cpp Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,7 +1,7 @@ + +set_cpp(WITH_STL) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) - -set_cpp() add_executable(telnet src/ansiprsr.cpp Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_RUNTIME) add_executable(sndrec32 audio_format.cpp Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,7 +1,7 @@ add_subdirectory(notifyhook) -set_cpp() +set_cpp(WITH_RTTI WITH_EXCEPTIONS WITH_STL) add_definitions( -DWIN32 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] Sat Jun 22 14:44:56 2013 @@ -1,9 +1,81 @@ +# set_cpp +# Marks the current folder as containing C++ modules, additionally enabling +# specific C++ language features as specified (all of these default to off): +# +# WITH_RUNTIME +# Links with the C++ runtime. Enable this for modules which use new/delete or +# RTTI, but do not require STL. This is the right choice if you see undefined +# references to operator new/delete, vector constructor/destructor iterator, +# type_info::vtable, ... +# Note: this only affects linking, so cannot be used for static libraries. +# WITH_RTTI +# Enables run-time type information. Enable this if the module uses typeid or +# dynamic_cast. You will probably need to enable WITH_RUNTIME as well, if +# you're not already using STL. +# WITH_EXCEPTIONS +# Enables C++ exception handling. Enable this if the module uses try/catch or +# throw. You might also need this if you use a standard operator new (the one +# without nothrow). +# WITH_STL +# Enables standard C++ headers and links to the Standard Template Library. +# Use this for modules using anything from the std:: namespace, e.g. maps, +# strings, vectors, etc. +# Note: this affects both compiling (via include directories) and +# linking (by adding STL). Implies WITH_RUNTIME. +# FIXME: WITH_STL is currently also required for runtime headers such as +# <new> and <exception>. This is not a big issue because in stl-less +# environments you usually don't want those anyway; but we might want +# to have modules like this in the future. +# +# Examples: +# set_cpp() +# Enables the C++ language, but will cause errors if any runtime or standard +# library features are used. This should be the default for C++ in kernel +# mode or otherwise restricted environments. +# Note: this is required to get libgcc (for multiplication/division) linked +# in for C++ modules, and to set the correct language for precompiled +# header files, so it IS required even with no features specified. +# set_cpp(WITH_RUNTIME) +# Links with the C++ runtime, so that e.g. custom operator new implementations +# can be used in a restricted environment. This is also required for linking +# with libraries (such as ATL) which have RTTI enabled, even if the module in +# question does not use WITH_RTTI. +# set_cpp(WITH_RTTI WITH_EXCEPTIONS WITH_STL) +# The full package. This will adjust compiler and linker so that all C++ +# features can be used. macro(set_cpp) + cmake_parse_arguments(__cppopts "WITH_RUNTIME;WITH_RTTI;WITH_EXCEPTIONS;WITH_STL" "" "" ${ARGN}) + if(__cppopts_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "set_cpp: unparsed arguments ${__cppopts_UNPARSED_ARGUMENTS}") + endif() + + if(__cppopts_WITH_RUNTIME) + set(CPP_USE_RT 1) + endif() + if(__cppopts_WITH_RTTI) + if(MSVC) + replace_compile_flags("/GR-" "/GR") + else() + replace_compile_flags_language("-fno-rtti" "-frtti" "CXX") + endif() + endif() + if(__cppopts_WITH_EXCEPTIONS) + if(MSVC) + replace_compile_flags("/EHs-c-" "/EHsc") + else() + replace_compile_flags_language("-fno-exceptions" "-fexceptions" "CXX") + endif() + endif() + if(__cppopts_WITH_STL) + set(CPP_USE_STL 1) + if(MSVC) + add_definitions(-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++) + include_directories(${REACTOS_SOURCE_DIR}/include/c++/stlport) + endif() + endif() + set(IS_CPP 1) - if(MSVC) - include_directories(${REACTOS_SOURCE_DIR}/include/c++) - endif() endmacro() function(add_dependency_node _node) Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59288&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -14,6 +14,8 @@ if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") endif() + +add_compile_flags_language("-fno-rtti -fno-exceptions" "CXX") #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) @@ -190,12 +192,15 @@ endfunction() function(set_module_type_toolchain MODULE TYPE) - if(IS_CPP) + if(CPP_USE_STL) if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) - target_link_libraries(${MODULE} -lgcc) - else() - target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex) - endif() + message(FATAL_ERROR "Use of STL in kernelmodedriver or wdmdriver type module prohibited") + endif() + target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex) + elseif(CPP_USE_RT) + target_link_libraries(${MODULE} -lsupc++ -lgcc) + elseif(IS_CPP) + target_link_libraries(${MODULE} -lgcc) endif() if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59288… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -20,7 +20,7 @@ add_definitions(/Dinline=__inline /D__STDC__=1) -add_compile_flags("/X /GR- /GS- /Zl /W3") +add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W3") # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See bug #7174 @@ -108,6 +108,12 @@ endfunction() function(set_module_type_toolchain MODULE TYPE) + if(CPP_USE_STL) + if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) + message(FATAL_ERROR "Use of STL in kernelmodedriver or wdmdriver type module prohibited") + endif() + #target_link_libraries(${MODULE} stlport oldnames) + endif() if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} STREQUAL "kernelmodedriver") 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] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_STL) spec2def(ksproxy.ax ksproxy.spec) @@ -27,14 +27,6 @@ set_module_type(ksproxy win32dll) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") -if(MSVC) - add_target_compile_flags(ksproxy "/GR-") -else() - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() - target_link_libraries(ksproxy strmiids) add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll) add_dependencies(ksproxy dxsdk) Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,21 +1,18 @@ + +set_cpp(WITH_RUNTIME) include_directories(BEFORE include src/include src/libnurbs/internals src/libnurbs/interface - src/libnurbs/nurbtess -) + src/libnurbs/nurbtess) add_definitions( -DBUILD_GLU32 -DNDEBUG -DLIBRARYBUILD - -DRESOLVE_3D_TEXTURE_SUPPORT -) - -#this library uses C++ -# set_cpp() + -DRESOLVE_3D_TEXTURE_SUPPORT) # we must use our own spec file spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) @@ -117,8 +114,6 @@ set_module_type(glu32 win32dll) if(NOT MSVC) -#FIXME: we really need a standard C++ library - target_link_libraries(glu32 -lsupc++ -lgcc) add_compile_flags("-Wno-error=write-strings") endif() Modified: trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,11 +1,9 @@ -# we link against C++ static libs -set_cpp() +set_cpp(WITH_STL) include_directories( ../../state_trackers/wgl - ../../winsys/sw -) + ../../winsys/sw) add_definitions(-DWIN32_LEAN_AND_MEAN) @@ -16,21 +14,20 @@ # and gallium is kind enough to provide good def files for both MSVC/mingw-w64 and mingw32 if(MSVC OR (ARCH STREQUAL "amd64")) list(APPEND SOURCE ../../state_trackers/wgl/opengl32.def) -else() +else() list(APPEND SOURCE ../../state_trackers/wgl/opengl32.mingw.def) endif() add_library(mesa32 SHARED ${SOURCE}) -target_link_libraries(mesa32 +target_link_libraries(mesa32 gallium_wgl gallium_ws_gdi mesa_glapi mesa_core gallium_softpipe gallium_core - mesa_glsl -) + mesa_glsl) set_module_type(mesa32 win32dll) @@ -42,4 +39,3 @@ add_dependencies(mesa32 psdk) add_cd_file(TARGET mesa32 DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/C… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_STL) # From Sconscript include_directories( @@ -18,73 +18,71 @@ ../../generated/glsl/builtin_function.cpp # Regular files strtod.c - ralloc.c + ralloc.c glcpp/pp.c ast_expr.cpp - ast_function.cpp - ast_to_hir.cpp - ast_type.cpp - builtin_variables.cpp - glsl_parser_extras.cpp - glsl_types.cpp - glsl_symbol_table.cpp - hir_field_selection.cpp - ir_basic_block.cpp - ir_clone.cpp - ir_constant_expression.cpp - ir.cpp - ir_expression_flattening.cpp - ir_function_can_inline.cpp - ir_function_detect_recursion.cpp - ir_function.cpp - ir_hierarchical_visitor.cpp - ir_hv_accept.cpp - ir_import_prototypes.cpp - ir_print_visitor.cpp - ir_reader.cpp - ir_rvalue_visitor.cpp - ir_set_program_inouts.cpp - ir_validate.cpp - ir_variable_refcount.cpp - linker.cpp - link_functions.cpp - link_uniforms.cpp - loop_analysis.cpp - loop_controls.cpp - loop_unroll.cpp - lower_clip_distance.cpp - lower_discard.cpp - lower_if_to_cond_assign.cpp - lower_instructions.cpp - lower_jumps.cpp - lower_mat_op_to_vec.cpp - lower_noise.cpp - lower_texture_projection.cpp - lower_variable_index_to_cond_assign.cpp - lower_vec_index_to_cond_assign.cpp - lower_vec_index_to_swizzle.cpp - lower_vector.cpp - lower_output_reads.cpp - opt_algebraic.cpp - opt_constant_folding.cpp - opt_constant_propagation.cpp - opt_constant_variable.cpp - opt_copy_propagation.cpp - opt_copy_propagation_elements.cpp - opt_dead_code.cpp - opt_dead_code_local.cpp - opt_dead_functions.cpp - opt_discard_simplification.cpp - opt_function_inlining.cpp - opt_if_simplification.cpp - opt_noop_swizzle.cpp - opt_redundant_jumps.cpp - opt_structure_splitting.cpp - opt_swizzle_swizzle.cpp - opt_tree_grafting.cpp - s_expression.cpp) + ast_function.cpp + ast_to_hir.cpp + ast_type.cpp + builtin_variables.cpp + glsl_parser_extras.cpp + glsl_types.cpp + glsl_symbol_table.cpp + hir_field_selection.cpp + ir_basic_block.cpp + ir_clone.cpp + ir_constant_expression.cpp + ir.cpp + ir_expression_flattening.cpp + ir_function_can_inline.cpp + ir_function_detect_recursion.cpp + ir_function.cpp + ir_hierarchical_visitor.cpp + ir_hv_accept.cpp + ir_import_prototypes.cpp + ir_print_visitor.cpp + ir_reader.cpp + ir_rvalue_visitor.cpp + ir_set_program_inouts.cpp + ir_validate.cpp + ir_variable_refcount.cpp + linker.cpp + link_functions.cpp + link_uniforms.cpp + loop_analysis.cpp + loop_controls.cpp + loop_unroll.cpp + lower_clip_distance.cpp + lower_discard.cpp + lower_if_to_cond_assign.cpp + lower_instructions.cpp + lower_jumps.cpp + lower_mat_op_to_vec.cpp + lower_noise.cpp + lower_texture_projection.cpp + lower_variable_index_to_cond_assign.cpp + lower_vec_index_to_cond_assign.cpp + lower_vec_index_to_swizzle.cpp + lower_vector.cpp + lower_output_reads.cpp + opt_algebraic.cpp + opt_constant_folding.cpp + opt_constant_propagation.cpp + opt_constant_variable.cpp + opt_copy_propagation.cpp + opt_copy_propagation_elements.cpp + opt_dead_code.cpp + opt_dead_code_local.cpp + opt_dead_functions.cpp + opt_discard_simplification.cpp + opt_function_inlining.cpp + opt_if_simplification.cpp + opt_noop_swizzle.cpp + opt_redundant_jumps.cpp + opt_structure_splitting.cpp + opt_swizzle_swizzle.cpp + opt_tree_grafting.cpp + s_expression.cpp) -#this is just a helper library, don't include it in the all target +# this is just a helper library, don't include it in the all target add_library(mesa_glsl STATIC EXCLUDE_FROM_ALL ${SOURCE}) - - Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -4,8 +4,7 @@ -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) - -DKHRONOS_DLL_EXPORTS -) + -DKHRONOS_DLL_EXPORTS) if((ARCH STREQUAL "i386") AND (NOT MSVC)) list(APPEND SOURCE glapi_x86.S) @@ -33,4 +32,4 @@ add_compile_flags("-Wno-unused-function") endif() -add_library(mesa_glapi STATIC EXCLUDE_FROM_ALL ${SOURCE}) +add_library(mesa_glapi STATIC EXCLUDE_FROM_ALL ${SOURCE}) Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,3 +1,5 @@ + +set_cpp(WITH_STL) add_definitions( -DFEATURE_GL=1 @@ -12,9 +14,6 @@ ../glsl . ../../generated/mesa) - -# This library uses C++ -set_cpp() if((ARCH STREQUAL "i386") AND (NOT MSVC)) list(APPEND SOURCE @@ -296,9 +295,9 @@ # drivers/common/driverfuncs.c # drivers/common/meta.c ) - + if(NOT MSVC) add_compile_flags("-Wno-format") endif() -add_library(mesa_core STATIC EXCLUDE_FROM_ALL ${SOURCE}) +add_library(mesa_core STATIC EXCLUDE_FROM_ALL ${SOURCE}) Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,12 +1,8 @@ -set_cpp() +set_cpp(WITH_RUNTIME) add_definitions( -D__WINESRC__) - -if (MSVC) - add_compile_flags("/EHa-") -endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -70,4 +66,3 @@ add_pch(browseui precomp.h) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,9 +1,11 @@ + +set_cpp(WITH_RUNTIME) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_NETSHELL_) -set_cpp() + spec2def(netshell.dll netshell.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,4 +1,5 @@ -set_cpp() + +set_cpp(WITH_RUNTIME) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,11 +1,11 @@ + +set_cpp() include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR} inc) #add_definitions(-D_DEBUG) - -set_cpp() list(APPEND SOURCE id_ata.cpp @@ -19,14 +19,11 @@ add_library(uniata SHARED ${SOURCE} idedma.rc) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(uniata "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #allow_warnings(uniata) - #add_target_compile_flags(uniata "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti -Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() add_pch(uniata stdafx.h) Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -21,16 +21,6 @@ libcntpr ${PSEH_LIB}) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(usbehci "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - target_link_libraries(usbehci -lgcc) - #add_target_compile_flags(usbehci "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() - set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) Modified: trunk/reactos/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -21,16 +21,6 @@ libcntpr ${PSEH_LIB}) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(usbohci "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - target_link_libraries(usbohci -lgcc) - #add_target_compile_flags(usbohci "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() - set_module_type(usbohci kernelmodedriver) add_importlibs(usbohci ntoskrnl hal usbd) Modified: trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -22,16 +22,6 @@ libcntpr ${PSEH_LIB}) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(usbuhci "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - target_link_libraries(usbuhci -lgcc) - #add_target_compile_flags(usbuhci "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() - set_module_type(usbuhci kernelmodedriver) add_importlibs(usbuhci ntoskrnl hal usbd) 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] Sat Jun 22 14:44:56 2013 @@ -57,15 +57,6 @@ libcntpr ${PSEH_LIB}) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(portcls "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - #add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() - set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) add_pch(portcls private.hpp) add_importlibs(portcls ntoskrnl ks drmk hal) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -12,33 +12,23 @@ adapter.cpp common.cpp mintopo.cpp - minwave.cpp -) + minwave.cpp) add_library(cmipci SHARED ${SOURCE} - cmipci.rc -) + cmipci.rc) -target_link_libraries(cmipci - stdunk - libcntpr -) +target_link_libraries(cmipci stdunk libcntpr) set_module_type(cmipci wdmdriver UNICODE ENTRYPOINT 0) -add_importlibs(cmipci - portcls - hal - ntoskrnl) +add_importlibs(cmipci portcls hal ntoskrnl) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(portcls "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - #add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti -Wno-write-strings -Wno-switch -Wno-error") +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(portcls "-Wno-write-strings -Wno-switch") + #allow_warnings(portcls) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-write-strings -Wno-switch -Wno-error") endif() add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,16 +1,13 @@ + +set_cpp() include_directories(..) -set_cpp() - add_executable(cmicontrol main.cpp - window.rc -) + window.rc) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(NOT MSVC) - #add_target_compile_flags(cmicontrol "-fno-exceptions -fno-rtti") set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") endif() @@ -25,9 +22,8 @@ setupapi winmm msvcrt - kernel32 -) + kernel32) set_module_type(cmicontrol win32gui) -add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -3,19 +3,8 @@ add_library(cmicpl SHARED cmicpl.cpp - cmicpl.rc -) + cmicpl.rc) set_module_type(cmicpl cpl UNICODE) - -add_importlibs(cmicpl - shell32 - msvcrt - kernel32 -) - -if (NOT MSVC) - target_link_libraries(cmicpl -lgcc) -endif() - +add_importlibs(cmicpl shell32 msvcrt kernel32) add_cd_file(TARGET cmicpl DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/atl/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,3 +1,7 @@ + +if(NOT MSVC) + set_cpp(WITH_RTTI) +endif() add_definitions( -DUNICODE -D_UNICODE Modified: trunk/reactos/lib/drivers/libusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/CMakeLi… ============================================================================== --- trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,3 +1,4 @@ + set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) @@ -18,12 +19,3 @@ add_library(libusb ${SOURCE}) add_dependencies(libusb bugcodes) - -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(libusb "/GR-") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-") -else() - #add_target_compile_flags(libusb "-fno-exceptions -fno-rtti") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") -endif() Modified: trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/stdunk/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -2,9 +2,3 @@ set_cpp() add_library(stdunk STATIC cunknown.cpp) - -if(MSVC) - add_target_compile_flags(stdunk "/GR-") -else() - add_target_compile_flags(stdunk "-fno-exceptions -fno-rtti") -endif() Modified: trunk/reactos/lib/sdk/comsupp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/comsupp/CMakeLists… ============================================================================== --- trunk/reactos/lib/sdk/comsupp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/comsupp/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_EXCEPTIONS) add_library(comsupp comsupp.cpp) add_dependencies(comsupp psdk) Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Sat Jun 22 14:44:56 2013 @@ -1,5 +1,5 @@ -set_cpp() +set_cpp(WITH_EXCEPTIONS WITH_STL) list(APPEND SOURCE CConfiguration.cpp

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs