Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[tkreuzer] 50866: [CRT] Fix special behaviour of wsprintf: when used with # flag, the "0x" prefix does not count into the field width, so we have to add additional 2 characters here. Fixes Opera in...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 22 17:29:32 2011 New Revision: 50866 URL: http://svn.reactos.org/svn/reactos?rev=50866&view=rev Log: [CRT] Fix special behaviour of wsprintf: when used with # flag, the "0x" prefix does not count into the field width, so we have to add additional 2 characters here. Fixes Opera installer. See issue #5900 for more details. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Feb 22 17:29:32 2011 @@ -587,6 +587,9 @@ if (flags & FLAG_SPECIAL) { prefix = &digits[16]; +#ifdef _USER32_WSPRINTF + fieldwidth += 2; +#endif } case _T('u'):

13 years, 10 months

[akhaldi] 50865: [NEWCC] - Add config.rbuild with NEWCC enabled by default.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Feb 22 11:28:00 2011 New Revision: 50865 URL: http://svn.reactos.org/svn/reactos?rev=50865&view=rev Log: [NEWCC] - Add config.rbuild with NEWCC enabled by default. Added: branches/arty-newcc/config.rbuild (with props) Added: branches/arty-newcc/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/config.rbuild?rev=50… ============================================================================== --- branches/arty-newcc/config.rbuild (added) +++ branches/arty-newcc/config.rbuild [iso-8859-1] Tue Feb 22 11:28:00 2011 @@ -1,0 +1,107 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="pentium" /> + + + +<property name="TUNE" value="i686" /> + + + +<property name="OPTIMIZE" value="1" /> + + + +<property name="KDBG" value="1" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="0" /> + + +<property name="_WINKD_" value="0" /> + + +<property name="_ELF_" value="0" /> + + +<property name="BUILD_MP" value="1" /> + + +<property name="NEWCC" value="1" /> + +</group> Propchange: branches/arty-newcc/config.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[tkreuzer] 50864: [NOTEPAD] Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string. By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns. See issue #...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 22 09:59:49 2011 New Revision: 50864 URL: http://svn.reactos.org/svn/reactos?rev=50864&view=rev Log: [NOTEPAD] Patch by EDIJS <terminedijs at yahoo dot com>: Improve window caption string. By me: use StringCchCat instead of _tcscat to prevent possible buffer overruns. See issue #5871 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/notepad.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Tue Feb 22 09:59:49 2011 @@ -112,31 +112,27 @@ /** * Sets the caption of the main window according to Globals.szFileTitle: - * Notepad - (untitled) if no file is open - * Notepad - [filename] if a file is given + * (untitled) - Notepad if no file is open + * [filename] - Notepad if a file is given */ static void UpdateWindowCaption(void) { TCHAR szCaption[MAX_STRING_LEN]; - TCHAR szUntitled[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_NOTEPAD, szCaption, SIZEOF(szCaption)); - - if (Globals.szFileTitle[0] != '\0') { - static const TCHAR bracket_l[] = _T(" - ["); - static const TCHAR bracket_r[] = _T("]"); - _tcscat(szCaption, bracket_l); - _tcscat(szCaption, Globals.szFileTitle); - _tcscat(szCaption, bracket_r); + TCHAR szNotepad[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + + if (Globals.szFileTitle[0] != '\0') + { + StringCchCat(szCaption, MAX_STRING_LEN, Globals.szFileTitle); } else { - static const TCHAR hyphen[] = _T(" - "); - LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); - _tcscat(szCaption, hyphen); - _tcscat(szCaption, szUntitled); + LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); } - + + StringCchCat(szCaption, MAX_STRING_LEN, _T(" - ")); + StringCchCat(szCaption, MAX_STRING_LEN, szNotepad); SetWindowText(Globals.hMainWnd, szCaption); } @@ -684,7 +680,7 @@ _tcscat(szText, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); _tcscat(szText, szDate); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szText); } VOID DoCreateStatusBar(VOID) @@ -766,7 +762,7 @@ { DWORD dwStyle; int iSize; - LPTSTR pTemp; + LPTSTR pTemp = NULL; iSize = 0; Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] Tue Feb 22 09:59:49 2011 @@ -6,6 +6,7 @@ #include <tchar.h> #include <richedit.h> #include <malloc.h> +#include <strsafe.h> #include "main.h" #include "dialog.h"

