Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 45063: [NTOS]: Remove debug spew (but keep Flag macros and fixes which fixed other bugs), thanks Timo.
by sir_richard＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: sir_richard Date: Wed Jan 13 22:56:14 2010 New Revision: 45063 URL: http://svn.reactos.org/svn/reactos?rev=45063&view=rev Log: [NTOS]: Remove debug spew (but keep Flag macros and fixes which fixed other bugs), thanks Timo. Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Jan 13 22:56:14 2010 @@ -54,7 +54,6 @@ ULONG Esp, V86EFlags, TrapEFlags; /* Get current V8086 flags and mask out interrupt flag */ - DbgPrint("VDM: Handling PUSHF (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); V86EFlags = *KiNtVdmState; V86EFlags &= ~EFLAGS_INTERRUPT_MASK; @@ -99,7 +98,6 @@ ULONG Esp, V86EFlags, EFlags, TrapEFlags; /* Build flat ESP */ - DbgPrint("VDM: Handling POPF (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp; /* Read EFlags */ @@ -205,7 +203,6 @@ /* Now read the interrupt number */ Interrupt = *(PUCHAR)Eip; - DbgPrint("VDM: Handling INT [0x%lx]\n", Interrupt); /* Read the EIP from its IVT entry */ Interrupt = *(PULONG)(Interrupt * 4); @@ -248,7 +245,6 @@ ULONG Esp, V86EFlags, EFlags, TrapEFlags, Eip; /* Build flat ESP */ - DbgPrint("VDM: Handling IRET (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); Esp = (TrapFrame->HardwareSegSs << 4) + TrapFrame->HardwareEsp; /* Check for OPER32 */ @@ -299,7 +295,6 @@ /* Build flat EIP and check if this is the BOP instruction */ Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip; - DbgPrint("VDM: Handling IRET EIP @ 0x%p [OPCODE: %lx]\n", Eip, *(PUSHORT)Eip); if (*(PUSHORT)Eip == 0xC4C4) { /* Dispatch the BOP */ @@ -322,7 +317,6 @@ /* FIXME: Support VME */ /* Disable interrupts */ - DbgPrint("VDM: Handling CLI\n"); KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK); /* Skip instruction */ @@ -340,7 +334,6 @@ /* FIXME: Support VME */ /* Enable interrupts */ - DbgPrint("VDM: Handling STI\n"); KiVdmSetVdmEFlags(EFLAGS_INTERRUPT_MASK); /* Skip instruction */ @@ -361,7 +354,6 @@ /* Get flat EIP of the *current* instruction (not the original EIP) */ Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip; - DbgPrint("VDM: Handling Opcode @ 0x%p\n", Eip); Eip += KiVdmGetInstructionSize(Flags) - 1; /* Read the opcode entry */ @@ -420,7 +412,6 @@ IN ULONG Flags) { /* Increase instruction size */ - DbgPrint("VDM: Handling PREFIX [%lx] Opcode @ 0x%p\n", KiVdmGetPrefixFlags(Flags), TrapFrame->Eip); Flags++; /* Handle the next opcode */ @@ -635,9 +626,7 @@ Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ - DbgPrint("VDM: Entering V8086 Mode\n"); Ki386SetupAndExitToV86Mode(VdmTeb); - DbgPrint("VDM: Exiting V8086 Mode\n"); /* Restore IOPM */ RtlCopyMemory(&Tss->IoMaps[0].IoMap, Ki386IopmSaveArea, PAGE_SIZE * 2);

1 0

[tkreuzer] 45062: [NTOS] KiExitV86Mode is supposed to return a pointer to the protected mode KTRAP_FRAME. Instead it was returning the value of TrapFrame->Edi, which would be identical to PmTrapFrame->Ebp, which doesn't have any particular meaning. Fix it by returning PmTrapFrame directly. Fixes 2nd stage boot.
by tkreuzer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: tkreuzer Date: Wed Jan 13 22:31:55 2010 New Revision: 45062 URL: http://svn.reactos.org/svn/reactos?rev=45062&view=rev Log: [NTOS] KiExitV86Mode is supposed to return a pointer to the protected mode KTRAP_FRAME. Instead it was returning the value of TrapFrame->Edi, which would be identical to PmTrapFrame->Ebp, which doesn't have any particular meaning. Fix it by returning PmTrapFrame directly. Fixes 2nd stage boot. Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Jan 13 22:31:55 2010 @@ -478,9 +478,9 @@ GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Thread->Teb >> 16); GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Thread->Teb >> 24); - /* Enable interrupts and get back to protected mode */ + /* Enable interrupts and return a pointer to the trap frame */ _enable(); - return TrapFrame->Edi; + return (ULONG)PmTrapFrame; } VOID

1 0

