Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[dreimer] 60006: Commit some Rapps Database regarding patches. CORE-7312 #resolve #comment Committed in r60006. Thank you. CORE-7352 #resolve #comment Committed in r60006. Thank you. ROSAPPS-284 #r...

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Sep 10 16:49:30 2013 New Revision: 60006 URL: http://svn.reactos.org/svn/reactos?rev=60006&view=rev Log: Commit some Rapps Database regarding patches. CORE-7312 #resolve #comment Committed in r60006. Thank you. CORE-7352 #resolve #comment Committed in r60006. Thank you. ROSAPPS-284 #resolve #comment Committed in r60006. Thank you. ROSAPPS-283 #resolve #comment Committed in r60006. Thank you. Added: trunk/reactos/base/applications/rapps/rapps/Pingus.txt (with props) trunk/reactos/base/applications/rapps/rapps/alreader.txt (with props) trunk/reactos/base/applications/rapps/rapps/boswars.txt (with props) trunk/reactos/base/applications/rapps/rapps/chromium.txt (with props) trunk/reactos/base/applications/rapps/rapps/globulation2.txt (with props) trunk/reactos/base/applications/rapps/rapps/hover.txt (with props) trunk/reactos/base/applications/rapps/rapps/indiftpd.txt (with props) trunk/reactos/base/applications/rapps/rapps/kyodai.txt (with props) trunk/reactos/base/applications/rapps/rapps/lautus.txt (with props) trunk/reactos/base/applications/rapps/rapps/pengupop.txt (with props) trunk/reactos/base/applications/rapps/rapps/pspad.txt (with props) trunk/reactos/base/applications/rapps/rapps/stamina.txt (with props) trunk/reactos/base/applications/rapps/rapps/supertux.txt (with props) trunk/reactos/base/applications/rapps/rapps/zaz.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt Added: trunk/reactos/base/applications/rapps/rapps/Pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/Pingus.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/Pingus.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Pingus +Version = 0.7.6 +Licence = GPL +Description = Pingus is a free Lemmings-like puzzle game. +Size = 16.0MB +Category = 4 +URLSite = http://pingus.seul.org +URLDownload = http://pingus.googlecode.com/files/Pingus-0.7.6.exe +CDPath = none + +[Section.0407] +Description = Pingus ist ein freies Lemings-Ã¤hnliches Puzzle Spiel. Propchange: trunk/reactos/base/applications/rapps/rapps/Pingus.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/alreader.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,13 @@ +ï»¿; UTF-8 + +[Section] +Name = AlReader +Description = A FB2 eBook Reader. +URLSite = http://www.alreader.com +Size = 4.6MB +Category = 6 +URLDownload = http://svn.reactos.org/packages/AlReader2Setup.exe +CDPath = none + +[Section.0407] +Description = Ein FB2 eBook Reader. Propchange: trunk/reactos/base/applications/rapps/rapps/alreader.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/boswars.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Bos Wars +Version = 2.6.1 +Licence = GPL +Description = Bos Wars is a futuristic real time strategy game. To start the game, install Microsoft Visual C++ 2008 runtime. +Size = 62.3MB +Category = 4 +URLSite = http://www.boswars.org +URLDownload = http://www.boswars.org/dist/releases/BosWars-2.6.1.exe +CDPath = none + +[Section.0407] +Description = Bos Wars ist ein futuristisches Echtzeitstrategiespiel. Um das Spiel zu starten, installieren Sie die Microsoft Visual C++ 2008 Runtime. Propchange: trunk/reactos/base/applications/rapps/rapps/boswars.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/chromium.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/chromium.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Chromium B.S.U. +Version = 0.9.13.2 +Licence = GPL +Description = Chromium B.S.U. is an arcade-style, top-scrolling space shooter. +Size = 2.3MB +Category = 4 +URLSite = http://chromium-bsu.sourceforge.net +URLDownload = http://files1.freesoft.ru/rep/701665/chromium-0.9.13.2.exe +CDPath = none + +[Section.0407] +Description = Chromium B.S.U. ist ein Arcade-Style, Top-Scrolling Space Shooter. Propchange: trunk/reactos/base/applications/rapps/rapps/chromium.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/globulation2.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/globulation2.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Globulation2 +Version = 0.9.4.4 +Licence = GPL +Description = Globulation 2 is a real-time strategy game. The game minimizes gaming micromanagement by automatically assigning tasks to units. +Size = 13.5MB +Category = 4 +URLSite = http://www.globulation2.org +URLDownload = http://dl.sv.nongnu.org/releases/glob2/0.9.4/glob2-0.9.4.4.exe +CDPath = none + +[Section.0407] +Description = Globulation 2 ist ein Echtzeitstrategiespiel. Das Spiel vereinfacht das Mikromanagement, indem es Einheiten automatisch mit AuftrÃ¤gen versieht. Propchange: trunk/reactos/base/applications/rapps/rapps/globulation2.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/hover.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/hover.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Hover! +Version = 1.0 +Licence = MS EULA +Description = The classic Hover CTF game which was found on the Windows 95 CD. +Size = 6.2MB +Category = 4 +URLDownload = http://svn.reactos.org/packages/Hover.exe +CDPath = none + +[Section.0407] +Description = Das klassische Hover CTF Spiel, dass auf der Windows 95 CD zu finden war. Propchange: trunk/reactos/base/applications/rapps/rapps/hover.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/indiftpd.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/indiftpd.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = IndiFTPD +Version = 1.0.9 Beta +Licence = GPL +Description = IndiFTPD is a standalone FTP server that functions as a single executable. It is designed for situations when a user does not want to install/configure a server on the system (or does not have permission to do so) and wants to quickly get a server running. +Size = 556kB +Category = 5 +URLSite = http://www.dftpd.com/products.php#indiftpd +URLDownload = http://www.dftpd.com/files/IndiFTPD/1.0.9_beta/Windows/Intel/indiftpd.exe +CDPath = none + +[Section.0407] +Description = IndiFTPD ist ein eigenstÃ¤ndiger FTP Server in einer einzigen Anwendung. Er wurde erstellt fÃ¼r Situationen, in denen ein Anwender keinen Server auf dem System installieren/konfigurieren mÃ¶chte (oder nicht die Recte dafÃ¼r besitzt) und schnell einen Server lauffÃ¤hig bekommen will. Propchange: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kyodai.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/kyodai.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Kyodai Mahjongg +Version = 21.42 +Licence = Shareware +Description = One of the best Mahjongg Solitaire games out there. +Size = 13.8MB +Category = 4 +URLDownload = http://files.cynagames.com/kyo2006.exe +CDPath = none + +[Section.0407] +Description = Eines der besten Mahjongg Solitaire Spiele im Netz. Propchange: trunk/reactos/base/applications/rapps/rapps/kyodai.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/lautus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lautus.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/lautus.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Lautus UXTheme +Version = 1.0 +License = GPLv2 +Description = Theme made specially for ReactOS. +URLSite = http://www.reactos.org/forum/viewtopic.php?f=25&t=9293 +Size = 341kB +Category = 15 +URLDownload = http://svn.reactos.org/packages/Lautus.exe +CDPath = none + +[Section.0407] +Description = Theme, der speziell fÃ¼r ReactOS entwickelt wird. Propchange: trunk/reactos/base/applications/rapps/rapps/lautus.txt ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Sep 10 16:49:30 2013 @@ -1,64 +1,62 @@ ï»¿; UTF-8 [Section] -Name = OpenOffice 3.4 -Version = 3.4.1 +Name = OpenOffice 4.0 +Version = 4.0.0 Licence = LGPL Description = THE Open Source Office Suite. -Size = 129.64MB +Size = 136.79MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/stable/3.4.1/… +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ -Size = 145.2MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/de/… +Size = 154.88MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ -Size = 119.19MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/es/… +Size = 126.29MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.040c] Description = LA suite bureautique open source. URLSite = http://fr.openoffice.org/ -Size = 120,18 Mo -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/fr/… +Size = 127,22 Mo +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0410] URLSite = http://it.openoffice.org/ -Size = 120.0MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/it/… +Size = 132.39MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0413] Description = Open-bron Office Pakket. URLSite = http://nl.openoffice.org/ -Size = 124.13MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/nl/… +Size = 132.11MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… [Section.0415] Description = Otwarty pakiet biurowy. URLSite = http://pl.openoffice.org/ -Size = 120.29MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/pl/… +Size = 136.79MB [Section.0419] Description = Suita de aplicaÈii de biroticÄ open-source. -Size = 129,64 Mo +Size = 136,79 Mo URLSite = http://www.openoffice.org/ro/ [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. URLSite = http://ua.openoffice.org/ -Size = 123.22MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/ru/… +Size = 136.79MB [Section.0813] Description = Open-bron Office Pakket. URLSite = http://nl.openoffice.org/ -Size = 124.13MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/nl/… +Size = 132.11MB +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/4.0.0/binarie… Added: trunk/reactos/base/applications/rapps/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pengupop.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/pengupop.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = Pengupop +Version = 2.2.3 +Licence = GPL +Description = The purpose of this game is to shoot colored orbs into your playfield, so they form groups of three or more. +Size = 384KB +Category = 4 +URLDownload = http://svn.reactos.org/packages/Pengupop.exe +CDPath = none + +[Section.0407] +Description = Das Ziel des Spiels ist es farbige Orbs ins Spielfeld zu feuern, so dass diese Gruppen von drei oder mehr bilden. Propchange: trunk/reactos/base/applications/rapps/rapps/pengupop.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pspad.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/pspad.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,47 @@ +ï»¿; UTF-8 + +[Section] +Name = PSPad +Version = 4.5.7 +Licence = Freeware +Description = A text editor. +Size = 4.46MB +Category = 6 +URLSite = http://www.pspad.com +URLDownload = http://31.31.78.126/pspad/pspad457inst_en.exe +CDPath = none + +[Section.0407] +Description = Ein Texteditor. + +[Section.040a] +Description = Un editor de text. + +[Section.040c] +Description = Un Ã©diteur de texte. +Size = 4,46 Mo + +[Section.0410] +Description = Un editor di testo. + +[Section.0413] +Description = Een teksteditor. + +[Section.0415] +Description = Edytor tekstu. + +[Section.0418] +Description = A text editor. +Size = 4,46 Mo + +[Section.0419] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. + +[Section.041b] +Description = TextovÃ½ editor. + +[Section.0422] +Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. + +[Section.0813] +Description = Een teksteditor. Propchange: trunk/reactos/base/applications/rapps/rapps/pspad.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/stamina.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/stamina.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,13 @@ +ï»¿; UTF-8 + +[Section] +Name = Stamina +Description = Free typing tutor. Russian only. +URLSite = http://stamina.ru +Size = 4.7MB +Category = 8 +URLDownload = http://stamina.ru/files/StaminaSetup.exe +CDPath = none + +[Section.0407] +Description = Ein freies Schreiblernprogramm in Russisch. Propchange: trunk/reactos/base/applications/rapps/rapps/stamina.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/supertux.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/supertux.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = SuperTux +Version = 0.1.3 +Licence = GPL +Description = SuperTux is a free, open-source two-dimensional platform game. +Size = 7.3MB +Category = 4 +URLSite = http://www.supertux.lethargik.org +URLDownload = http://files1.freesoft.ru/rep/694851/supertux-0.1.3-setup.exe +CDPath = none + +[Section.0407] +Description = SuperTux ist ein zweidimensionales, freies, Open Source Plattformspiel. Propchange: trunk/reactos/base/applications/rapps/rapps/supertux.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/zaz.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] Tue Sep 10 16:49:30 2013 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Zaz +Version = 1.0.0 +Licence = GPL +Description = Zaz is a free software arcade action puzzle computer game, a little bit like Frozen Bubble. +Size = 21.0MB +Category = 4 +URLSite = http://zaz.sourceforge.net +URLDownload = http://files1.freesoft.ru/rep/704321/Zaz-1.0.0-Setup.exe +CDPath = none + +[Section.0407] +Description = Zaz ist ein freies Arcade Action Puzzle Spiel, ein wenig wie Frozen Bubble. Propchange: trunk/reactos/base/applications/rapps/rapps/zaz.txt ------------------------------------------------------------------------------ svn:eol-style = native

11 years