13 years, 10 months

[arty] 50863: [NEWCC] Reenable post-unmap flush. It seems to fix the regtest cd.

by arty＠svn.reactos.org

Author: arty Date: Tue Feb 22 04:39:26 2011 New Revision: 50863 URL: http://svn.reactos.org/svn/reactos?rev=50863&view=rev Log: [NEWCC] Reenable post-unmap flush. It seems to fix the regtest cd. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Tue Feb 22 04:39:26 2011 @@ -767,12 +767,7 @@ CcpUnlock(); if (!Released) { - // Note: I thought this flush was needed based on the unwritten pages I had - // seen post-install, but realized that the installer is using sections to - // write files and we weren't pushing section pages. - // I corrected that seperately and this probably isn't needed anymore. - //if (RealBcb->Dirty) - //MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); + MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); CcpLock(); CcpUnpinData(RealBcb, TRUE); CcpUnlock();

13 years, 10 months

[dreimer] 50862: Update rapps database.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Feb 21 23:26:03 2011 New Revision: 50862 URL: http://svn.reactos.org/svn/reactos?rev=50862&view=rev Log: Update rapps database. Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 RC3 +Version = 3.3.0 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 209.0MB +Size = 215.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc3/win/x8… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.3.0/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.13 +Version = 0.9.16 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.13-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.16-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = Media Player Classic Home Cinema -Version = 1.4.2499 +Version = 1.5.0.2827 Licence = GPL Description = A media player. Size = 4.9MB Category = 1 URLSite = http://mpc-hc.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win3… +URLDownload = http://freefr.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win3… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -1,36 +1,36 @@ ï»¿; UTF-8 [Section] -Name = OpenOffice 3.0 -Version = 3.2.1 +Name = OpenOffice 3.3 +Version = 3.3.0 Licence = LGPL Description = THE Open Source Office Suite. -Size = 134.0MB +Size = 137.0MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.2.1/OOo_3.2.1_Win_x86_install_e… +URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.3.0/OOo_3.3.0_Win_x86_install_e… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ -Size = 144.0MB -URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.2.1/OOo_3.2.1_Win_x86_ins… +Size = 160.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.3.0/OOo_3.3.0_Win_x86_ins… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ -Size = 144.0MB -URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/es/3.2.1/OOo_3.2.1_Win_x86_ins… +Size = 132.0MB +URLDownload = http://ftp.gwdg.de/pub/openoffice/localized/es/3.3.0/OOo_3.3.0_Win_x86_inst… [Section.0415] Description = Otwarty pakiet biurowy. URLSite = http://pl.openoffice.org/ -Size = 130.0MB -URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_ins… +Size = 134.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.3.0/OOo_3.3.0_Win_x86_ins… [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. URLSite = http://ua.openoffice.org/ -Size = 128.0MB -URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/ru/3.2.1/OOo_3.2.1_Win_x86_ins… +Size = 133.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/ru/3.3.0/OOo_3.3.0_Win_x86_ins… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 11.00 +Version = 11.01 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 8.9M Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://get4.opera.com/pub/opera/win/1100/int/Opera_1100_int_Setup.exe +URLDownload = http://get4.opera.com/pub/opera/win/1101/int/Opera_1101_int_Setup.exe CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 2.23 +Version = 2.24 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 0.6M Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.23/Sc223.exe +URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.24/Sc224.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Mon Feb 21 23:26:03 2011 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.1.5 +Version = 1.1.7 Licence = GPL Description = A media player. -Size = 19.1MB +Size = 19.4MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.5/win32/vlc-1.1.5-win32.exe +URLDownload = http://kent.dl.sourceforge.net/project/vlc/1.1.7/win32/vlc-1.1.7-win32.exe CDPath = none [Section.0407]

13 years, 10 months