[dreimer] 45061: Update the Rapps Entries to up to date Versions.
by dreimer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: dreimer Date: Wed Jan 13 17:48:13 2010 New Revision: 45061 URL: http://svn.reactos.org/svn/reactos?rev=45061&view=rev Log: Update the Rapps Entries to up to date Versions. Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -16,4 +16,3 @@ [Section.040a] Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. - Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Edytor tekstu. - Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -13,4 +13,3 @@ [Section.0407] Description = Abyss Web Server ermÃ¶glicht es Webseiten auf Ihrem Computer zu hosten. Er unterstÃ¼tzt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausfÃ¼hren, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstÃ¼tzt werden kÃ¶nnen. - Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -34,4 +34,3 @@ Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Description = Ð Ð°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. URLSite = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ - Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = A very good CD Ripper/Audio File Converter. Size = 1.6MB Category = 1 -URLSite = http://www.audiograbber.com-us.net/ +URLSite = http://www.audiograbber.de/ URLDownload = http://www.audiograbber.de/files/4898276276/agsetup183se.exe CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Bardzo dobry CD Ripper/konwerter plikÃ³w audio. - Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,8 +7,8 @@ Description = Diablo 2 Shareware. zeckensack's glide wrapper is required to run it. Size = 132MB Category = 4 -URLSite = http://www.blizzard.com/diablo2 -URLDownload = http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe +URLSite = http://www.blizzard.com/diablo2/ +URLDownload = http://ftp.freenet.de/pub/filepilot/windows/spiele/diabloiidemo.exe CDPath = none [Section.0407] @@ -19,4 +19,3 @@ [Section.0415] Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. - Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -16,4 +16,3 @@ [Section.040a] Description = DosBlaster en una extensiÃ³n Shell que permite abrir cualquier ejecutable DOS en DOSBox desde el botÃ³n derecho del ratÃ³n. Esta versiÃ³n contiene DOSBox 0.70, pero puede ser actualizado facilmente instalando una nueva versiÃ³n de DOSBox en la carpeta de DosBlaster. - Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = DOSBox is a DOS emulator. Size = 1.4MB Category = 15 -URLSite = http://www.dosbox.com +URLSite = http://www.dosbox.com/ URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.73-win32-installer… CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = DOSBox - emulator DOSa. - Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -40,4 +40,3 @@ Size = 6.4M URLSite = http://www.mozilla-europe.org/ru/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… - Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -2,42 +2,41 @@ [Section] Name = Mozilla Firefox 3.0 -Version = 3.0.15 +Version = 3.0.17 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 7.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 6.9M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 7.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 6.9M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 7.8M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/r… - +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.0/win… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. - Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = glidewrapper jest potrzebny do uruchomienia Diablo2 w ReactOS-ie. - Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Viewer for all kinds of graphics/audio files/video files. Size = 1.3MB Category = 3 -URLSite = http://www.irfanview.com +URLSite = http://www.irfanview.com/ URLDownload = http://irfanview.tuwien.ac.at/iview425_setup.exe CDPath = none @@ -22,4 +22,3 @@ [Section.0415] Licence = Freeware (dla uÅ¼ytku domowego) Description = PrzeglÄdarka dla bardzo wielu typÃ³w obrazÃ³w, plikÃ³w audio oraz wideo. - Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Additional Plugins for supporting more file types. Size = 7.7MB Category = 3 -URLSite = http://www.irfanview.com +URLSite = http://www.irfanview.com/ URLDownload = http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_425_setup.exe CDPath = none @@ -22,4 +22,3 @@ [Section.0415] Licence = Freeware (dla uÅ¼ytku domowego) Description = Wtyczki otwierajÄce dodatkowe typy plikÃ³w w Irfanview. - Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Klon Breakouta/Arkanoida napisany przy uÅ¼yciu biblioteki SDL. - Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Klon gry Panzer General napisany przy uÅ¼yciu biblioteki SDL. - Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Klon gry Atomix, uÅ¼ywajÄcy biblioteki SDL. - Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = MFC 4 is needed by some applications. Size = 865kB Category = 14 -URLSite = http://support.microsoft.com/kb/122244 +URLSite = http://support.microsoft.com/kb/122244/ URLDownload = http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe CDPath = none @@ -25,4 +25,3 @@ Name = PrzeglÄdarka OLE oraz MFC (Microsoft Foundation Classes) wersja 4 Licence = Nieznana Description = Biblioteka MFC 4 jest uÅ¼ywana przez czÄÅÄ aplikacji. - Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Kompilator GCC dla platformy Windows wraz z dodatkowymi narzÄdziami (GDB, make, itd.). - 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] Wed Jan 13 17:48:13 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.10 +Version = 0.8.12 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.10-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.12-unicode.exe CDPath = none [Section.0407] @@ -19,4 +19,3 @@ [Section.0415] Description = Otwarty komunikator internetowy, obsÅugujÄcy wiele rÃ³Å¼nych protokoÅÃ³w (m.in. GG, Tlen, Jabber, ICQ, IRC) - moÅ¼e nie dziaÅaÄ prawidÅowo. - Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = The most popular client for the Internet Relay Chat (IRC). Size = 1.66M Category = 5 -URLSite = http://www.mirc.com +URLSite = http://www.mirc.com/ URLDownload = http://mirc.bigchief.dk/mirc635.exe CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). - Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = NiektÃ³re spoÅrÃ³d plikÃ³w instalacyjnych MSI potrzebujÄ parsera MSXML3. - Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = The Off By One Browser is a very small and fast web browser with full HTML 3.2 support. Size = 0.98M Category = 5 -URLSite = http://offbyone.com +URLSite = http://offbyone.com/ URLDownload = http://offbyone.com/offbyone/images/OffByOneSetup.exe CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Bardzo maÅa i szybka przeglÄdarka internetowa z peÅnÄ obsÅugÄ HTML 3.2. - Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,23 +7,24 @@ Description = THE Open Source Office Suite. Size = 127MB Category = 6 -URLSite = http://www.openoffice.org +URLSite = http://www.openoffice.org/ URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.3/OOo_2.4.3_Win32Intel_install… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. -URLSite = http://de.openoffice.org +URLSite = http://de.openoffice.org/ Size = 114.2MB URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.3/OOo_2.4.3_Win32… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ +Size = 113.9MB +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/2.4.3/OOo_2.4.3_Win32… [Section.0415] URLSite = http://pl.openoffice.org/ Description = Otwarty pakiet biurowy. -URLDownload = http://www.mirrorservice.org/sites/download.openoffice.org/localized/pl/2.4… -Size = 128.0M - +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/2.4.2/OOo_2.4.2_Win32… +Size = 113.9M 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] Wed Jan 13 17:48:13 2010 @@ -7,27 +7,25 @@ Description = THE Open Source Office Suite. Size = 134.3MB Category = 6 -URLSite = http://www.openoffice.org +URLSite = http://www.openoffice.org/ URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.1/OOo_3.1.1_Win32Intel_… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. -URLSite = http://de.openoffice.org -Size = 156.8MB -Version = 3.1.1 -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.1.1/OOo_3.1.1_Win32… +URLSite = http://de.openoffice.org/ +Size = 142.9MB +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.1.1/OOo_3.1.1_Win32… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ +Version = 3.1.0 Size = 130.0MB -Version = 3.1.0 -URLDownload = http://openoffice.panu.it/localized/es/3.1.0/OOo_3.1.0_Win32Intel_install_e… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.1.0/OOo_3.1.0_Win32… [Section.0415] Description = Otwarty pakiet biurowy. -URLSite = http://pl.openoffice.org +URLSite = http://pl.openoffice.org/ Size = 147.1MB URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.1/OOo_3.1.1_Win32… - Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 2.9MB Category = 4 -URLSite = http://www.openttd.org +URLSite = http://www.openttd.org/ URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.3-windows-win… CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego dziaÅania potrzebna jest kopia gry Transport Tycoon. - 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] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. - Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Darmowy klient obsÅugujÄcy protokoÅy SSH, Telnet, rlogin oraz bezpoÅrednie TCP. - Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. Size = 14.9MB Category = 7 -URLSite = http://reactos.org/wiki/Build_Environment +URLSite = http://reactos.org/wiki/Build_Environment/ URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.5.exe CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. - Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = This tool allows you to access your Windows shared folders/printers with ReactOS. Size = 1MB Category = 5 -URLSite = http://samba-tng.org +URLSite = http://samba-tng.org/ URLDownload = http://svn.reactos.org/packages/samba-tng.exe CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = NarzÄdzie pozwalajÄce na dostÄp z poziomu ReactOSa do wspÃ³Ådzielonych folderÃ³w/drukarek Windows. - 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] Wed Jan 13 17:48:13 2010 @@ -16,4 +16,3 @@ [Section.040a] Description = Editor de texto basado en SCIntilla. Originalmente creado para demostrar Scintilla, a crecido para ser un gran editor con capacidad para crear y ejecutar programas. - Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Program pozwalajÄcy uruchomiÄ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS. - Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Biblioteka wymagana przez niektÃ³re gry (zwÅaszcza te o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest 7-Zip lub podobny program. - Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0415] Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL) Description = Wymagana przez wiele gier (gÅÃ³wnie o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny. - Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -2,32 +2,31 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0 +Version = 2.0.2 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 10.0MB +Size = 10.1MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/en-US/SeaMonkey%2… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0.2/win32/en-US/SeaMonkey… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.0MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/de/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0.2/win32/de/SeaMonkey%20… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. -Size = 11.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… +Size = 10.0MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0.2/win32/es-ES/SeaMonkey… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 10.8MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/pl/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0.2/win32/pl/SeaMonkey%20… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.4MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/ru/SeaMonkey%20Se… - +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0.2/win32/ru/SeaMonkey%20… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -21,4 +21,3 @@ [Section.0415] URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=pl Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. - Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -1,37 +1,36 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Thunderbird 2.0 -Version = 2.0.0.23 +Name = Mozilla Thunderbird +Version = 3.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 6.2M +Size = 8.6M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 6.4M +Size = 8.4M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. -Size = 6.3M +Size = 8.4M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. -Size = 7.2M +Size = 9.2M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 7.1M +Size = 8.8M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… - +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Udany klon gry Chip's Challenge z Atari Lynx. Zawiera darmowy zestaw grafik CCLP2. - Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = An Open Source bitmap graphics editor geared towards young children. Size = 10MB Category = 3 -URLSite = http://tuxpaint.org +URLSite = http://tuxpaint.org/ URLDownload = http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.21-win32-in… CDPath = none @@ -19,4 +19,3 @@ [Section.0415] Description = Otwarty program graficzny przeznaczony gÅÃ³wnie dla dzieci. - Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -2,15 +2,14 @@ [Section] Name = UltraVNC -Version = 1.0.8.0 +Version = 1.0.8.2 Licence = GPL Description = Open-source VNC client/server. Size = 1.9MB Category = 5 -URLSite = http://www.uvnc.com -URLDownload = http://support1.uvnc.com/download/1080/UltraVNC_1.0.8.0_Setup.exe +URLSite = http://www.uvnc.com/ +URLDownload = http://support1.uvnc.com/download/1082/UltraVNC_1.0.8.2_Setup.exe CDPath = none [Section.040a] Description = Cliente/Servidor VNC de cÃ³digo abierto. - Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -27,4 +27,3 @@ [Section.0419] Licence = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent. - Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Visual Basic 5 Runtime. Size = 970kB Category = 14 -URLSite = http://support.microsoft.com/kb/180071 +URLSite = http://support.microsoft.com/kb/180071/ URLDownload = http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm… CDPath = none @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 5. - Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Visual Basic 6 Runtime. Size = 1.0MB Category = 14 -URLSite = http://support.microsoft.com/kb/192461 +URLSite = http://support.microsoft.com/kb/192461/ URLDownload = http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru… CDPath = none @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 6. - Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2005. - Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2005 SP1. - Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2008. - Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -7,7 +7,7 @@ Description = Visual Studio 6 Runtime. Size = 1.7MB Category = 14 -URLSite = http://support.microsoft.com/kb/259403 +URLSite = http://support.microsoft.com/kb/259403/ URLDownload = http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red… CDPath = none @@ -22,4 +22,3 @@ [Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 6. - 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] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. - Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Jan 13 17:48:13 2010 @@ -19,4 +19,3 @@ [Section.0415] Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych(w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych. -

1 0