[akhaldi] 60005: [PSDK] * Import Wine's (broken) winioctl.h. * Remove FILE_FS_VOLUME_INFORMATION from winternl.h. It doesn't belong there. [NTDLL_WINETEST] * Be more specific about winioctl.h inclu...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 10 16:39:37 2013 New Revision: 60005 URL: http://svn.reactos.org/svn/reactos?rev=60005&view=rev Log: [PSDK] * Import Wine's (broken) winioctl.h. * Remove FILE_FS_VOLUME_INFORMATION from winternl.h. It doesn't belong there. [NTDLL_WINETEST] * Be more specific about winioctl.h inclusion. Added: trunk/reactos/include/reactos/wine/winioctl.h (with props) Modified: trunk/reactos/include/psdk/winternl.h trunk/rostests/winetests/ntdll/file.c Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -2513,14 +2513,7 @@ return e; } -typedef struct _FILE_FS_VOLUME_INFORMATION -{ - LARGE_INTEGER VolumeCreationTime; - ULONG VolumeSerialNumber; - ULONG VolumeLabelLength; - BOOLEAN SupportsObjects; - WCHAR VolumeLabel[1]; -} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #ifdef __cplusplus Added: trunk/reactos/include/reactos/wine/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winio… ============================================================================== --- trunk/reactos/include/reactos/wine/winioctl.h (added) +++ trunk/reactos/include/reactos/wine/winioctl.h [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -0,0 +1,471 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINIOCTL_H +#define __WINE_WINIOCTL_H + +#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ + (DWORD)((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ +) + +#define DEVICE_TYPE DWORD + +#define FILE_DEVICE_BEEP 0x00000001 +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_DATALINK 0x00000005 +#define FILE_DEVICE_DFS 0x00000006 +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_FILE_SYSTEM 0x00000009 +#define FILE_DEVICE_INPORT_PORT 0x0000000a +#define FILE_DEVICE_KEYBOARD 0x0000000b +#define FILE_DEVICE_MAILSLOT 0x0000000c +#define FILE_DEVICE_MIDI_IN 0x0000000d +#define FILE_DEVICE_MIDI_OUT 0x0000000e +#define FILE_DEVICE_MOUSE 0x0000000f +#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 +#define FILE_DEVICE_NAMED_PIPE 0x00000011 +#define FILE_DEVICE_NETWORK 0x00000012 +#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 +#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 +#define FILE_DEVICE_NULL 0x00000015 +#define FILE_DEVICE_PARALLEL_PORT 0x00000016 +#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 +#define FILE_DEVICE_PRINTER 0x00000018 +#define FILE_DEVICE_SCANNER 0x00000019 +#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a +#define FILE_DEVICE_SERIAL_PORT 0x0000001b +#define FILE_DEVICE_SCREEN 0x0000001c +#define FILE_DEVICE_SOUND 0x0000001d +#define FILE_DEVICE_STREAMS 0x0000001e +#define FILE_DEVICE_TAPE 0x0000001f +#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 +#define FILE_DEVICE_TRANSPORT 0x00000021 +#define FILE_DEVICE_UNKNOWN 0x00000022 +#define FILE_DEVICE_VIDEO 0x00000023 +#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 +#define FILE_DEVICE_WAVE_IN 0x00000025 +#define FILE_DEVICE_WAVE_OUT 0x00000026 +#define FILE_DEVICE_8042_PORT 0x00000027 +#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 +#define FILE_DEVICE_BATTERY 0x00000029 +#define FILE_DEVICE_BUS_EXTENDER 0x0000002a +#define FILE_DEVICE_MODEM 0x0000002b +#define FILE_DEVICE_VDM 0x0000002c +#define FILE_DEVICE_MASS_STORAGE 0x0000002d +#define FILE_DEVICE_SMB 0x0000002e +#define FILE_DEVICE_KS 0x0000002f +#define FILE_DEVICE_CHANGER 0x00000030 +#define FILE_DEVICE_SMARTCARD 0x00000031 +#define FILE_DEVICE_ACPI 0x00000032 +#define FILE_DEVICE_DVD 0x00000033 +#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 +#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 +#define FILE_DEVICE_DFS_VOLUME 0x00000036 +#define FILE_DEVICE_SERENUM 0x00000037 +#define FILE_DEVICE_TERMSRV 0x00000038 +#define FILE_DEVICE_KSEC 0x00000039 + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define FILE_ANY_ACCESS 0 +#define FILE_SPECIAL_ACCESS 0 +#define FILE_READ_ACCESS FILE_READ_DATA /* file & pipe */ +#define FILE_WRITE_ACCESS FILE_WRITE_DATA /* file & pipe */ + +#define FSCTL_REQUEST_OPLOCK_LEVEL_1 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_OPLOCK_LEVEL_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_BATCH_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPBATCH_ACK_CLOSE_PENDING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_NOTIFY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_IS_VOLUME_MOUNTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_IS_PATHNAME_VALID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_MARK_AS_SYSTEM_HIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_OPLOCK_BREAK_ACK_NO_2 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_INVALIDATE_VOLUMES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_FAT_BPB CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_REQUEST_FILTER_OPLOCK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 23, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_NTFS_VOLUME_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_NTFS_FILE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_HFS_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_ALLOW_EXTENDED_DASD_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 33, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 34, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_FIND_FILES_BY_SID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_DUMP_PROPERTY_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 37, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_ENUM_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SECURITY_ID_CHECK CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_READ_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SET_OBJECT_ID_EXTENDED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_CREATE_OR_GET_OBJECT_ID CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_ZERO_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_QUERY_ALLOCATED_RANGES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51, METHOD_NEITHER, FILE_READ_DATA) +#define FSCTL_ENABLE_UPGRADE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_ENCRYPTION_FSCTL_IO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55, METHOD_NEITHER, FILE_SPECIAL_ACCESS) +#define FSCTL_READ_RAW_ENCRYPTED CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56, METHOD_NEITHER, FILE_SPECIAL_ACCESS) +#define FSCTL_CREATE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_FILE_USN_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_WRITE_USN_CLOSE_RECORD CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_EXTEND_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 61, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DELETE_USN_JOURNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 62, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_MARK_HANDLE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SIS_COPYFILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SIS_LINK_FILES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_HSM_MSG CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 66, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_HSM_DATA CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 68, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_RECALL_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_READ_FROM_PLEX CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT,FILE_READ_DATA) +#define FSCTL_FILE_PREFETCH CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_MAKE_MEDIA_COMPATIBLE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 76, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_SET_DEFECT_MANAGEMENT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 77, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_QUERY_SPARING_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 78, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_QUERY_ON_DISK_VOLUME_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 79, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_VOLUME_COMPRESSION_STATE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 80, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_TXFS_MODIFY_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 81, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_QUERY_RM_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 82, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_ROLLFORWARD_REDO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 84, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_ROLLFORWARD_UNDO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 85, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_START_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 86, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_SHUTDOWN_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 87, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_READ_BACKUP_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 88, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_WRITE_BACKUP_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 89, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_CREATE_SECONDARY_RM CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 90, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_GET_METADATA_INFO CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 91, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_GET_TRANSACTED_VERSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 92, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_CREATE_MINIVERSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 95, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_TXFS_TRANSACTION_ACTIVE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 99, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_SET_ZERO_ON_DEALLOCATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 101, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 102, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_GET_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 103, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_WAIT_FOR_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 104, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_INITIATE_REPAIR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 106, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_CSC_INTERNAL CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER, FILE_ANY_ACCESS) +#define FSCTL_SHRINK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 108, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) +#define FSCTL_SET_SHORT_NAME_BEHAVIOR CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 109, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_DFSR_SET_GHOST_HANDLE_STATE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 110, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_TXFS_LIST_TRANSACTION_LOCKED_FILES CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 120, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_TXFS_LIST_TRANSACTIONS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 121, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_QUERY_PAGEFILE_ENCRYPTION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 122, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define FSCTL_PIPE_ASSIGN_EVENT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_DISCONNECT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_PEEK CTL_CODE(FILE_DEVICE_NAMED_PIPE, 3, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_PIPE_QUERY_EVENT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 5, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_SET_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_QUERY_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_PIPE_INTERNAL_READ CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA) +#define FSCTL_PIPE_INTERNAL_WRITE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA) +#define FSCTL_PIPE_INTERNAL_TRANSCEIVE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA) +#define FSCTL_PIPE_INTERNAL_READ_OVFLOW CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) + +#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE +#define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS) + +#define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_DISK_BASE FILE_DEVICE_DISK +#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_VERIFY CTL_CODE(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS CTL_CODE(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_REASSIGN_BLOCKS CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_PERFORMANCE CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_IS_WRITABLE CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_LOGGING CTL_CODE(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_TRACKS_EX CTL_CODE(IOCTL_DISK_BASE, 0x000b, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_HISTOGRAM_STRUCTURE CTL_CODE(IOCTL_DISK_BASE, 0x000c, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_DATA CTL_CODE(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_HISTOGRAM_RESET CTL_CODE(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_STRUCTURE CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_REQUEST_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_CHECK_VERIFY CTL_CODE(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_MEDIA_REMOVAL CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_EJECT_MEDIA CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_LOAD_MEDIA CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_RESERVE CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_RELEASE CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) + + +#define IOCTL_DISK_CONTROLLER_NUMBER CTL_CODE(IOCTL_DISK_BASE, 0x0011, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define SMART_GET_VERSION CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) +#define SMART_SEND_DRIVE_COMMAND CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define SMART_RCV_DRIVE_DATA CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_VOLUME_BASE ((DWORD)'V') +#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS) + + +/* Return Codes... should these be the same as something somewhere? */ +#define PARTITION_ENTRY_UNUSED 0x00 /* Entry unused */ +#define PARTITION_FAT_12 0x01 /* 12-bit FAT entries */ +#define PARTITION_XENIX_1 0x02 /* Xenix */ +#define PARTITION_XENIX_2 0x03 /* Xenix */ +#define PARTITION_FAT_16 0x04 /* 16-bit FAT entries */ +#define PARTITION_EXTENDED 0x05 /* Extended partition entry */ +#define PARTITION_HUGE 0x06 /* Huge partition MS-DOS V4 */ +#define PARTITION_IFS 0x07 /* IFS Partition */ +#define PARTITION_FAT32 0x0B /* FAT32 */ +#define PARTITION_FAT32_XINT13 0x0C /* FAT32 using extended int13 services */ +#define PARTITION_XINT13 0x0E /* Win95 partition using extended int13 services */ +#define PARTITION_XINT13_EXTENDED 0x0F /* Same as type 5 but uses extended int13 services */ +#define PARTITION_PREP 0x41 /* PowerPC Reference Platform (PReP) Boot Partition */ +#define PARTITION_LDM 0x42 /* Logical Disk Manager partition */ +#define PARTITION_UNIX 0x63 /* Unix */ + +typedef enum _MEDIA_TYPE { + Unknown, F5_1Pt2_512, F3_1Pt44_512, F3_2Pt88_512, F3_20Pt8_512, F3_720_512, F5_360_512, + F5_320_512, F5_320_1024, F5_180_512, F5_160_512, RemovableMedia, FixedMedia, F3_120M_512, + F3_640_512, F5_640_512, F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, F3_128Mb_512, + F3_230Mb_512, F8_256_128 +} MEDIA_TYPE, *PMEDIA_TYPE; + +typedef struct _FORMAT_PARAMETERS { + MEDIA_TYPE MediaType; + DWORD StartCylinderNumber; + DWORD EndCylinderNumber; + DWORD StartHeadNumber; + DWORD EndHeadNumber; +} FORMAT_PARAMETERS, *PFORMAT_PARAMETERS; + +typedef WORD BAD_TRACK_NUMBER; +typedef WORD *PBAD_TRACK_NUMBER; + +typedef struct _FORMAT_EX_PARAMETERS { + MEDIA_TYPE MediaType; + DWORD StartCylinderNumber; + DWORD EndCylinderNumber; + DWORD StartHeadNumber; + DWORD EndHeadNumber; + WORD FormatGapLength; + WORD SectorsPerTrack; + WORD SectorNumber[1]; +} FORMAT_EX_PARAMETERS, *PFORMAT_EX_PARAMETERS; + +typedef struct _DISK_GEOMETRY { + LARGE_INTEGER Cylinders; + MEDIA_TYPE MediaType; + DWORD TracksPerCylinder; + DWORD SectorsPerTrack; + DWORD BytesPerSector; +} DISK_GEOMETRY, *PDISK_GEOMETRY; + +typedef struct _DISK_GEOMETRY_EX { + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + BYTE Data[1]; +} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX; + +typedef struct _PARTITION_INFORMATION { + LARGE_INTEGER StartingOffset; + LARGE_INTEGER PartitionLength; + DWORD HiddenSectors; + DWORD PartitionNumber; + BYTE PartitionType; + BOOLEAN BootIndicator; + BOOLEAN RecognizedPartition; + BOOLEAN RewritePartition; +} PARTITION_INFORMATION, *PPARTITION_INFORMATION; + +typedef struct _SET_PARTITION_INFORMATION { + BYTE PartitionType; +} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION; + +typedef struct _DRIVE_LAYOUT_INFORMATION { + DWORD PartitionCount; + DWORD Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; + +typedef struct _VERIFY_INFORMATION { + LARGE_INTEGER StartingOffset; + DWORD Length; +} VERIFY_INFORMATION, *PVERIFY_INFORMATION; + +typedef struct _REASSIGN_BLOCKS { + WORD Reserved; + WORD Count; + DWORD BlockNumber[1]; +} REASSIGN_BLOCKS, *PREASSIGN_BLOCKS; + +/* Start: _WIN32_WINNT >= 0x0400 */ + +typedef struct _DISK_CONTROLLER_NUMBER { + DWORD ControllerNumber; + DWORD DiskNumber; +} DISK_CONTROLLER_NUMBER, *PDISK_CONTROLLER_NUMBER; + +/* VOLUME_GET_VOLUME_DISK_EXTENTS */ +typedef struct _DISK_EXTENT { + DWORD DiskNumber; + LARGE_INTEGER StartingOffset; + LARGE_INTEGER ExtentLength; +} DISK_EXTENT; + +typedef struct _VOLUME_DISK_EXTENTS { + DWORD NumberOfDiskExtents; + DISK_EXTENT Extents[1]; +} VOLUME_DISK_EXTENTS; + +typedef struct RETRIEVAL_POINTERS_BUFFER { + DWORD ExtentCount; + LARGE_INTEGER StartingVcn; + struct { + LARGE_INTEGER NextVcn; + LARGE_INTEGER Lcn; + } Extents[1]; +} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER; + +/* End: _WIN32_WINNT >= 0x0400 */ + +/* + * NT I/O-Manager + */ + +/* + * structures for NtQueryVolumeInformationFile + * (wdm.h) + */ + +/* FileFsVolumeInformation = 1 */ +typedef struct _FILE_FS_VOLUME_INFORMATION { + LARGE_INTEGER VolumeCreationTime; + ULONG VolumeSerialNumber; + ULONG VolumeLabelLength; + BOOLEAN SupportsObjects; + WCHAR VolumeLabel[1]; +} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; + +/* FileFsLabelInformation = 2 */ +/* + unknown +*/ + +/* FileFsSizeInformation = 3 */ +typedef struct _FILE_FS_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER AvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +/* FileFsDeviceInformation = 4 */ +typedef struct _FILE_FS_DEVICE_INFORMATION { + DEVICE_TYPE DeviceType; + ULONG Characteristics; +} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; + +/* FileFsAttributeInformation = 5 */ +typedef struct _FILE_FS_ATTRIBUTE_INFORMATION { + ULONG FileSystemAttribute; + LONG MaximumComponentNameLength; + ULONG FileSystemNameLength; + WCHAR FileSystemName[1]; +} FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION; + +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + +typedef struct _FILE_PIPE_PEEK_BUFFER { + ULONG NamedPipeState; + ULONG ReadDataAvailable; + ULONG NumberOfMessages; + ULONG MessageLength; + CHAR Data[1]; +} FILE_PIPE_PEEK_BUFFER, *PFILE_PIPE_PEEK_BUFFER; + +/* Device GUIDs */ +#ifdef DEFINE_GUID + +DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0, 0x8089, + 0x11D0, 0x9C, 0xE4, 0x08, 0x00, 0x3E, 0x30, 0x1F, 0x73); +DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978, 0xE325, + 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); + +/* obsolete GUID names */ +#define GUID_CLASS_COMPORT GUID_DEVINTERFACE_COMPORT +#define GUID_SERENUM_BUS_ENUMERATOR GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR + +#endif /* DEFINE_GUID */ + +#endif Propchange: trunk/reactos/include/reactos/wine/winioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Tue Sep 10 16:39:37 2013 @@ -36,7 +36,7 @@ #include "wine/test.h" #include "winternl.h" #include "winuser.h" -#include "winioctl.h" +#include "wine/winioctl.h" #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003