[tkreuzer] 50861: [CRT] Improve _getdrive and _tchdir. Patch by devpao (devotip at tiscali dot it), small formatting change by me. See issue #5848 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 21 23:11:53 2011 New Revision: 50861 URL: http://svn.reactos.org/svn/reactos?rev=50861&view=rev Log: [CRT] Improve _getdrive and _tchdir. Patch by devpao (devotip at tiscali dot it), small formatting change by me. See issue #5848 for more details. Modified: trunk/reactos/lib/sdk/crt/direct/chdir.c trunk/reactos/lib/sdk/crt/direct/getdrive.c Modified: trunk/reactos/lib/sdk/crt/direct/chdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/chdir.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/direct/chdir.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/direct/chdir.c [iso-8859-1] Mon Feb 21 23:11:53 2011 @@ -17,10 +17,13 @@ } /* Update the drive-specific current directory variable */ - if (GetCurrentDirectoryW(MAX_PATH, newdir) && newdir[1] == L':') + if (GetCurrentDirectoryW(MAX_PATH, newdir) >= 2) { - WCHAR envvar[4] = { L'=', towupper(newdir[0]), L':', L'\0' }; - SetEnvironmentVariableW(envvar, newdir); + if (newdir[1] == L':') + { + WCHAR envvar[4] = { L'=', towupper(newdir[0]), L':', L'\0' }; + SetEnvironmentVariableW(envvar, newdir); + } } return 0; Modified: trunk/reactos/lib/sdk/crt/direct/getdrive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/getdriv… ============================================================================== --- trunk/reactos/lib/sdk/crt/direct/getdrive.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/direct/getdrive.c [iso-8859-1] Mon Feb 21 23:11:53 2011 @@ -20,9 +20,12 @@ int _getdrive(void) { WCHAR buffer[MAX_PATH]; - if (GetCurrentDirectoryW( MAX_PATH, buffer ) && - buffer[0] >= 'A' && buffer[0] <= 'z' && buffer[1] == ':') - return towupper(buffer[0]) - 'A' + 1; + if (GetCurrentDirectoryW( MAX_PATH, buffer )>=2) + { + buffer[0]=towupper(buffer[0]); + if (buffer[0] >= L'A' && buffer[0] <= L'Z' && buffer[1] == L':') + return buffer[0] - L'A' + 1; + } return 0; }

13 years, 10 months