[dreimer] 45060: Bug 5072: PATCH: Add ReMooD to ReactOS Application Downloader. (by GhostlyDeath) Added a German translation myself.
by dreimer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: dreimer Date: Wed Jan 13 16:46:00 2010 New Revision: 45060 URL: http://svn.reactos.org/svn/reactos?rev=45060&view=rev Log: Bug 5072: PATCH: Add ReMooD to ReactOS Application Downloader. (by GhostlyDeath) Added a German translation myself. Added: trunk/reactos/base/applications/rapps/rapps/remood.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Wed Jan 13 16:46:00 2010 @@ -1,0 +1,15 @@ +; UTF-8 + +[Section] +Name = ReMooD +Version = 0.8a +Licence = GPL +Description = ReMooD is a source port of Doom Legacy. It aims to provide the classic Legacy Experience with new features and more stability. This supports Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x and higher; and Linux (x86 and x86_64). +Size = 1.2M +Category = 4 +URLSite = http://remood.sourceforge.net/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/remood/remoodsetup-win32_08a.exe +CDPath = none + +[Section.0407] +Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64). Propchange: trunk/reactos/base/applications/rapps/rapps/remood.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 45059: - Create branch from current HEAD for jcatena. - Note, this branch will need to be synched with the trap handler rewrite until it's complete as it contains bugs at the moment. If this causes problems it may be preferable to branch from an earlier revision. Just let me know.
by gedmurphy＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: gedmurphy Date: Wed Jan 13 12:41:16 2010 New Revision: 45059 URL: http://svn.reactos.org/svn/reactos?rev=45059&view=rev Log: - Create branch from current HEAD for jcatena. - Note, this branch will need to be synched with the trap handler rewrite until it's complete as it contains bugs at the moment. If this causes problems it may be preferable to branch from an earlier revision. Just let me know. Added: branches/jcatena-branch/ (props changed) - copied from r45058, trunk/reactos/ Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jan 13 12:41:16 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jan 13 12:41:16 2010 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 13 12:41:16 2010 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Propchange: branches/jcatena-branch/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[dreimer] 45058: Some heavy cleanup. - We already have the tools folder in PATH for ages now, so we don't need to write the whole path to run a app from there. - Adding the Host GCC Path to PATH twice doesn't make things better. - Tidy up the clean command a bit more with Colin's Version in mind.
by dreimer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: dreimer Date: Wed Jan 13 10:27:18 2010 New Revision: 45058 URL: http://svn.reactos.org/svn/reactos?rev=45058&view=rev Log: Some heavy cleanup. - We already have the tools folder in PATH for ages now, so we don't need to write the whole path to run a app from there. - Adding the Host GCC Path to PATH twice doesn't make things better. - Tidy up the clean command a bit more with Colin's Version in mind. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -20,7 +20,7 @@ } function rembin { - # Check if we have something to clean, if so, clean it. + # Check if we have any binaries to clean, if so, clean them. # Apply modified obj and out paths for deletion. @@ -46,12 +46,12 @@ $null = (Remove-Item "$MAKEFILE" -force) } - if (Test-Path "$OBJCLEANPATH\.") { + if (Test-Path "$OBJCLEANPATH") { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - if (Test-Path "$OBJCLEANPATH\.") { + if (Test-Path "$OBJCLEANPATH") { $null = (Remove-Item "$OBJCLEANPATH" -recurse -force) } - if (Test-Path "$OUTCLEANPATH\.") { + if (Test-Path "$OUTCLEANPATH") { $null = (Remove-Item "$OUTCLEANPATH" -recurse -force) } "Done cleaning ReactOS $ENV:ROS_ARCH source directory." @@ -71,16 +71,13 @@ if ("$args" -eq "") { rembin - end } elseif ("$args" -eq "logs") { remlog - end } elseif ("$args" -eq "all") { rembin remlog - end } elseif ("$args" -ne "") { $argindex = 0 @@ -90,5 +87,5 @@ $argindex += 1 } remove-variable cl - end } +end Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -227,7 +227,7 @@ settitle } elseif ("$args" -ne "") { - "Unknown parameter specified. Try 'help [COMMAND]'." + "Unknown parameter specified. Try 'help config'." settitle } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -96,7 +96,7 @@ " appropiate name." " depends - Does a full dependency check on the ReactOS Source" " and generates a new makefile. This will take a while." - " ""module""-depends - Does a dependency check for one module with the" + " ""module""_depends - Does a dependency check for one module with the" " appropiate name." } elseif ("$args" -eq "makex") { " Usage: makex [OPTIONS]" @@ -118,7 +118,7 @@ " appropiate name." " depends - Does a full dependency check on the ReactOS Source" " and generates a new makefile. This will take a while." - " ""module""-depends - Does a dependency check for one module with the" + " ""module""_depends - Does a dependency check for one module with the" " appropiate name." " NOTE: The number makex uses can be modified by editing Build.cmd" " located in the RosBE directory, instructions for doing so are" @@ -193,7 +193,7 @@ } } elseif ("$args" -eq "scut") { if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { - IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' --help" + IEX "& scut.exe --help" } } elseif ("$args" -eq "ssvn") { if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -45,7 +45,7 @@ $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" -$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH" +$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath @@ -119,7 +119,6 @@ if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global - set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global } function global:UPDATE {IEX "&'$_ROSBE_BASEDIR\Tools\Elevate.exe' '$pshome\powershell.exe' -noexit {&'$_ROSBE_BASEDIR\update.ps1' $_ROSBE_VERSION '$_ROSBE_BASEDIR' $args}"} Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -35,11 +35,11 @@ $baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) if ($baseaddr -lt $ADDRESS) { - IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$ADDRESS'" + IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'" } else { $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& '$_ROSBE_BASEDIR\Tools\log2lines.exe' '$FILEPATH' '$relbase'" + IEX "& log2lines.exe '$FILEPATH' '$relbase'" } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -7,13 +7,13 @@ # function UP($arg) { - $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" + $OFFSVN = IEX "& svn.exe info" | select-string "Revision:" $OFFSVN = $OFFSVN -replace "(.*)Revision: ",'' $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10) if ("$ENV:ROS_ARCH" -eq "amd64") { - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:" + $ONSVN = IEX "& svn.exe info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:" } else { - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" + $ONSVN = IEX "& svn.exe info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" } $ONSVN = $ONSVN -replace "(.*)Revision: ",'' $ONSVN = [CONVERT]::ToInt32($ONSVN,10) @@ -31,31 +31,31 @@ if ("$_ROSBE_SSVN_JOB" -eq "update") { if ("$($arg[1])" -ne "") { $temparg = $arg[1] - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + IEX "& svn.exe update -r $temparg" if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps "Updating RosApps..." - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + IEX "& svn.exe update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" } if (Test-Path "modules\rostests\.") { Set-Location modules\rostests "Updating RosTests..." - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + IEX "& svn.exe update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" } } else { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + IEX "& svn.exe update" if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps "Updating RosApps..." - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + IEX "& svn.exe update" Set-Location "$_ROSBE_ROSSOURCEDIR" } if (Test-Path "modules\rostests\.") { Set-Location modules\rostests "Updating RosTests..." - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + IEX "& svn.exe update" Set-Location "$_ROSBE_ROSSOURCEDIR" } } @@ -63,7 +63,7 @@ $CL = Read-Host "Please enter 'yes' or 'no': " if (("$CL" -eq "yes") -or ("$CL" -eq "y")) { $range = "$OFFSVN" + ":" + "$ONSVN" - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' log -r $range" + IEX "& svn.exe log -r $range" } } } @@ -89,7 +89,7 @@ $host.ui.RawUI.WindowTitle = "SVN Cleaning..." "This might take a while, so please be patient." "" - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" + IEX "& svn.exe cleanup" } # Check if the folder is empty. If not, output an error. @@ -102,9 +102,9 @@ $dir = get-childitem if ("$dir" -eq "") { if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." } else { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos ." } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" @@ -125,9 +125,9 @@ $dir = get-childitem if ("$dir" -eq "") { if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." } else { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/rosapps ." } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" @@ -149,9 +149,9 @@ $dir = get-childitem if ("$dir" -eq "") { if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." } else { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ." + IEX "& svn.exe checkout svn://svn.reactos.org/reactos/trunk/rostests ." } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -7,7 +7,7 @@ # function paramcall($arg) { - IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' $arg" + IEX "& scut.exe $arg" } function parse($arg) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -49,7 +49,7 @@ } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue - IEX "&'$_ROSBE_BASEDIR\Tools\7z.exe' x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'" + IEX "& 7z.exe x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'" set-location "$_ROSBE_VERSION-$_ROSBE_STATCOUNT" IEX "& .\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" return @@ -57,7 +57,7 @@ "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." return } - } elseif ("$YESNO" -eq "no") { + } elseif (("$YESNO" -eq "no") -or ("$YESNO" -eq "n")) { "Do you want to be asked again to install this update?" $YESNO = Read-Host "(yes), (no)" if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -17,7 +17,7 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: abort the build and inform the user. if exist .\config.rbuild ( - "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild + chknewer.exe config.template.rbuild config.rbuild if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -46,7 +46,7 @@ :: Do the actual building if %_ROSBE_SHOWTIME% == 1 ( - set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" + set BUILDTIME_COMMAND=buildtime.exe ) else ( set BUILDTIME_COMMAND= ) @@ -55,12 +55,12 @@ if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* ) :EOC :: Highlight the fact that building has ended. -"%_ROSBE_BASEDIR%\Tools\flash.exe" +flash.exe title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -18,26 +18,23 @@ title Cleaning... if "%1" == "" ( - call :DEL - goto :EOC + call :BIN ) else if /i "%1" == "logs" ( call :LOG - goto :EOC ) else if /i "%1" == "all" ( - call :DEL + call :BIN call :LOG - goto :EOC ) else ( - call :WHILE %* + call :MODULE %* ) goto :EOC -:WHILE +:MODULE if "%1" == "" goto :EOF call "%_ROSBE_BASEDIR%\Make.cmd" %1_clean shift /1 echo. - GOTO :WHILE %* + GOTO :MODULE %* :: Check if we have any logs to clean, if so, clean them. :LOG @@ -51,8 +48,8 @@ goto :EOF -:: Check if we have something to clean, if so, clean it. -:DEL +:: Check if we have any binaries to clean, if so, clean them. +:BIN :: Apply modified obj and out paths for deletion. if "%_ROSBE_OBJPATH%" == "" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -234,7 +234,7 @@ ) if not "%1" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. + echo Unknown parameter specified. Try 'help config'. goto :NOK ) @@ -260,7 +260,7 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: inform the user and offer an update. if exist ".\config.rbuild" ( - "%_ROSBE_BASEDIR%\Tools\chknewer.exe" ".\config.template.rbuild" ".\config.rbuild" + chknewer.exe config.template.rbuild config.rbuild if !errorlevel! == 1 ( echo. echo *** config.template.rbuild is newer than working config.rbuild *** Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -103,7 +103,7 @@ echo appropiate name. echo depends - Does a full dependency check on the ReactOS Source echo and generates a new makefile. This will take a while. - echo "module"-depends - Does a dependency check for one module with the + echo "module"_depends - Does a dependency check for one module with the echo appropiate name. ) else if /i "%1" == "makex" ( echo Usage: makex [OPTIONS] @@ -125,7 +125,7 @@ echo appropiate name. echo depends - Does a full dependency check on the ReactOS Source echo and generates a new makefile. This will take a while. - echo "module"-depends - Does a dependency check for one module with the + echo "module"_depends - Does a dependency check for one module with the echo appropiate name. echo NOTE: The number makex uses can be modified by editing Build.cmd echo located in the RosBE directory, instructions for doing so are @@ -200,7 +200,7 @@ ) ) else if /i "%1" == "scut" ( if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - "%_ROSBE_BASEDIR%\Tools\scut.exe" --help + scut.exe --help ) ) else if /i "%1" == "ssvn" ( if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -39,7 +39,7 @@ set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% -set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH% +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%PATH% :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -15,7 +15,7 @@ ) :: Get the raw date and time. -for /f "usebackq tokens=1" %%u in (`"%_ROSBE_BASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u +for /f "usebackq tokens=1" %%u in (`getdate.exe`) do set DATERAW=%%u for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u :: Check if we need to pad the time with a zero. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -26,7 +26,7 @@ goto :EOC ) ) else ( - for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set TOOLPATH=%%i + for /f "usebackq tokens=*" %%i in (`"rquote.exe %1"`) do set TOOLPATH=%%i ) if "%2" == "" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -14,8 +14,6 @@ title Options -set options=%_ROSBE_BASEDIR%\Tools\options.exe - if not "%ROS_ARCH%" == "i386" ( set param=%ROS_ARCH% set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd @@ -25,9 +23,9 @@ ) :: Run options.exe -if exist "%options%" ( +if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( pushd "%_ROSBE_BASEDIR%" - call "%options%" %param% + call options.exe %param% popd if exist "%cfgfile%" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -49,7 +49,7 @@ :: Check if the user supplied a path, if they didn't look for :: the specified file in the current directory and any :: sub-directories. -"%_ROSBE_BASEDIR%\Tools\chkslash.exe" "%FILEPATH%" +chkslash.exe "%FILEPATH%" if errorlevel 2 ( for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%" 2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i ) @@ -63,12 +63,12 @@ for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i if %%i lss %ADDRESS% ( - "%_ROSBE_BASEDIR%\Tools\log2lines.exe" "%FILEPATH%" "%ADDRESS%" + log2lines.exe "%FILEPATH%" "%ADDRESS%" ) else ( set /a BASEADDRESS+=0x%ADDRESS% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" !BASEADDRESS!"') do set RELBASE=%%i - "%_ROSBE_BASEDIR%\Tools\log2lines.exe" "!FILEPATH!" "!RELBASE!" + for /f %%i in ('"echoh.exe !BASEADDRESS!"') do set RELBASE=%%i + log2lines.exe "!FILEPATH!" "!RELBASE!" ) :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -32,7 +32,7 @@ if /i "%1" == "cleanup" ( title SVN Cleaning... - "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup + svn.exe cleanup goto :EOC ) @@ -48,9 +48,9 @@ dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . + svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . ) else ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . + svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos . ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED @@ -72,9 +72,9 @@ dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . + svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . ) else ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps . + svn.exe checkout svn://svn.reactos.org/reactos/trunk/rosapps . ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED @@ -97,9 +97,9 @@ dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . + svn.exe checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . ) else ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests . + svn.exe checkout svn://svn.reactos.org/reactos/trunk/rostests . ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED @@ -123,11 +123,11 @@ ) :UP - for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i + for /f "usebackq tokens=2" %%i in (`"svn.exe info | find "Revision:""`) do set OFFSVN=%%i if "%ROS_ARCH%" == "amd64" ( - for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j + for /f "usebackq tokens=2" %%j in (`"svn.exe info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j ) else ( - for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j + for /f "usebackq tokens=2" %%j in (`"svn.exe info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j ) echo Local Revision: !OFFSVN! @@ -142,31 +142,31 @@ ) if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + svn.exe update -r %2 if exist "modules\rosapps\." ( cd modules\rosapps echo Updating RosApps... - "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + svn.exe update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" ) if exist "modules\rostests\." ( cd modules\rostests echo Updating RosTests... - "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + svn.exe update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" ) ) else ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" update + svn.exe update if exist "modules\rosapps\." ( cd modules\rosapps echo Updating RosApps... - "%_ROSBE_BASEDIR%\Tools\svn.exe" update + svn.exe update cd "%_ROSBE_ROSSOURCEDIR%" ) if exist "modules\rostests\." ( cd modules\rostests echo Updating RosTests... - "%_ROSBE_BASEDIR%\Tools\svn.exe" update + svn.exe update cd "%_ROSBE_ROSSOURCEDIR%" ) ) @@ -174,7 +174,7 @@ echo Do you want to see the changelog? set /p CL="Please enter 'yes' or 'no': " if /i "!CL!"=="yes" ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" log -r !OFFSVN!:!ONSVN! + svn.exe log -r !OFFSVN!:!ONSVN! ) ) if !OFFSVN! equ !ONSVN! ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -25,7 +25,7 @@ if /i "%1" == "--help" goto paramcall :: It's a shortcut name, so change the directory -for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\scut.exe" %*"`) do ( +for /f "usebackq tokens=*" %%i in (`"scut.exe %*"`) do ( if /i not "%%i" == "Default" ( if exist "%%i\." ( cd /d %%i @@ -36,7 +36,7 @@ goto :EOC :paramcall -call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 +call scut.exe "%1" %2 %3 :EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed Jan 13 10:27:18 2010 @@ -32,7 +32,7 @@ :: First check for a new Updater for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF -"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( cls @@ -63,7 +63,7 @@ set _ROSBE_STATCOUNT=%2 cd tmp if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL + wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ) else ( @@ -97,7 +97,7 @@ ) if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL + wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL ) if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( @@ -110,11 +110,11 @@ goto :no :updyes if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z 1> NUL 2> NUL + wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z 1> NUL 2> NUL ) if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" ( del /F /Q "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!\*.*" 1>NUL 2>NUL - "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" + 7z.exe x "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" cd "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!" call "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.cmd" goto :EOF @@ -152,7 +152,7 @@ if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT cd tmp if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL + wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( set _ROSBE_UPDATES=!_ROSBE_UPDATES! !_ROSBE_STATCOUNT! ) else (

