Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[janderwald] 44559: [MMIXER] - Add more error checks - Fix a bug MMixerGetControlsFromPinByConnectionIndex which pre-early stopped the enumeration of mixer controls - Only add guids which can be later be resolved to mixer control - Check if no a topology connection has no links connected
by janderwald＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: janderwald Date: Sun Dec 13 12:32:44 2009 New Revision: 44559 URL: http://svn.reactos.org/svn/reactos?rev=44559&view=rev Log: [MMIXER] - Add more error checks - Fix a bug MMixerGetControlsFromPinByConnectionIndex which pre-early stopped the enumeration of mixer controls - Only add guids which can be later be resolved to mixer control - Check if no a topology connection has no links connected Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Dec 13 12:32:44 2009 @@ -96,6 +96,12 @@ else NodeIndex = CurConnection->ToNode; + if (NodeIndex > NodeTypes->Count) + { + // reached end of pin connection + return MM_STATUS_SUCCESS; + } + /* get target node type of current connection */ NodeType = MMixerGetNodeType(NodeTypes, NodeIndex); @@ -124,7 +130,7 @@ Status = MMixerGetNodeIndexes(MixerContext, NodeConnections, NodeIndex, TRUE, TRUE, &NodeConnectionCount, &NodeConnection); } - if (Status != MM_STATUS_SUCCESS) + if (Status == MM_STATUS_SUCCESS) { for(Index = 0; Index < NodeConnectionCount; Index++) { @@ -332,6 +338,7 @@ LPWSTR PinName; GUID NodeType; ULONG BytesReturned, ControlCount, Index; + LPGUID Node; PULONG Nodes; if (!bTargetPin) @@ -414,8 +421,14 @@ { if (Nodes[Index]) { - // found a node - ControlCount++; + // get node type + Node = MMixerGetNodeType(NodeTypes, Index); + + if (MMixerGetControlTypeFromTopologyNode(Node)) + { + // found a node which can be resolved to a type + ControlCount++; + } } } @@ -457,14 +470,20 @@ { if (Nodes[Index]) { - /* store the node index for retrieving / setting details */ - SrcLine->NodeIds[ControlCount] = Index; - - Status = MMixerAddMixerControl(MixerContext, MixerInfo, hDevice, NodeTypes, Index, SrcLine, &SrcLine->LineControls[ControlCount]); - if (Status == MM_STATUS_SUCCESS) + // get node type + Node = MMixerGetNodeType(NodeTypes, Index); + + if (MMixerGetControlTypeFromTopologyNode(Node)) { - /* increment control count on success */ - ControlCount++; + /* store the node index for retrieving / setting details */ + SrcLine->NodeIds[ControlCount] = Index; + + Status = MMixerAddMixerControl(MixerContext, MixerInfo, hDevice, NodeTypes, Index, SrcLine, &SrcLine->LineControls[ControlCount]); + if (Status == MM_STATUS_SUCCESS) + { + /* increment control count on success */ + ControlCount++; + } } } } @@ -902,8 +921,6 @@ return Status; } - - RtlZeroMemory(Pins, sizeof(ULONG) * PinCount); // now get the target pins of the ADC / DAC node Status = MMixerGetTargetPins(MixerContext, NodeTypes, NodeConnections, NodeIndex, bInputMixer, Pins, PinCount); Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sun Dec 13 12:32:44 2009 @@ -251,6 +251,13 @@ Connection++; } + if (!Count) + { + *NodeReferenceCount = 0; + *NodeReference = NULL; + return MM_STATUS_SUCCESS; + } + ASSERT(Count != 0); /* now allocate node index array */

1 0

[hyperion] 44558: added Wine on ReactOS - Inkscape.svg added Wine on ReactOS.svg My "Wine on ReactOS" diagram, in SVG format, two variants (Inkscape-friendly and optimized for the web) added COPYING Licensing information on the images
by hyperion＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: hyperion Date: Sun Dec 13 02:40:56 2009 New Revision: 44558 URL: http://svn.reactos.org/svn/reactos?rev=44558&view=rev Log: added Wine on ReactOS - Inkscape.svg added Wine on ReactOS.svg My "Wine on ReactOS" diagram, in SVG format, two variants (Inkscape-friendly and optimized for the web) added COPYING Licensing information on the images Added: trunk/press-media/art/COPYING trunk/press-media/art/Wine on ReactOS - Inkscape.svg trunk/press-media/art/Wine on ReactOS.svg [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/press-media/art/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/press-media/art/COPYING?rev=44558&… Added: trunk/press-media/art/Wine on ReactOS - Inkscape.svg URL: http://svn.reactos.org/svn/reactos/trunk/press-media/art/Wine%20on%20ReactO… Added: trunk/press-media/art/Wine on ReactOS.svg URL: http://svn.reactos.org/svn/reactos/trunk/press-media/art/Wine%20on%20ReactO…