[fireball] 50860: [RTL/DPH] - Implement heap free operation using already implemented busy/free/available/unused lists support and other base routines. - Implement missing place to free list and re...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 21 22:42:21 2011 New Revision: 50860 URL: http://svn.reactos.org/svn/reactos?rev=50860&view=rev Log: [RTL/DPH] - Implement heap free operation using already implemented busy/free/available/unused lists support and other base routines. - Implement missing place to free list and remove from busy list routines. - Implement find busy block routine (using AVL tree). - Fix a bug in RtlpDphCoalesceNodeIntoAvailable() which resulted in unwanted attempt to merge the only node with itself (which failed anyway). - Fix a bug in RtlpDphCoalesceNodeIntoAvailable() which incorrectly removed a node from available list (which is implemented as a standard NT double-linked list, compared to unused and free lists which are implemented as single-linked custom lists and busy list which is an AVL tree). Result of that bug was an infinite loop at the next attempt to traverse the list of available nodes. - In RtlpDphCoalesceFreeIntoAvailable() break when FreeAllocations becomes less than LeaveOnFreeList (before it would break 1 size too early). - Fix list traversal in RtlpDphSearchAvailableMemoryListForBestFit(). If it couldn't find a node, it would return the last node in the list instead of NULL. - In RtlpDphFindAvailableMemory(), a new smaller size should be 4 times smaller, not just 2. - Add a #if0-ed section in RtlpDphRemoveFromAvailableList which checks if a request to remove node not in the list performed. Used only for debugging. - Add a trace dprint to every type of list insert/removal operation for easier tracking. - Add break on NULL ptr freeing support. - RtlpDphSetProtectionAfterUse() is stubbed and protection is set directly in RtlpDphHeapFree(). To be moved into this function. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Mon Feb 21 22:42:21 2011 @@ -137,20 +137,22 @@ #define DPH_BREAK_ON_RELEASE_FAIL 0x04 #define DPH_BREAK_ON_FREE_FAIL 0x08 #define DPH_BREAK_ON_PROTECT_FAIL 0x10 +#define DPH_BREAK_ON_NULL_FREE 0x80 /* RtlpDphDebugOptions */ #define DPH_DEBUG_INTERNAL_VALIDATE 0x01 #define DPH_DEBUG_VERBOSE 0x04 /* DPH ExtraFlags */ -#define DPH_EXTRA_CHECK_UNDERRUN 0x10 -#define DPH_LOG_STACK_TRACES 0x0 //FIXME: Get correct value +#define DPH_EXTRA_LOG_STACK_TRACES 0x02 +#define DPH_EXTRA_CHECK_UNDERRUN 0x10 /* Fillers */ #define DPH_FILL 0xEEEEEEEE #define DPH_FILL_START_STAMP_1 0xABCDBBBB #define DPH_FILL_START_STAMP_2 0xABCDBBBA #define DPH_FILL_END_STAMP_1 0xDCBABBBB +#define DPH_FILL_END_STAMP_2 0xDCBABBBA #define DPH_FILL_SUFFIX 0xD0 #define DPH_FILL_INFIX 0xC0 @@ -453,9 +455,31 @@ } VOID NTAPI +RtlpDphPlaceOnFreeList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) +{ + DPRINT("RtlpDphPlaceOnFreeList(%p %p)\n", DphRoot, Node); + + /* Node is being added to the tail of the list */ + Node->pNextAlloc = NULL; + + /* Add it to the tail of the linked list */ + if (DphRoot->pFreeAllocationListTail) + DphRoot->pFreeAllocationListTail->pNextAlloc = Node; + else + DphRoot->pFreeAllocationListHead = Node; + DphRoot->pFreeAllocationListTail = Node; + + /* Update byte counts taking in account this new node */ + DphRoot->nFreeAllocations++; + DphRoot->nFreeAllocationBytesCommitted += Node->nVirtualBlockSize; +} + +VOID NTAPI RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { - /* DphNode is being added to the tail of the list */ + DPRINT("RtlpDphPlaceOnPoolList(%p %p)\n", DphRoot, Node); + + /* Node is being added to the tail of the list */ Node->pNextAlloc = NULL; /* Add it to the tail of the linked list */ @@ -473,6 +497,8 @@ VOID NTAPI RtlpDphPlaceOnVirtualList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { + DPRINT("RtlpDphPlaceOnVirtualList(%p %p)\n", DphRoot, Node); + /* Add it to the head of the virtual list */ Node->pNextAlloc = DphRoot->pVirtualStorageListHead; if (!DphRoot->pVirtualStorageListHead) @@ -490,6 +516,8 @@ PDPH_HEAP_BLOCK Node = DphRoot->pUnusedNodeListHead; PDPH_HEAP_BLOCK Next; + DPRINT("RtlpDphTakeNodeFromUnusedList(%p), ret %p\n", DphRoot, Node); + /* Take the first entry */ if (!Node) return NULL; @@ -508,6 +536,8 @@ RtlpDphReturnNodeToUnusedList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { + DPRINT("RtlpDphReturnNodeToUnusedList(%p, %p)\n", DphRoot, Node); + /* Add it back to the head of the unused list */ Node->pNextAlloc = DphRoot->pUnusedNodeListHead; if (!DphRoot->pUnusedNodeListHead) @@ -528,6 +558,37 @@ DPRINT("RtlpDphRemoveFromAvailableList(%p %p)\n", DphRoot, Node); + /* Check if it is in the list */ +#if 0 + { + PLIST_ENTRY CurEntry; + PDPH_HEAP_BLOCK NodeEntry; + BOOLEAN Found = FALSE; + + /* Find where to put this node according to its virtual address */ + CurEntry = DphRoot->AvailableAllocationHead.Flink; + + while (CurEntry != &DphRoot->AvailableAllocationHead) + { + NodeEntry = CONTAINING_RECORD(CurEntry, DPH_HEAP_BLOCK, AvailableEntry); + + if (NodeEntry == Node) + { + Found = TRUE; + break; + } + + CurEntry = CurEntry->Flink; + } + + if (!Found) + { + DPRINT1("Trying to remove non-existing in availlist node!\n"); + DbgBreakPoint(); + } + } +#endif + /* Remove it from the list */ RemoveEntryList(&Node->AvailableEntry); @@ -541,11 +602,31 @@ } VOID NTAPI +RtlpDphRemoveFromBusyList(PDPH_HEAP_ROOT DphRoot, + PDPH_HEAP_BLOCK Node) +{ + BOOLEAN ElementPresent; + + DPRINT("RtlpDphRemoveFromBusyList(%p %p)\n", DphRoot, Node); + + /* Delete it from busy nodes table */ + ElementPresent = RtlDeleteElementGenericTableAvl(&DphRoot->BusyNodesTable, &Node->pUserAllocation); + ASSERT(ElementPresent == TRUE); + + /* Update counters */ + DphRoot->nBusyAllocations--; + DphRoot->nBusyAllocationBytesCommitted -= Node->nVirtualBlockSize; + DphRoot->nBusyAllocationBytesAccessible -= Node->nVirtualAccessSize; +} + +VOID NTAPI RtlpDphRemoveFromFreeList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node, PDPH_HEAP_BLOCK Prev) { PDPH_HEAP_BLOCK Next; + + DPRINT("RtlpDphRemoveFromFreeList(%p %p %p)\n", DphRoot, Node, Prev); /* Detach it from the list */ Next = Node->pNextAlloc; @@ -578,12 +659,13 @@ /* Find where to put this node according to its virtual address */ AvailListHead = &DphRoot->AvailableAllocationHead; + + /* Find a point where to insert an available node */ CurEntry = AvailListHead->Flink; while (CurEntry != AvailListHead) { NodeEntry = CONTAINING_RECORD(CurEntry, DPH_HEAP_BLOCK, AvailableEntry); - if (NodeEntry->pVirtualBlock >= Node->pVirtualBlock) { PrevNode = NodeEntry; @@ -592,10 +674,9 @@ CurEntry = CurEntry->Flink; } - /* Did we find a node to insert our one after? */ if (!PrevNode) { - /* No, just add to the head of the list then */ + /* That means either this list is empty, or we should add to the head of it */ InsertHeadList(AvailListHead, &Node->AvailableEntry); } else @@ -615,20 +696,22 @@ /* Insert after PrevNode */ InsertTailList(&PrevNode->AvailableEntry, &Node->AvailableEntry); } - } - - /* Now check the next entry after our one */ - if (Node->AvailableEntry.Flink != AvailListHead) - { - NextNode = CONTAINING_RECORD(Node->AvailableEntry.Flink, DPH_HEAP_BLOCK, AvailableEntry);; - /* Node is not at the tail of the list, check if it's adjacent */ - if (Node->pVirtualBlock + Node->nVirtualBlockSize == NextNode->pVirtualBlock) - { - /* They are adjacent - merge! */ - Node->nVirtualBlockSize += NextNode->nVirtualBlockSize; - Node->pNextAlloc = NextNode->pNextAlloc; - RtlpDphReturnNodeToUnusedList(DphRoot, NextNode); - DphRoot->nAvailableAllocations--; + + /* Now check the next entry after our one */ + if (Node->AvailableEntry.Flink != AvailListHead) + { + NextNode = CONTAINING_RECORD(Node->AvailableEntry.Flink, DPH_HEAP_BLOCK, AvailableEntry); + /* Node is not at the tail of the list, check if it's adjacent */ + if (Node->pVirtualBlock + Node->nVirtualBlockSize == NextNode->pVirtualBlock) + { + /* They are adjacent - merge! */ + Node->nVirtualBlockSize += NextNode->nVirtualBlockSize; + + /* Remove next entry from the list and put it into unused entries list */ + RemoveEntryList(&NextNode->AvailableEntry); + RtlpDphReturnNodeToUnusedList(DphRoot, NextNode); + DphRoot->nAvailableAllocations--; + } } } } @@ -643,10 +726,12 @@ /* Make sure requested size is not too big */ ASSERT(FreeAllocations >= LeaveOnFreeList); + DPRINT("RtlpDphCoalesceFreeIntoAvailable(%p %d)\n", DphRoot, LeaveOnFreeList); + while (Node) { FreeAllocations--; - if (FreeAllocations <= LeaveOnFreeList) break; + if (FreeAllocations < LeaveOnFreeList) break; /* Get the next pointer, because it may be changed after following two calls */ Next = Node->pNextAlloc; @@ -657,6 +742,7 @@ /* And put into the available */ RtlpDphCoalesceNodeIntoAvailable(DphRoot, Node); + /* Go to the next node */ Node = Next; } } @@ -713,20 +799,21 @@ SIZE_T Size) { PLIST_ENTRY CurEntry; - PDPH_HEAP_BLOCK Node; + PDPH_HEAP_BLOCK Node, NodeFound = NULL; CurEntry = DphRoot->AvailableAllocationHead.Flink; - while (TRUE) - { - /* If we reached end of the list - return right away */ - if (CurEntry == &DphRoot->AvailableAllocationHead) return NULL; - + while (CurEntry != &DphRoot->AvailableAllocationHead) + { /* Get the current available node */ Node = CONTAINING_RECORD(CurEntry, DPH_HEAP_BLOCK, AvailableEntry); /* Check its size */ - if (Node->nVirtualBlockSize >= Size) break; + if (Node->nVirtualBlockSize >= Size) + { + NodeFound = Node; + break; + } /* Move to the next available entry */ CurEntry = CurEntry->Flink; @@ -736,7 +823,7 @@ //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); - return Node; + return NodeFound; } PDPH_HEAP_BLOCK NTAPI @@ -757,7 +844,7 @@ if (DphRoot->nFreeAllocations <= DPH_FREE_LIST_MINIMUM) break; /* Calculate a new free list size */ - NewSize = DphRoot->nFreeAllocations >> 1; + NewSize = DphRoot->nFreeAllocations >> 2; if (NewSize < DPH_FREE_LIST_MINIMUM) NewSize = DPH_FREE_LIST_MINIMUM; /* Coalesce free into available */ @@ -795,6 +882,23 @@ return Node; } +PDPH_HEAP_BLOCK NTAPI +RtlpDphFindBusyMemory(PDPH_HEAP_ROOT DphRoot, + PVOID pUserMem) +{ + PDPH_HEAP_BLOCK Node; + PVOID Ptr; + + /* Lookup busy block in AVL */ + Ptr = RtlLookupElementGenericTableAvl(&DphRoot->BusyNodesTable, &pUserMem); + if (!Ptr) return NULL; + + /* Restore pointer to the heap block */ + Node = CONTAINING_RECORD(Ptr, DPH_HEAP_BLOCK, pUserAllocation); + ASSERT(Node->pUserAllocation == pUserMem); + return Node; +} + NTSTATUS NTAPI RtlpDphSetProtectionBeforeUse(PDPH_HEAP_ROOT DphRoot, PUCHAR VirtualBlock, ULONG UserSize) { @@ -815,6 +919,20 @@ Protection = PAGE_READWRITE; return RtlpDphProtectVm(Base, UserSize, Protection); +} + +NTSTATUS NTAPI +RtlpDphSetProtectionAfterUse(PDPH_HEAP_ROOT DphRoot, /*PUCHAR VirtualBlock*/PDPH_HEAP_BLOCK Node) +{ + // FIXME: Bring stuff here + if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN) + { + } + else + { + } + + return STATUS_SUCCESS; } PDPH_HEAP_BLOCK NTAPI @@ -1685,8 +1803,91 @@ ULONG Flags, PVOID Ptr) { - UNIMPLEMENTED; - return FALSE; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK Node; + ULONG ValidationInfo; + PDPH_BLOCK_INFORMATION Info; + + /* Check for a NULL pointer freeing */ + if (!HeapPtr) + { + if (RtlpDphBreakOptions & DPH_BREAK_ON_NULL_FREE) + { + DPRINT1("Page heap: freeing a null pointer \n"); + DbgBreakPoint(); + } + return TRUE; + } + + /* Get a pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return FALSE; + + /* Acquire the heap lock */ + RtlpDphPreProcessing(DphRoot, Flags); + + /* Perform internal validation if specified by flags */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + + /* Add heap flags */ + Flags |= DphRoot->HeapFlags; + + /* Find busy memory */ + Node = RtlpDphFindBusyMemory(DphRoot, Ptr); + + if (!Node) + { + /* This block was not found in page heap, try a normal heap instead */ + //RtlpDphNormalHeapFree(); + ASSERT(FALSE); + } + + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) + { + /* Check and report corrupted block */ + if (!RtlpDphIsPageHeapBlock(DphRoot, Ptr, &ValidationInfo, TRUE)) + { + RtlpDphReportCorruptedBlock(DphRoot, 1, Ptr, ValidationInfo); + } + + // FIXME: Should go inside RtlpDphSetProtectionAfterUse + if (Node->nVirtualAccessSize != 0) + { + /* Set stamps */ + Info = (PDPH_BLOCK_INFORMATION)Node->pUserAllocation - 1; + Info->StartStamp = DPH_FILL_START_STAMP_2; + Info->EndStamp = DPH_FILL_END_STAMP_2; + + RtlpDphProtectVm(Node->pVirtualBlock, Node->nVirtualAccessSize, PAGE_NOACCESS); + } + } + else + { + // FIXME: Should go inside RtlpDphSetProtectionAfterUse + if (Node->nVirtualAccessSize != 0) + RtlpDphProtectVm(Node->pVirtualBlock + PAGE_SIZE, Node->nVirtualAccessSize, PAGE_NOACCESS); + } + + /* Set new protection */ + RtlpDphSetProtectionAfterUse(DphRoot, Node); + + /* Remove it from the list of busy nodes */ + RtlpDphRemoveFromBusyList(DphRoot, Node); + + /* And put it into the list of free nodes */ + RtlpDphPlaceOnFreeList(DphRoot, Node); + + //if (DphRoot->ExtraFlags & DPH_EXTRA_LOG_STACK_TRACES) + // Node->StackTrace = RtlpDphLogStackTrace(3); + //else + Node->StackTrace = NULL; + + /* Leave the heap lock */ + RtlpDphPostProcessing(DphRoot); + + /* Return success */ + return TRUE; } PVOID NTAPI