1 0

[sir_richard] 45057: [NTOS]: Fix some bugs and cleanup V8086 code in regards to flags usage. [NTOS]: Add VDM debug spew to see why there's now an invalid opcode on Windows builds of VMWare and certain QEmu combinations. (Note: the double fault issue is fixed, this is a new issue).
by sir_richard＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: sir_richard Date: Wed Jan 13 04:43:03 2010 New Revision: 45057 URL: http://svn.reactos.org/svn/reactos?rev=45057&view=rev Log: [NTOS]: Fix some bugs and cleanup V8086 code in regards to flags usage. [NTOS]: Add VDM debug spew to see why there's now an invalid opcode on Windows builds of VMWare and certain QEmu combinations. (Note: the double fault issue is fixed, this is a new issue). Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Jan 13 04:43:03 2010 @@ -12,6 +12,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define KiVdmGetInstructionSize(x) ((x) & 0xFF) +#define KiVdmGetPrefixFlags(x) ((x) & 0xFFFFFF00) /* GLOBALS ********************************************************************/ @@ -51,6 +54,7 @@ ULONG Esp, V86EFlags, TrapEFlags; /* Get current V8086 flags and mask out interrupt flag */ + DbgPrint("VDM: Handling PUSHF (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); V86EFlags = *KiNtVdmState; V86EFlags &= ~EFLAGS_INTERRUPT_MASK; @@ -67,7 +71,7 @@ Esp -= 2; /* Check for OPER32 */ - if (Flags & PFX_FLAG_OPER32) + if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32) { /* Save EFlags */ Esp -= 2; @@ -81,7 +85,7 @@ /* Set new ESP and EIP */ TrapFrame->HardwareEsp = (USHORT)Esp; - TrapFrame->Eip += (Flags & 0xFF); + TrapFrame->Eip += KiVdmGetInstructionSize(Flags); /* We're done */ return TRUE; @@ -95,6 +99,7 @@ ULONG Esp, V86EFlags, EFlags, TrapEFlags; /* Build flat ESP */ + DbgPrint("VDM: Handling POPF (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp; /* Read EFlags */ @@ -102,7 +107,7 @@ Esp += 4; /* Check for OPER32 */ - if (!(Flags & PFX_FLAG_OPER32)) + if (!(KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32)) { /* Read correct flags and use correct stack address */ Esp -= 2; @@ -140,7 +145,7 @@ /* FIXME: Check for VDM interrupts */ /* Update EIP */ - TrapFrame->Eip += (Flags & 0xFF); + TrapFrame->Eip += KiVdmGetInstructionSize(Flags); /* We're done */ return TRUE; @@ -187,7 +192,7 @@ /* Push IP */ Esp -= 2; - *(PUSHORT)(Esp) = (USHORT)TrapFrame->Eip + (Flags & 0xFF) + 1; + *(PUSHORT)(Esp) = (USHORT)TrapFrame->Eip + KiVdmGetInstructionSize(Flags) + 1; /* Update ESP */ TrapFrame->HardwareEsp = (USHORT)Esp; @@ -196,11 +201,12 @@ Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip; /* Now get the *next* EIP address (current is original + the count - 1) */ - Eip += (Flags & 0xFF); + Eip += KiVdmGetInstructionSize(Flags); /* Now read the interrupt number */ Interrupt = *(PUCHAR)Eip; - + DbgPrint("VDM: Handling INT [0x%lx]\n", Interrupt); + /* Read the EIP from its IVT entry */ Interrupt = *(PULONG)(Interrupt * 4); TrapFrame->Eip = (USHORT)Interrupt; @@ -240,12 +246,13 @@ IN ULONG Flags) { ULONG Esp, V86EFlags, EFlags, TrapEFlags, Eip; - + /* Build flat ESP */ + DbgPrint("VDM: Handling IRET (PREFIX [0x%lx])\n", KiVdmGetPrefixFlags(Flags)); Esp = (TrapFrame->HardwareSegSs << 4) + TrapFrame->HardwareEsp; /* Check for OPER32 */ - if (Flags & PFX_FLAG_OPER32) + if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32) { /* Build segmented EIP */ TrapFrame->Eip = *(PULONG)Esp; @@ -292,6 +299,7 @@ /* Build flat EIP and check if this is the BOP instruction */ Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip; + DbgPrint("VDM: Handling IRET EIP @ 0x%p [OPCODE: %lx]\n", Eip, *(PUSHORT)Eip); if (*(PUSHORT)Eip == 0xC4C4) { /* Dispatch the BOP */ @@ -313,11 +321,12 @@ { /* FIXME: Support VME */ - /* disable interrupts */ + /* Disable interrupts */ + DbgPrint("VDM: Handling CLI\n"); KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK); /* Skip instruction */ - TrapFrame->Eip += (Flags & 0xFF); + TrapFrame->Eip += KiVdmGetInstructionSize(Flags); /* Done */ return TRUE; @@ -331,10 +340,11 @@ /* FIXME: Support VME */ /* Enable interrupts */ + DbgPrint("VDM: Handling STI\n"); KiVdmSetVdmEFlags(EFLAGS_INTERRUPT_MASK); /* Skip instruction */ - TrapFrame->Eip += (Flags & 0xFF); + TrapFrame->Eip += KiVdmGetInstructionSize(Flags); /* Done */ return TRUE; @@ -351,7 +361,8 @@ /* Get flat EIP of the *current* instruction (not the original EIP) */ Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip; - Eip += (Flags & 0xFF) - 1; + DbgPrint("VDM: Handling Opcode @ 0x%p\n", Eip); + Eip += KiVdmGetInstructionSize(Flags) - 1; /* Read the opcode entry */ switch (*(PUCHAR)Eip) @@ -409,6 +420,7 @@ IN ULONG Flags) { /* Increase instruction size */ + DbgPrint("VDM: Handling PREFIX [%lx] Opcode @ 0x%p\n", KiVdmGetPrefixFlags(Flags), TrapFrame->Eip); Flags++; /* Handle the next opcode */ @@ -623,7 +635,9 @@ Tss->IoMapBase = (USHORT)IOPM_OFFSET; /* Switch stacks and work the magic */ + DbgPrint("VDM: Entering V8086 Mode\n"); Ki386SetupAndExitToV86Mode(VdmTeb); + DbgPrint("VDM: Exiting V8086 Mode\n"); /* Restore IOPM */ RtlCopyMemory(&Tss->IoMaps[0].IoMap, Ki386IopmSaveArea, PAGE_SIZE * 2);