1 0

[gschneider] 44557: [regedit] Amine Khaldi: Remove unused variables
by gschneider＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: gschneider Date: Sat Dec 12 23:09:05 2009 New Revision: 44557 URL: http://svn.reactos.org/svn/reactos?rev=44557&view=rev Log: [regedit] Amine Khaldi: Remove unused variables Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Sat Dec 12 23:09:05 2009 @@ -87,10 +87,9 @@ { PAINTSTRUCT ps; RECT rt; - HDC hdc; GetClientRect(hWnd, &rt); - hdc = BeginPaint(hWnd, &ps); + BeginPaint(hWnd, &ps); FillRect(ps.hdc, &rt, GetSysColorBrush(COLOR_BTNFACE)); EndPaint(hWnd, &ps); } Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Sat Dec 12 23:09:05 2009 @@ -768,15 +768,10 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode) { size_t bufsize; - BOOL shift, control; - if(GetKeyState(VK_MENU) & 0x8000) { return FALSE; } - - shift = GetKeyState(VK_SHIFT) & 0x8000; - control = GetKeyState(VK_CONTROL) & 0x8000; bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.c [iso-8859-1] Sat Dec 12 23:09:05 2009 @@ -65,7 +65,6 @@ WNDCLASSEX wcFrame; WNDCLASSEX wcChild; ATOM hFrameWndClass; - ATOM hChildWndClass; ZeroMemory(&wcFrame, sizeof(WNDCLASSEX)); wcFrame.cbSize = sizeof(WNDCLASSEX); @@ -93,7 +92,7 @@ wcChild.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ + RegisterClassEx(&wcChild); /* register child windows class */ RegisterHexEditorClass(hInstance); Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Sat Dec 12 23:09:05 2009 @@ -544,7 +544,6 @@ HKEY hKey = NULL; HKEY hNewKey = NULL; BOOL bSuccess = FALSE; - LONG lResult; DWORD dwDisposition; HTREEITEM hNewItem; @@ -559,7 +558,7 @@ do { _sntprintf(szNewKey, sizeof(szNewKey) / sizeof(szNewKey[0]), szNewKeyFormat, iIndex++); - lResult = RegCreateKeyEx(hKey, szNewKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hNewKey, &dwDisposition); + RegCreateKeyEx(hKey, szNewKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hNewKey, &dwDisposition); if (hNewKey && (dwDisposition == REG_OPENED_EXISTING_KEY)) { RegCloseKey(hNewKey);

1 0

[dgorbachev] 44556: Patch for LdrFixupImports() by Alexander Yastrebov, bug #4954.
by dgorbachev＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: dgorbachev Date: Sat Dec 12 21:53:23 2009 New Revision: 44556 URL: http://svn.reactos.org/svn/reactos?rev=44556&view=rev Log: Patch for LdrFixupImports() by Alexander Yastrebov, bug #4954. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Dec 12 21:53:23 2009 @@ -2063,24 +2063,25 @@ } ImportModuleDirectoryCurrent++; } - if(!NT_SUCCESS(Status)) + + if (!NT_SUCCESS(Status)) { NTSTATUS errorStatus = Status; - while(ImportModuleDirectoryCurrent-- >= ImportModuleDirectory) + while (ImportModuleDirectoryCurrent >= ImportModuleDirectory) { ImportedName = (PCHAR)Module->DllBase + ImportModuleDirectoryCurrent->Name; Status = LdrpGetOrLoadModule(NULL, ImportedName, &ImportedModule, FALSE); - if(NT_SUCCESS(Status) && Module != ImportedModule) + if (NT_SUCCESS(Status) && Module != ImportedModule) { Status = LdrpUnloadModule(ImportedModule, FALSE); if (!NT_SUCCESS(Status)) DPRINT1("unable to unload %s\n", ImportedName); } + ImportModuleDirectoryCurrent--; } return errorStatus; } - } if (TlsDirectory && TlsSize > 0)