13 years, 10 months

[arty] 50859: [NEWCC] Pull a copy of trunk as arty-newcc, with edits from mercurial.

by arty＠svn.reactos.org

Author: arty Date: Mon Feb 21 21:06:23 2011 New Revision: 50859 URL: http://svn.reactos.org/svn/reactos?rev=50859&view=rev Log: [NEWCC] Pull a copy of trunk as arty-newcc, with edits from mercurial. Added: branches/arty-newcc/ - copied from r50807, trunk/reactos/ Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif branches/arty-newcc/drivers/filesystems/fastfat/blockdev.c branches/arty-newcc/drivers/filesystems/fastfat/create.c branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c branches/arty-newcc/drivers/filesystems/fastfat/vfat.h branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/newcc.h branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/cache/section/data.c branches/arty-newcc/ntoskrnl/cache/section/fault.c branches/arty-newcc/ntoskrnl/cache/section/io.c branches/arty-newcc/ntoskrnl/cache/section/newmm.h branches/arty-newcc/ntoskrnl/cache/section/sptab.c branches/arty-newcc/ntoskrnl/cache/section/swapout.c branches/arty-newcc/ntoskrnl/cc/fs.c branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c branches/arty-newcc/ntoskrnl/ke/powerpc/kiinit.c branches/arty-newcc/ntoskrnl/ke/powerpc/thrdini.c branches/arty-newcc/ntoskrnl/mm/amd64/init.c branches/arty-newcc/ntoskrnl/mm/marea.c branches/arty-newcc/ntoskrnl/mm/mmfault.c branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/mm/powerpc/page.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild branches/arty-newcc/ntoskrnl/po/poshtdwn.c branches/arty-newcc/ntoskrnl/ps/psmgr.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/txtset… Modified: branches/arty-newcc/drivers/filesystems/fastfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… Modified: branches/arty-newcc/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/newcc… Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… Modified: branches/arty-newcc/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… Modified: branches/arty-newcc/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/fs.c?rev… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… Modified: branches/arty-newcc/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/powerpc/… Modified: branches/arty-newcc/ntoskrnl/ke/powerpc/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/powerpc/… Modified: branches/arty-newcc/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/amd64/in… Modified: branches/arty-newcc/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/marea.c?… Modified: branches/arty-newcc/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mmfault.… Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… Modified: branches/arty-newcc/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/powerpc/… Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge… Modified: branches/arty-newcc/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/po/poshtdwn… Modified: branches/arty-newcc/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/psmgr.c?…