1 0

[tkreuzer] 45056: Update file from trunk
by tkreuzer＠svn.reactos.org 13 Jan '10

13 Jan '10

Author: tkreuzer Date: Wed Jan 13 02:10:36 2010 New Revision: 45056 URL: http://svn.reactos.org/svn/reactos?rev=45056&view=rev Log: Update file from trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Wed Jan 13 02:10:36 2010 @@ -74,9 +74,9 @@ PFAST_IO_DISPATCH FastIoDispatch; PDEVICE_OBJECT Device; BOOLEAN Result = TRUE; - ULONG PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(FileOffset,Length); - - PAGED_CODE(); + ULONG PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(FileOffset, Length); + + PAGED_CODE(); ASSERT(FileObject); ASSERT(FileObject->FsContext); @@ -91,9 +91,9 @@ if (Length > MAXLONGLONG - FileOffset->QuadPart) { - IoStatus->Status = STATUS_INVALID_PARAMETER; - IoStatus->Information = 0; - return FALSE; + IoStatus->Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + return FALSE; } /* Get the offset and FCB header */ @@ -104,7 +104,7 @@ { /* Use a Resource Acquire */ FsRtlEnterFileSystem(); - CcFastReadWait++; + CcFastReadWait++; ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); } else @@ -115,9 +115,9 @@ FsRtlEnterFileSystem(); if (!ExAcquireResourceSharedLite(FcbHeader->Resource, FALSE)) { - FsRtlExitFileSystem(); - FsRtlIncrementCcFastReadResourceMiss(); - return FALSE; + FsRtlExitFileSystem(); + FsRtlIncrementCcFastReadResourceMiss(); + return FALSE; } } @@ -126,8 +126,8 @@ (FcbHeader->IsFastIoPossible == FastIoIsNotPossible)) { /* It's not, so fail */ - Result = FALSE; - goto Cleanup; + Result = FALSE; + goto Cleanup; } /* Check if we need to find out if fast I/O is available */ @@ -138,7 +138,7 @@ /* Get the Fast I/O table */ Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; + FastIoDispatch = Device->DriverObject->FastIoDispatch; /* Sanity check */ ASSERT(FastIoDispatch != NULL); @@ -158,7 +158,7 @@ Result = FALSE; goto Cleanup; } - } + } /* Check if we read too much */ if (Offset.QuadPart > FcbHeader->FileSize.QuadPart) @@ -177,15 +177,15 @@ } /* Set this as top-level IRP */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { - /* Make sure the IO and file size is below 4GB */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { + /* Make sure the IO and file size is below 4GB */ if (Wait && !(Offset.HighPart | FcbHeader->FileSize.HighPart)) { - /* Call the cache controller */ + /* Call the cache controller */ CcFastCopyRead(FileObject, FileOffset->LowPart, Length, @@ -193,14 +193,14 @@ Buffer, IoStatus); - /* File was accessed */ - FileObject->Flags |= FO_FILE_FAST_IO_READ; + /* File was accessed */ + FileObject->Flags |= FO_FILE_FAST_IO_READ; if (IoStatus->Status != STATUS_END_OF_FILE) { ASSERT(FcbHeader->FileSize.QuadPart >= FileOffset->QuadPart + IoStatus->Information); - } + } } else { @@ -214,30 +214,30 @@ IoStatus); /* File was accessed */ - FileObject->Flags |= FO_FILE_FAST_IO_READ; + FileObject->Flags |= FO_FILE_FAST_IO_READ; if (Result == TRUE) { - ASSERT( (IoStatus->Status == STATUS_END_OF_FILE) || + ASSERT((IoStatus->Status == STATUS_END_OF_FILE) || ((LONGLONG)(FileOffset->QuadPart + IoStatus->Information) <= FcbHeader->FileSize.QuadPart)); - } - } + } + } /* Update the current file offset */ if (Result == TRUE) { - FileObject->CurrentByteOffset.QuadPart += IoStatus->Information; - } - } + FileObject->CurrentByteOffset.QuadPart += IoStatus->Information; + } + } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; - PsGetCurrentThread()->TopLevelIrp = 0; + PsGetCurrentThread()->TopLevelIrp = 0; /* Return to caller */ Cleanup: @@ -248,7 +248,7 @@ if (Result == FALSE) { CcFastReadNotPossible += 1; - } + } return Result; } @@ -306,11 +306,11 @@ /* Nagar p.544. * Check with Cc if we can write and check if the IO > 64kB (WDK macro). */ - if ( (CcCanIWrite(FileObject, Length,Wait, FALSE) == FALSE) || - (CcCopyWriteWontFlush(FileObject,FileOffset,Length) == FALSE) || + if ((CcCanIWrite(FileObject, Length, Wait, FALSE) == FALSE) || + (CcCopyWriteWontFlush(FileObject, FileOffset, Length) == FALSE) || ((FileObject->Flags & FO_WRITE_THROUGH) == TRUE)) { - return FALSE; + return FALSE; } /* No actual read */ @@ -334,12 +334,12 @@ if ((FileOffsetAppend == FALSE) && (Offset.LowPart <= FcbHeader->ValidDataLength.LowPart)) { - ExAcquireResourceSharedLite(FcbHeader->Resource,TRUE); - ResourceAquiredShared = TRUE; + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + ResourceAquiredShared = TRUE; } else { - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); } /* Nagar p.544/545. @@ -348,15 +348,15 @@ */ if (FileOffsetAppend == TRUE) { - Offset.LowPart = FcbHeader->FileSize.LowPart; - NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; - b_4GB = (NewSize.LowPart < FcbHeader->FileSize.LowPart); + Offset.LowPart = FcbHeader->FileSize.LowPart; + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + b_4GB = (NewSize.LowPart < FcbHeader->FileSize.LowPart); } else { - Offset.LowPart = FileOffset->LowPart; - NewSize.LowPart = FileOffset->LowPart + Length; + Offset.LowPart = FileOffset->LowPart; + NewSize.LowPart = FileOffset->LowPart + Length; b_4GB = (NewSize.LowPart < FileOffset->LowPart) || (FileOffset->HighPart != 0); } @@ -367,10 +367,10 @@ * That we are not extending past the allocated size. * That we are not creating a hole bigger than 8k. * That we are not crossing the 4GB boundary. - */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && - (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && (Offset.LowPart < FcbHeader->ValidDataLength.LowPart + 0x2000) && !b_4GB) { @@ -381,133 +381,133 @@ if (ResourceAquiredShared && (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart + 0x2000)) { - /* Then we need to acquire the resource exclusive */ - ExReleaseResourceLite(FcbHeader->Resource); - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + /* Then we need to acquire the resource exclusive */ + ExReleaseResourceLite(FcbHeader->Resource); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); if (FileOffsetAppend == TRUE) { - Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? - NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; - - /* Make sure we don't cross the 4GB boundary */ - b_4GB = (NewSize.LowPart < Offset.LowPart); - } + Offset.LowPart = FcbHeader->FileSize.LowPart; // ?? + NewSize.LowPart = FcbHeader->FileSize.LowPart + Length; + + /* Make sure we don't cross the 4GB boundary */ + b_4GB = (NewSize.LowPart < Offset.LowPart); + } /* Recheck some of the conditions since we let the lock go */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && - (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && - (FcbHeader->AllocationSize.HighPart == 0) && + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + (FcbHeader->AllocationSize.LowPart >= NewSize.LowPart) && + (FcbHeader->AllocationSize.HighPart == 0) && !b_4GB) - { + { /* Do nothing? */ } else - { - goto FailAndCleanup; - } - } + { + goto FailAndCleanup; + } + } } else { - goto FailAndCleanup; - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; - - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + goto FailAndCleanup; + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, FileOffsetAppend ? &FcbHeader->FileSize : FileOffset, - Length, - TRUE, - LockKey, - FALSE, - &FastIoCheckIfPossibleStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to extend the file then save * the old file size in case the operation fails. - */ + */ if (NewSize.LowPart > FcbHeader->FileSize.LowPart) { - FileSizeModified = TRUE; - OldFileSize.LowPart = FcbHeader->FileSize.LowPart; - OldValidDataLength.LowPart = FcbHeader->ValidDataLength.LowPart; - FcbHeader->FileSize.LowPart = NewSize.LowPart; - } - - /* Set this as top-level IRP */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { + FileSizeModified = TRUE; + OldFileSize.LowPart = FcbHeader->FileSize.LowPart; + OldValidDataLength.LowPart = FcbHeader->ValidDataLength.LowPart; + FcbHeader->FileSize.LowPart = NewSize.LowPart; + } + + /* Set this as top-level IRP */ + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { if (Offset.LowPart > FcbHeader->ValidDataLength.LowPart) { - LARGE_INTEGER OffsetVar; - OffsetVar.LowPart = Offset.LowPart; - OffsetVar.HighPart = 0; - CcZeroData(FileObject,&FcbHeader->ValidDataLength,&OffsetVar,TRUE); - } - - /* Call the cache manager */ - CcFastCopyWrite(FileObject,Offset.LowPart,Length,Buffer); - } + LARGE_INTEGER OffsetVar; + OffsetVar.LowPart = Offset.LowPart; + OffsetVar.HighPart = 0; + CcZeroData(FileObject, &FcbHeader->ValidDataLength, &OffsetVar, TRUE); + } + + /* Call the cache manager */ + CcFastCopyWrite(FileObject, Offset.LowPart, Length, Buffer); + } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Remove ourselves at the top level component after the IO is done */ - PsGetCurrentThread()->TopLevelIrp = 0; - - /* Did the operation succeed ? */ + PsGetCurrentThread()->TopLevelIrp = 0; + + /* Did the operation succeed? */ if (Result == TRUE) { - /* Update the valid file size if necessary */ + /* Update the valid file size if necessary */ if (NewSize.LowPart > FcbHeader->ValidDataLength.LowPart) { - FcbHeader->ValidDataLength.LowPart = NewSize.LowPart ; - } + FcbHeader->ValidDataLength.LowPart = NewSize.LowPart; + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Update the strucutres if the file size changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Update the strucutres if the file size changed */ if (FileSizeModified) { SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.LowPart = NewSize.LowPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } /* Update the file object current file offset */ - FileObject->CurrentByteOffset.QuadPart = NewSize.LowPart; + FileObject->CurrentByteOffset.QuadPart = NewSize.LowPart; } else @@ -515,31 +515,31 @@ /* Result == FALSE if we get here */ if (FileSizeModified) { - /* If the file size was modified then restore the old file size */ + /* If the file size was modified then restore the old file size */ if (FcbHeader->PagingIoResource != NULL) { /* Nagar P.544. * Restore the old file size if operation didn't succeed. */ - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource,TRUE); - FcbHeader->FileSize.LowPart = OldFileSize.LowPart; - FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - /* If there is no lock and do it without */ - FcbHeader->FileSize.LowPart = OldFileSize.LowPart; - FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; - } - } + /* If there is no lock and do it without */ + FcbHeader->FileSize.LowPart = OldFileSize.LowPart; + FcbHeader->ValidDataLength.LowPart = OldValidDataLength.LowPart; + } + } else { /* Do nothing? */ - } - } - - goto Cleanup; + } + } + + goto Cleanup; } else { @@ -550,126 +550,126 @@ OldFileSize.QuadPart = 0; #endif - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); /* Nagar P.544. * Check if we need to acquire the resource exclusive. */ - if ( (FileOffsetAppend == FALSE) && + if ((FileOffsetAppend == FALSE) && (FileOffset->QuadPart + Length <= FcbHeader->ValidDataLength.QuadPart)) - { - /* Acquire the resource shared */ + { + /* Acquire the resource shared */ if (!ExAcquireResourceSharedLite(FcbHeader->Resource, Wait)) { - goto LeaveCriticalAndFail; - } - ResourceAquiredShared =TRUE; + goto LeaveCriticalAndFail; + } + ResourceAquiredShared = TRUE; } else { - /* Acquire the resource exclusive */ + /* Acquire the resource exclusive */ if (!ExAcquireResourceExclusiveLite(FcbHeader->Resource, Wait)) { - goto LeaveCriticalAndFail; - } - } - - /* Check if we are appending */ + goto LeaveCriticalAndFail; + } + } + + /* Check if we are appending */ if (FileOffsetAppend == TRUE) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; } else { - Offset.QuadPart = FileOffset->QuadPart; - NewSize.QuadPart += FileOffset->QuadPart + Length; - } + Offset.QuadPart = FileOffset->QuadPart; + NewSize.QuadPart += FileOffset->QuadPart + Length; + } /* Nagar p.544/545. * Make sure that caching is initated. * That fast are allowed for this file stream. * That we are not extending past the allocated size. * That we are not creating a hole bigger than 8k. - */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->ValidDataLength.QuadPart + 0x2000 > Offset.QuadPart) && (Length <= MAXLONGLONG - Offset.QuadPart) && (FcbHeader->AllocationSize.QuadPart >= NewSize.QuadPart)) - { - /* Check if we can keep the lock shared */ + { + /* Check if we can keep the lock shared */ if (ResourceAquiredShared && (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart)) { - ExReleaseResourceLite(FcbHeader->Resource); - if(!ExAcquireResourceExclusiveLite(FcbHeader->Resource,Wait)) - { - goto LeaveCriticalAndFail; - } + ExReleaseResourceLite(FcbHeader->Resource); + if (!ExAcquireResourceExclusiveLite(FcbHeader->Resource, Wait)) + { + goto LeaveCriticalAndFail; + } /* Compute the offset and the new filesize */ if (FileOffsetAppend) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; - } - - /* Recheck the above points since we released and reacquire the lock */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } + + /* Recheck the above points since we released and reacquire the lock */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->AllocationSize.QuadPart > NewSize.QuadPart)) - { - /* Do nothing */ + { + /* Do nothing */ } else { - goto FailAndCleanup; - } - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; - - /* Sanity check */ - ASSERT(!KeIsExecutingDpc()); - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + goto FailAndCleanup; + } + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + IO_STATUS_BLOCK FastIoCheckIfPossibleStatus; + + /* Sanity check */ + ASSERT(!KeIsExecutingDpc()); + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, FileOffsetAppend ? &FcbHeader->FileSize : FileOffset, - Length, - TRUE, - LockKey, - FALSE, - &FastIoCheckIfPossibleStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + Length, + TRUE, + LockKey, + FALSE, + &FastIoCheckIfPossibleStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to modify the filesize, * save the old fs in case the operation fails. */ if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) { - FileSizeModified = TRUE; - OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; - OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; + FileSizeModified = TRUE; + OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; + OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; /* If the high part of the filesize is going * to change, grab the Paging IoResouce. @@ -677,28 +677,28 @@ if (NewSize.HighPart != FcbHeader->FileSize.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + } + } /* Nagar p.544. * Set ourselves as top component. */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - - _SEH2_TRY - { - BOOLEAN CallCc = TRUE; + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + + _SEH2_TRY + { + BOOLEAN CallCc = TRUE; /* Check if there is a gap between the end of the file * and the offset. If yes, then we have to zero the data. - */ + */ if (Offset.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (!(Result = CcZeroData(FileObject, @@ -708,92 +708,92 @@ { /* If this operation fails, then we have to exit. We can jump * outside the SEH, so I a using a variable to exit normally. - */ - CallCc = FALSE; - } - } + */ + CallCc = FALSE; + } + } /* Unless the CcZeroData failed, call the cache manager */ if (CallCc) { - Result = CcCopyWrite(FileObject,&Offset,Length, Wait, Buffer); - } + Result = CcCopyWrite(FileObject, &Offset, Length, Wait, Buffer); + } } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Reset the top component */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; /* Did the operation suceeded */ if (Result) { - /* Check if we need to update the filesize */ + /* Check if we need to update the filesize */ if (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (NewSize.HighPart != FcbHeader->ValidDataLength.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + } + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Check if the filesize has changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Check if the filesize has changed */ if (FileSizeModified) { - /* Update the file sizes */ + /* Update the file sizes */ SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.QuadPart = NewSize.QuadPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } - - /* Update the current FO byte offset */ - FileObject->CurrentByteOffset.QuadPart = NewSize.QuadPart; - } - else - { + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + + /* Update the current FO byte offset */ + FileObject->CurrentByteOffset.QuadPart = NewSize.QuadPart; + } + else + { /* The operation did not succeed. * Reset the file size to what it should be. - */ + */ if (FileSizeModified) { if (FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - } - } - } - - goto Cleanup; + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + } + } + } + + goto Cleanup; } else { - goto FailAndCleanup; - } - } + goto FailAndCleanup; + } + } LeaveCriticalAndFail: @@ -818,7 +818,7 @@ */ NTSTATUS NTAPI -FsRtlGetFileSize(IN PFILE_OBJECT FileObject, +FsRtlGetFileSize(IN PFILE_OBJECT FileObject, IN OUT PLARGE_INTEGER FileSize) { FILE_STANDARD_INFORMATION Info; @@ -840,8 +840,8 @@ /* Check if we support Fast Calls, and check FastIoQueryStandardInfo. * Call the function and see if it succeeds. */ - if ( !FastDispatch || - !FastDispatch->FastIoQueryStandardInfo || + if (!FastDispatch || + !FastDispatch->FastIoQueryStandardInfo || !FastDispatch->FastIoQueryStandardInfo(FileObject, TRUE, &Info, @@ -851,10 +851,10 @@ /* If any of the above failed, then we are going to send an * IRP to the device object. Initialize the event for the IO. */ - KeInitializeEvent(&Event,NotificationEvent,FALSE); + KeInitializeEvent(&Event, NotificationEvent, FALSE); /* Allocate the IRP */ - Irp = IoAllocateIrp(DeviceObject->StackSize,FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (Irp == NULL) { @@ -885,12 +885,12 @@ FileStandardInformation; /* Send the IRP to the related device object */ - Status = IoCallDriver(DeviceObject,Irp); + Status = IoCallDriver(DeviceObject, Irp); /* Standard DDK IRP result processing */ if (Status == STATUS_PENDING) { - KeWaitForSingleObject(&Event,Executive,KernelMode,FALSE,NULL); + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } /* If there was a synchronous error, signal it */ @@ -905,7 +905,7 @@ /* Check the sync/async IO result */ if (NT_SUCCESS(IoStatus.Status)) { - /* Was the request for a directory ? */ + /* Was the request for a directory? */ if (Info.Directory) { IoStatus.Status = STATUS_FILE_IS_A_DIRECTORY; @@ -1012,8 +1012,8 @@ /* * @implemented */ - BOOLEAN - NTAPI +BOOLEAN +NTAPI FsRtlMdlReadCompleteDev(IN PFILE_OBJECT FileObject, IN PMDL MemoryDescriptorList, IN PDEVICE_OBJECT DeviceObject) @@ -1133,8 +1133,8 @@ _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; @@ -1208,11 +1208,11 @@ { if (FileObject->Flags & FO_WRITE_THROUGH) { - return FALSE; + return FALSE; } /* Call the Cache Manager */ - CcMdlWriteComplete2(FileObject,FileOffset,MdlChain); + CcMdlWriteComplete2(FileObject, FileOffset, MdlChain); return TRUE; } @@ -1315,9 +1315,9 @@ * Check with Cc if we can write. */ if (!CcCanIWrite(FileObject, Length, TRUE, FALSE) || - (FileObject->Flags & FO_WRITE_THROUGH)) - { - return FALSE; + (FileObject->Flags & FO_WRITE_THROUGH)) + { + return FALSE; } IoStatus->Status = STATUS_SUCCESS; @@ -1332,213 +1332,213 @@ FsRtlEnterFileSystem(); /* Check we are going to extend the file */ - if ( (FileOffsetAppend == FALSE) && + if ((FileOffsetAppend == FALSE) && (FileOffset->QuadPart + Length <= FcbHeader->ValidDataLength.QuadPart)) - { - /* Acquire the resource shared */ - ExAcquireResourceSharedLite(FcbHeader->Resource,TRUE); - ResourceAquiredShared =TRUE; + { + /* Acquire the resource shared */ + ExAcquireResourceSharedLite(FcbHeader->Resource, TRUE); + ResourceAquiredShared = TRUE; } else - { - /* Acquire the resource exclusive */ - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); - } - - /* Check if we are appending */ + { + /* Acquire the resource exclusive */ + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); + } + + /* Check if we are appending */ if (FileOffsetAppend == TRUE) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; } else - { - Offset.QuadPart = FileOffset->QuadPart; - NewSize.QuadPart = FileOffset->QuadPart + Length; - } - - if ( (FileObject->PrivateCacheMap) && - (FcbHeader->IsFastIoPossible) && + { + Offset.QuadPart = FileOffset->QuadPart; + NewSize.QuadPart = FileOffset->QuadPart + Length; + } + + if ((FileObject->PrivateCacheMap) && + (FcbHeader->IsFastIoPossible) && (Length <= MAXLONGLONG - FileOffset->QuadPart) && - (NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart) ) + (NewSize.QuadPart <= FcbHeader->AllocationSize.QuadPart)) { /* Check if we can keep the lock shared */ if (ResourceAquiredShared && (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart)) { - ExReleaseResourceLite(FcbHeader->Resource); - ExAcquireResourceExclusiveLite(FcbHeader->Resource,TRUE); + ExReleaseResourceLite(FcbHeader->Resource); + ExAcquireResourceExclusiveLite(FcbHeader->Resource, TRUE); /* Compute the offset and the new filesize */ if (FileOffsetAppend) { - Offset.QuadPart = FcbHeader->FileSize.QuadPart; - NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; - } - - /* Recheck the above points since we released and reacquire the lock */ - if ( (FileObject->PrivateCacheMap != NULL) && - (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && + Offset.QuadPart = FcbHeader->FileSize.QuadPart; + NewSize.QuadPart = FcbHeader->FileSize.QuadPart + Length; + } + + /* Recheck the above points since we released and reacquire the lock */ + if ((FileObject->PrivateCacheMap != NULL) && + (FcbHeader->IsFastIoPossible != FastIoIsNotPossible) && (FcbHeader->AllocationSize.QuadPart > NewSize.QuadPart)) - { - /* Do nothing */ + { + /* Do nothing */ } else { - goto FailAndCleanup; - } - } - - /* Check if we need to find out if fast I/O is available */ - if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) - { - /* Sanity check */ - /* ASSERT(!KeIsExecutingDpc()); */ - - /* Get the Fast I/O table */ - Device = IoGetRelatedDeviceObject(FileObject); - FastIoDispatch = Device->DriverObject->FastIoDispatch; - - /* Sanity check */ - ASSERT(FastIoDispatch != NULL); - ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); - - /* Ask the driver if we can do it */ - if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, - FileOffset, - Length, - TRUE, - LockKey, - FALSE, - IoStatus, - Device)) - { - /* It's not, fail */ - goto FailAndCleanup; - } - } + goto FailAndCleanup; + } + } + + /* Check if we need to find out if fast I/O is available */ + if (FcbHeader->IsFastIoPossible == FastIoIsQuestionable) + { + /* Sanity check */ + /* ASSERT(!KeIsExecutingDpc()); */ + + /* Get the Fast I/O table */ + Device = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = Device->DriverObject->FastIoDispatch; + + /* Sanity check */ + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + /* Ask the driver if we can do it */ + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffset, + Length, + TRUE, + LockKey, + FALSE, + IoStatus, + Device)) + { + /* It's not, fail */ + goto FailAndCleanup; + } + } /* If we are going to modify the filesize, * save the old fs in case the operation fails. */ - if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) - { - FileSizeModified = TRUE; - OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; - OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; + if (NewSize.QuadPart > FcbHeader->FileSize.QuadPart) + { + FileSizeModified = TRUE; + OldFileSize.QuadPart = FcbHeader->FileSize.QuadPart; + OldValidDataLength.QuadPart = FcbHeader->ValidDataLength.QuadPart; /* If the high part of the filesize is going * to change, grab the Paging IoResouce. */ if (NewSize.HighPart != FcbHeader->FileSize.HighPart && FcbHeader->PagingIoResource) - { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + { + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->FileSize.QuadPart = NewSize.QuadPart; + } + } /* Nagar p.544. * Set ourselves as top component. */ - PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; - _SEH2_TRY - { + PsGetCurrentThread()->TopLevelIrp = FSRTL_FAST_IO_TOP_LEVEL_IRP; + _SEH2_TRY + { /* Check if there is a gap between the end of the file and the offset. * If yes, then we have to zero the data. - */ + */ if (Offset.QuadPart > FcbHeader->ValidDataLength.QuadPart) { Result = CcZeroData(FileObject, &FcbHeader->ValidDataLength, &Offset, TRUE); - if (Result) - { + if (Result) + { CcPrepareMdlWrite(FileObject, &Offset, Length, MdlChain, IoStatus); - } + } } else { - CcPrepareMdlWrite(FileObject,&Offset,Length,MdlChain,IoStatus); - } + CcPrepareMdlWrite(FileObject, &Offset, Length, MdlChain, IoStatus); + } } _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - Result = FALSE; + { + Result = FALSE; } _SEH2_END; /* Reset the top component */ - PsGetCurrentThread()->TopLevelIrp = 0; + PsGetCurrentThread()->TopLevelIrp = 0; /* Did the operation suceeded */ if (Result) { - /* Check if we need to update the filesize */ + /* Check if we need to update the filesize */ if (NewSize.QuadPart > FcbHeader->ValidDataLength.QuadPart) { if (NewSize.HighPart != FcbHeader->ValidDataLength.HighPart && FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; - } - } + FcbHeader->ValidDataLength.QuadPart = NewSize.QuadPart; + } + } /* Flag the file as modified */ - FileObject->Flags |= FO_FILE_MODIFIED; - - /* Check if the filesize has changed */ + FileObject->Flags |= FO_FILE_MODIFIED; + + /* Check if the filesize has changed */ if (FileSizeModified) { SharedCacheMap = (PSHARED_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; SharedCacheMap->FileSize.QuadPart = NewSize.QuadPart; - FileObject->Flags |= FO_FILE_SIZE_CHANGED; - } - } - else - { + FileObject->Flags |= FO_FILE_SIZE_CHANGED; + } + } + else + { /* The operation did not succeed. * Reset the file size to what it should be. - */ + */ if (FileSizeModified) { if (FcbHeader->PagingIoResource) { - ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - ExReleaseResourceLite(FcbHeader->PagingIoResource); + ExAcquireResourceExclusiveLite(FcbHeader->PagingIoResource, TRUE); + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + ExReleaseResourceLite(FcbHeader->PagingIoResource); } else { - FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; - FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; - } - } - } - - goto Cleanup; + FcbHeader->FileSize.QuadPart = OldFileSize.QuadPart; + FcbHeader->ValidDataLength.QuadPart = OldValidDataLength.QuadPart; + } + } + } + + goto Cleanup; } else {