11 years

[akhaldi] 60004: [USER32] * Be more specific about the commctrl.h inclusion. * We no longer need to add include/reactos/wine as a global inclusions folder.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 10 16:28:05 2013 New Revision: 60004 URL: http://svn.reactos.org/svn/reactos?rev=60004&view=rev Log: [USER32] * Be more specific about the commctrl.h inclusion. * We no longer need to add include/reactos/wine as a global inclusions folder. Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/spy.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Tue Sep 10 16:28:05 2013 @@ -2,7 +2,6 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB) include_directories( - BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/subsys include ${REACTOS_SOURCE_DIR}/win32ss/include) Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Tue Sep 10 16:28:05 2013 @@ -20,7 +20,7 @@ */ #include <user32.h> -#include <commctrl.h> +#include <wine/commctrl.h> #include <commdlg.h> #include <richedit.h> #include <prsht.h>

11 years

[pschweitzer] 60003: [NTOSKRNL] Fix string size to store GPT GUIDs. This was causing a buffer overflow (with ending null char) and thus a stack corruption. The side effect of the stack corruption w...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 10 13:42:34 2013 New Revision: 60003 URL: http://svn.reactos.org/svn/reactos?rev=60003&view=rev Log: [NTOSKRNL] Fix string size to store GPT GUIDs. This was causing a buffer overflow (with ending null char) and thus a stack corruption. The side effect of the stack corruption was that the debug code (display) was looping forever while attempting to read partition table making ntoskrnl unable to boot with a machine where there's a GPT disk. Kernel is now able again to handle GPT disks (and they can be used again in user-land). This was magically hidding before r59923 or by disabling NDEBUG. Lovely Heisenbugs :-). Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Tue Sep 10 13:42:34 2013 @@ -86,6 +86,8 @@ #define EFI_HEADER_REVISION_1 0x00010000 /* Defines system type for MBR showing that a GPT is following */ #define EFI_PMBR_OSTYPE_EFI 0xEE +/* Defines size to store a complete GUID + null char */ +#define EFI_GUID_STRING_SIZE 0x27 #define IS_VALID_DISK_INFO(Disk) \ (Disk) && \ @@ -534,7 +536,7 @@ FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout) { ULONG i; - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); @@ -575,7 +577,7 @@ FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry, IN ULONG PartitionNumber) { - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("Printing partition %lu\n", PartitionNumber); @@ -614,7 +616,7 @@ FstubDbgPrintSetPartitionEx(IN PSET_PARTITION_INFORMATION_EX PartitionEntry, IN ULONG PartitionNumber) { - CHAR Guid[38]; + CHAR Guid[EFI_GUID_STRING_SIZE]; PAGED_CODE(); DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry);

11 years

[ion] 60002: [NTOSKRNL]: Implement ExAllocatePoolWithQuotaTag. However PsChargeProcessPoolQuota is still unimplemented so nothing really gets charged (we do write the owner process, though).

by ion＠svn.reactos.org

Author: ion Date: Tue Sep 10 10:02:27 2013 New Revision: 60002 URL: http://svn.reactos.org/svn/reactos?rev=60002&view=rev Log: [NTOSKRNL]: Implement ExAllocatePoolWithQuotaTag. However PsChargeProcessPoolQuota is still unimplemented so nothing really gets charged (we do write the owner process, though). Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Tue Sep 10 10:02:27 2013 @@ -2511,11 +2511,114 @@ IN SIZE_T NumberOfBytes, IN ULONG Tag) { - // - // Allocate the pool - // - UNIMPLEMENTED; - return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + BOOLEAN Raise = TRUE; + PVOID Buffer; + PPOOL_HEADER Entry; + NTSTATUS Status; + PEPROCESS Process = PsGetCurrentProcess(); + + // + // Check if we should fail intead of raising an exception + // + if (PoolType & POOL_QUOTA_FAIL_INSTEAD_OF_RAISE) + { + Raise = FALSE; + PoolType &= ~POOL_QUOTA_FAIL_INSTEAD_OF_RAISE; + } + + // + // Inject the pool quota mask + // + PoolType += QUOTA_POOL_MASK; + + // + // Check if we have enough space to add the quota owner process, as long as + // this isn't the system process, which never gets charged quota + // + ASSERT(NumberOfBytes != 0); + if ((NumberOfBytes <= (PAGE_SIZE - sizeof(POOL_BLOCK_SIZE) - sizeof(PVOID))) && + (Process != PsInitialSystemProcess)) + { + // + // Add space for our EPROCESS pointer + // + NumberOfBytes += sizeof(PEPROCESS); + } + else + { + // + // We won't be able to store the pointer, so don't use quota for this + // + PoolType -= QUOTA_POOL_MASK; + } + + // + // Allocate the pool buffer now + // + Buffer = ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); + + // + // If the buffer is page-aligned, this is a large page allocation and we + // won't touch it + // + if (PAGE_ALIGN(Buffer) != Buffer) + { + // + // Also if special pool is enabled, and this was allocated from there, + // we won't touch it either + // + if ((ExpPoolFlags & POOL_FLAG_SPECIAL_POOL) && + (MmIsSpecialPoolAddress(Buffer))) + { + return Buffer; + } + + // + // If it wasn't actually allocated with quota charges, ignore it too + // + if (!(PoolType & QUOTA_POOL_MASK)) return Buffer; + + // + // If this is the system process, we don't charge quota, so ignore + // + if (Process == PsInitialSystemProcess) return Buffer; + + // + // Actually go and charge quota for the process now + // + Entry = POOL_ENTRY(Buffer); + Status = PsChargeProcessPoolQuota(Process, + PoolType & BASE_POOL_TYPE_MASK, + Entry->BlockSize * sizeof(POOL_BLOCK_SIZE)); + if (!NT_SUCCESS(Status)) + { + // + // Quota failed, back out the allocation, clear the owner, and fail + // + *(PVOID*)((ULONG_PTR)POOL_NEXT_BLOCK(Entry) - sizeof(PVOID)) = NULL; + ExFreePoolWithTag(Buffer, Tag); + if (Raise) RtlRaiseStatus(Status); + return NULL; + } + + // + // Quota worked, write the owner and then reference it before returning + // + *(PVOID*)((ULONG_PTR)POOL_NEXT_BLOCK(Entry) - sizeof(PVOID)) = Process; + ObReferenceObject(Process); + } + else if (!(Buffer) && (Raise)) + { + // + // The allocation failed, raise an error if we are in raise mode + // + RtlRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + // + // Return the allocated buffer + // + return Buffer; } #if DBG && KDBG

11 years

[ion] 60001: [CSRSRV]: Update CSR_SERVER_DLL definition to Server 2003 instead of XP. Get rid of the whole initialization event stuff. This should make Windows CSRSS+CSRSRV work with our BASESRV. T...

by ion＠svn.reactos.org

Author: ion Date: Tue Sep 10 08:55:09 2013 New Revision: 60001 URL: http://svn.reactos.org/svn/reactos?rev=60001&view=rev Log: [CSRSRV]: Update CSR_SERVER_DLL definition to Server 2003 instead of XP. Get rid of the whole initialization event stuff. This should make Windows CSRSS+CSRSRV work with our BASESRV. Thanks to Hermes for discovering there was a structure issue. Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/init.c trunk/reactos/subsystems/win32/csrsrv/server.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -208,7 +208,6 @@ typedef struct _CSR_SERVER_DLL { ULONG Length; - HANDLE Event; ANSI_STRING Name; HANDLE ServerHandle; ULONG ServerId; @@ -227,7 +226,7 @@ PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; ULONG Unknown2[3]; } CSR_SERVER_DLL, *PCSR_SERVER_DLL; - +C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C); typedef NTSTATUS Modified: trunk/reactos/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -32,7 +32,6 @@ HANDLE BNOLinksDirectory; HANDLE SessionObjectDirectory; HANDLE DosDevicesDirectory; -HANDLE CsrInitializationEvent; SYSTEM_BASIC_INFORMATION CsrNtSysInfo; @@ -963,19 +962,6 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* Create the Init Event */ - Status = NtCreateEvent(&CsrInitializationEvent, - EVENT_ALL_ACCESS, - NULL, - SynchronizationEvent, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV:%s: NtCreateEvent failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - /* Cache System Basic Information so we don't always request it */ Status = NtQuerySystemInformation(SystemBasicInformation, &CsrNtSysInfo, @@ -1065,18 +1051,6 @@ __FUNCTION__, Status); return Status; } - - /* Finito! Signal the event */ - Status = NtSetEvent(CsrInitializationEvent, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV:%s: NtSetEvent failed (Status=%08lx)\n", - __FUNCTION__, Status); - return Status; - } - - /* Close the event handle now */ - NtClose(CsrInitializationEvent); /* Have us handle Hard Errors */ Status = NtSetDefaultHardErrorPort(CsrApiPort); Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Tue Sep 10 08:55:09 2013 @@ -168,7 +168,6 @@ /* Set up the Object */ ServerDll->Length = Size; ServerDll->SharedSection = CsrSrvSharedSectionHeap; // Send to the server dll our shared heap pointer. - ServerDll->Event = CsrInitializationEvent; ServerDll->Name.Length = DllName.Length; ServerDll->Name.MaximumLength = DllName.MaximumLength; ServerDll->Name.Buffer = (PCHAR)(ServerDll + 1);

11 years

[ion] 60000: For our 60000th commit, I bring you a complete rewrite of the Named Pipe File System. It is not yet "active", but I consider this to now be largely code complete and worthy of the priz...

by ion＠svn.reactos.org

Author: ion Date: Tue Sep 10 08:36:25 2013 New Revision: 60000 URL: http://svn.reactos.org/svn/reactos?rev=60000&view=rev Log: For our 60000th commit, I bring you a complete rewrite of the Named Pipe File System. It is not yet "active", but I consider this to now be largely code complete and worthy of the prize (and I didn't want to delay other commiters any further). Once the code is reviewed, fixed, tested, and commented, it will replace our old and aging NPFS. This driver is cross-compatible with Windows Server 2003. It is expected to fix winetest incompatiblities, speed up performance, and reduce bizare RPC/SCM issues. This commit is dedicated to my best friend Rachel, who has not only always been there for me, but was also the motivating factor behind my return to my passion -- ReactOS :) [NPFS-NEW]: Implement QueryVolume, QuerySecurity, SetSecurity. Everything but Directory Query, Fast I/O, and a few rare FSCTLs is implemented now. The former two will come in an upcoming commit. [NPFS-NEW]: Major cleanup in the way some member variables were being addressed. Reference them as array members based on the correct FILE_PIPE defines from now on. Also fix a lot of formatting issues. Fix a bunch of bugs that were found. Use FILE_PIPE_SERVER_END and FILE_PIPE_CLIENT_END intead of a BOOLEAN. Use TRUE/FALSE/STATUS_SUCCESS/NULL/etc when needed intead of 0/1. The code formatting can/should still be improved, but this was a big help. Added: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c (with props) trunk/reactos/drivers/filesystems/npfs_new/volinfo.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/readsup.c trunk/reactos/drivers/filesystems/npfs_new/secursup.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c trunk/reactos/drivers/filesystems/npfs_new/write.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Added: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Added: trunk/reactos/drivers/filesystems/npfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…

11 years

[ion] 59999: [NPFS-NEW]: Implement Close, Cleanup, Disconnect, Flush, Listen, Peek, SetInfo, Transceive, Wait, Write. Only QueryInfo remains as critical functionality to support the Kernel32 APIs. ...

by ion＠svn.reactos.org