13 years, 10 months

[tkreuzer] 50858: [USER32] Fix a typo. Fixes "Calling invalid routine number 0x10 in NtUserCallOneParam()"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 21 20:55:45 2011 New Revision: 50858 URL: http://svn.reactos.org/svn/reactos?rev=50858&view=rev Log: [USER32] Fix a typo. Fixes "Calling invalid routine number 0x10 in NtUserCallOneParam()" Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Mon Feb 21 20:55:45 2011 @@ -890,7 +890,7 @@ WINAPI MessageBeep(UINT uType) { - return (BOOL)NtUserCallOneParam(ONEPARAM_ROUTINE_MESSAGEBEEP, uType); + return (BOOL)NtUserCallOneParam(uType, ONEPARAM_ROUTINE_MESSAGEBEEP); }

13 years, 10 months

[tkreuzer] 50857: [CMAKE] Improve configure script. It now defaults to nmake for MSVC, if you want a "VSSolution", pass exactly this as 1st paramter Patch by Samuel Serapion

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 21 20:11:52 2011 New Revision: 50857 URL: http://svn.reactos.org/svn/reactos?rev=50857&view=rev Log: [CMAKE] Improve configure script. It now defaults to nmake for MSVC, if you want a "VSSolution", pass exactly this as 1st paramter Patch by Samuel Serapion Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Mon Feb 21 20:11:52 2011 @@ -1,7 +1,8 @@ -@echo off +::@echo off :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 +set USE_NMAKE= :: Detect build environment (MinGW, VS, WDK, ...) if defined ROS_ARCH ( @@ -16,6 +17,7 @@ set ARCH=amd64 ) set BUILD_ENVIRONMENT=WDK + set USE_NMAKE=1 echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH% )else if defined VCINSTALLDIR ( :: VS command prompt does not put this in enviroment vars @@ -29,6 +31,10 @@ exit /b ) echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% + if not "%1" == "VSSolution" ( + set USE_NMAKE=1 + echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter. + ) ) else if defined sdkdir ( if "%TARGET_CPU%" == "x86" ( set ARCH=i386 @@ -37,6 +43,7 @@ set ARCH=amd64 ) set BUILD_ENVIRONMENT=SDK + set USE_NMAKE=1 echo Detected Windows SDK %TARGET_PLATFORM%-%ARCH% ) @@ -44,15 +51,14 @@ goto createdirs ) -echo Error: Critical variable missing. Configure script failure. +echo Error: Unable to detect a build environment. Configure script failure. exit /b :: Create directories :createdirs set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% -if "%REACTOS_SOURCE_DIR%" == "%CD%" ( - echo test +if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( echo Creating directories in %REACTOS_OUTPUT_PATH% if not exist %REACTOS_OUTPUT_PATH% ( @@ -78,9 +84,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "SDK" ( +) else if defined USE_NMAKE ( cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% ) else if "%BUILD_ENVIRONMENT%" == "VS8" ( if "%ARCH%" == "amd64" ( @@ -113,9 +117,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if "%BUILD_ENVIRONMENT%" == "SDK" ( +) else if defined USE_NMAKE ( cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) else if "%BUILD_ENVIRONMENT%" == "VS8" ( if "%ARCH%" == "amd64" ( @@ -138,9 +140,6 @@ ) cd.. -if not ERRORLEVEL == 0 ( - echo Warning: errors occured. -) echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, etc...).

13 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011