1 0

[tkreuzer] 45055: Add a dummy PSEH2 for amd64
by tkreuzer＠svn.reactos.org 12 Jan '10

12 Jan '10

Author: tkreuzer Date: Wed Jan 13 00:15:23 2010 New Revision: 45055 URL: http://svn.reactos.org/svn/reactos?rev=45055&view=rev Log: Add a dummy PSEH2 for amd64 Added: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h (with props) Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Wed Jan 13 00:15:23 2010 @@ -19,6 +19,9 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef _M_AMD64 +#include "pseh2_64.h" +#else #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ @@ -401,5 +404,6 @@ #endif #endif +#endif /* EOF */ Added: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2_64.h (added) +++ trunk/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1] Wed Jan 13 00:15:23 2010 @@ -1,0 +1,37 @@ +#ifndef KJK_PSEH2_H_ +#define KJK_PSEH2_H_ + + +#define _SEH2_TRY if(1) { +#define _SEH2_EXCEPT(...) } if(0) { +#define _SEH2_END } +#define _SEH2_YIELD(STMT_) STMT_ +#define _SEH2_LEAVE +#define _SEH2_FINALLY } if(1) { +#define _SEH2_GetExceptionInformation() (GetExceptionInformation()) +#define _SEH2_GetExceptionCode() (0) +#define _SEH2_AbnormalTermination() (0) + +struct _EXCEPTION_RECORD; +struct _EXCEPTION_POINTERS; +struct _CONTEXT; + +typedef int (__cdecl * _SEH2FrameHandler_t) +( + struct _EXCEPTION_RECORD *, + void *, + struct _CONTEXT *, + void * +); + +typedef struct __SEH2Registration +{ + struct __SEH2Registration * SER_Prev; + _SEH2FrameHandler_t SER_Handler; +} +_SEH2Registration_t; + + +#endif + +/* EOF */ Propchange: trunk/reactos/include/reactos/libs/pseh/pseh2_64.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 45054: Enable a few definitions for amd64, too
by tkreuzer＠svn.reactos.org 12 Jan '10