Author: ion Date: Tue Sep 10 02:23:32 2013 New Revision: 59999 URL: http://svn.reactos.org/svn/reactos?rev=59999&view=rev Log: [NPFS-NEW]: Implement Close, Cleanup, Disconnect, Flush, Listen, Peek, SetInfo, Transceive, Wait, Write. Only QueryInfo remains as critical functionality to support the Kernel32 APIs. Code is WIP, untested, and ugly! But it is now 90% complete. r60000 should hopefully finalize the implementation. As long as I didn't forget a file :) Added: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/close.c (with props) trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c (with props) trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c (with props) trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (with props) trunk/reactos/drivers/filesystems/npfs_new/write.c (with props) trunk/reactos/drivers/filesystems/npfs_new/writesup.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -1,8 +1,13 @@ list(APPEND SOURCE + cleanup.c + close.c create.c datasup.c + fileinfo.c fileobsup.c + flushbuf.c + fsctrl.c main.c prefxsup.c read.c @@ -10,7 +15,9 @@ secursup.c statesup.c strucsup.c - waitsup.c) + waitsup.c + write.c + writesup.c) add_library(npfs_new SHARED ${SOURCE}) set_module_type(npfs_new kernelmodedriver) Added: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,73 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE NodeTypeCode; + LIST_ENTRY List; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PLIST_ENTRY ThisEntry, NextEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InitializeListHead(&List); + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB ) + { + if ( ServerSide == 1 ) + { + ASSERT(Ccb->Fcb->ServerOpenCount != 0); + --Ccb->Fcb->ServerOpenCount; + } + + NpSetClosingPipeState(Ccb, Irp, ServerSide, &List); + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonCleanup(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,68 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE NodeTypeCode; + LIST_ENTRY List; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PLIST_ENTRY ThisEntry, NextEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InitializeListHead(&List); + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if (NodeTypeCode == NPFS_NTC_ROOT_DCB) + { + --Fcb->CurrentInstances; + NpDeleteCcb(Ccb, &List); + } + else if (NodeTypeCode == NPFS_NTC_VCB) + { + --NpVcb->ReferenceCount; + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpFsdClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonClose(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/close.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,178 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpSetBasicInfo(IN PNP_CCB Ccb, + IN PFILE_BASIC_INFORMATION Buffer) +{ + PAGED_CODE(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpSetPipeInfo(IN PNP_FCB Fcb, + IN PNP_CCB Ccb, + IN PFILE_PIPE_INFORMATION Buffer, + IN ULONG ServerSide, + IN PLIST_ENTRY List) +{ + NTSTATUS Status; + PNP_DATA_QUEUE ReadQueue, WriteQueue; + ULONG CompletionMode; + PAGED_CODE(); + + if ( Buffer->ReadMode == FILE_PIPE_MESSAGE_MODE && Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE ) + { + return STATUS_INVALID_PARAMETER; + } + + if ( ServerSide ) + { + if ( ServerSide != 1 ) KeBugCheckEx(NPFS_FILE_SYSTEM, 0xA04EFu, ServerSide, 0, 0); + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + CompletionMode = Ccb->ServerCompletionMode; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + CompletionMode = Ccb->ClientCompletionMode; + } + + if ( Buffer->CompletionMode != FILE_PIPE_COMPLETE_OPERATION || + CompletionMode == FILE_PIPE_COMPLETE_OPERATION || + (ReadQueue->QueueState == ReadEntries && + WriteQueue->QueueState != WriteEntries )) + { + if (ServerSide) + { + Ccb->ServerReadMode = Buffer->ReadMode & 0xFF; + Ccb->ServerCompletionMode = Buffer->CompletionMode & 0xFF; + } + else + { + Ccb->ClientReadMode = Buffer->ReadMode & 0xFF; + Ccb->ClientCompletionMode = Buffer->CompletionMode & 0xFF; + } + + NpCheckForNotify(Fcb->ParentDcb, 0, List); + Status = 0; + } + else + { + Status = STATUS_PIPE_BUSY; + } + + return Status; +} + +NTSTATUS +NTAPI +NpCommonSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + ULONG InfoClass; + PVOID Buffer; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if ( !NodeTypeCode ) return STATUS_PIPE_DISCONNECTED; + if ( NodeTypeCode != NPFS_NTC_CCB ) return STATUS_INVALID_PARAMETER; + + InfoClass = IoStack->Parameters.QueryFile.FileInformationClass; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + if ( InfoClass == FileBasicInformation ) return NpSetBasicInfo(Ccb, Buffer); + + if ( InfoClass != FilePipeInformation ) return STATUS_INVALID_PARAMETER; + + return NpSetPipeInfo(Fcb, Ccb, Buffer, ServerSide, List); +} + +NTSTATUS +NTAPI +NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + + InitializeListHead(&List); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + Status = NpCommonSetInformation(DeviceObject, Irp, &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + +NTSTATUS +NTAPI +NpCommonQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + Status = NpCommonQueryInformation(DeviceObject, Irp); + + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,68 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + BOOLEAN ServerSide; + NTSTATUS Status; + PNP_DATA_QUEUE FlushQueue; + PAGED_CODE(); + + NodeTypeCode = NpDecodeFileObject(IoGetCurrentIrpStackLocation(Irp)->FileObject, + NULL, + &Ccb, + &ServerSide); + if (NodeTypeCode != NPFS_NTC_CCB ) return STATUS_PIPE_DISCONNECTED; + + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + //ms_exc.registration.TryLevel = 0; + + FlushQueue = &Ccb->OutQueue; + if ( ServerSide != 1 ) FlushQueue = &Ccb->InQueue; + + if ( FlushQueue->QueueState == WriteEntries) + { + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + FlushQueue, + 1, + 2u, + 0, + Irp, + NULL, + 0); + } + else + { + Status = STATUS_SUCCESS; + } + + // ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + + return Status; +} + +NTSTATUS +NTAPI +NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + + Status = NpCommonFlushBuffers(DeviceObject, Irp); + + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,692 @@ +#include "npfs.h" + +IO_STATUS_BLOCK NpUserIoStatusBlock; + +NTSTATUS +NTAPI +NpInternalTransceive(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpInternalRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN BOOLEAN Overflow, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpInternalWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpQueryClientProcess(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpSetClientProcess(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpAssignEvent(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpQueryEvent(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpImpersonate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpDisconnect(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + BOOLEAN ServerSide; + PNP_CCB Ccb; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB) + { + if ( ServerSide == 1 ) + { + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + Status = NpSetDisconnectedPipeState(Ccb, List); + + NpUninitializeSecurity(Ccb); + + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + } + else + { + Status = STATUS_PIPE_DISCONNECTED; + } + + return Status; +} + +NTSTATUS +NTAPI +NpListen(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + BOOLEAN ServerSide; + PNP_CCB Ccb; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB) + { + if ( ServerSide == 1 ) + { + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + Status = NpSetListeningPipeState(Ccb, Irp, List); + + NpUninitializeSecurity(Ccb); + + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + + return Status; +} + +NTSTATUS +NTAPI +NpPeek(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE Type; + ULONG InputLength; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PFILE_PIPE_PEEK_BUFFER PeekBuffer; + PNP_DATA_QUEUE DataQueue; + ULONG BytesPeeked; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PNP_DATA_QUEUE_ENTRY DataEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InputLength = IoStack->Parameters.FileSystemControl.OutputBufferLength; + Type = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (!Type) return STATUS_PIPE_DISCONNECTED; + + if ((Type != NPFS_NTC_CCB) && (InputLength < sizeof(*PeekBuffer))) + { + return STATUS_INVALID_PARAMETER; + } + + PeekBuffer = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if ( ServerSide ) + { + if ( ServerSide != 1 ) + { + KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD02E5, ServerSide, 0, 0); + } + DataQueue = &Ccb->InQueue; + } + else + { + DataQueue = &Ccb->OutQueue; + } + + if ( Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE ) + { + if ( Ccb->NamedPipeState != FILE_PIPE_CLOSING_STATE ) + { + return STATUS_INVALID_PIPE_STATE; + } + if ( DataQueue->QueueState != WriteEntries) + { + return STATUS_PIPE_BROKEN; + } + } + + PeekBuffer->NamedPipeState = 0; + PeekBuffer->ReadDataAvailable = 0; + PeekBuffer->NumberOfMessages = 0; + PeekBuffer->MessageLength = 0; + PeekBuffer->NamedPipeState = Ccb->NamedPipeState; + BytesPeeked = sizeof(*PeekBuffer); + + if ( DataQueue->QueueState == WriteEntries) + { + DataEntry = CONTAINING_RECORD(DataQueue->Queue.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + ASSERT((DataEntry->DataEntryType == Buffered) || (DataEntry->DataEntryType == Unbuffered)); + + PeekBuffer->ReadDataAvailable = DataQueue->BytesInQueue - DataQueue->ByteOffset; + if ( Ccb->Fcb->NamedPipeType == FILE_PIPE_MESSAGE_TYPE) + { + PeekBuffer->NumberOfMessages = DataQueue->EntriesInQueue; + PeekBuffer->MessageLength = DataEntry->DataSize - DataQueue->ByteOffset; + } + if ( InputLength == sizeof(*PeekBuffer) ) + { + Status = PeekBuffer->ReadDataAvailable != 0 ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; + } + else + { + IoStatus = NpReadDataQueue(DataQueue, + TRUE, + FALSE, + PeekBuffer->Data, + InputLength - sizeof(*PeekBuffer), + Ccb->Fcb->NamedPipeType == FILE_PIPE_MESSAGE_TYPE, + Ccb, + List); + Status = IoStatus.Status; + BytesPeeked = IoStatus.Information + sizeof(*PeekBuffer); + } + } + else + { + Status = STATUS_SUCCESS; + } + + Irp->IoStatus.Information = BytesPeeked; + return Status; +} + +NTSTATUS +NTAPI +NpCompleteTransceiveIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PAGED_CODE(); + + if ( Irp->AssociatedIrp.SystemBuffer ) + { + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + + IoFreeIrp(Irp); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +NpTransceive(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + PIO_STACK_LOCATION IoStack; + PVOID InBuffer, OutBuffer; + ULONG InLength, OutLength, ReadMode, BytesWritten; + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PNP_NONPAGED_CCB NonPagedCcb; + PNP_DATA_QUEUE ReadQueue, WriteQueue; + PNP_EVENT_BUFFER EventBuffer; + NTSTATUS Status; + PIRP NewIrp; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InLength = IoStack->Parameters.FileSystemControl.InputBufferLength; + InBuffer = IoStack->Parameters.FileSystemControl.Type3InputBuffer; + OutLength = IoStack->Parameters.FileSystemControl.OutputBufferLength; + OutBuffer = Irp->UserBuffer; + + if ( Irp->RequestorMode == UserMode) + { + _SEH2_TRY + { + ProbeForRead(InBuffer, InLength, sizeof(CHAR)); + ProbeForWrite(OutBuffer, OutLength, sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + } + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode != NPFS_NTC_CCB ) + { + return STATUS_PIPE_DISCONNECTED; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + //ms_exc.registration.TryLevel = 1; + if ( Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE ) + { + Status = STATUS_INVALID_PIPE_STATE; + goto Quickie; + } + + if ( ServerSide ) + { + if ( ServerSide != 1 ) KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD0538, ServerSide, 0, 0); + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + ReadMode = Ccb->ServerReadMode; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + ReadMode = Ccb->ClientReadMode; + WriteQueue = &Ccb->InQueue; + } + + if (Ccb->Fcb->NamedPipeConfiguration != FILE_PIPE_FULL_DUPLEX || + ReadMode != FILE_PIPE_MESSAGE_MODE ) + { + Status = STATUS_INVALID_PIPE_STATE; + goto Quickie; + } + + if ( ReadQueue->QueueState != Empty) + { + Status = STATUS_PIPE_BUSY; + goto Quickie; + } + + Status = NpWriteDataQueue(WriteQueue, + 1, + InBuffer, + InLength, + Ccb->Fcb->NamedPipeType, + &BytesWritten, + Ccb, + ServerSide, + Irp->Tail.Overlay.Thread, + List); + if ( Status == STATUS_MORE_PROCESSING_REQUIRED ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + NewIrp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if ( !NewIrp ) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + IoSetCompletionRoutine(Irp, NpCompleteTransceiveIrp, NULL, TRUE, TRUE, TRUE); + + if ( BytesWritten ) + { + NewIrp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PagedPool, BytesWritten, 'wFpN'); + if ( !NewIrp->AssociatedIrp.SystemBuffer ) + { + IoFreeIrp(NewIrp); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + RtlCopyMemory(NewIrp->AssociatedIrp.SystemBuffer, + (PVOID)((ULONG_PTR)InBuffer + InLength - BytesWritten), + BytesWritten); + //ms_exc.registration.TryLevel = 1; + } + else + { + NewIrp->AssociatedIrp.SystemBuffer = NULL; + } + + IoStack = IoGetNextIrpStackLocation(NewIrp); + IoSetNextIrpStackLocation(NewIrp); + + NewIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread; + NewIrp->IoStatus.Information = BytesWritten; + + IoStack->Parameters.Read.Length = BytesWritten; + IoStack->MajorFunction = IRP_MJ_WRITE; + + if ( BytesWritten > 0 ) NewIrp->Flags = IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO; + NewIrp->UserIosb = &NpUserIoStatusBlock; + + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + WriteQueue, + WriteEntries, + 1, + BytesWritten, + NewIrp, + NULL, + 0); + if ( Status != STATUS_PENDING ) + { + NewIrp->IoStatus.Status = Status; + InsertTailList(List, &NewIrp->Tail.Overlay.ListEntry); + } + } + + if (!NT_SUCCESS(Status)) goto Quickie; + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + ASSERT(ReadQueue->QueueState == Empty); + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + ReadQueue, + ReadEntries, + 0, + OutLength, + Irp, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + } + +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return Status; +} + +NTSTATUS +NTAPI +NpWaitForNamedPipe(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + ULONG InLength, NameLength; + UNICODE_STRING SourceString, Prefix; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PFILE_PIPE_WAIT_FOR_BUFFER Buffer; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PLIST_ENTRY NextEntry; + PNP_FCB Fcb; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InLength = IoStack->Parameters.DeviceIoControl.InputBufferLength; + + SourceString.Buffer = NULL; + + //ms_exc.registration.TryLevel = 0; + + if (NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide) != NPFS_NTC_ROOT_DCB ) + { + Status = STATUS_ILLEGAL_FUNCTION; + goto Quickie; + } + + Buffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if (InLength < sizeof(*Buffer)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + NameLength = Buffer->NameLength; + if ((NameLength > 0xFFFD) || ((NameLength + sizeof(*Buffer)) > InLength )) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + SourceString.Length = (USHORT)NameLength + sizeof(OBJ_NAME_PATH_SEPARATOR); + SourceString.Buffer = ExAllocatePoolWithTag(PagedPool, SourceString.Length, 'WFpN'); + if (!SourceString.Buffer ) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + SourceString.Buffer[0] = OBJ_NAME_PATH_SEPARATOR; + RtlCopyMemory(&SourceString.Buffer[1], Buffer->Name, Buffer->NameLength); + + Status = STATUS_SUCCESS; + //Status = NpTranslateAlias(&SourceString); + if (!NT_SUCCESS(Status)) goto Quickie; + + Fcb = NpFindPrefix(&SourceString, TRUE, &Prefix); + Fcb = (PNP_FCB)((ULONG_PTR)Fcb & ~1); + + NodeTypeCode = Fcb ? Fcb->NodeType : 0; + if ( NodeTypeCode != NPFS_NTC_FCB ) + { + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + for (NextEntry = Fcb->CcbList.Flink; + NextEntry != &Fcb->CcbList; + NextEntry = NextEntry->Flink) + { + Ccb = CONTAINING_RECORD(NextEntry, NP_CCB, CcbEntry); + if ( Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE ) break; + } + + if ( NextEntry == &Fcb->CcbList ) + { + Status = STATUS_SUCCESS; + } + else + { + Status = NpAddWaiter(&NpVcb->WaitQueue, + Fcb->Timeout, + Irp, + &SourceString); + } + +Quickie: + //ms_exc.registration.TryLevel = -1; + if ( SourceString.Buffer ) ExFreePool(SourceString.Buffer); + return Status; +} + +NTSTATUS +NTAPI +NpCommonFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG Fsctl; + BOOLEAN Overflow = FALSE; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + NTSTATUS Status; + PAGED_CODE(); + + InitializeListHead(&List); + Fsctl = IoGetCurrentIrpStackLocation(Irp)->Parameters.FileSystemControl.FsControlCode; + + switch (Fsctl) + { + case FSCTL_PIPE_PEEK: + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpPeek(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_WRITE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalWrite(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_TRANSCEIVE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpTransceive(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_TRANSCEIVE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalTransceive(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_READ_OVFLOW: + Overflow = TRUE; + // on purpose + + case FSCTL_PIPE_INTERNAL_READ: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalRead(DeviceObject, Irp, Overflow, &List); + break; + + case FSCTL_PIPE_QUERY_CLIENT_PROCESS: + + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpQueryClientProcess(DeviceObject, Irp); + break; + + case FSCTL_PIPE_ASSIGN_EVENT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpAssignEvent(DeviceObject, Irp); + break; + + case FSCTL_PIPE_DISCONNECT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpDisconnect(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_LISTEN: + + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpListen(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_QUERY_EVENT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpQueryEvent(DeviceObject, Irp); + break; + + case FSCTL_PIPE_WAIT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpWaitForNamedPipe(DeviceObject, Irp); + break; + + case FSCTL_PIPE_IMPERSONATE: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpImpersonate(DeviceObject, Irp); + break; + + case FSCTL_PIPE_SET_CLIENT_PROCESS: + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpSetClientProcess(DeviceObject, Irp); + break; + + default: + return STATUS_NOT_SUPPORTED; + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + return Status; +} + +NTSTATUS +NTAPI +NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonFileSystemControl(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + + Propchange: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -4,8 +4,8 @@ NTSTATUS NTAPI -NpFsdClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; @@ -18,36 +18,8 @@ NTSTATUS NTAPI -NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; @@ -74,49 +46,7 @@ NTSTATUS NTAPI -NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { UNIMPLEMENTED; @@ -152,14 +82,12 @@ DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpFsdFlushBuffers; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NpFsdDirectoryControl; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NpFsdFileSystemControl; - // DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = - // NpfsQuerySecurity; - // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = - // NpfsSetSecurity; + DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurity; + DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurity; DriverObject->DriverUnload = NULL; - RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); + RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe2"); Status = IoCreateDevice(DriverObject, sizeof(NP_VCB), &DeviceName, Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -81,6 +81,19 @@ LIST_ENTRY WaitList; KSPIN_LOCK WaitLock; } NP_WAIT_QUEUE, *PNP_WAIT_QUEUE; + +// +// The Entries in the Queue above, one for each Waiter. +// +typedef struct _NP_WAIT_QUEUE_ENTRY +{ + PIRP Irp; + KDPC Dpc; + KTIMER Timer; + PNP_WAIT_QUEUE WaitQueue; + UNICODE_STRING String; + PFILE_OBJECT FileObject; +} NP_WAIT_QUEUE_ENTRY, *PNP_WAIT_QUEUE_ENTRY; // // The event buffer in the NonPaged CCB @@ -225,6 +238,11 @@ extern PNP_VCB NpVcb; +BOOLEAN +NTAPI +NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer); + VOID NTAPI NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue); @@ -322,9 +340,44 @@ NTSTATUS NTAPI +NpFsdClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +NTSTATUS +NTAPI +NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI NpSetConnectedPipeState(IN PNP_CCB Ccb, IN PFILE_OBJECT FileObject, IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpSetListeningPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN PLIST_ENTRY List); + + +NTSTATUS +NTAPI +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpSetClosingPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN ULONG NamedPipeEnd, + IN PLIST_ENTRY List); VOID NTAPI @@ -385,6 +438,13 @@ NpCheckForNotify(IN PNP_DCB Dcb, IN BOOLEAN SecondList, IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN LARGE_INTEGER WaitTime, + IN PIRP Irp, + IN PUNICODE_STRING Name); NTSTATUS NTAPI @@ -405,8 +465,43 @@ IN PNP_CCB Ccb, IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, + IN ULONG Mode, + IN PVOID OutBuffer, + IN ULONG OutBufferSize, + IN ULONG PipeType, + OUT PULONG BytesWritten, + IN PNP_CCB Ccb, + IN BOOLEAN ServerSide, + IN PETHREAD Thread, + IN PLIST_ENTRY List); + NTSTATUS NTAPI NpFsdRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -12,7 +12,6 @@ IN PLIST_ENTRY List) { NODE_TYPE_CODE NodeType; - ULONG NamedPipeConfiguation; PNP_DATA_QUEUE Queue; PNP_EVENT_BUFFER EventBuffer; NTSTATUS Status; @@ -51,10 +50,8 @@ ASSERT((Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE) || (Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE)); - NamedPipeConfiguation = Ccb->Fcb->NamedPipeConfiguration; - - if ((ServerSide == 1 && NamedPipeConfiguation == FILE_PIPE_OUTBOUND) || - (ServerSide == 0 && NamedPipeConfiguation == FILE_PIPE_INBOUND) ) + if ((ServerSide == 1 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND) || + (ServerSide == 0 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND )) { IoStatus->Status = STATUS_INVALID_PARAMETER; ReadOk = TRUE; @@ -109,30 +106,32 @@ goto Quickie; } - if ( Irp ) + if ( !Irp ) { - Status = NpAddDataQueueEntry(ServerSide, - Ccb, - Queue, - 0, - 0, - BufferSize, - Irp, - 0, - 0); - IoStatus->Status = Status; - if (!NT_SUCCESS(Status)) - { - ReadOk = FALSE; - goto Quickie; - } + ReadOk = FALSE; + goto Quickie; + } + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + Queue, + 0, + 0, + BufferSize, + Irp, + 0, + 0); + IoStatus->Status = Status; + if (!NT_SUCCESS(Status)) + { + ReadOk = FALSE; + } + else + { ReadOk = TRUE; if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); - goto Quickie; } - ReadOk = FALSE; Quickie: //ms_exc.registration.TryLevel = -1; ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); @@ -182,7 +181,7 @@ { Irp->IoStatus.Information = IoStatus.Information; Irp->IoStatus.Status = IoStatus.Status; - IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); } return IoStatus.Status; Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -1,4 +1,21 @@ #include "npfs.h" + +VOID +NTAPI +NpCancelListeningQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + FsRtlExitFileSystem(); + ExReleaseResourceLite(&NpVcb->Lock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); +} NTSTATUS NTAPI @@ -37,3 +54,316 @@ return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, + IN PLIST_ENTRY List) +{ + PIRP Irp; + PNP_NONPAGED_CCB NonPagedCcb; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PNP_EVENT_BUFFER EventBuffer; + + NonPagedCcb = Ccb->NonPagedCcb; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_DISCONNECTED_STATE: + Status = STATUS_PIPE_DISCONNECTED; + break; + + case FILE_PIPE_LISTENING_STATE: + while (!IsListEmpty(&Ccb->IrpList)) + { + NextEntry = RemoveHeadList(&Ccb->IrpList); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + Status = STATUS_SUCCESS; + break; + + case FILE_PIPE_CONNECTED_STATE: + + EventBuffer = NonPagedCcb->EventBufferClient; + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + while ( Ccb->OutQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->OutQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + + Status = STATUS_SUCCESS; + break; + + case FILE_PIPE_CLOSING_STATE: + + EventBuffer = NonPagedCcb->EventBufferClient; + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + ASSERT(Ccb->OutQueue.QueueState == Empty); + + NpDeleteEventTableEntry(&NpVcb->EventTable, EventBuffer); + NonPagedCcb->EventBufferClient = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + NpUninitializeSecurity(Ccb); + + if ( Ccb->ClientSession ) + { + ExFreePool(Ccb->ClientSession); + Ccb->ClientSession = NULL; + } + + Status = STATUS_SUCCESS; + break; + + default: + KeBugCheckEx(NPFS_FILE_SYSTEM, 0x1603DD, Ccb->NamedPipeState, 0, 0); + break; + } + + Ccb->NamedPipeState = FILE_PIPE_DISCONNECTED_STATE; + return Status; +} + +NTSTATUS +NTAPI +NpSetListeningPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NTSTATUS Status; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_DISCONNECTED_STATE: + + Status = NpCancelWaiter(&NpVcb->WaitQueue, + &Ccb->Fcb->FullName, + STATUS_SUCCESS, + List); + if (!NT_SUCCESS(Status)) return Status; + + // + // Drop down on purpose + // + + case FILE_PIPE_LISTENING_STATE: + + if ( Ccb->ServerCompletionMode == FILE_PIPE_COMPLETE_OPERATION) + { + Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; + return STATUS_PIPE_LISTENING; + } + + IoSetCancelRoutine(Irp, NpCancelListeningQueueIrp); + if ( Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + return STATUS_CANCELLED; + } + + Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; + IoMarkIrpPending(Irp); + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + return STATUS_PENDING; + + case FILE_PIPE_CONNECTED_STATE: + Status = STATUS_PIPE_CONNECTED; + break; + + case FILE_PIPE_CLOSING_STATE: + Status = STATUS_PIPE_CLOSING; + break; + + default: + KeBugCheckEx(NPFS_FILE_SYSTEM, 0x160133, Ccb->NamedPipeState, 0, 0); + break; + } + + return Status; +} + +NTSTATUS +NTAPI +NpSetClosingPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN ULONG NamedPipeEnd, + IN PLIST_ENTRY List) +{ + PNP_NONPAGED_CCB NonPagedCcb; + PNP_FCB Fcb; + PLIST_ENTRY NextEntry; + PNP_DATA_QUEUE ReadQueue, WriteQueue, DataQueue; + PNP_EVENT_BUFFER EventBuffer; + + NonPagedCcb = Ccb->NonPagedCcb; + Fcb = Ccb->Fcb; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_LISTENING_STATE: + + ASSERT(NamedPipeEnd == FILE_PIPE_SERVER_END); + + while (!IsListEmpty(&Ccb->IrpList)) + { + NextEntry = RemoveHeadList(&Ccb->IrpList); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + // Drop on purpose + + case FILE_PIPE_DISCONNECTED_STATE: + + ASSERT(NamedPipeEnd == FILE_PIPE_SERVER_END); + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + NpDeleteCcb(Ccb, List); + if ( !Fcb->CurrentInstances ) NpDeleteFcb(Fcb, List); + break; + + case FILE_PIPE_CLOSING_STATE: + + if ( NamedPipeEnd == FILE_PIPE_SERVER_END) + { + DataQueue = &Ccb->InQueue; + } + else + { + DataQueue = &Ccb->OutQueue; + } + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + NpUninitializeSecurity(Ccb); + + if ( Ccb->ClientSession ) + { + ExFreePool(Ccb->ClientSession); + Ccb->ClientSession = 0; + } + + NpDeleteCcb(Ccb, List); + if ( !Fcb->CurrentInstances ) NpDeleteFcb(Fcb, List); + break; + + case FILE_PIPE_CONNECTED_STATE: + if ( NamedPipeEnd == FILE_PIPE_SERVER_END) + { + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = 0; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = 0; + } + + Ccb->NamedPipeState = FILE_PIPE_CLOSING_STATE; + + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + while (WriteQueue->QueueState == WriteEntries) + { + Irp = NpRemoveDataQueueEntry(WriteQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + break; + + default: + KeBugCheckEx(0x25u, 0x1602F9, Ccb->NamedPipeState, 0, 0); + break; + } + return STATUS_SUCCESS; +} + Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -37,8 +37,10 @@ NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer) { - UNIMPLEMENTED; - return FALSE; + if (!Buffer) return FALSE; + + ObfDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event); + return RtlDeleteElementGenericTable(Table, Buffer); } VOID Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -1,4 +1,75 @@ #include "npfs.h" + +VOID +NTAPI +NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KIRQL OldIrql; + PNP_WAIT_QUEUE_ENTRY WaitEntry; + PNP_WAIT_QUEUE WaitQueue; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + WaitQueue = (PNP_WAIT_QUEUE)Irp->Tail.Overlay.DriverContext[0]; + + OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + + WaitEntry = (PNP_WAIT_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[1]; + if ( WaitEntry ) + { + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + if ( !KeCancelTimer(&WaitEntry->Timer) ) + { + WaitEntry->Irp = NULL; + WaitEntry = NULL; + } + } + + KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + + if ( WaitEntry ) + { + ObfDereferenceObject(WaitEntry->FileObject); + ExFreePool(WaitEntry); + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); +} + +VOID +NTAPI +NpTimerDispatch(IN PKDPC Dpc, + IN PVOID Context, + IN PVOID Argument1, + IN PVOID Argument2) +{ + PIRP Irp; + KIRQL OldIrql; + PNP_WAIT_QUEUE_ENTRY WaitEntry = Context; + + OldIrql = KfAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock); + Irp = WaitEntry->Irp; + if ( Irp); + { + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + if ( !IoSetCancelRoutine(Irp, NULL)) + { + Irp->Tail.Overlay.DriverContext[1] = NULL; + Irp = NULL; + } + } + KfReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + ObfDereferenceObject(WaitEntry->FileObject); + ExFreePoolWithTag(WaitEntry, 0); +} VOID NTAPI @@ -33,3 +104,88 @@ ExFreePool(DestinationString.Buffer); return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN LARGE_INTEGER WaitTime, + IN PIRP Irp, + IN PUNICODE_STRING Name) +{ + PIO_STACK_LOCATION IoStack; + KIRQL OldIrql; + NTSTATUS Status; + PNP_WAIT_QUEUE_ENTRY WaitEntry; + PFILE_PIPE_WAIT_FOR_BUFFER WaitBuffer; + LARGE_INTEGER DueTime; + ULONG i; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + WaitEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*WaitEntry), 'wFpN'); + if ( WaitEntry ) + { + KeInitializeDpc(&WaitEntry->Dpc, NpTimerDispatch, WaitEntry); + KeInitializeTimer(&WaitEntry->Timer); + + if ( Name ) + { + WaitEntry->String = *Name; + } + else + { + WaitEntry->String.Length = 0; + WaitEntry->String.Buffer = 0; + } + + WaitEntry->WaitQueue = WaitQueue; + WaitEntry->Irp = Irp; + + WaitBuffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if ( WaitBuffer->TimeoutSpecified ) + { + DueTime = WaitBuffer->Timeout; + } + else + { + DueTime = WaitTime; + } + + for (i = 0; i < WaitBuffer->NameLength / sizeof(WCHAR); i++) + { + WaitBuffer->Name[i] = RtlUpcaseUnicodeChar(WaitBuffer->Name[i]); + } + + Irp->Tail.Overlay.DriverContext[0] = WaitQueue; + Irp->Tail.Overlay.DriverContext[1] = WaitEntry; + OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + + IoSetCancelRoutine(Irp, NpCancelWaitQueueIrp); + + if ( Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + Status = STATUS_CANCELLED; + } + else + { + InsertTailList(&WaitQueue->WaitList, &Irp->Tail.Overlay.ListEntry); + + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + WaitEntry->FileObject = IoStack->FileObject; + ObfReferenceObject(WaitEntry->FileObject); + + KeSetTimer(&WaitEntry->Timer, DueTime, &WaitEntry->Dpc); + WaitEntry = NULL; + + } + KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + if ( WaitEntry ) ExFreePool(WaitEntry); + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + return Status; +} Added: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,204 @@ +#include "npfs.h" + +LONG NpSlowWriteCalls; + +BOOLEAN +NTAPI +NpCommonWrite(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN ULONG DataSize, + IN PETHREAD Thread, + IN PIO_STATUS_BLOCK IoStatus, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeType; + BOOLEAN WriteOk, ServerSide; + PNP_CCB Ccb; + PNP_NONPAGED_CCB NonPagedCcb; + PNP_DATA_QUEUE WriteQueue; + NTSTATUS Status; + PNP_EVENT_BUFFER EventBuffer; + ULONG BytesWritten; + PAGED_CODE(); + + IoStatus->Information = 0; + NodeType = NpDecodeFileObject(FileObject, NULL, &Ccb, &ServerSide); + + if (!NodeType) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + return TRUE; + } + + if ( NodeType != NPFS_NTC_CCB ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + return TRUE; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + // ms_exc.registration.TryLevel = 0; + + if ( Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE ) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + WriteOk = TRUE; + goto Quickie; + } + + if ( Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE || Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE ) + { + IoStatus->Status = Ccb->NamedPipeState != FILE_PIPE_LISTENING_STATE ? STATUS_PIPE_LISTENING : STATUS_PIPE_CLOSING; + WriteOk = TRUE; + goto Quickie; + } + + ASSERT(Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE); + + if ((ServerSide == 1 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND) || + (ServerSide == 0 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND)) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + WriteOk = TRUE; + goto Quickie; + } + + IoStatus->Status = 0; + IoStatus->Information = DataSize; + + if ( ServerSide == 1 ) + { + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + } + else + { + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + } + + if (WriteQueue->QueueState != ReadEntries || + WriteQueue->BytesInQueue >= DataSize || + WriteQueue->Quota >= DataSize - WriteQueue->BytesInQueue ) + { + if (WriteQueue->QueueState != ReadEntries || + WriteQueue->Quota - WriteQueue->QuotaUsed >= DataSize ) + { + goto DoWrite; + } + } + + if (Ccb->Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE && + Ccb->ServerCompletionMode & FILE_PIPE_COMPLETE_OPERATION) + { + IoStatus->Information = 0; + IoStatus->Status = 0; + WriteOk = TRUE; + goto Quickie; + } + + if (!Irp ) + { + WriteOk = 0; + goto Quickie; + } + +DoWrite: + Status = NpWriteDataQueue(WriteQueue, + ServerSide ? Ccb->ClientReadMode : Ccb->ServerReadMode, + Buffer, + DataSize, + Ccb->Fcb->NamedPipeType, + &BytesWritten, + Ccb, + ServerSide, + Thread, + List); + IoStatus->Status = Status; + if ( Status == STATUS_MORE_PROCESSING_REQUIRED ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + if ( (Ccb->ServerCompletionMode & FILE_PIPE_COMPLETE_OPERATION || !Irp) + && WriteQueue->Quota - WriteQueue->QuotaUsed < BytesWritten ) + { + IoStatus->Information = DataSize - BytesWritten; + IoStatus->Status = 0; + } + else + { + ASSERT(WriteQueue->QueueState != ReadEntries); + + IoStatus->Status = NpAddDataQueueEntry(ServerSide, + Ccb, + WriteQueue, + WriteEntries, + 0, + DataSize, + Irp, + Buffer, + DataSize - BytesWritten); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + WriteOk = 1; + +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return WriteOk; +} + +NTSTATUS +NTAPI +NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + IO_STATUS_BLOCK IoStatus; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + NpSlowWriteCalls++; + + InitializeListHead(&List); + IoStack = IoGetCurrentIrpStackLocation(Irp); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + NpCommonWrite(IoStack->FileObject, + Irp->UserBuffer, + IoStack->Parameters.Write.Length, + Irp->Tail.Overlay.Thread, + &IoStatus, + Irp, + &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( IoStatus.Status != STATUS_PENDING ) + { + Irp->IoStatus.Information = IoStatus.Information; + Irp->IoStatus.Status = IoStatus.Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return IoStatus.Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/write.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/writesup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,151 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, + IN ULONG Mode, + IN PVOID OutBuffer, + IN ULONG OutBufferSize, + IN ULONG PipeType, + OUT PULONG BytesWritten, + IN PNP_CCB Ccb, + IN BOOLEAN ServerSide, + IN PETHREAD Thread, + IN PLIST_ENTRY List) +{ + BOOLEAN HaveContext = FALSE, MoreProcessing, AllocatedBuffer; + PNP_DATA_QUEUE_ENTRY DataEntry; + ULONG DataSize, BufferSize; + PIRP WriteIrp; + PIO_STACK_LOCATION IoStack; + PVOID Buffer; + NTSTATUS Status; + PSECURITY_CLIENT_CONTEXT ClientContext; + PAGED_CODE(); + + *BytesWritten = OutBufferSize; + + MoreProcessing = 1; + if ( PipeType != FILE_PIPE_OUTBOUND || (OutBufferSize) ) MoreProcessing = 0; + + for (DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List); + ((WriteQueue->QueueState == ReadEntries) && + ((*BytesWritten > 0) || (MoreProcessing))); + DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List)) + { + DataSize = DataEntry->DataSize; + + IoStack = IoGetCurrentIrpStackLocation( DataEntry->Irp); + + if ( IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + IoStack->Parameters.FileSystemControl.FsControlCode == FSCTL_PIPE_INTERNAL_WRITE && + (DataSize < OutBufferSize || MoreProcessing) ) + { + WriteIrp = NpRemoveDataQueueEntry(WriteQueue, 1, List); + if (WriteIrp ) + { + WriteIrp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + } + continue; + } + + if ( DataEntry->DataEntryType == Unbuffered ) + { + DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; + } + + BufferSize = *BytesWritten; + if ( BufferSize >= DataSize ) BufferSize = DataSize; + + if ( DataEntry->DataEntryType != Unbuffered && BufferSize ) + { + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, 'RFpN'); + if ( !Buffer ) return STATUS_INSUFFICIENT_RESOURCES; + AllocatedBuffer = 1; + } + else + { + Buffer = DataEntry->Irp->AssociatedIrp.SystemBuffer; + AllocatedBuffer = 0; + } + + _SEH2_TRY + { + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesWritten), + BufferSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + + if ( !HaveContext ) + { + HaveContext = 1; + Status = NpGetClientSecurityContext(ServerSide, Ccb, Thread, &ClientContext); + if (!NT_SUCCESS(Status)) + { + if ( AllocatedBuffer ) ExFreePool(Buffer); + return Status; + } + + if ( ClientContext ) + { + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = ClientContext; + } + } + + WriteIrp = NpRemoveDataQueueEntry(WriteQueue, 1, List); + if ( WriteIrp ) + { + *BytesWritten -= BufferSize; + WriteIrp->IoStatus.Information = BufferSize; + + if ( AllocatedBuffer ) + { + WriteIrp->AssociatedIrp.SystemBuffer = Buffer; + WriteIrp->Flags |= IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO | IRP_INPUT_OPERATION; + } + + if ( !*BytesWritten ) + { + MoreProcessing = 0; + WriteIrp->IoStatus.Status = 0; + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + continue; + } + + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + WriteIrp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + } + else + { + WriteIrp->IoStatus.Status = 0; + } + + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + } + else if ( AllocatedBuffer ) + { + ExFreePool(Buffer); + } + } + + if ( *BytesWritten > 0 || MoreProcessing ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + Status = STATUS_MORE_PROCESSING_REQUIRED; + } + else + { + Status = STATUS_SUCCESS; + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/writesup.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years

[ion] 59998: [NPFS-NEW]: Add data queue management routines, and add read support. Implement NpFsdRead & NpfsCommonRead (Peek is inherently implemented too, just didn't write the FSCTL handlers yet...

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 9 01:16:06 2013 New Revision: 59998 URL: http://svn.reactos.org/svn/reactos?rev=59998&view=rev Log: [NPFS-NEW]: Add data queue management routines, and add read support. Implement NpFsdRead & NpfsCommonRead (Peek is inherently implemented too, just didn't write the FSCTL handlers yet). Next up will be Write/Peek/Close/Cleanup. Code is WIP. Added: trunk/reactos/drivers/filesystems/npfs_new/read.c (with props) trunk/reactos/drivers/filesystems/npfs_new/readsup.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/secursup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -1,17 +1,20 @@ list(APPEND SOURCE - create.c - datasup.c - fileobsup.c - main.c - prefxsup.c - secursup.c - statesup.c - strucsup.c - waitsup.c) + create.c + datasup.c + fileobsup.c + main.c + prefxsup.c + read.c + readsup.c + secursup.c + statesup.c + strucsup.c + waitsup.c) add_library(npfs_new SHARED ${SOURCE}) set_module_type(npfs_new kernelmodedriver) +target_link_libraries(npfs_new ${PSEH_LIB}) add_importlibs(npfs_new ntoskrnl hal) add_pch(npfs_new npfs.h) add_cd_file(TARGET npfs_new DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -25,6 +25,435 @@ DataQueue->ByteOffset = 0; DataQueue->QueueState = Empty; DataQueue->Quota = Quota; - InitializeListHead(&DataQueue->List); + InitializeListHead(&DataQueue->Queue); return STATUS_SUCCESS; } + +VOID +NTAPI +NpCompleteStalledWrites(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List) +{ + ULONG QuotaLeft, ByteOffset, DataLeft, NewQuotaLeft; + PNP_DATA_QUEUE_ENTRY DataQueueEntry; + PIRP Irp; + PLIST_ENTRY NextEntry; + + QuotaLeft = DataQueue->Quota - DataQueue->QuotaUsed; + ByteOffset = DataQueue->ByteOffset; + + NextEntry = DataQueue->Queue.Flink; + while (NextEntry != &DataQueue->Queue) + { + if ( !QuotaLeft ) break; + + DataQueueEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, Irp); + + Irp = DataQueueEntry->Irp; + + if ((DataQueueEntry->DataEntryType == 0) && (Irp)) + { + DataLeft = DataQueueEntry->DataSize - ByteOffset; + + if ( DataQueueEntry->QuotaInEntry < DataLeft ) + { + NewQuotaLeft = DataLeft - DataQueueEntry->QuotaInEntry; + if ( NewQuotaLeft > QuotaLeft ) NewQuotaLeft = QuotaLeft; + + QuotaLeft -= NewQuotaLeft; + DataQueueEntry->QuotaInEntry += NewQuotaLeft; + + if (DataQueueEntry->QuotaInEntry == DataLeft && + IoSetCancelRoutine(Irp, NULL)) + { + DataQueueEntry->Irp = NULL; + + Irp->IoStatus.Status = 0; + Irp->IoStatus.Information = DataQueueEntry->DataSize; + + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + } + + NextEntry = NextEntry->Flink; + ByteOffset = 0; + } + + DataQueue->QuotaUsed = DataQueue->Quota - QuotaLeft; +} + +PIRP +NTAPI +NpRemoveDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Flag, + IN PLIST_ENTRY List) +{ + PIRP Irp; + PNP_DATA_QUEUE_ENTRY QueueEntry; + BOOLEAN HasWrites; + + if ( DataQueue->QueueState == Empty) + { + Irp = NULL; + ASSERT(IsListEmpty(&DataQueue->Queue)); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->QuotaUsed == 0); + } + else + { + QueueEntry = CONTAINING_RECORD(RemoveHeadList(&DataQueue->Queue), + NP_DATA_QUEUE_ENTRY, + QueueEntry); + + DataQueue->BytesInQueue -= QueueEntry->DataSize; + --DataQueue->EntriesInQueue; + + HasWrites = 1; + if ( !DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !QueueEntry->QuotaInEntry ) + { + HasWrites = 0; + } + + DataQueue->QuotaUsed -= QueueEntry->QuotaInEntry; + + if (DataQueue->Queue.Flink == &DataQueue->Queue) + { + DataQueue->QueueState = Empty; + HasWrites = 0; + } + + Irp = QueueEntry->Irp; + NpFreeClientSecurityContext(QueueEntry->ClientSecurityContext); + + if (Irp && IoSetCancelRoutine(Irp, NULL)) + { + Irp->Tail.Overlay.DriverContext[3] = 0; + } + + ExFreePool(QueueEntry); + + if ( Flag ) + { + NpGetNextRealDataQueueEntry(DataQueue, List); + } + + if ( HasWrites ) + { + NpCompleteStalledWrites(DataQueue, List); + } + } + + DataQueue->ByteOffset = 0; + return Irp; +} + +PNP_DATA_QUEUE_ENTRY +NTAPI +NpGetNextRealDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List) +{ + PNP_DATA_QUEUE_ENTRY DataEntry; + ULONG Type; + PIRP Irp; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + DataEntry = NULL; + + NextEntry = DataQueue->Queue.Flink; + while (NextEntry != &DataQueue->Queue) + { + DataEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, QueueEntry); + + Type = DataEntry->DataEntryType; + if ( Type == Buffered || Type == Unbuffered ) break; + + Irp = NpRemoveDataQueueEntry(DataQueue, 0, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + return DataEntry; +} + +VOID +NTAPI +NpCancelDataQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PNP_DATA_QUEUE DataQueue; + PNP_DATA_QUEUE_ENTRY DataEntry; + LIST_ENTRY List; + PSECURITY_CLIENT_CONTEXT ClientSecurityContext; + BOOLEAN CompleteWrites, FirstEntry; + PLIST_ENTRY NextEntry, ThisEntry; + + if ( DeviceObject ) IoReleaseCancelSpinLock(Irp->CancelIrql); + + InitializeListHead(&List); + + DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; + ClientSecurityContext = NULL; + + if ( DeviceObject ) + { + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + } + + DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3]; + if ( DataEntry ) + { + if (DataEntry->QueueEntry.Blink == &DataQueue->Queue ) + { + DataQueue->ByteOffset = 0; + FirstEntry = 1; + } + else + { + FirstEntry = 0; + } + + RemoveEntryList(&DataEntry->QueueEntry); + + ClientSecurityContext = DataEntry->ClientSecurityContext; + + CompleteWrites = 1; + if ( !DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !DataEntry->QuotaInEntry ) + { + CompleteWrites = 0; + } + + DataQueue->BytesInQueue -= DataEntry->DataSize; + DataQueue->QuotaUsed -= DataEntry->QuotaInEntry; + --DataQueue->EntriesInQueue; + + if (DataQueue->Queue.Flink == &DataQueue->Queue ) + { + DataQueue->QueueState = Empty; + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(DataQueue->QuotaUsed == 0); + } + else + { + if ( FirstEntry ) + { + NpGetNextRealDataQueueEntry(DataQueue, &List); + } + if ( CompleteWrites ) + { + NpCompleteStalledWrites(DataQueue, &List); + } + } + } + + if ( DeviceObject ) + { + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + } + + if ( DataEntry ) ExFreePool(DataEntry); + + NpFreeClientSecurityContext(ClientSecurityContext); + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_DISK_INCREMENT); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } +} + +NTSTATUS +NTAPI +NpAddDataQueueEntry(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE DataQueue, + IN ULONG Who, + IN ULONG Type, + IN ULONG DataSize, + IN PIRP Irp, + IN PVOID Buffer, + IN ULONG ByteOffset) +{ + NTSTATUS Status; + PNP_DATA_QUEUE_ENTRY DataEntry; + SIZE_T EntrySize; + ULONG QuotaInEntry; + PSECURITY_CLIENT_CONTEXT ClientContext; + BOOLEAN HasSpace; + + ClientContext = NULL; + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + + Status = STATUS_SUCCESS; + + if ((Type != 2) && (Who == WriteEntries)) + { + Status = NpGetClientSecurityContext(ServerSide, + Ccb, + Irp ? Irp->Tail.Overlay.Thread : + PsGetCurrentThread(), + &ClientContext); + if (!NT_SUCCESS(Status)) return Status; + } + + switch (Type) + { + case Unbuffered: + case 2: + case 3: + + ASSERT(Irp != NULL); + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*DataEntry), 'rFpN'); + if ( DataEntry ) + { + DataEntry->DataEntryType = Type; + DataEntry->QuotaInEntry = 0; + DataEntry->Irp = Irp; + DataEntry->DataSize = DataSize; + DataEntry->ClientSecurityContext = ClientContext; + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + Status = STATUS_PENDING; + break; + } + + NpFreeClientSecurityContext(ClientContext); + return STATUS_INSUFFICIENT_RESOURCES; + + case Buffered: + + EntrySize = sizeof(*DataEntry); + if ( Who != Empty) + { + EntrySize = DataSize + sizeof(*DataEntry); + if ((DataSize + sizeof(*DataEntry)) < DataSize ) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INVALID_PARAMETER; + } + } + + QuotaInEntry = DataSize - ByteOffset; + if ( DataQueue->Quota - DataQueue->QuotaUsed < QuotaInEntry ) + { + QuotaInEntry = DataQueue->Quota - DataQueue->QuotaUsed; + HasSpace = 1; + } + else + { + HasSpace = 0; + } + + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, EntrySize, 'rFpN'); + if ( !DataEntry ) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DataEntry->QuotaInEntry = QuotaInEntry; + DataEntry->Irp = Irp; + DataEntry->DataEntryType = Buffered; + DataEntry->ClientSecurityContext = ClientContext; + DataEntry->DataSize = DataSize; + + if ( Who == ReadEntries) + { + ASSERT(Irp); + + Status = STATUS_PENDING; + ASSERT((DataQueue->QueueState == Empty) || + (DataQueue->QueueState == Who)); + } + else + { + _SEH2_TRY + { + RtlCopyMemory(DataEntry + 1, + Irp ? Irp->UserBuffer: Buffer, + DataSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NpFreeClientSecurityContext(ClientContext); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if ( HasSpace && Irp ) + { + Status = STATUS_PENDING; + } + else + { + DataEntry->Irp = 0; + Status = STATUS_SUCCESS; + } + + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + } + + default: + ASSERT(FALSE); + NpFreeClientSecurityContext(ClientContext); + return STATUS_INVALID_PARAMETER; + } + + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + if ( DataQueue->QueueState == Empty ) + { + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(IsListEmpty (&DataQueue->Queue)); + } + else + { + ASSERT(DataQueue->QueueState == Who); + ASSERT(DataQueue->QueueState != Empty); + ASSERT(DataQueue->EntriesInQueue != 0); + } + + DataQueue->QuotaUsed += DataEntry->QuotaInEntry; + DataQueue->QueueState = Who; + DataQueue->BytesInQueue += DataEntry->DataSize; + ++DataQueue->EntriesInQueue; + if ( ByteOffset ) + { + DataQueue->ByteOffset = ByteOffset; + ASSERT(Who == WriteEntries); + ASSERT(ByteOffset < DataEntry->DataSize); + ASSERT(DataQueue->EntriesInQueue == 1); + } + + InsertTailList(&DataQueue->Queue, &DataEntry->QueueEntry); + + if ( Status == STATUS_PENDING ) + { + IoMarkIrpPending(Irp); + Irp->Tail.Overlay.DriverContext[2] = DataQueue; + Irp->Tail.Overlay.DriverContext[3] = DataEntry; + + IoSetCancelRoutine(Irp, NpCancelDataQueueIrp); + + if ( Irp->Cancel ) + { + IoSetCancelRoutine(Irp, NULL); + NpCancelDataQueueIrp(0, Irp); + } + } + + return Status; +} Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -5,20 +5,6 @@ NTSTATUS NTAPI NpFsdClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { UNIMPLEMENTED; Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -3,6 +3,7 @@ // #include <ntifs.h> #include <ntndk.h> +#include <pseh/pseh2.h> #define UNIMPLEMENTED #define DPRINT1 DbgPrint @@ -31,15 +32,26 @@ // typedef enum _NP_DATA_QUEUE_STATE { + ReadEntries = 0, + WriteEntries = 1, Empty = 2 } NP_DATA_QUEUE_STATE; // +// Data Queue Entry Types +// +typedef enum _NP_DATA_QUEUE_ENTRY_TYPE +{ + Buffered = 0, + Unbuffered +} NP_DATA_QUEUE_ENTRY_TYPE; + +// // An Input or Output Data Queue. Each CCB has two of these. // typedef struct _NP_DATA_QUEUE { - LIST_ENTRY List; + LIST_ENTRY Queue; ULONG QueueState; ULONG BytesInQueue; ULONG EntriesInQueue; @@ -49,6 +61,19 @@ } NP_DATA_QUEUE, *PNP_DATA_QUEUE; // +// The Entries that go into the Queue +// +typedef struct _NP_DATA_QUEUE_ENTRY +{ + LIST_ENTRY QueueEntry; + ULONG DataEntryType; + PIRP Irp; + ULONG QuotaInEntry; + PSECURITY_CLIENT_CONTEXT ClientSecurityContext; + ULONG DataSize; +} NP_DATA_QUEUE_ENTRY, *PNP_DATA_QUEUE_ENTRY; + +// // A Wait Queue. Only the VCB has one of these. // typedef struct _NP_WAIT_QUEUE @@ -56,6 +81,14 @@ LIST_ENTRY WaitList; KSPIN_LOCK WaitLock; } NP_WAIT_QUEUE, *PNP_WAIT_QUEUE; + +// +// The event buffer in the NonPaged CCB +// +typedef struct _NP_EVENT_BUFFER +{ + PKEVENT Event; +} NP_EVENT_BUFFER, *PNP_EVENT_BUFFER; // // The CCB for the Root DCB @@ -76,7 +109,7 @@ LIST_ENTRY DcbEntry; PVOID ParentDcb; ULONG CurrentInstances; - ULONG OtherCount; + ULONG ServerOpenCount; PSECURITY_DESCRIPTOR SecurityDescriptor; } NP_CB_HEADER, *PNP_CB_HEADER; @@ -144,8 +177,8 @@ typedef struct _NP_NONPAGED_CCB { NODE_TYPE_CODE NodeType; - PVOID EventBufferClient; - PVOID EventBufferServer; + PNP_EVENT_BUFFER EventBufferClient; + PNP_EVENT_BUFFER EventBufferServer; ERESOURCE Lock; } NP_NONPAGED_CCB, *PNP_NONPAGED_CCB; @@ -201,6 +234,34 @@ NTAPI NpUninitializeDataQueue(IN PNP_DATA_QUEUE DataQueue); +PNP_DATA_QUEUE_ENTRY +NTAPI +NpGetNextRealDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List); + +PIRP +NTAPI +NpRemoveDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Flag, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpAddDataQueueEntry(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE DataQueue, + IN ULONG Who, + IN ULONG Type, + IN ULONG DataSize, + IN PIRP Irp, + IN PVOID Buffer, + IN ULONG ByteOffset); + +VOID +NTAPI +NpCompleteStalledWrites(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List); + NTSTATUS NTAPI NpInitializeDataQueue(IN PNP_DATA_QUEUE DataQueue, @@ -267,6 +328,15 @@ VOID NTAPI +NpFreeClientSecurityContext(IN PSECURITY_CLIENT_CONTEXT ClientContext); + +VOID +NTAPI +NpCopyClientContext(IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE_ENTRY DataQueueEntry); + +VOID +NTAPI NpUninitializeSecurity(IN PNP_CCB Ccb); NTSTATUS @@ -274,6 +344,13 @@ NpInitializeSecurity(IN PNP_CCB Ccb, IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, IN PETHREAD Thread); + +NTSTATUS +NTAPI +NpGetClientSecurityContext(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PETHREAD Thread, + IN PSECURITY_CLIENT_CONTEXT *Context); VOID NTAPI @@ -316,3 +393,20 @@ IN NTSTATUS Status, IN PLIST_ENTRY ListEntry); + +IO_STATUS_BLOCK +NTAPI +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Peek, + IN BOOLEAN ReadOverflowOperation, + IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG Mode, + IN PNP_CCB Ccb, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpFsdRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + Added: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -0,0 +1,189 @@ +#include "npfs.h" + +LONG NpSlowReadCalls; + +BOOLEAN +NTAPI +NpCommonRead(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PIO_STATUS_BLOCK IoStatus, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeType; + ULONG NamedPipeConfiguation; + PNP_DATA_QUEUE Queue; + PNP_EVENT_BUFFER EventBuffer; + NTSTATUS Status; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PNP_NONPAGED_CCB NonPagedCcb; + BOOLEAN ReadOk; + PAGED_CODE(); + + IoStatus->Information = 0; + NodeType = NpDecodeFileObject(FileObject, NULL, &Ccb, &ServerSide); + + if (!NodeType) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + return TRUE; + } + + if ( NodeType != NPFS_NTC_CCB ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + return TRUE; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + //ms_exc.registration.TryLevel = 0; + + if ( Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE || Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE ) + { + IoStatus->Status = Ccb->NamedPipeState != FILE_PIPE_DISCONNECTED_STATE ? STATUS_PIPE_LISTENING : STATUS_PIPE_DISCONNECTED; + ReadOk = TRUE; + goto Quickie; + } + + ASSERT((Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE) || (Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE)); + + NamedPipeConfiguation = Ccb->Fcb->NamedPipeConfiguration; + + if ((ServerSide == 1 && NamedPipeConfiguation == FILE_PIPE_OUTBOUND) || + (ServerSide == 0 && NamedPipeConfiguation == FILE_PIPE_INBOUND) ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + ReadOk = TRUE; + goto Quickie; + } + + if ( ServerSide == 1 ) + { + Queue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + } + else + { + Queue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + } + + if ( Queue->QueueState == WriteEntries ) + { + *IoStatus = NpReadDataQueue(Queue, + FALSE, + FALSE, + Buffer, + BufferSize, + ServerSide ? Ccb->ServerReadMode : Ccb->ClientReadMode, + Ccb, + List); + if (!NT_SUCCESS(IoStatus->Status)) + { + ReadOk = TRUE; + goto Quickie; + } + + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ( Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE ) + { + IoStatus->Status = STATUS_PIPE_BROKEN; + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ((ServerSide ? Ccb->ServerCompletionMode : Ccb->ServerCompletionMode) == FILE_PIPE_COMPLETE_OPERATION) + { + IoStatus->Status = STATUS_PIPE_EMPTY; + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ( Irp ) + { + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + Queue, + 0, + 0, + BufferSize, + Irp, + 0, + 0); + IoStatus->Status = Status; + if (!NT_SUCCESS(Status)) + { + ReadOk = FALSE; + goto Quickie; + } + + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + ReadOk = FALSE; +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return ReadOk; +} + +NTSTATUS +NTAPI +NpFsdRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + IO_STATUS_BLOCK IoStatus; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + NpSlowReadCalls++; + + InitializeListHead(&List); + IoStack = IoGetCurrentIrpStackLocation(Irp); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + NpCommonRead(IoStack->FileObject, + Irp->UserBuffer, + IoStack->Parameters.Read.Length, + &IoStatus, + Irp, + &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( IoStatus.Status != STATUS_PENDING ) + { + Irp->IoStatus.Information = IoStatus.Information; + Irp->IoStatus.Status = IoStatus.Status; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return IoStatus.Status; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/read.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/readsup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/readsup.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -0,0 +1,138 @@ +#include "npfs.h" + +IO_STATUS_BLOCK +NTAPI +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Peek, + IN BOOLEAN ReadOverflowOperation, + IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG Mode, + IN PNP_CCB Ccb, + IN PLIST_ENTRY List) +{ + PNP_DATA_QUEUE_ENTRY DataEntry, TempDataEntry; + PVOID DataBuffer; + ULONG DataSize, DataLength, TotalBytesCopied, RemainingSize, Offset; + PIRP Irp; + IO_STATUS_BLOCK Status; + BOOLEAN CompleteWrites = FALSE; + PAGED_CODE(); + + if ( ReadOverflowOperation ) Peek = TRUE; + + RemainingSize = BufferSize; + Status.Status = 0; + TotalBytesCopied = 0; + + if ( Peek ) + { + DataEntry = CONTAINING_RECORD(DataQueue->Queue.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + } + else + { + DataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + } + + while (&DataEntry->QueueEntry != &DataQueue->Queue && RemainingSize ) + { + if ( !Peek || (DataEntry->DataEntryType == Buffered || DataEntry->DataEntryType == Unbuffered )) + { + if ( DataEntry->DataEntryType == Unbuffered ) + { + DataBuffer = DataEntry->Irp->AssociatedIrp.SystemBuffer; + } + else + { + DataBuffer = &DataEntry[1]; + } + DataSize = DataEntry->DataSize; + Offset = DataSize; + + if (&DataEntry->QueueEntry == DataQueue->Queue.Flink) + { + Offset = DataSize - DataQueue->ByteOffset; + } + + DataLength = Offset; + if ( Offset >= RemainingSize ) DataLength = RemainingSize; + + _SEH2_TRY + { + RtlCopyMemory((PVOID)((ULONG_PTR)Buffer + BufferSize - RemainingSize), + (PVOID)((ULONG_PTR)DataBuffer + DataSize - Offset), + DataLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + + + RemainingSize -= DataLength; + Offset -= DataLength; + TotalBytesCopied += DataLength; + if ( !Peek ) + { + DataEntry->QuotaInEntry -= DataLength; + DataQueue->QuotaUsed -= DataLength; + DataQueue->ByteOffset += DataLength; + CompleteWrites = TRUE;; + } + + NpCopyClientContext(Ccb, DataEntry); + + if ( Offset || (ReadOverflowOperation && !TotalBytesCopied )) + { + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + Status.Status = STATUS_BUFFER_OVERFLOW; + break; + } + } + else + { + if ( !Peek || ReadOverflowOperation ) + { + if ( ReadOverflowOperation) + { + TempDataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + ASSERT(TempDataEntry == DataEntry); + } + + Irp = NpRemoveDataQueueEntry(DataQueue, TRUE, List); + if ( Irp ) + { + Irp->IoStatus.Information = DataSize; + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + Status.Status = STATUS_SUCCESS; + break; + } + ASSERT(!ReadOverflowOperation); + } + } + if ( Peek ) + { + DataEntry = CONTAINING_RECORD(DataEntry->QueueEntry.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + } + else + { + DataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + } + } + + Status.Information = TotalBytesCopied; + if ( CompleteWrites ) NpCompleteStalledWrites(DataQueue, List); + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/readsup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -1,25 +1,45 @@ #include "npfs.h" + +VOID +NTAPI +NpFreeClientSecurityContext(IN PSECURITY_CLIENT_CONTEXT ClientContext) +{ + TOKEN_TYPE TokenType; + PVOID ClientToken; + + if (!ClientContext) return; + + TokenType = SeTokenType(ClientContext->ClientToken); + ClientToken = ClientContext->ClientToken; + if ((TokenType == TokenPrimary) || (ClientToken)) + { + ObfDereferenceObject(ClientToken); + } + ExFreePool(ClientContext); +} + +VOID +NTAPI +NpCopyClientContext(IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE_ENTRY DataQueueEntry) +{ + PAGED_CODE(); + + if (!DataQueueEntry->ClientSecurityContext) return; + + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = DataQueueEntry->ClientSecurityContext; + DataQueueEntry->ClientSecurityContext = NULL; +} VOID NTAPI NpUninitializeSecurity(IN PNP_CCB Ccb) { - PACCESS_TOKEN ClientToken; - PSECURITY_CLIENT_CONTEXT ClientContext; - TOKEN_TYPE TokenType; PAGED_CODE(); - ClientContext = Ccb->ClientContext; - if (!ClientContext) return; - - TokenType = SeTokenType(ClientContext->ClientToken); - ClientToken = Ccb->ClientContext->ClientToken; - if ((TokenType == TokenPrimary) || (ClientToken)) - { - ObfDereferenceObject(ClientToken); - } - ExFreePool(Ccb->ClientContext); - Ccb->ClientContext = 0; + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = NULL; } NTSTATUS @@ -63,3 +83,36 @@ Ccb->ClientContext = 0; return Status; } + +NTSTATUS +NTAPI +NpGetClientSecurityContext(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PETHREAD Thread, + IN PSECURITY_CLIENT_CONTEXT *Context) +{ + + PSECURITY_CLIENT_CONTEXT NewContext; + NTSTATUS Status; + PAGED_CODE(); + + if ( ServerSide || Ccb->ClientQos.ContextTrackingMode != 1 ) + { + NewContext = NULL; + Status = STATUS_SUCCESS; + } + else + { + NewContext = ExAllocatePoolWithQuotaTag(PagedPool, sizeof(*NewContext), 'sFpN'); + if ( !NewContext ) return STATUS_INSUFFICIENT_RESOURCES; + + Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, NewContext); + if (!NT_SUCCESS(Status)) + { + ExFreePool(NewContext); + NewContext = NULL; + } + } + *Context = NewContext; + return Status; +}

11 years

[dreimer] 59997: Update Rapps Database to most recent versions.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Sep 8 10:34:18 2013 New Revision: 59997 URL: http://svn.reactos.org/svn/reactos?rev=59997&view=rev Log: Update Rapps Database to most recent versions. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/npp.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/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt 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] Sun Sep 8 10:34:18 2013 @@ -2,7 +2,7 @@ [Section] Name = Abyss Web server X1 -Version = 2.9 +Version = 2.9.0.1 Licence = Freeware Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle. Size = 2.1MB Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Double Commander -Version = 0.5.5 +Version = 0.5.6 Beta Licence = GPL Description = Double Commander is an open source file manager with two panels side by side. You need 7-Zip or a similar Utility to extract it. Size = 7.5MB Category = 12 URLSite = http://doublecmd.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… +URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -1,78 +1,78 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 22 -Version = 22.0 +Name = Mozilla Firefox 23 +Version = 23.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 20.3MB +Size = 21.4MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/en-US/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/en-US/… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 20.17MB +Size = 21.21MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/de/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/de/Fir… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 20.13MB +Size = 21.17MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/es-ES/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/es-ES/… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 20,46 Mo +Size = 21,51 Mo URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/fr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/fr/Fir… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. -Size = 20.1MB +Size = 21.16MB URLSite = http://www.mozilla-europe.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/it/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/it/Fir… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -Size = 20.82MB +Size = 21.86MB URLSite = http://www.mozilla-europe.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/nl/Fir… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 20.18MB +Size = 21.21MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nb-NO/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/nb-NO/… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 21.03MB +Size = 22.08MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/pl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/pl/Fir… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. -Size = 20,65 Mo +Size = 21,69 Mo URLSite = http://www.mozilla-europe.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ro/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/ro/Fir… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 20.59MB +Size = 21.62MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ru/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/ru/Fir… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 20.84MB +Size = 21.89MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/sk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/sk/Fir… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 20.6MB +Size = 21.63MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/uk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/uk/Fir… 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = FreeBASIC -Version = 0.90.0 +Version = 0.90.1 Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = 7.3MB +Size = 7.4MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… +URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Compilateur BASIC open source. La syntaxe du BASIC est compatible avec le QBASIC. -Size = 7,3 Mo +Size = 7,4 Mo [Section.0410] Description = Compilatore BASIC open source. La sintassi del BASIC Ã¨ compatibile con il QBASIC. @@ -29,7 +29,7 @@ [Section.0419] Description = Compilator (open-source) BASIC. Sintaxa BASIC este compatibilÄ cu QBASIC. -Size = 7,3 Mo +Size = 7,4 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ BASIC. Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÐ¼ÑÑÐ½Ð¸Ð¹ Ð· QBASIC. 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] Sun Sep 8 10:34:18 2013 @@ -2,7 +2,7 @@ [Section] Name = IrfanView Plugins -Version = 4.35 +Version = 4.36 Licence = Freeware (for personal use) Description = Additional Plugins for supporting more file types. Size = 9.85MB Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Lazarus -Version = 1.0.10 +Version = 1.0.12 Licence = modified LGPL, GPL Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable. Size = 106MB Category = 7 URLSite = http://www.lazarus.freepascal.org/ -URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bit… +URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bit… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 4.0.4 +Version = 4.1.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 182.5MB +Size = 205.09MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.4/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.1.1/win/x86/Lib… CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 182,5 Mo +Size = 205,09 Mo [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,7 +32,7 @@ [Section.0418] Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. -Size = 182,5 Mo +Size = 205,09 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.10.14 +Version = 0.10.16 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 2.81MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.14-unicode.exe +URLDownload = http://files.miranda-im.org/stable/0.10.16.0/miranda-im-v0.10.16-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Notepad++ -Version = 6.4.1 +Version = 6.4.5 Licence = GPL Description = A text editor. Size = 7.1MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.4.1/npp.6.4.1.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.4.5/npp.6.4.5.Installer.exe CDPath = none [Section.0407] 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 1.3.1 +Version = 1.3.2 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. -Size = 4.9MB +Size = 6.75MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.3.1/openttd-1.3.1-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.3.2/openttd-1.3.2-windows-win32.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Clone open source du moteur de jeu "Transport Tycoon Deluxe". Vous aurez besoin d'une copie de Transport Tycoon. -Size = 4,9 Mo +Size = 6,75 Mo [Section.0410] Description = Clone open source del motore di gioco di "Transport Tycoon Deluxe". Hai bisogno di una copia di Transport Tycoon. @@ -32,7 +32,7 @@ [Section.0418] Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesarÄ o copie a jocului Transport Tycoon. -Size = 4,9 Mo +Size = 6,75 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ»Ð¾Ð½ Ð´Ð²Ð¸Ð³ÑÐ½Ð° Ð³ÑÐ¸ "Transport Tycoon Deluxe". ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð¿ÑÑ Ð³ÑÐ¸ 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 12.15 +Version = 12.16 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 12.56MB Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/1215/int/Opera_1215_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1216/int/Opera_1216_int_Setup.exe CDPath = none [Section.0405] 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = PuTTY -Version = 0.62 +Version = 0.63 Licence = MIT Description = A free SSH, Telnet, rlogin, and raw TCP client. -Size = 1.76MB +Size = 1.78MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.62-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.63-installer.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Un client SSH, Telnet, rlogin et raw TCP gratuit. -Size = 1,76 Mo +Size = 1,78 Mo [Section.0410] Description = Un client SSH, Telnet, rlogin, and raw TCP gratuito. @@ -32,7 +32,7 @@ [Section.0418] Description = Un client gratuit de SSH, Telnet, rlogin, and TCP brut. -Size = 1,76 Mo +Size = 1,78 Mo [Section.0422] Description = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ SSH, Telnet, rlogin ÑÐ° raw TCP ÐºÐ»ÑÑÐ½Ñ. 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.3.3 +Version = 3.3.5 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 702kB +Size = 716kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.3/Sc333.exe +URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.5/Sc335.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 702 ko +Size = 716 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -33,7 +33,7 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 702 ko +Size = 716 ko [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. 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] Sun Sep 8 10:34:18 2013 @@ -2,44 +2,44 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.17.1 +Version = 2.20 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 = 21.61MB +Size = 21.83MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/en-U… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/en-US/… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 21.56MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/de/S… +Size = 21.71MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/de/Sea… [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 = 21.51MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/es-E… +Size = 21.69MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/es-ES/… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. -Size = 21,8 Mo -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/fr/S… +Size = 21,97 Mo +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/fr/Sea… [Section.0410] Description = Mozilla Suite Ã¨ vivo. Questo Ã¨ l'unico e solo Browser, Mail, Chat, e Composer di cui avrete mai bisogno... -Size = 21.5MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/it/S… +Size = 21.62MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/it/Sea… [Section.0413] Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer. -Size = 22.1MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/nl/S… +Size = 22.31MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/nl/Sea… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 22.41MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/pl/S… +Size = 22.56MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/pl/Sea… [Section.0418] Description = Suita Mozilla. Acest pachet ce Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. @@ -47,10 +47,10 @@ [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 22.03MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/ru/S… +Size = 22.17MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/ru/Sea… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 22.03MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/ru/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/ru/Sea… 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = SMPlayer -Version = 0.8.5 +Version = 0.8.6 Licence = GPL Description = Graphical Frontend for MPlayer. -Size = 16.09MB +Size = 16.98MB Category = 1 URLSite = http://smplayer.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.8.5/smplayer-0… +URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.8.6/smplayer-0… CDPath = none [Section.0407] @@ -20,7 +20,7 @@ Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia). [Section.040c] -Size = 16,09 Mo +Size = 16,98 Mo URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=fr [Section.0410] @@ -36,7 +36,7 @@ [Section.0418] Description = Lector multimedia (interfaÈÄ pentru MPlayer). -Size = 16,09 Mo +Size = 16,98 Mo URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=ro [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,65 +2,65 @@ [Section] Name = Mozilla Thunderbird 17 -Version = 17.0.7 +Version = 17.0.8 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 18.91MB Category = 5 URLSite = http://www.mozilla.org/en/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/en… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 18.77MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/de… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 18.73MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/es… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 19,06 Mo URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/fr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/fr… [Section.0410] Description = Il piÃ¹ popolare e il migliore Clients mail gratuito. Size = 18.7MB URLSite = http://www.mozilla-europe.org/it/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/it… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/it… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 19.28MB URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/nl… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 19.62MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/pl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 19,28 Mo URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ro… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 19.19MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ru… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 19.21MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/uk… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/uk… 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] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 2.0.7 +Version = 2.0.8 Licence = GPL Description = A media player. -Size = 21.88MB +Size = 21.94MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.0.7/win32/vlc-2.0.7-win32.exe +URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.0.8/win32/vlc-2.0.8-win32.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Un lecteur media. -Size = 21,88 Mo +Size = 21,94 Mo [Section.0410] Description = Lettore multimediale. @@ -32,7 +32,7 @@ [Section.0418] Description = Lector multimedia. -Size = 21,88 Mo +Size = 21,94 Mo [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ.

11 years

← Newer
1
...
46
47
48
49
50
51
52
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013