1 0

[cfinck] 44555: Document what r44552 is all about.
by cfinck＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: cfinck Date: Sat Dec 12 20:38:03 2009 New Revision: 44555 URL: http://svn.reactos.org/svn/reactos?rev=44555&view=rev Log: Document what r44552 is all about. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Dec 12 20:38:03 2009 @@ -689,11 +689,17 @@ SelectDrive(chan, DeviceNumber); AtapiStallExecution(10000); AtapiWritePort1(chan, IDX_IO1_o_Command, IDE_COMMAND_ATAPI_RESET); + + // ReactOS modification: Already stop looping when we know that the drive has finished resetting. + // Not all controllers clear the IDE_STATUS_BUSY flag (e.g. not the VMware one), so ensure that + // the maximum waiting time (30 * i = 0.9 seconds) does not exceed the one of the original + // implementation. (which is around 1 second) while ((AtapiReadPort1(chan, IDX_IO1_i_Status) & IDE_STATUS_BUSY) && i--) { AtapiStallExecution(30); } + SelectDrive(chan, DeviceNumber); WaitOnBusy(chan); GetBaseStatus(chan, statusByte2);

1 0

[cfinck] 44554: Add missing dependencies. Found out using "make -j 70" :-)
by cfinck＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: cfinck Date: Sat Dec 12 19:51:16 2009 New Revision: 44554 URL: http://svn.reactos.org/svn/reactos?rev=44554&view=rev Log: Add missing dependencies. Found out using "make -j 70" :-) Modified: trunk/reactos/dll/win32/itss/itss.rbuild trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild Modified: trunk/reactos/dll/win32/itss/itss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.rbuild… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.rbuild [iso-8859-1] Sat Dec 12 19:51:16 2009 @@ -5,6 +5,7 @@ <include base="itss">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <dependency>wineheaders</dependency> <file>chm_lib.c</file> <file>lzx.c</file> <file>itss.c</file> Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] Sat Dec 12 19:51:16 2009 @@ -42,5 +42,6 @@ <file>shdocvw.rc</file> </module> <module name="shdocvw_v1" type="embeddedtypelib" allowwarnings="true"> + <dependency>stdole2</dependency> <file>shdocvw_v1.idl</file> </module>

1 0

[cfinck] 44553: Merge r44552
by cfinck＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: cfinck Date: Sat Dec 12 18:15:19 2009 New Revision: 44553 URL: http://svn.reactos.org/svn/reactos?rev=44553&view=rev Log: Merge r44552 Modified: branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… ============================================================================== --- branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Dec 12 18:15:19 2009 @@ -679,7 +679,7 @@ ) { //ULONG c = chan->lChannel; - ULONG i = 1000 * 1000; + ULONG i = 30 * 1000; UCHAR dma_status = 0; KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n")); UCHAR statusByte2;

1 0

[cfinck] 44552: Set a lower maximum number of iterations in AtapiSoftReset. This reduces the UniATA bootup time in VMware (which doesn't seem to clear the IDE_STATUS_BUSY flag) from 70 seconds to around 8. Tested successfully under QEMU, VBox, VMware and an Athlon XP-based system.
by cfinck＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: cfinck Date: Sat Dec 12 18:14:26 2009 New Revision: 44552 URL: http://svn.reactos.org/svn/reactos?rev=44552&view=rev Log: Set a lower maximum number of iterations in AtapiSoftReset. This reduces the UniATA bootup time in VMware (which doesn't seem to clear the IDE_STATUS_BUSY flag) from 70 seconds to around 8. Tested successfully under QEMU, VBox, VMware and an Athlon XP-based system. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Dec 12 18:14:26 2009 @@ -679,7 +679,7 @@ ) { //ULONG c = chan->lChannel; - ULONG i = 1000 * 1000; + ULONG i = 30 * 1000; UCHAR dma_status = 0; KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n")); UCHAR statusByte2;

1 0

[janderwald] 44551: [PORTCLS] - Return correct status code from InterruptSync::CallSynchronizedRoutine
by janderwald＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: janderwald Date: Sat Dec 12 17:27:17 2009 New Revision: 44551 URL: http://svn.reactos.org/svn/reactos?rev=44551&view=rev Log: [PORTCLS] - Return correct status code from InterruptSync::CallSynchronizedRoutine Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Sat Dec 12 17:27:17 2009 @@ -52,6 +52,7 @@ PINTERRUPTSYNCROUTINE m_SyncRoutine; PVOID m_DynamicContext; + NTSTATUS m_Status; LONG m_Ref; @@ -97,10 +98,10 @@ IN PVOID ServiceContext) { CInterruptSync * This = (CInterruptSync*)ServiceContext; - NTSTATUS Status = This->m_SyncRoutine(This, This->m_DynamicContext); - - DPRINT("CInterruptSynchronizedRoutine this %p SyncRoutine %p Context %p Status %x\n", This, This->m_SyncRoutine, This->m_DynamicContext, Status); - return NT_SUCCESS(Status); + This->m_Status = This->m_SyncRoutine(This, This->m_DynamicContext); + + DPRINT("CInterruptSynchronizedRoutine this %p SyncRoutine %p Context %p Status %x\n", This, This->m_SyncRoutine, This->m_DynamicContext, This->m_Status); + return TRUE; } NTSTATUS @@ -112,7 +113,7 @@ KIRQL OldIrql; DPRINT("CInterruptSync::CallSynchronizedRoutine this %p Routine %p DynamicContext %p Irql %x Interrupt %p\n", this, Routine, DynamicContext, KeGetCurrentIrql(), m_Interrupt); - + if (!m_Interrupt) { DPRINT("CInterruptSync_CallSynchronizedRoutine %p no interrupt connected\n", this); @@ -125,14 +126,14 @@ CInterruptSynchronizedRoutine((PVOID)this); KeReleaseSpinLock(&m_Lock, OldIrql); - return STATUS_SUCCESS; + return m_Status; } m_SyncRoutine = Routine; m_DynamicContext = DynamicContext; if (KeSynchronizeExecution(m_Interrupt, CInterruptSynchronizedRoutine, (PVOID)this)) - return STATUS_SUCCESS; + return m_Status; else return STATUS_UNSUCCESSFUL; }

1 0

[sserapion] 44550: -Remove hacks for older gcc versions. -Black list gcc below 4.4.2 -Black list ld below 20091119. -99.99% Based on bug 4810 -Speeds up my build by 3 minutes
by sserapion＠svn.reactos.org 12 Dec '09

12 Dec '09

Author: sserapion Date: Sat Dec 12 16:41:43 2009 New Revision: 44550 URL: http://svn.reactos.org/svn/reactos?rev=44550&view=rev Log: -Remove hacks for older gcc versions. -Black list gcc below 4.4.2 -Black list ld below 20091119. -99.99% Based on bug 4810 -Speeds up my build by 3 minutes Modified: branches/ros-amd64-bringup/reactos/ReactOS-generic.rbuild branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp branches/ros-amd64-bringup/reactos/dll/directx/ddraw/ddraw.rbuild branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild branches/ros-amd64-bringup/reactos/dll/win32/actxprxy/actxprxy.rbuild branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild branches/ros-amd64-bringup/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild branches/ros-amd64-bringup/reactos/dll/win32/wlanapi/wlanapi.rbuild branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.rbuild branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.rbuild branches/ros-amd64-bringup/reactos/drivers/network/afd/afd.rbuild branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip.rbuild branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c branches/ros-amd64-bringup/reactos/lib/nls/idna/idna.cpp branches/ros-amd64-bringup/reactos/lib/nls/idna/nameprep.cpp branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ps/job.c branches/ros-amd64-bringup/reactos/ntoskrnl/ps/process.c branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp Modified: branches/ros-amd64-bringup/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-generic.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -120,11 +120,7 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> -  +  </group> Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -196,8 +196,6 @@ SaveSettings(); - try { throw 0; } catch (int i) { } /* HACK */ - return msg.wParam; } Modified: branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -154,9 +154,6 @@ DispatchMessage(&msg); } } - - try { throw 0; } catch (int i) { } /* HACK */ - return msg.wParam; } Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -69,6 +69,4 @@ <file>DirectD3D3_Vtable.c</file> <file>DirectD3D7_Vtable.c</file> </directory> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -42,7 +42,4 @@ <file>viewport.c</file> <dependency>wineheaders</dependency> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -15,7 +15,6 @@ <library>rpcrt4</library> <library>pseh</library> <file>usrmarshal.c</file> - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="actxprxy_interface" type="idlinterface"> <file>actxprxy_servprov.idl</file> Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -59,5 +59,4 @@ <file>token.c</file> </directory> <file>advapi32.rc</file> - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -42,6 +42,4 @@ <file>message.c</file> <file>crypt32.rc</file> <file>version.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -8,11 +8,9 @@ <library>pseh</library> <library>dxguid</library> <library>ntdll</library> -  <directory name="main"> <file>dllmain.c</file> </directory> @@ -49,6 +47,4 @@ <file>path.c</file> </directory> <file>gdi32.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -13,12 +13,8 @@ <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> <dependency>errcodes</dependency> -  <group compilerset="gcc"> -  - <compilerflag>-fno-unit-at-a-time</compilerflag> <compilerflag compiler="cxx">-fno-exceptions</compilerflag> <compilerflag compiler="cxx">-fno-rtti</compilerflag> </group> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -63,8 +63,6 @@ <file>dcom.idl</file> <file>irot.idl</file> <include base="ole32" root="intermediate">.</include> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="ole32_irot_server" type="rpcserver"> <file>irot.idl</file> Modified: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -5,12 +5,9 @@ <library>epsapi</library> <library>pseh</library> <library>ntdll</library> -  + <file>malloc.c</file> <file>psapi.c</file> <file>psapi.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -15,7 +15,6 @@ <library>rpcrt4</library> <library>pseh</library> <file>version.rc</file>  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="qmgrprxy_interface" type="idlinterface"> <file>qmgrprxy.idl</file> Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -39,8 +39,6 @@ <file>rpcrt4.rc</file> <file>epm.idl</file> <include base="rpcrt4" root="intermediate">.</include> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="rpcrt4_epm_client" type="rpcclient"> <file>epm.idl</file> Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -39,6 +39,4 @@ <file>stubs.c</file> <file>rpc.c</file> <file>setupapi.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -20,6 +20,4 @@ <file>logfile.c</file> <file>wizard.c</file> <file>syssetup.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -11,11 +11,9 @@ <library>pseh</library> <library>ntdll</library> <compilerflag compilerset="gcc">-fms-extensions</compilerflag> -  <directory name="controls"> <file>button.c</file> <file>combo.c</file> @@ -76,6 +74,4 @@ <file>winpos.c</file> </directory> <file>user32.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -1459,7 +1459,7 @@ BOOL WINAPI mciExecute(LPCSTR lpstrCommand) { char strRet[256]; - DWORD ret; + int ret; TRACE("(%s)!\n", lpstrCommand); Modified: branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -18,6 +18,4 @@ <file>asn.c</file> <file>softpub.c</file> <file>version.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -8,6 +8,4 @@ <library>pseh</library> <library>ntdll</library> <file>main.c</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -9,6 +9,4 @@ <file>misc.c</file> <file>setup.c</file> <file>kbdclass.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -8,6 +8,4 @@ <file>misc.c</file> <file>mouclass.c</file> <file>mouclass.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -8,9 +8,7 @@ <library>ntoskrnl</library> <library>hal</library> <directory name="include"> -  </directory> <directory name="afd"> <file>bind.c</file> @@ -27,6 +25,4 @@ <file>write.c</file> </directory> <file>afd.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -13,11 +13,9 @@ <library>chew</library> <library>ntoskrnl</library> <library>hal</library> -  <directory name="datalink"> <file>lan.c</file> </directory> @@ -40,6 +38,4 @@ <file>wait.c</file> </directory> <file>tcpip.rc</file> -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -781,6 +781,8 @@ MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; MapInformation->VideoRamLength = 0x10000; } +#else + FrameBuffer.QuadPart = 0; #endif VideoPortMapMemory(DeviceExtension, FrameBuffer, Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -798,6 +798,8 @@ LONG tt1, tt2; BOOLEAN TSCPresent; + t1.QuadPart = 0; + DPRINT("Calibrating APIC timer for CPU %d\n", CPU); APICSetupLVTT(1000000000); Modified: branches/ros-amd64-bringup/reactos/lib/nls/idna/idna.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/nls/idna/idna.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/nls/idna/idna.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -38,6 +38,9 @@ #include <unicode/uidna.h> +C_ASSERT(IDN_ALLOW_UNASSIGNED == UIDNA_ALLOW_UNASSIGNED); +C_ASSERT(IDN_USE_STD3_ASCII_RULES == UIDNA_USE_STD3_RULES); + static int32_t IDNA_FlagsToICU @@ -45,8 +48,6 @@ DWORD dwFlags ) { - C_ASSERT(IDN_ALLOW_UNASSIGNED == UIDNA_ALLOW_UNASSIGNED); - C_ASSERT(IDN_USE_STD3_ASCII_RULES == UIDNA_USE_STD3_RULES); return dwFlags; } Modified: branches/ros-amd64-bringup/reactos/lib/nls/idna/nameprep.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/nls/idna/nameprep.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/nls/idna/nameprep.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -38,6 +38,8 @@ #include <unicode/usprep.h> +C_ASSERT(IDN_ALLOW_UNASSIGNED == USPREP_ALLOW_UNASSIGNED); + static int32_t NAMEPREP_FlagsToICU @@ -45,7 +47,6 @@ DWORD dwFlags ) { - C_ASSERT(IDN_ALLOW_UNASSIGNED == USPREP_ALLOW_UNASSIGNED); return dwFlags; } Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -107,9 +107,5 @@ <file>version.c</file> <file>wait.c</file> <file>workitem.c</file> -  -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -246,7 +246,6 @@ NTAPI MiFreeContiguousMemory(IN PVOID BaseAddress) { - KIRQL OldIrql; PFN_NUMBER PageFrameIndex, LastPage, PageCount; PMMPFN Pfn1, StartPfn; PAGED_CODE(); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -30,11 +30,9 @@ <library>bootvid</library> <library>wdmguid</library> <dependency>bugcodes</dependency> -  <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -556,7 +554,4 @@ </directory> <file>ntoskrnl.rc</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </group> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -164,7 +164,7 @@ ExAcquireRundownProtection(&Process->RundownProtect); if(NT_SUCCESS(Status)) { - if(Process->Job == NULL && Process->Session == Job->SessionId) + if(Process->Job == NULL && (ULONG_PTR)Process->Session == Job->SessionId) { /* Just store the pointer to the job object in the process, we'll assign it later. The reason we can't do this here is that locking @@ -268,7 +268,7 @@ /* setup the job object */ InitializeListHead(&Job->ProcessListHead); - Job->SessionId = CurrentProcess->Session; /* inherit the session id from the caller */ + Job->SessionId = (ULONG_PTR)CurrentProcess->Session; /* inherit the session id from the caller */ Status = ExInitializeResource(&Job->JobLock); if(!NT_SUCCESS(Status)) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -1104,7 +1104,7 @@ NTAPI PsGetCurrentProcessSessionId(VOID) { - return PsGetCurrentProcess()->Session; + return (ULONG)(ULONG_PTR)PsGetCurrentProcess()->Session; } /* Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -1001,7 +1001,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = SessionInfo.SessionId; + Process->Session = (PVOID)(ULONG_PTR)SessionInfo.SessionId; /* Check if the process also has a PEB */ if (Process->Peb) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -30,7 +30,7 @@ #include "gdidbg.c" -/* static */ /* FIXME: -fno-unit-at-a-time breaks this */ +static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); /** GLOBALS *******************************************************************/ @@ -87,7 +87,7 @@ /* * Dummy GDI Cleanup Callback */ -/* static */ /* FIXME: -fno-unit-at-a-time breaks this */ +static BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody) { Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -20,9 +20,7 @@ <compilerflag compilerset="msc">/wd4276</compilerflag> <define name="LANGPACK" /> <define name="_WIN32K_" /> -  <directory name="dib" root="intermediate"> <file>dib8gen.c</file> @@ -205,8 +203,5 @@ <file>stubs.c</file> <file>umpdstubs.c</file> </directory> - -  - <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> </group> Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -4,6 +4,8 @@ LDFLAG_CONSOLE:=--subsystem=console LDFLAG_WINDOWS:=--subsystem=windows LDFLAG_NATIVE:=--subsystem=native + +LDFLAG_EXCLUDE_ALL_SYMBOLS=-exclude-all-symbols #~ #(module, objs, deps, ldflags, output, def, libs, entry, base) #(module, objs, deps, ldflags, output, def, libs, entry, base, extralibs) @@ -40,7 +42,7 @@ $(5): ${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_LD) #~ $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ - $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(10) $(7) $(10) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ + $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp --start-group $(10) $(7) --end-group ${call RBUILD_ldflags,$(1),$(4)} -o $$@ ifneq ($(or $(6),$$(MODULETYPE$$($(1)_TYPE)_KMODE)),) $$(ECHO_PEFIXUP) $$(Q)$$(PEFIXUP_TARGET) $$@ $(if $(6),-exports) $$(if $$(MODULETYPE$($(1)_TYPE)_KMODE),-sections) Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -480,14 +480,8 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); - - /* hack to get libgcc_eh.a, should check mingw version or something */ - if (Environment::GetArch() == "amd64") - { - fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" ); - } - fprintf ( fMakefile,"\n"); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"\n" ); + } MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data ); MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data ); @@ -844,7 +838,7 @@ buffer[i] = '\0'; pclose ( fp ); - char separators[] = " ()"; + char separators[] = " ()\n"; char *token; char *prevtoken = NULL; @@ -888,7 +882,7 @@ string MingwBackend::GetCompilerVersion ( const string& compilerCommand ) { - string versionCommand = ssprintf ( "%s --version gcc", + string versionCommand = ssprintf ( "%s --version", compilerCommand.c_str (), NUL, NUL ); @@ -908,7 +902,7 @@ bool MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion ) { - if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 ) + if ( strcmp ( compilerVersion.c_str (), "4.4.2") < 0 ) return false; else return true; @@ -970,27 +964,32 @@ bool MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) { - if ( manualBinutilsSetting ) return true; - - /* linux */ - if ( binutilsVersion.find('.') != std::string::npos ) - { - /* TODO: blacklist versions on version number instead of date */ - return true; - } - - /* - * - Binutils older than 2003/10/01 have broken windres which can't handle - * icons with alpha channel. - * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of - * forward exports in dlltool. - */ - if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && - ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || - ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) + int digit = binutilsVersion.find_last_of("."); + if(digit == -1) + { + printf("Unable to detect binutils version!\n"); return false; + } + + string date = string(binutilsVersion, digit + 1); + if(date.length() == 8) + { + /* This is a real date in the format YYYYMMDD. + Check whether we have at least Binutils 20091017 (older versions + don't support the -exclude-all-symbols option we use). */ + if(strcmp(date.c_str(), "20091119") < 0) + return false; + } else - return true; + { + /* This is no date, so binutilsVersion should just contain the version + number. + Binutils 2.20 will hopefully contain the required features. */ + if(strcmp(binutilsVersion.c_str(), "2.20") < 0) + return false; + } + + return true; } void Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -1782,6 +1782,12 @@ &module.linkerFlags, used_defs ); + /* LD automatically exports all symbols by default if -shared is specified. Prevent it from doing + this by adding the option -exclude-all-symbols (available since Binutils 20091017). */ + // FIXME: Should only be applied for -shared modules, when there's a smart way to check for them. + if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse && !module.importLibrary ) + fprintf ( fMakefile, "%s_LDFLAGS+=$(LDFLAG_EXCLUDE_ALL_SYMBOLS)\n", module.name.c_str() ); + fprintf ( fMakefile, "\n\n" ); } Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -259,7 +259,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o} endef @@ -272,7 +272,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o} endef @@ -285,7 +285,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call RBUILD_intermediate_path_noext,$(2)}_p.o} endef @@ -298,7 +298,7 @@ $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U $$@ $$< -${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_i.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_i.o} +${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_i.c,,,${call RBUILD_intermediate_path_noext,$(2)}_i.o} endef Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Sat Dec 12 16:41:43 2009 @@ -527,6 +527,7 @@ case MicrosoftC: return "msc"; default: assert ( false ); } + return ""; } std::string @@ -538,4 +539,5 @@ case MicrosoftLink: return "mslink"; default: assert ( false ); } -} + return ""; +}

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009