12 Jan '10

Author: tkreuzer Date: Tue Jan 12 21:30:43 2010 New Revision: 45054 URL: http://svn.reactos.org/svn/reactos?rev=45054&view=rev Log: Enable a few definitions for amd64, too Modified: trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Tue Jan 12 21:30:43 2010 @@ -152,7 +152,7 @@ _CRTIMP extern char *_sys_errlist[]; _CRTIMP extern int _sys_nerr; -#if !defined(__x86_64) +//#if !defined(__x86_64) _CRTIMP int *__cdecl __p___argc(void); _CRTIMP char ***__cdecl __p___argv(void); _CRTIMP wchar_t ***__cdecl __p___wargv(void); @@ -160,7 +160,7 @@ _CRTIMP wchar_t ***__cdecl __p__wenviron(void); _CRTIMP char **__cdecl __p__pgmptr(void); _CRTIMP wchar_t **__cdecl __p__wpgmptr(void); -#endif +//#endif #ifndef __argc #ifdef _MSVCRT_ extern int __argc; @@ -292,7 +292,8 @@ #define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) #else extern "C++" { - template <typename _CountofType,size_t _SizeOfArray> char (*__countof_helper(UNALIGNED _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray]; + template <typename _CountofType,size_t _SizeOfArray> + char (*__countof_helper(/*UNALIGNED*/ _CountofType (&_Array)[_SizeOfArray]))[_SizeOfArray]; #define _countof(_Array) sizeof(*__countof_helper(_Array)) } #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs