Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 35047: Reorganize shdocvw: - Moved and renamed language resource files into created 'lang' directory. - Outdated shdocvw_ros.diff removed.
by mkupfer＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: mkupfer Date: Sat Aug 2 16:57:53 2008 New Revision: 35047 URL: http://svn.reactos.org/svn/reactos?rev=35047&view=rev Log: Reorganize shdocvw: - Moved and renamed language resource files into created 'lang' directory. - Outdated shdocvw_ros.diff removed. Added: trunk/reactos/dll/win32/shdocvw/lang/ trunk/reactos/dll/win32/shdocvw/lang/bg-BG.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/lang/cz-CZ.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Cs.rc trunk/reactos/dll/win32/shdocvw/lang/de-DE.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/lang/en-US.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/lang/es-ES.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/lang/fi-FI.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/lang/fr-FR.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/lang/hu-HU.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/lang/ja-JP.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ja.rc trunk/reactos/dll/win32/shdocvw/lang/ko-KO.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/lang/nl-NL.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/lang/no-NO.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/lang/pl-PL.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/lang/pt-PT.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/lang/ru-RU.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/lang/sk-SK.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/lang/sv-SE.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/lang/uk-UA.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Uk.rc Removed: trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/Cs.rc trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/Ja.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc Removed: trunk/reactos/dll/win32/shdocvw/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Bg.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Bg.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ñâàëÿíå íà ActiveX äæàäæàòà çà Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Îòêàç", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ïðèëîæåíèåòî èçèñêâà ActiveX îáåêò íà îáçîðíèêà\n" \ - "íî äæàäæàòà Mozilla Active X íå å ñëîæåíà.\n" \ - "Èñêàòå ëè äà ÿ ñâàëèòå è äà ÿ ñëîæèòå?" -END Removed: trunk/reactos/dll/win32/shdocvw/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Cs.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Cs.rc (removed) @@ -1,23 +1,0 @@ -/* FILE: dll/win32/shdocvw/Cs.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-06-27 - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Stahuji objekt Mozilla ActiveX" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Storno", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Tato aplikace poaduje objekt prohlíeèe ActiveX,\n" \ - "ale objekt Mozilla ActiveX momentálnì není nainstalovaný.\n" \ - "Stáhnout a nainstalovat jej?" -END Removed: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/De.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Henning Gerhardt - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Lade die Mozilla Active X Steuerung" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Abbrechen", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Diese Anwendung fordert ein ActiveX Browser Objekt an,\n" \ - "aber die Mozilla Active X Steuerung ist nicht installiert.\n" \ - "Möchten Sie, dass es aus dem Internet geladen und installiert wird ?" -END Removed: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/En.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Downloading the Mozilla Active X control" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "This application is requesting an ActiveX browser object\n" \ - "but the Mozilla Active X control is currently not installed.\n" \ - "Do you wish to download and install it?" -END Removed: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Es.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 José Manuel Ferrer Ortiz - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Descargando el control Active X de Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Esta aplicación está solicitando un objeto Active X de navegador\n" \ - "pero el control Active X de Mozilla no está instalado actualmente.\n" \ - "¿Desea descargarlo e instalarlo?" -END Removed: trunk/reactos/dll/win32/shdocvw/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fi.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Fi.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Kimmo Myllyvirta - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ladataan Mozilla Active X -komponenttia" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Peruuta", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Tämä sovellus vaatii ActiveX selainkomponentin,\n" \ - "mutta Mozilla Active X -komponenttia ei ole vielä asennettu.\n" \ - "Haluatko ladata ja asentaa sen?" -END Removed: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Fr.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Jonathan Ernst - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Téléchargement du contrôle ActiveX de Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annuler", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Cette application requiert un object navigateur ActiveX\n" \ - "mais le contrôle Active X de Mozilla n'est pas installé.\n" \ - "Souhaitez-vous le télécharger et l'installer ?" -END Removed: trunk/reactos/dll/win32/shdocvw/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Hu.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Hu.rc (removed) @@ -1,37 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * Copyright 2005 Risko Gergely - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "A Mozilla Active X vezérlõ letöltése" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Mégse", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ez az alkalmazás ActiveX támogatást igényel, de nincs \n" \ - "feltelepítve a Mozilla Active X vezérlõ.\n" \ - "Szeretnéd letölteni és telepíteni?" -END Removed: trunk/reactos/dll/win32/shdocvw/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ja.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ja.rc (removed) @@ -1,18 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mozilla ActiveX Control Ì_E[h" -FONT 9, "MS UI Gothic" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "LZ", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "±ÌAvP[VÍ ActiveX browser object ðvµÄ¢Ü·\n" \ - "ªAMozilla ActiveX control Í»ÝCXg[³êÄ¢Ü¹ñB\n" \ - "Mozilla ActiveX Control ð_E[hµACXg[µÜ·©H" -END Removed: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ko.rc (removed) @@ -1,22 +1,0 @@ -/* - *Korean Translation by manatails007(www.manatails007.org) Seungju Kim - */ - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mozilla ActiveX ÄÁÆ®·Ñ ´Ù¿î·Îµå Áß" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "ÀÌ ÇÁ·Î±×·¥Àº Mozilla ActiveX ºê¶ó¿ìÀú °´Ã¼¸¦ ¿ä±¸ÇÕ´Ï´Ù.\n" \ - "±×·¯³ª Mozilla ActiveX ÄÁÆ®·ÑÀÌ ÇöÀç ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù.\n" \ - "´Ù¿î·ÎµåÇØ¼ ¼³Ä¡ÇÏ½Ã°Ú½À´Ï±î?" -END Removed: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Nl.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Hans Leidekker - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "De Mozilla ActiveX control wordt gedownload" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annuleren", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Deze applicatie heeft een ActiveX browserobject nodig\n" \ - "maar de Mozilla ActiveX control is niet geïnstalleerd.\n" \ - "Wilt u deze downloaden en installeren?" -END Removed: trunk/reactos/dll/win32/shdocvw/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/No.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Last ned Mozilla Active X-kontrolleren" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Dette programmet ber om et Active X-nettleserobjekt,\n" \ - "men Mozilla Active X-kontrolleren er ikke installert.\n" \ - "Vil du laste den ned og installere den?" -END Removed: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Pl.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Sebastian Gasiorek - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Pobierz kontrolkê ActiveX Mozilli" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Anuluj", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ta aplikacja wywo³uje obiekt ActiveX przegl¹darki,\n" \ - "ale kontrolka Mozilla Active X nie jest zainstalowana.\n" \ - "Czy chcesz j¹ pobraæ i zainstalowaæ?" -END Removed: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Pt.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Marcelo Duarte - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Baixando o controle Mozilla ActiveX" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Esta aplicação requer um objecto ActiveX do navegador\n" \ - "mas o controle Mozilla ActiveX atualmente não está instalado.\n" \ - "Você deseja baixá-lo e instalá-lo?" -END Removed: trunk/reactos/dll/win32/shdocvw/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ru.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ru.rc (removed) @@ -1,38 +1,0 @@ -/* - * Copyright 2005 Mikhail Y. Zvyozdochkin - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Çàãðóçêà ýëåìåíòà óïðàâëåíèÿ Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ïðèëîæåíèå çàïðàøèâàåò ActiveX-îáúåêò îáîçðåâàòåëÿ,\n" \ - "îäíàêî ýëåìåíò óïðàâëåíèÿ Mozilla ActiveX íåóñòàíîâëåí.\n" \ - "Õîòèòå çàãðóçèòü è óñòàíîâèòü åãî?" -END - - Removed: trunk/reactos/dll/win32/shdocvw/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Sk.rc (removed) @@ -1,22 +1,0 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 15-02-2008 - */ - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sahujem ovládanie Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Zrui", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Táto aplikácia sa doaduje prehliadania objektu ActiveX\n" \ - "ale ovládanie Mozilla Active X nie je v súèasnosti naintalované.\n" \ - "eláte si ho stiahnu a naintalova?" -END Removed: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Sv.rc (removed) @@ -1,34 +1,0 @@ -/* - * Copyright 2005 Anders Bergh - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Laddar ner Mozilla ActiveX-komponent" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Programmet kräver en ActiveX-komponent som inte är tillgänglig.\nVill du ladda ner och installera Mozillas ActiveX-komponent?" -END Removed: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Uk.rc (removed) @@ -1,26 +1,0 @@ -/* - * PROJECT: Shell Doc Object and Control Library - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shdocvw/Uk.rc - * PURPOSE: Ukraianian Language File for shdocvw - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Çàâàíòàæåííÿ åëåìåíòó óïðàâë³ííÿ Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Öåé äîäàòîê ïîòðåáóº îá'ºêò ActiveX îãëÿäà÷à,\n" \ - "àëå åëåìåíò óïðàâë³ííÿ Mozilla Active X íå âñòàíîâëåíèé.\n" \ - "Âè áàæàºòå çàâàíòàæèòè ³ âñòàíîâèòè éîãî??" -END Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] Sat Aug 2 16:57:53 2008 @@ -23,21 +23,21 @@ #include "version.rc" -#include "Bg.rc" -#include "Cs.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Sk.rc" -#include "Sv.rc" -#include "Uk.rc" +#include "lang/bg-BG.rc" +#include "lang/cz-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fi-FI.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/ko-KO.rc" +#include "lang/nl-NL.rc" +#include "lang/no-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/pt-PT.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Removed: trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff (removed) @@ -1,46 +1,0 @@ -Index: shdocvw.rc -=================================================================== ---- shdocvw.rc (revision 25694) -+++ shdocvw.rc (revision 25695) -@@ -38,3 +38,4 @@ - #include "Pt.rc" - #include "Ru.rc" - #include "Sv.rc" -+#include "Uk.rc" -Index: Uk.rc -=================================================================== ---- Uk.rc (revision 25695) -+++ Uk.rc (working copy) -@@ -0,0 +1,26 @@ -+/* -+ * PROJECT: Shell Doc Object and Control Library -+ * LICENSE: GPL - See COPYING in the top level directory -+ * FILE: dll/win32/shdocvw/Uk.rc -+ * PURPOSE: Ukraianian Language File for shdocvw -+ * TRANSLATOR: Artem Reznikov -+ */ -+ -+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -+ -+100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -+CAPTION "Çàâàíòàæåííÿ åëåìåíòó óïðàâë³ííÿ Mozilla Active X" -+FONT 8, "MS Shell Dlg" -+{ -+ CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 -+ LTEXT "", 104, 10, 30, 200, 10, SS_CENTER -+ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -+} -+ -+STRINGTABLE -+BEGIN -+ 1001 "Öåé äîäàòîê ïîòðåáóº îá'ºêò ActiveX îãëÿäà÷à,\n" \ -+ "àëå åëåìåíò óïðàâë³ííÿ Mozilla Active X íå âñòàíîâëåíèé." \ -+ "Âè áàæàºòå çàâàíòàæèòè ³ âñòàíîâèòè éîãî??" -+END - -Property changes on: Uk.rc -___________________________________________________________________ -Name: svn:eol-style - + native -

1 0

[cgutman] 35046: - Set Irp->IoStatus.Information to 0 - Set Irp->IoStatus.Status before returning
by cgutman＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cgutman Date: Sat Aug 2 15:53:32 2008 New Revision: 35046 URL: http://svn.reactos.org/svn/reactos?rev=35046&view=rev Log: - Set Irp->IoStatus.Information to 0 - Set Irp->IoStatus.Status before returning Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 2 15:53:32 2008 @@ -313,6 +313,8 @@ ASSERT(FileObject == IrpSp->FileObject); } + Irp->IoStatus.Information = 0; + switch(IrpSp->MajorFunction) { /* opening and closing handles to the device */ @@ -457,7 +459,6 @@ default: Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; AFD_DbgPrint(MIN_TRACE, ("Unknown IOCTL (0x%x)\n", IrpSp->Parameters.DeviceIoControl. IoControlCode)); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 2 15:53:32 2008 @@ -262,6 +262,8 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + Irp->IoStatus.Status = Status; + return Status; }

1 0

[jmorlan] 35045: NtGdiGetRegionData: Use correct address of region header (&obj->rdh, not obj). Also, for the contents, just use 'rgndata->Buffer' as the destination address instead of doing funky pointer arithmetic.
by jmorlan＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: jmorlan Date: Sat Aug 2 15:07:59 2008 New Revision: 35045 URL: http://svn.reactos.org/svn/reactos?rev=35045&view=rev Log: NtGdiGetRegionData: Use correct address of region header (&obj->rdh, not obj). Also, for the contents, just use 'rgndata->Buffer' as the destination address instead of doing funky pointer arithmetic. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sat Aug 2 15:07:59 2008 @@ -3174,12 +3174,8 @@ _SEH_TRY { ProbeForWrite(rgndata, count, 1); - RtlCopyMemory(rgndata, - obj, - sizeof(RGNDATAHEADER)); - RtlCopyMemory((PVOID)((ULONG_PTR)rgndata + (ULONG_PTR)sizeof(RGNDATAHEADER)), - obj->Buffer, - size); + RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); + RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); } _SEH_HANDLE {

1 0

[pschweitzer] 35044: Revert r35043 on shell32/fprop.c
by pschweitzer＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: pschweitzer Date: Sat Aug 2 13:35:08 2008 New Revision: 35044 URL: http://svn.reactos.org/svn/reactos?rev=35044&view=rev Log: Revert r35043 on shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Aug 2 13:35:08 2008 @@ -349,10 +349,10 @@ return FALSE; } CloseHandle(hFile); - if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr)/sizeof(resultstr[0]))); + if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr) / sizeof(WCHAR))) return FALSE; hDlgCtrl = GetDlgItem(hwndDlg, 14011); - ERR("result size %u resultstr %s %s\n", file_size.QuadPart, debugstr_w(resultstr), resultstr); + TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); if (lpfilesize)

1 0

[pschweitzer] 35043: Synced dbghelp.dll with Wine HEAD.
by pschweitzer＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: pschweitzer Date: Sat Aug 2 13:30:38 2008 New Revision: 35043 URL: http://svn.reactos.org/svn/reactos?rev=35043&view=rev Log: Synced dbghelp.dll with Wine HEAD. Removed: trunk/reactos/dll/win32/dbghelp/Makefile.in trunk/reactos/dll/win32/dbghelp/dbghelp.def trunk/reactos/dll/win32/dbghelp/dbghelp.rc trunk/reactos/dll/win32/dbghelp/stackframe.h trunk/reactos/dll/win32/dbghelp/stubs.c trunk/reactos/dll/win32/dbghelp/thread.h Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/dwarf.h trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/reactos/wine/mscvpdb.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/dbghelp/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/Makefile… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Removed: trunk/reactos/dll/win32/dbghelp/dbghelp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Removed: trunk/reactos/dll/win32/dbghelp/dbghelp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Removed: trunk/reactos/dll/win32/dbghelp/stackframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stackfra… Removed: trunk/reactos/dll/win32/dbghelp/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stubs.c?… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Removed: trunk/reactos/dll/win32/dbghelp/thread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/thread.h… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… Modified: trunk/reactos/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[sginsberg] 35042: - ExpLookupHandleTableEntry: Apply same changes as was done for ExpFreeHandleTable and ExpAllocateHandleTableEntrySlow in 34467 - ExpAllocateHandleTableEntry: Fail if we don't find a handle table entry
by sginsberg＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: sginsberg Date: Sat Aug 2 13:25:53 2008 New Revision: 35042 URL: http://svn.reactos.org/svn/reactos?rev=35042&view=rev Log: - ExpLookupHandleTableEntry: Apply same changes as was done for ExpFreeHandleTable and ExpAllocateHandleTableEntrySlow in 34467 - ExpAllocateHandleTableEntry: Fail if we don't find a handle table entry Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Sat Aug 2 13:25:53 2008 @@ -35,8 +35,10 @@ ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable, IN EXHANDLE LookupHandle) { - ULONG i, j, k, TableLevel, NextHandle; - ULONG_PTR TableBase; + ULONG i, j, k, NextHandle; + ULONG_PTR TableCode = HandleTable->TableCode; + ULONG_PTR TableBase = TableCode & ~3; + ULONG TableLevel = (ULONG)(TableCode & 3); PHANDLE_TABLE_ENTRY Entry = NULL; EXHANDLE Handle = LookupHandle; PUCHAR Level1, Level2, Level3; @@ -45,13 +47,6 @@ Handle.TagBits = 0; NextHandle = *(volatile ULONG*)&HandleTable->NextHandleNeedingPool; if (Handle.Value >= NextHandle) return NULL; - - /* Get the table code */ - TableBase = *(volatile ULONG_PTR*)&HandleTable->TableCode; - - /* Extract the table level and actual table base */ - TableLevel = (ULONG)(TableBase & 3); - TableBase = TableBase - TableLevel; /* Check what level we're running at */ switch (TableLevel) @@ -210,8 +205,8 @@ PEPROCESS Process = HandleTable->QuotaProcess; ULONG i, j; ULONG_PTR TableCode = HandleTable->TableCode; - ULONG TableLevel = TableCode & 3; ULONG_PTR TableBase = TableCode & ~3; + ULONG TableLevel = (ULONG)(TableCode & 3); PHANDLE_TABLE_ENTRY Level1, *Level2, **Level3; PAGED_CODE(); @@ -733,6 +728,13 @@ /* Lookup the entry for this handle */ Entry = ExpLookupHandleTableEntry(HandleTable, Handle); + + /* Make sure that we found an entry */ + if (!Entry) + { + /* We didn't, fail */ + return NULL; + } /* Get an available lock and acquire it */ i = ((OldValue & FREE_HANDLE_MASK) >> 2) % 4;

1 0

[jmorlan] 35041: - Implement GenerateConsoleCtrlEvent. - Remove IgnoreCtrlEvents variable (which ConsoleControlDispatcher did not actually use); set ProcessParameters->ConsoleFlags instead. Despite the name "ConsoleFlags", SetConsoleCtrlHandler treats it like a boolean. - Preserve all 16 bits of the attribute set by SetConsoleTextAttribute. Even though the upper byte does not affect text colors, it should be retrievable with GetConsoleScreenBufferInfo. - Update OpenConsoleW prototype in kernel32
by jmorlan＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: jmorlan Date: Sat Aug 2 12:01:22 2008 New Revision: 35041 URL: http://svn.reactos.org/svn/reactos?rev=35041&view=rev Log: - Implement GenerateConsoleCtrlEvent. - Remove IgnoreCtrlEvents variable (which ConsoleControlDispatcher did not actually use); set ProcessParameters->ConsoleFlags instead. Despite the name "ConsoleFlags", SetConsoleCtrlHandler treats it like a boolean. - Preserve all 16 bits of the attribute set by SetConsoleTextAttribute. Even though the upper byte does not affect text colors, it should be retrievable with GetConsoleScreenBufferInfo. - Update OpenConsoleW prototype in kernel32.h to match the change made in r34694. Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -69,7 +69,7 @@ HANDLE STDCALL OpenConsoleW (LPCWSTR wsName, DWORD dwDesiredAccess, BOOL bInheritHandle, - DWORD dwCreationDistribution); + DWORD dwShareMode); PTEB GetTeb(VOID); Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -26,8 +26,6 @@ extern BOOL WINAPI IsDebuggerPresent(VOID); /* GLOBALS *******************************************************************/ - -static BOOL IgnoreCtrlEvents = FALSE; static PHANDLER_ROUTINE* CtrlHandlers = NULL; static ULONG NrCtrlHandlers = 0; @@ -3141,7 +3139,7 @@ CsrRequest = MAKE_CSR_API(SET_ATTRIB, CSR_CONSOLE); Request.Data.SetAttribRequest.ConsoleHandle = hConsoleOutput; - Request.Data.SetAttribRequest.Attrib = (CHAR)wAttributes; + Request.Data.SetAttribRequest.Attrib = wAttributes; Status = CsrClientCallServer( &Request, NULL, CsrRequest, sizeof( CSR_API_MESSAGE ) ); if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Request.Status ) ) { @@ -3157,7 +3155,7 @@ { if (HandlerRoutine == NULL) { - IgnoreCtrlEvents = TRUE; + NtCurrentPeb()->ProcessParameters->ConsoleFlags = TRUE; return(TRUE); } else @@ -3193,7 +3191,7 @@ if (HandlerRoutine == NULL) { - IgnoreCtrlEvents = FALSE; + NtCurrentPeb()->ProcessParameters->ConsoleFlags = FALSE; return(TRUE); } else @@ -3245,7 +3243,7 @@ /*-------------------------------------------------------------- * GenerateConsoleCtrlEvent * - * @unimplemented + * @implemented */ BOOL WINAPI GenerateConsoleCtrlEvent( @@ -3253,9 +3251,30 @@ DWORD dwProcessGroupId ) { - DPRINT1("GenerateConsoleCtrlEvent(0x%x, 0x%x) UNIMPLEMENTED!\n", dwCtrlEvent, dwProcessGroupId); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + CSR_API_MESSAGE Request; + ULONG CsrRequest; + NTSTATUS Status; + + if (dwCtrlEvent != CTRL_C_EVENT && dwCtrlEvent != CTRL_BREAK_EVENT) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + CsrRequest = MAKE_CSR_API(GENERATE_CTRL_EVENT, CSR_CONSOLE); + Request.Data.GenerateCtrlEvent.Event = dwCtrlEvent; + Request.Data.GenerateCtrlEvent.ProcessGroup = dwProcessGroupId; + Status = CsrClientCallServer(&Request, + NULL, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request.Status))) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -163,7 +163,7 @@ typedef struct { HANDLE ConsoleHandle; - CHAR Attrib; + WORD Attrib; } CSRSS_SET_ATTRIB, *PCSRSS_SET_ATTRIB; typedef struct @@ -459,6 +459,12 @@ { DWORD Length; } CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH; + +typedef struct +{ + DWORD Event; + DWORD ProcessGroup; +} CSRSS_GENERATE_CTRL_EVENT, *PCSRSS_GENERATE_CTRL_EVENT; @@ -537,6 +543,7 @@ #define GET_ALL_CONSOLE_ALIASES_LENGTH (0x3B) #define GET_CONSOLE_ALIASES_EXES (0x3C) #define GET_CONSOLE_ALIASES_EXES_LENGTH (0x3D) +#define GENERATE_CTRL_EVENT (0x3E) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -608,6 +615,7 @@ CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH GetAllConsoleAliasesLength; CSRSS_GET_CONSOLE_ALIASES_EXES GetConsoleAliasesExes; CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH GetConsoleAliasesExesLength; + CSRSS_GENERATE_CTRL_EVENT GenerateCtrlEvent; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -242,6 +242,15 @@ } } + if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) + { + NewProcessData->ProcessGroup = (DWORD)NewProcessData->ProcessId; + } + else + { + NewProcessData->ProcessGroup = ProcessData->ProcessGroup; + } + /* Set default shutdown parameters */ NewProcessData->ShutdownLevel = 0x280; NewProcessData->ShutdownFlags = 0; Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -48,6 +48,7 @@ ULONG HandleTableSize; PCSRSS_HANDLE HandleTable; HANDLE ProcessId; + DWORD ProcessGroup; HANDLE Process; ULONG ShutdownLevel; ULONG ShutdownFlags; Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -41,7 +41,7 @@ USHORT ShowX, ShowY; /* beginning offset for the actual display area */ ULONG CurrentX; /* Current X cursor position */ ULONG CurrentY; /* Current Y cursor position */ - BYTE DefaultAttrib; /* default char attribute */ + WORD DefaultAttrib; /* default char attribute */ USHORT VirtualY; /* top row of buffer being displayed, reported to callers */ CONSOLE_CURSOR_INFO CursorInfo; USHORT Mode; @@ -135,6 +135,7 @@ CSR_API(CsrGetConsoleOutputCodePage); CSR_API(CsrSetConsoleOutputCodePage); CSR_API(CsrGetProcessList); +CSR_API(CsrGenerateCtrlEvent); #define ConioInitScreenBuffer(Console, Buff) (Console)->Vtbl->InitScreenBuffer((Console), (Buff)) #define ConioDrawRegion(Console, Region) (Console)->Vtbl->DrawRegion((Console), (Region)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -3129,4 +3129,40 @@ return Request->Status = STATUS_SUCCESS; } +CSR_API(CsrGenerateCtrlEvent) +{ + PCSRSS_CONSOLE Console; + PCSRSS_PROCESS_DATA current; + PLIST_ENTRY current_entry; + DWORD Group; + NTSTATUS Status; + + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + + Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (! NT_SUCCESS(Status)) + { + return Request->Status = Status; + } + + Group = Request->Data.GenerateCtrlEvent.ProcessGroup; + Status = STATUS_INVALID_PARAMETER; + for (current_entry = Console->ProcessList.Flink; + current_entry != &Console->ProcessList; + current_entry = current_entry->Flink) + { + current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + if (Group == 0 || current->ProcessGroup == Group) + { + ConioConsoleCtrlEvent(Request->Data.GenerateCtrlEvent.Event, current); + Status = STATUS_SUCCESS; + } + } + + ConioUnlockConsole(Console); + + return Request->Status = Status; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Aug 2 12:01:22 2008 @@ -74,6 +74,7 @@ CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), + CSRSS_DEFINE_API(GENERATE_CTRL_EVENT, CsrGenerateCtrlEvent), { 0, 0, NULL } };

1 0

[hpoussin] 35040: Add lots of missing functions to LSA RPC interface Fix existing ones to have same prototypes as MS Windows
by hpoussin＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: hpoussin Date: Sat Aug 2 10:45:59 2008 New Revision: 35040 URL: http://svn.reactos.org/svn/reactos?rev=35040&view=rev Log: Add lots of missing functions to LSA RPC interface Fix existing ones to have same prototypes as MS Windows Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Aug 2 10:45:59 2008 @@ -93,7 +93,7 @@ LSAHandleBind(); return LsarClose(LSABindingHandle, - (unsigned long)ObjectHandle); + (unsigned long *)&ObjectHandle); } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Aug 2 10:45:59 2008 @@ -8,8 +8,7 @@ #include "lsa_s.h" -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> #define POLICY_DELETE (RTL_HANDLE_VALID << 1) typedef struct _LSAR_POLICY_HANDLE @@ -22,10 +21,12 @@ static RTL_CRITICAL_SECTION PolicyHandleTableLock; static RTL_HANDLE_TABLE PolicyHandleTable; +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + /* FUNCTIONS ***************************************************************/ -static NTSTATUS -ReferencePolicyHandle(IN LSA_HANDLE ObjectHandle, +/*static*/ NTSTATUS +ReferencePolicyHandle(IN LSAPR_HANDLE ObjectHandle, IN ACCESS_MASK DesiredAccess, OUT PLSAR_POLICY_HANDLE *Policy) { @@ -56,7 +57,7 @@ return Status; } -static VOID +/*static*/ VOID DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, IN BOOLEAN Delete) { @@ -90,7 +91,7 @@ sizeof(LSAR_POLICY_HANDLE), &PolicyHandleTable); - DPRINT("LsarStartRpcServer() called"); + TRACE("LsarStartRpcServer() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -98,7 +99,7 @@ NULL); if (Status != RPC_S_OK) { - DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); return; } @@ -107,31 +108,33 @@ NULL); if (Status != RPC_S_OK) { - DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); return; } Status = RpcServerListen(1, 20, TRUE); if (Status != RPC_S_OK) { - DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + WARN("RpcServerListen() failed (Status %lx)\n", Status); return; } - DPRINT("LsarStartRpcServer() done\n"); -} + TRACE("LsarStartRpcServer() done\n"); +} + /* Function 0 */ -NTSTATUS -LsarClose(IN handle_t BindingHandle, - IN unsigned long ObjectHandle) -{ +NTSTATUS LsarClose( + handle_t hBinding, + LSAPR_HANDLE *ObjectHandle) +{ +#if 0 PLSAR_POLICY_HANDLE Policy = NULL; NTSTATUS Status; - DPRINT("LsarClose(0x%p) called!\n", ObjectHandle); - - Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle, + TRACE("0x%p\n", ObjectHandle); + + Status = ReferencePolicyHandle(*ObjectHandle, 0, &Policy); if (NT_SUCCESS(Status)) @@ -142,15 +145,974 @@ } return Status; -} +#endif + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* Function 1 */ -NTSTATUS -LsarDelete(IN handle_t BindingHandle, - IN unsigned long ObjectHandle) -{ - DPRINT1("LsarDelete(0x%p) UNIMPLEMENTED!\n", ObjectHandle); - return STATUS_ACCESS_DENIED; -} +NTSTATUS LsarDelete( + handle_t hBinding, + LSAPR_HANDLE ObjectHandle) +{ + /* Deprecated */ + return STATUS_NOT_SUPPORTED; +} + + +/* Function 2 */ +NTSTATUS LsarEnumeratePrivileges( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD *EnumerationContext, + PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, + DWORD PreferedMaximumLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 3 */ +NTSTATUS LsarQuerySecurityObject( + handle_t hBinding, + LSAPR_HANDLE ObjectHandle, + SECURITY_INFORMATION SecurityInformation, + PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 4 */ +NTSTATUS LsarSetSecurityObject( + handle_t hBinding, + LSAPR_HANDLE ObjectHandle, + SECURITY_INFORMATION SecurityInformation, + PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 5 */ +NTSTATUS LsarChangePassword( + handle_t hBinding, + PRPC_UNICODE_STRING String1, + PRPC_UNICODE_STRING String2, + PRPC_UNICODE_STRING String3, + PRPC_UNICODE_STRING String4, + PRPC_UNICODE_STRING String5) +{ + /* Deprecated */ + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 6 */ +NTSTATUS LsarOpenPolicy( + handle_t hBinding, + LPWSTR SystemName, + PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *PolicyHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 7 */ +NTSTATUS LsarQueryInformationPolicy( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 8 */ +NTSTATUS LsarSetInformationPolicy( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long *PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 9 */ +NTSTATUS LsarClearAuditLog( + handle_t hBinding, + LSAPR_HANDLE ObjectHandle) +{ + /* Deprecated */ + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 10 */ +NTSTATUS LsarCreateAccount( + handle_t hBinding, + PRPC_SID AccountSid, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *AccountHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 11 */ +NTSTATUS LsarEnumerateAccounts( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD *EnumerationContext, + PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, + DWORD PreferedMaximumLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 12 */ +NTSTATUS LsarCreateTrustedDomain( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSAPR_TRUST_INFORMATION TrustedDomainInformation, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *TrustedDomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 13 */ +NTSTATUS LsarEnumerateTrustedDomains( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD *EnumerationContext, + PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, + DWORD PreferedMaximumLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 14 */ +NTSTATUS LsarLookupNames( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SIDS TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 15 */ +NTSTATUS LsarLookupSids( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 16 */ +NTSTATUS LsarCreateSecret( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING SecretName, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *SecretHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 17 */ +NTSTATUS LsarOpenAccount( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *AccountHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 18 */ +NTSTATUS LsarEnumeratePrivilegesAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + PLSAPR_PRIVILEGE_SET *Privileges) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 19 */ +NTSTATUS LsarAddPrivilegesToAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + PLSAPR_PRIVILEGE_SET Privileges) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 20 */ +NTSTATUS LsarRemovePrivilegesFromAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + BOOL AllPrivileges, + PLSAPR_PRIVILEGE_SET Privileges) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 21 */ +NTSTATUS LsarGetQuotasForAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + PQUOTA_LIMITS QuotaLimits) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 22 */ +NTSTATUS LsarSetQuotasForAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + PQUOTA_LIMITS QuotaLimits) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 23 */ +NTSTATUS LsarGetSystemAccessAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + ACCESS_MASK *SystemAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 24 */ +NTSTATUS LsarSetSystemAccessAccount( + handle_t hBinding, + LSAPR_HANDLE AccountHandle, + ACCESS_MASK SystemAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 25 */ +NTSTATUS LsarOpenTrustedDomain( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID TrustedDomainSid, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *TrustedDomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 26 */ +NTSTATUS LsarQueryInfoTrustedDomain( + handle_t hBinding, + LSAPR_HANDLE TrustedDomainHandle, + TRUSTED_INFORMATION_CLASS InformationClass, + PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 27 */ +NTSTATUS LsarSetInformationTrustedDomain( + handle_t hBinding, + LSAPR_HANDLE TrustedDomainHandle, + TRUSTED_INFORMATION_CLASS InformationClass, + PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 28 */ +NTSTATUS LsarOpenSecret( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING SecretName, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *SecretHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 29 */ +NTSTATUS LsarSetSecret( + handle_t hBinding, + LSAPR_HANDLE *SecretHandle, + PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, + PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 30 */ +NTSTATUS LsarQuerySecret( + handle_t hBinding, + LSAPR_HANDLE SecretHandle, + PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, + PLARGE_INTEGER CurrentValueSetTime, + PLSAPR_CR_CIPHER_VALUE *EncryptedOldValue, + PLARGE_INTEGER OldValueSetTime) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 31 */ +NTSTATUS LsarLookupPrivilegeValue( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING Name, + PLUID Value) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 32 */ +NTSTATUS LsarLookupPrivilegeName( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLUID Value, + PRPC_UNICODE_STRING *Name) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 33 */ +NTSTATUS LsarLookupPrivilegeDisplayName( + handle_t hBinding, + USHORT *LanguageReturned) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 34 */ +NTSTATUS LsarDeleteObject( + handle_t hBinding, + LSAPR_HANDLE *ObjectHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 35 */ +NTSTATUS LsarEnumerateAccountsWithUserRight( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING UserRight, + PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 36 */ +NTSTATUS LsarEnmuerateAccountRights( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + PLSAPR_USER_RIGHT_SET UserRights) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 37 */ +NTSTATUS LsarAddAccountRights( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + PLSAPR_USER_RIGHT_SET UserRights) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 38 */ +NTSTATUS LsarRemoveAccountRights( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + BOOL AllRights, + PLSAPR_USER_RIGHT_SET UserRights) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 39 */ +NTSTATUS LsarQueryTrustedDomainInfo( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID TrustedDomainSid, + TRUSTED_INFORMATION_CLASS InformationClass, + PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 40 */ +NTSTATUS LsarSetTrustedDomainInfo( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID TrustedDomainSid, + TRUSTED_INFORMATION_CLASS InformationClass, + PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 41 */ +NTSTATUS LsarDeleteTrustedDomain( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_SID TrustedDomainSid) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 42 */ +NTSTATUS LsarStorePrivateData( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING KeyName, + PLSAPR_CR_CIPHER_VALUE EncryptedData) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 43 */ +NTSTATUS LsarRetrievePrivateData( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING KeyName, + PLSAPR_CR_CIPHER_VALUE *EncryptedData) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 44 */ +NTSTATUS LsarOpenPolicy2( + handle_t hBinding, + LPWSTR SystemName, + PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *PolicyHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 45 */ +NTSTATUS LsarGetUserName( + handle_t hBinding, + LPWSTR SystemName, + PRPC_UNICODE_STRING *UserName, + PRPC_UNICODE_STRING *DomainName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 46 */ +NTSTATUS LsarQueryInformationPolicy2( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long *PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 47 */ +NTSTATUS LsarSetInformationPolicy2( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 48 */ +NTSTATUS LsarQueryTrustedDomainInfoByName( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING TrustedDomainName, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long *PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 49 */ +NTSTATUS LsarSetTrustedDomainInfoByName( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING TrustedDomainName, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 50 */ +NTSTATUS LsarEnumerateTrustedDomainsEx( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD *EnumerationContext, + PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, + DWORD PreferedMaximumLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 51 */ +NTSTATUS LsarCreateTrustedDomainEx( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, + PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *TrustedDomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 52 */ +NTSTATUS LsarSetPolicyReplicationHandle( + handle_t hBinding, + PLSAPR_HANDLE PolicyHandle) +{ + /* Deprecated */ + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 53 */ +NTSTATUS LsarQueryDomainInformationPolicy( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long *PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 54 */ +NTSTATUS LsarSetDomainInformationPolicy( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + POLICY_INFORMATION_CLASS InformationClass, + unsigned long PolicyInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 55 */ +NTSTATUS LsarOpenTrustedDomainByName( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING TrustedDomainName, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *TrustedDomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 56 */ +NTSTATUS LsarTestCall( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 57 */ +NTSTATUS LsarLookupSids2( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 58 */ +NTSTATUS LsarLookupNames2( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SID_EX TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 59 */ +NTSTATUS LsarCreateTrustedDomainEx2( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, + PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *TrustedDomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 60 */ +NTSTATUS CredrWrite( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 61 */ +NTSTATUS CredrRead( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 62 */ +NTSTATUS CredrEnumerate( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 63 */ +NTSTATUS CredrWriteDomainCredentials( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 64 */ +NTSTATUS CredrReadDomainCredentials( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 65 */ +NTSTATUS CredrDelete( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 66 */ +NTSTATUS CredrGetTargetInfo( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 67 */ +NTSTATUS CredrProfileLoaded( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 68 */ +NTSTATUS LsarLookupNames3( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 69 */ +NTSTATUS CredrGetSessionTypes( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 70 */ +NTSTATUS LsarRegisterAuditEvent( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 71 */ +NTSTATUS LsarGenAuditEvent( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 72 */ +NTSTATUS LsarUnregisterAuditEvent( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 73 */ +NTSTATUS LsarQueryForestTrustInformation( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSA_UNICODE_STRING TrustedDomainName, + LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, + PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 74 */ +NTSTATUS LsarSetForestTrustInformation( + handle_t hBinding, + LSAPR_HANDLE PolicyHandle, + PLSA_UNICODE_STRING TrustedDomainName, + LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, + PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, + BOOL CheckOnly, + PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 75 */ +NTSTATUS CredrRename( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 76 */ +NTSTATUS LsarLookupSids3( + handle_t hBinding, + PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 77 */ +NTSTATUS LsarLookupNames4( + handle_t hBinding, + handle_t RpcHandle, + DWORD Count, + PRPC_UNICODE_STRING Names, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 78 */ +NTSTATUS LsarOpenPolicySce( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 79 */ +NTSTATUS LsarAdtRegisterSecurityEventSource( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 80 */ +NTSTATUS LsarAdtUnregisterSecurityEventSource( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 81 */ +NTSTATUS LsarAdtReportSecurityEvent( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Sat Aug 2 10:45:59 2008 @@ -5,9 +5,10 @@ <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x0600</define> <library>lsa_server</library> - <library>ntdll</library> + <library>wine</library> <library>kernel32</library> <library>rpcrt4</library> + <library>ntdll</library> <library>pseh</library> <file>lsarpc.c</file> <file>lsasrv.c</file> Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sat Aug 2 10:45:59 2008 @@ -2,9 +2,590 @@ * Local Security Authority interface definition */ -#include "include/reactos/idl/wtypes.idl" - -#define LSA_HANDLE unsigned long +#include <ms-dtyp.idl> + +typedef [context_handle] unsigned long LSAPR_HANDLE; +typedef LSAPR_HANDLE *PLSAPR_HANDLE; + +cpp_quote("#ifndef _WINNT_H"); +typedef LARGE_INTEGER LUID; +cpp_quote("#endif"); + +cpp_quote("#ifndef _NTDEF_"); + +typedef long NTSTATUS; + +typedef struct _STRING { + WORD Length; + WORD MaximumLength; + [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; +} STRING, *PSTRING; + +cpp_quote("#endif"); + +typedef struct _LSAPR_ACL { + BYTE AclRevision; + BYTE Sbz1; + WORD AclSize; + [size_is(AclSize - 4)] BYTE Dummy1[*]; +} LSAPR_ACL, *PLSAPR_ACL; + +typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; + +typedef struct _LSAPR_SECURITY_DESCRIPTOR { + BYTE Revision; + BYTE Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + PRPC_SID Owner; + PRPC_SID Group; + PLSAPR_ACL Sacl; + PLSAPR_ACL Dacl; +} LSAPR_SECURITY_DESCRIPTOR, *PLSAPR_SECURITY_DESCRIPTOR; + +cpp_quote("#if 0"); + +typedef enum _SECURITY_IMPERSONATION_LEVEL { + SecurityAnonymous = 0, + SecurityIdentification, + SecurityImpersonation, + SecurityDelegation, +} SECURITY_IMPERSONATION_LEVEL, *PSECURITY_IMPERSONATION_LEVEL; + +typedef BYTE SECURITY_CONTEXT_TRACKING_MODE, *PSECURITY_CONTEXT_TRACKING_MODE; + +typedef struct _SECURITY_QUALITY_OF_SERVICE { + DWORD Length; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; + BYTE EffectiveOnly; +} SECURITY_QUALITY_OF_SERVICE, *PSECURITY_QUALITY_OF_SERVICE; + +cpp_quote("#endif"); + +typedef struct _LSAPR_OBJECT_ATTRIBUTES { + DWORD Length; + BYTE *RootDirectory; + PSTRING ObjectName; + DWORD Attributes; + PLSAPR_SECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; +} LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES; + +typedef unsigned long ACCESS_MASK; + +typedef unsigned long SECURITY_INFORMATION; + +typedef struct _LSAPR_POLICY_PRIVILEGE_DEF { + RPC_UNICODE_STRING Name; + LUID LocalValue; +} LSAPR_POLICY_PRIVILEGE_DEF, *PLSAPR_POLICY_PRIVILEGE_DEF; + +typedef struct _LSAPR_PRIVILEGE_ENUM_BUFFER { + DWORD Entries; + [size_is(Entries)] PLSAPR_POLICY_PRIVILEGE_DEF Privileges; +} LSAPR_PRIVILEGE_ENUM_BUFFER, *PLSAPR_PRIVILEGE_ENUM_BUFFER; + +typedef struct _LSAPR_ACCOUNT_INFORMATION { + PRPC_SID Sid; +} LSAPR_ACCOUNT_INFORMATION, *PLSAPR_ACCOUNT_INFORMATION; + +typedef struct _LSAPR_ACCOUNT_ENUM_BUFFER { + DWORD EntriesRead; + [size_is(EntriesRead)] PLSAPR_ACCOUNT_INFORMATION Information; +} LSAPR_ACCOUNT_ENUM_BUFFER, *PLSAPR_ACCOUNT_ENUM_BUFFER; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef RPC_UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; +cpp_quote("#endif"); + +typedef struct _LSAPR_TRUST_INFORMATION { + RPC_UNICODE_STRING Name; + PRPC_SID Sid; +} LSAPR_TRUST_INFORMATION, *PLSAPR_TRUST_INFORMATION; + +typedef struct _LSAPR_REFERENCED_DOMAIN_LIST { + DWORD Entries; + [size_is(Entries)] PLSAPR_TRUST_INFORMATION Domains; + DWORD MaxEntries; +} LSAPR_REFERENCED_DOMAIN_LIST, *PLSAPR_REFERENCED_DOMAIN_LIST; + +cpp_quote("#if 0"); + +typedef enum _SID_NAME_USE { + SidTypeUser = 1, + SidTypeGroup, + SidTypeDomain, + SidTypeAlias, + SidTypeWellKnownGroup, + SidTypeDeletedAccount, + SidTypeInvalid, + SidTypeUnknown, + SidTypeComputer, + SidTypeLabel, +} SID_NAME_USE, *PSID_NAME_USE; + +cpp_quote("#endif"); + +cpp_quote("#ifndef _NTDEF_"); + +typedef struct _LSA_TRANSLATED_SID { + SID_NAME_USE Use; + DWORD RelativeId; + LONG DomainIndex; +} LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID; + +cpp_quote("#endif"); + +typedef struct _LSAPR_TRANSLATED_SIDS { + DWORD Entries; + [size_is(Entries)] PLSA_TRANSLATED_SID Sids; +} LSAPR_TRANSLATED_SIDS, *PLSAPR_TRANSLATED_SIDS; + +typedef enum _LSAP_LOOKUP_LEVEL { + LsapLookupWksta = 1, + LsapLookupPDC, + LsapLookupTDL, + LsapLookupGC, + LsapLookupXForestReferral, + LsapLookupXForestResolve, + LsapLookupRODCReferralToFullDC, +} LSAP_LOOKUP_LEVEL, *PLSAP_LOOKUP_LEVEL; + +typedef struct _LSAPR_SID_INFORMATION { + PRPC_SID Sid; +} LSAPR_SID_INFORMATION, *PLSAPR_SID_INFORMATION; + +typedef struct _LSAPR_SID_ENUM_BUFFER { + DWORD Entries; + [size_is(Entries)] PLSAPR_SID_INFORMATION SidInfo; +} LSAPR_SID_ENUM_BUFFER, *PLSAPR_SID_ENUM_BUFFER; + +typedef struct _LSAPR_TRANSLATED_NAME { + SID_NAME_USE Use; + RPC_UNICODE_STRING Name; + LONG DomainIndex; +} LSAPR_TRANSLATED_NAME, *PLSAPR_TRANSLATED_NAME; + +typedef struct _LSAPR_TRANSLATED_NAMES { + DWORD Entries; + [size_is(Entries)] PLSAPR_TRANSLATED_NAME Names; +} LSAPR_TRANSLATED_NAMES, *PLSAPR_TRANSLATED_NAMES; + +typedef struct _LSAPR_TRANSLATED_NAME_EX { + SID_NAME_USE Use; + RPC_UNICODE_STRING Name; + LONG DomainIndex; + DWORD Flags; +} LSAPR_TRANSLATED_NAME_EX, *PLSAPR_TRANSLATED_NAME_EX; + +typedef struct _LSAPR_TRANSLATED_NAMES_EX { + DWORD Entries; + [size_is(Entries)] PLSAPR_TRANSLATED_NAME_EX Names; +} LSAPR_TRANSLATED_NAMES_EX, *PLSAPR_TRANSLATED_NAMES_EX; + +typedef struct _LSAPR_TRANSLATED_SID_EX { + SID_NAME_USE Use; + DWORD RelativeId; + LONG DomainIndex; + DWORD Flags; +} LSAPR_TRANSLATED_SID_EX, *PLSAPR_TRANSLATED_SID_EX; + +typedef struct _LSAPR_TRANSLATED_SIDS_EX { + DWORD Entries; + [size_is(Entries)] PLSAPR_TRANSLATED_SID_EX Sids; +} LSAPR_TRANSLATED_SIDS_EX, *PLSAPR_TRANSLATED_SIDS_EX; + +typedef struct _LSAPR_TRANSLATED_SID_EX2 { + SID_NAME_USE Use; + PRPC_SID Sid; + LONG DomainIndex; + DWORD Flags; +} LSAPR_TRANSLATED_SID_EX2, *PLSAPR_TRANSLATED_SID_EX2; + +typedef struct _LSAPR_TRANSLATED_SIDS_EX2 { + DWORD Entries; + [size_is(Entries)] PLSAPR_TRANSLATED_SID_EX2 Sids; +} LSAPR_TRANSLATED_SIDS_EX2, *PLSAPR_TRANSLATED_SIDS_EX2; + +typedef LSAPR_TRUST_INFORMATION LSAPR_TRUSTED_DOMAIN_INFORMATION_BASIC; + +typedef struct _LSAPR_SR_SECURITY_DESCRIPTOR { + DWORD Length; + [size_is(Length)] BYTE *SecurityDescriptor; +} LSAPR_SR_SECURITY_DESCRIPTOR, *PLSAPR_SR_SECURITY_DESCRIPTOR; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef enum _POLICY_INFORMATION_CLASS { + PolicyAuditLogInformation = 1, + PolicyAuditEventsInformation, + PolicyPrimaryDomainInformation, + PolicyPdAccountInformation, + PolicyAccountDomainInformation, + PolicyLsaServerRoleInformation, + PolicyReplicaSourceInformation, + PolicyDefaultQuotaInformation, + PolicyModificationInformation, + PolicyAuditFullSetInformation, + PolicyAuditFullQueryInformation, + PolicyDnsDomainInformation, + PolicyDnsDomainInformationInt, + PolicyLocalAccountDomainInformation, + PolicyLastEntry, +} POLICY_INFORMATION_CLASS, *PPOLICY_INFORMATION_CLASS; + +typedef struct _POLICY_AUDIT_LOG_INFO { + DWORD AuditLogPercentFull; + DWORD MaximumLogSize; + LARGE_INTEGER AuditRetentionPeriod; + BYTE AuditLogFullShutdownInProgress; + LARGE_INTEGER TimeToShutdown; + DWORD NextAuditRecordId; +} POLICY_AUDIT_LOG_INFO, *PPOLICY_AUDIT_LOG_INFO; +cpp_quote("#endif"); + +typedef struct _LSAPR_POLICY_AUDIT_EVENTS_INFO { + BYTE AuditingMode; + [size_is(MaximumAuditEventCount)] DWORD *EventAuditingOptions; + DWORD MaximumAuditEventCount; +} LSAPR_POLICY_AUDIT_EVENTS_INFO, *PLSAPR_POLICY_AUDIT_EVENTS_INFO; + +typedef struct _LSAPR_POLICY_PRIMARY_DOM_INFO { + RPC_UNICODE_STRING Name; + PRPC_SID Sid; +} LSAPR_POLICY_PRIMARY_DOM_INFO, *PLSAPR_POLICY_PRIMARY_DOM_INFO; + +typedef struct _LSAPR_POLICY_ACCOUNT_DOM_INFO { + RPC_UNICODE_STRING DomainName; + PRPC_SID Sid; +} LSAPR_POLICY_ACCOUNT_DOM_INFO, *PLSAPR_POLICY_ACCOUNT_DOM_INFO; + +typedef struct _LSAPR_POLICY_PD_ACCOUNT_INFO { + RPC_UNICODE_STRING Name; +} LSAPR_POLICY_PD_ACCOUNT_INFO, *PLSAPR_POLICY_PD_ACCOUNT_INFO; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef enum _POLICY_LSA_SERVER_ROLE { + PolicyServerRoleBackup = 2, + PolicyServerRolePrimary, +} POLICY_LSA_SERVER_ROLE, *PPOLICY_LSA_SERVER_ROLE; + +typedef struct _POLICY_LSA_SERVER_ROLE_INFO { + POLICY_LSA_SERVER_ROLE LsaServerRole; +} POLICY_LSA_SERVER_ROLE_INFO, *PPOLICY_LSA_SERVER_ROLE_INFO; +cpp_quote("#endif"); + +typedef struct _POLICY_LSA_REPLICA_SRCE_INFO { + RPC_UNICODE_STRING ReplicaSource; + RPC_UNICODE_STRING ReplicaAccountName; +} POLICY_LSA_REPLICA_SRCE_INFO, *PPOLICY_LSA_REPLICA_SRCE_INFO; + +cpp_quote("#ifndef _WINNT_H"); +typedef struct _QUOTA_LIMITS { + INT64 PagedPoolLimit; + INT64 NonPagedPoolLimit; + INT64 MinimumWorkingSetSize; + INT64 MaximumWorkingSetSize; + INT64 PagefileLimit; + LARGE_INTEGER TimeLimit; +} QUOTA_LIMITS, *PQUOTA_LIMITS; +cpp_quote("#endif"); + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef struct _POLICY_DEFAULT_QUOTA_INFO { + QUOTA_LIMITS QuotaLimits; +} POLICY_DEFAULT_QUOTA_INFO, *PPOLICY_DEFAULT_QUOTA_INFO; + +typedef struct _POLICY_MODIFICATION_INFO { + LARGE_INTEGER ModifiedId; + LARGE_INTEGER DatabaseCreationTime; +} POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO; +cpp_quote("#endif"); + +typedef struct _POLICY_FULL_SET_INFO { + BOOL ShutDownOnFull; +} POLICY_FULL_SET_INFO, *PPOLICY_FULL_SET_INFO; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef struct _POLICY_AUDIT_FULL_QUERY_INFO { + BOOL ShutDownOnFull; + BOOL LogIsFull; +} POLICY_AUDIT_FULL_QUERY_INFO, *PPOLICY_AUDIT_FULL_QUERY_INFO; +cpp_quote("#endif"); + +typedef struct _LSAPR_POLICY_DNS_DOMAIN_INFO { + RPC_UNICODE_STRING Name; + RPC_UNICODE_STRING DnsDomainName; + RPC_UNICODE_STRING DnsForestName; + GUID DomainGuid; + PRPC_SID Sid; +} LSAPR_POLICY_DNS_DOMAIN_INFO, *PLSAPR_POLICY_DNS_DOMAIN_INFO; + +/*typedef +[switch_type(POLICY_INFORMATION_CLASS)] union _LSAPR_POLICY_INFORMATION { + [case(PolicyAuditLogInformation)] POLICY_AUDIT_LOG_INFO PolicyAuditLogInfo; + [case(PolicyAuditEventsInformation)] POLICY_AUDIT_EVENTS_INFO PolicyAuditEventsInfo; + [case(PolicyPrimaryDomainInformation)] POLICY_PRIMARY_DOM_INFO PolicyPrimaryDomInfo; + [case(PolicyPdAccountInformation)] POLICY_PD_ACCOUNT_INFO PolicyPdAccountInfo; + [case(PolicyAccountDomainInformation)] POLICY_ACCOUNT_DOM_INFO PolicyAccountDomainInfo; + [case(PolicyLsaServerRoleInformation)] POLICY_LSA_SERVER_ROLE_INFO PolicyServerRoleInfo; + [case(PolicyReplicaSourceInformation)] POLICY_REPLICA_SRCE_INFO PolicyReplicaSourceInfo; + [case(PolicyDefaultQuotaInformation)] POLICY_DEFAULT_QUOTA_INFO PolicyDefaultQuotaInfo; + [case(PolicyModificationInformation)] POLICY_MODIFICATION_INFO PolicyModificationInfo; + [case(PolicyAuditFullSetInformation)] POLICY_AUDIT_FULL_SET_INFO PolicyAuditFullSetInfo; + [case(PolicyAuditFullQueryInformation)] POLICY_AUDIT_FULL_QUERY_INFO PolicyAuditFullQueryInfo; + [case(PolicyDnsDomainInformation)] LSAPR_DNS_DOMAIN_INFO PolicyDnsDomainInfo; + [case(PolicyDnsDomainInformationInt)] LSAPR_DNS_DOMAIN_INFO PolicyDnsDomainInfoInt; + [case(PolicyLocalAccountDomainInformation)] LSAPR_POLICY_ACCOUNT_DOM_INFO PolicyLocalAccountDomainInfo; +} LSAPR_POLICY_INFORMATION, *PLSAPR_POLICY_INFORMATION;*/ + +typedef struct _LSAPR_TRUSTED_ENUM_BUFFER { + DWORD EntriesRead; + [size_is(EntriesRead)] PLSAPR_TRUST_INFORMATION Information; +} LSAPR_TRUSTED_ENUM_BUFFER, *PLSAPR_TRUSTED_ENUM_BUFFER; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef enum _TRUSTED_INFORMATION_CLASS { + TrustedDomainNameInformation = 1, + TrustedControllersInformation, + TrustedPosixOffsetInformation, + TrustedPasswordInformation, + TrustedDomainInformationBasic, + TrustedDomainInformationEx, + TrustedDomainAuthInformation, + TrustedDomainFullInformation, + TrustedDomainAuthInformationInternal, + TrustedDomainFullInformationInternal, + TrustedDomainInformationEx2Internal, + TrustedDomainFullInformation2Internal, + TrustedDomainSupportedEncryptionTypes, +} TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS; +cpp_quote("#endif"); + +typedef struct _LSAPR_TRUSTED_DOMAIN_NAME_INFO { + RPC_UNICODE_STRING Name; +} LSAPR_TRUSTED_DOMAIN_NAME_INFO, *PLSAPR_TRUSTED_DOMAIN_NAME_INFO; + +typedef struct _LSAPR_TRUSTED_CONTROLLERS_INFO { + DWORD Entries; + [size_is(Entries)] PRPC_UNICODE_STRING Names; +} LSAPR_TRUSTED_CONTROLLERS_INFO, *PLSAPR_TRUSTED_CONTROLLERS_INFO; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef struct _TRUSTED_POSIX_OFFSET_INFO { + DWORD Offset; +} TRUSTED_POSIX_OFFSET_INFO, *PTRUSTED_POSIX_OFFSET_INFO; +cpp_quote("#endif"); + +typedef struct _LSAPR_CR_CIPHER_VALUE { + DWORD Length; + DWORD MaximumLength; + [size_is(MaximumLength), length_is(Length)] BYTE *Buffer; +} LSAPR_CR_CIPHER_VALUE, *PLSAPR_CR_CIPHER_VALUE; + +typedef struct _LSAPR_TRUSTED_PASSWORD_INFO { + PLSAPR_CR_CIPHER_VALUE Password; + PLSAPR_CR_CIPHER_VALUE OldPassword; +} LSAPR_TRUSTED_PASSWORD_INFO, *PLSAPR_TRUSTED_PASSWORD_INFO; + +typedef struct _LSAPR_USER_RIGHT_SET { + DWORD Entries; + [size_is(Entries)] PRPC_UNICODE_STRING UserRights; +} LSAPR_USER_RIGHT_SET, *PLSAPR_USER_RIGHT_SET; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef enum _POLICY_DOMAIN_INFORMATION_CLASS { + PolicyDomainQualityOfServiceInformation = 1, + PolicyDomainEfsInformation = 2, + PolicyDomainKerberosTicketInformation = 3, +} POLICY_DOMAIN_INFORMATION_CLASS, *PPOLICY_DOMAIN_INFORMATION_CLASS; + +typedef struct _POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO { + DWORD QualityOfService; +} POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO, *PPOLICY_DOMAIN_QUALITY_OF_SERVICE_INFO; +cpp_quote("#endif"); + +typedef struct _LSAPR_POLICY_DOMAIN_EFS_INFO { + DWORD InfoLength; + [size_is(InfoLength)] BYTE *EfsBlob; +} LSAPR_POLICY_DOMAIN_EFS_INFO, *PLSAPR_POLICY_DOMAIN_EFS_INFO; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef struct _POLICY_DOMAIN_KERBEROS_TICKET_INFO { + DWORD AuthenticationOptions; + LARGE_INTEGER MaxServiceTicketAge; + LARGE_INTEGER MaxTicketAge; + LARGE_INTEGER MaxRenewAge; + LARGE_INTEGER MaxClockSkew; + LARGE_INTEGER Reserved; +} POLICY_DOMAIN_KERBEROS_TICKET_INFO, *PPOLICY_DOMAIN_KERBEROS_TICKET_INFO; +cpp_quote("#endif"); + +typedef +[switch_type(POLICY_DOMAIN_INFORMATION_CLASS)] union _LSAPR_POLICY_DOMAIN_INFORMATION { + [case(PolicyDomainQualityOfServiceInformation)] POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO PolicyDomainQualityOfServiceInfo; + [case(PolicyDomainEfsInformation)] LSAPR_POLICY_DOMAIN_EFS_INFO PolicyDomainEfsInfo; + [case(PolicyDomainKerberosTicketInformation)] POLICY_DOMAIN_KERBEROS_TICKET_INFO PolicyDomainKerbTicketInfo; +} LSAPR_POLICY_DOMAIN_INFORMATION, *PLSAPR_POLICY_DOMAIN_INFORMATION; + +typedef struct _LSAPR_TRUSTED_DOMAIN_INFORMATION_EX { + RPC_UNICODE_STRING Name; + RPC_UNICODE_STRING FlatName; + PRPC_SID Sid; + DWORD TrustDirection; + DWORD TrustType; + DWORD TrustAttributes; +} LSAPR_TRUSTED_DOMAIN_INFORMATION_EX, *PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX; + +typedef struct _LSAPR_TRUSTED_ENUM_BUFFER_EX { + DWORD EntriesRead; + [size_is(EntriesRead)] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX EnumerationBuffer; +} LSAPR_TRUSTED_ENUM_BUFFER_EX, *PLSAPR_TRUSTED_ENUM_BUFFER_EX; + +typedef struct _LSAPR_TRUSTED_DOMAIN_INFORMATION_EX2 { + RPC_UNICODE_STRING Name; + RPC_UNICODE_STRING FlatName; + PRPC_SID Sid; + DWORD TrustDirection; + DWORD TrustType; + DWORD TrustAttributes; + DWORD ForestTrustLength; + [size_is(ForestTrustLength)] BYTE *ForestTrustInfo; +} LSAPR_TRUSTED_DOMAIN_INFORMATION_EX2, *PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX2; + +typedef struct _LSAPR_AUTH_INFORMATION { + LARGE_INTEGER LastUpdateTime; + DWORD AuthType; + DWORD AuthInfoLength; + [size_is(AuthInfoLength)] BYTE *AuthInfo; +} LSAPR_AUTH_INFORMATION, *PLSAPR_AUTH_INFORMATION; + +typedef struct _LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION { + DWORD IncomingAuthInfos; + PLSAPR_AUTH_INFORMATION IncomingAuthenticationInformation; + PLSAPR_AUTH_INFORMATION IncomingPreviousAuthenticationInformation; + DWORD OutgoingAuthInfos; + PLSAPR_AUTH_INFORMATION OutgoingAuthenticationInformation; + PLSAPR_AUTH_INFORMATION OutgoingPreviousAuthenticationInformation; +} LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION, *PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION; + +typedef struct _LSAPR_TRUSTED_DOMAIN_AUTH_BLOB { + DWORD AuthSize; + [size_is(AuthSize)] BYTE *AuthBlob; +} LSAPR_TRUSTED_DOMAIN_AUTH_BLOB, *PLSAPR_TRUSTED_DOMAIN_AUTH_BLOB; + +typedef struct _LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL { + LSAPR_TRUSTED_DOMAIN_AUTH_BLOB AuthBlob; +} LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL, *PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL; + +typedef struct _LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION { + LSAPR_TRUSTED_DOMAIN_INFORMATION_EX Information; + TRUSTED_POSIX_OFFSET_INFO PosixOffset; + LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthInformation; +} LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION, *PLSAPR_TRUSTED_DOMAIN_FULL_INFORMATION; + +typedef struct _LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION_INTERNAL { + LSAPR_TRUSTED_DOMAIN_INFORMATION_EX Information; + TRUSTED_POSIX_OFFSET_INFO PosixOffset; + LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthInformation; +} LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION_INTERNAL, *PLSAPR_TRUSTED_DOMAIN_FULL_INFORMATION_INTERNAL; + +typedef struct _LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION2 { + LSAPR_TRUSTED_DOMAIN_INFORMATION_EX2 Information; + TRUSTED_POSIX_OFFSET_INFO PosixOffset; + LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthInformation; +} LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION2, *PLSAPR_TRUSTED_DOMAIN_FULL_INFORMATION2; + +typedef struct _TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES { + DWORD SupportedEncryptionTypes; +} TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES, *PTRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES; + +typedef +[switch_type(TRUSTED_INFORMATION_CLASS)] union _LSAPR_TRUSTED_DOMAIN_INFO { + [case(TrustedDomainNameInformation)] LSAPR_TRUSTED_DOMAIN_NAME_INFO TrustedDomainNameInfo; + [case(TrustedControllersInformation)] LSAPR_TRUSTED_CONTROLLERS_INFO TrustedControllersInfo; + [case(TrustedPosixOffsetInformation)] TRUSTED_POSIX_OFFSET_INFO TrustedPosixOffsetInfo; + [case(TrustedPasswordInformation)] LSAPR_TRUSTED_PASSWORD_INFO TrustedPasswordInfo; + [case(TrustedDomainInformationBasic)] LSAPR_TRUSTED_DOMAIN_INFORMATION_BASIC TrustedDomainInfoBasic; + [case(TrustedDomainInformationEx)] LSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInfoEx; + [case(TrustedDomainAuthInformation)] LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION TrustedAuthInfo; + [case(TrustedDomainFullInformation)] LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION TrustedFullInfo; + [case(TrustedDomainAuthInformationInternal)] LSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL TrustedAuthInfoInternal; + [case(TrustedDomainFullInformationInternal)] LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION_INTERNAL TrustedFullInfoInternal; + [case(TrustedDomainInformationEx2Internal)] LSAPR_TRUSTED_DOMAIN_INFORMATION_EX2 TrustedDomainInfoEx2; + [case(TrustedDomainFullInformation2Internal)] LSAPR_TRUSTED_DOMAIN_FULL_INFORMATION2 TrustedFullInfo2; + [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs; +} LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO; + +cpp_quote("#ifndef _WINNT_H"); +typedef struct _LUID { + ULONG LowPart; + LONG HightPart; +} LUID, *PLUID; +cpp_quote("#endif"); + +typedef struct _LSAPR_LUID_AND_ATTRIBUTES { + LUID Luid; + DWORD Attributes; +} LSAPR_LUID_AND_ATTRIBUTES, *PLSAPR_LUID_AND_ATTRIBUTES; + +typedef struct _LSAPR_PRIVILEGE_SET { + DWORD PrivilegeCount; + DWORD Control; + [size_is(PrivilegeCount)] LSAPR_LUID_AND_ATTRIBUTES Privilege[*]; +} LSAPR_PRIVILEGE_SET, *PLSAPR_PRIVILEGE_SET; + +cpp_quote("#ifndef _NTSECAPI_H"); +typedef enum _LSA_FOREST_TRUST_RECORD_TYPE { + ForestTrustTopLevelName = 0, + ForestTrustTopLevelNameEx = 1, + ForestTrustDomainInfo = 2, +} LSA_FOREST_TRUST_RECORD_TYPE; + +typedef struct _LSA_FOREST_TRUST_BINARY_DATA { + DWORD Length; + [size_is(Length)] BYTE *Buffer; +} LSA_FOREST_TRUST_BINARY_DATA, *PLSA_FOREST_TRUST_BINARY_DATA; + +typedef struct _LSA_FOREST_TRUST_DOMAIN_INFO { + PRPC_SID Sid; + LSA_UNICODE_STRING DnsName; + LSA_UNICODE_STRING NetbiosName; +} LSA_FOREST_TRUST_DOMAIN_INFO, *PLSA_FOREST_TRUST_DOMAIN_INFO; + +typedef struct _LSA_FOREST_TRUST_RECORD { + DWORD Flags; + LSA_FOREST_TRUST_RECORD_TYPE ForestTrustType; + LARGE_INTEGER Time; + [switch_type(LSA_FOREST_TRUST_RECORD_TYPE), switch_is(ForestTrustType)] union { + [case(ForestTrustTopLevelName, ForestTrustTopLevelNameEx)] LSA_UNICODE_STRING TopLevelName; + [case(ForestTrustDomainInfo)] LSA_FOREST_TRUST_DOMAIN_INFO DomainInfo; + [default] LSA_FOREST_TRUST_BINARY_DATA Data; + } ForestTrustData; +} LSA_FOREST_TRUST_RECORD, *PLSA_FOREST_TRUST_RECORD; + +typedef struct _LSA_FOREST_TRUST_INFORMATION { + DWORD RecordCount; + [size_is(RecordCount)] PLSA_FOREST_TRUST_RECORD *Entries; +} LSA_FOREST_TRUST_INFORMATION, *PLSA_FOREST_TRUST_INFORMATION; + +typedef enum _LSA_FOREST_TRUST_COLLISION_RECORD_TYPE { + CollisionTdo = 0, + CollisionXref, + CollisionOther, +} LSA_FOREST_TRUST_COLLISION_RECORD_TYPE; + +typedef struct _LSA_FOREST_TRUST_COLLISION_RECORD { + DWORD Index; + LSA_FOREST_TRUST_COLLISION_RECORD_TYPE Type; + DWORD Flags; + LSA_UNICODE_STRING Name; +} LSA_FOREST_TRUST_COLLISION_RECORD, *PLSA_FOREST_TRUST_COLLISION_RECORD; + +typedef struct _LSA_FOREST_TRUST_COLLISION_INFORMATION { + DWORD RecordCount; + [size_is(RecordCount)] PLSA_FOREST_TRUST_COLLISION_RECORD *Entries; +} LSA_FOREST_TRUST_COLLISION_INFORMATION, *PLSA_FOREST_TRUST_COLLISION_INFORMATION; +cpp_quote("#endif"); [ uuid(12345778-1234-abcd-ef00-0123456789ab), @@ -16,29 +597,591 @@ ] interface lsarpc { -/* - cpp_quote("#if 0") - typedef [handle, unique] wchar_t *LPWSTR; - typedef [handle, unique] char *LPSTR; - cpp_quote("#endif") - typedef [context_handle] void *LSA_HANDLE; - typedef LSA_HANDLE *PLSA_HANDLE; - typedef unsigned int NTSTATUS; -*/ - - cpp_quote("#if 0") - typedef struct _LSA_UNICODE_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength)] wchar_t *Buffer; - } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; - cpp_quote("#endif") - /* Function 0 */ - NTSTATUS LsarClose(handle_t BindingHandle, - [in] LSA_HANDLE ObjectHandle); + NTSTATUS LsarClose( + [in] handle_t hBinding, + [in, out] LSAPR_HANDLE *ObjectHandle); /* Function 1 */ - NTSTATUS LsarDelete(handle_t BindingHandle, - [in] LSA_HANDLE ObjectHandle); + NTSTATUS LsarDelete( + [in] handle_t hBinding, + [in] LSAPR_HANDLE ObjectHandle); + + /* Function 2 */ + NTSTATUS LsarEnumeratePrivileges( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in, out] DWORD *EnumerationContext, + [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, + [in] DWORD PreferedMaximumLength); + + /* Function 3 */ + NTSTATUS LsarQuerySecurityObject( + [in] handle_t hBinding, + [in] LSAPR_HANDLE ObjectHandle, + [in] SECURITY_INFORMATION SecurityInformation, + [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); + + /* Function 4 */ + NTSTATUS LsarSetSecurityObject( + [in] handle_t hBinding, + [in] LSAPR_HANDLE ObjectHandle, + [in] SECURITY_INFORMATION SecurityInformation, + [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); + + /* Function 5 */ + NTSTATUS LsarChangePassword( + [in] handle_t hBinding, + [in] PRPC_UNICODE_STRING String1, + [in] PRPC_UNICODE_STRING String2, + [in] PRPC_UNICODE_STRING String3, + [in] PRPC_UNICODE_STRING String4, + [in] PRPC_UNICODE_STRING String5); + + /* Function 6 */ + NTSTATUS LsarOpenPolicy( + [in] handle_t hBinding, + [in, unique] LPWSTR SystemName, + [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *PolicyHandle); + + /* Function 7 */ + NTSTATUS LsarQueryInformationPolicy( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [in] unsigned long PolicyInformation); + /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ + + /* Function 8 */ + NTSTATUS LsarSetInformationPolicy( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [out] unsigned long *PolicyInformation); + /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ + + /* Function 9 */ + NTSTATUS LsarClearAuditLog( + [in] handle_t hBinding, + [in] LSAPR_HANDLE ObjectHandle); + + /* Function 10 */ + NTSTATUS LsarCreateAccount( + [in] handle_t hBinding, + [in] PRPC_SID AccountSid, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *AccountHandle); + + /* Function 11 */ + NTSTATUS LsarEnumerateAccounts( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in, out] DWORD *EnumerationContext, + [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, + [in] DWORD PreferedMaximumLength); + + /* Function 12 */ + NTSTATUS LsarCreateTrustedDomain( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *TrustedDomainHandle); + + /* Function 13 */ + NTSTATUS LsarEnumerateTrustedDomains( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in, out] DWORD *EnumerationContext, + [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, + [in] DWORD PreferedMaximumLength); + + /* Function 14 */ + NTSTATUS LsarLookupNames( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] DWORD Count, + [in, size_is(Count)] PRPC_UNICODE_STRING Names, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_SIDS TranslatedSids, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount); + + /* Function 15 */ + NTSTATUS LsarLookupSids( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_NAMES TranslatedNames, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount); + + /* Function 16 */ + NTSTATUS LsarCreateSecret( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING SecretName, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *SecretHandle); + + /* Function 17 */ + NTSTATUS LsarOpenAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID AccountSid, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *AccountHandle); + + /* Function 18 */ + NTSTATUS LsarEnumeratePrivilegesAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [out] PLSAPR_PRIVILEGE_SET *Privileges); + + /* Function 19 */ + NTSTATUS LsarAddPrivilegesToAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [in] PLSAPR_PRIVILEGE_SET Privileges); + + /* Function 20 */ + NTSTATUS LsarRemovePrivilegesFromAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [in] BOOL AllPrivileges, + [in, unique] PLSAPR_PRIVILEGE_SET Privileges); + + /* Function 21 */ + NTSTATUS LsarGetQuotasForAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [out] PQUOTA_LIMITS QuotaLimits); + + /* Function 22 */ + NTSTATUS LsarSetQuotasForAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [in] PQUOTA_LIMITS QuotaLimits); + + /* Function 23 */ + NTSTATUS LsarGetSystemAccessAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [out] ACCESS_MASK *SystemAccess); + + /* Function 24 */ + NTSTATUS LsarSetSystemAccessAccount( + [in] handle_t hBinding, + [in] LSAPR_HANDLE AccountHandle, + [in] ACCESS_MASK SystemAccess); + + /* Function 25 */ + NTSTATUS LsarOpenTrustedDomain( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID TrustedDomainSid, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *TrustedDomainHandle); + + /* Function 26 */ + NTSTATUS LsarQueryInfoTrustedDomain( + [in] handle_t hBinding, + [in] LSAPR_HANDLE TrustedDomainHandle, + [in] TRUSTED_INFORMATION_CLASS InformationClass, + [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); + + /* Function 27 */ + NTSTATUS LsarSetInformationTrustedDomain( + [in] handle_t hBinding, + [in] LSAPR_HANDLE TrustedDomainHandle, + [in] TRUSTED_INFORMATION_CLASS InformationClass, + [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); + + /* Function 28 */ + NTSTATUS LsarOpenSecret( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING SecretName, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *SecretHandle); + + /* Function 29 */ + NTSTATUS LsarSetSecret( + [in] handle_t hBinding, + [in] LSAPR_HANDLE *SecretHandle, + [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, + [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue); + + /* Function 30 */ + NTSTATUS LsarQuerySecret( + [in] handle_t hBinding, + [in] LSAPR_HANDLE SecretHandle, + [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, + [in, out, unique] PLARGE_INTEGER CurrentValueSetTime, + [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedOldValue, + [in, out, unique] PLARGE_INTEGER OldValueSetTime); + + /* Function 31 */ + NTSTATUS LsarLookupPrivilegeValue( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING Name, + [out] PLUID Value); + + /* Function 32 */ + NTSTATUS LsarLookupPrivilegeName( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLUID Value, + [out] PRPC_UNICODE_STRING *Name); + + /* Function 33 */ + NTSTATUS LsarLookupPrivilegeDisplayName( + [in] handle_t hBinding, + /*[in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING Name, + [in] USHORT ClientLanguage, + [in] USHORT ClientSystemDefaultLanguage, + [out] PRPC_UNICODE_STRING *DisplayName,*/ + [out] USHORT *LanguageReturned); + + /* Function 34 */ + NTSTATUS LsarDeleteObject( + [in] handle_t hBinding, + [in, out] LSAPR_HANDLE *ObjectHandle); + +cpp_quote("#if _WIN32_WINNT >= 0x0351") + + /* Function 35 */ + NTSTATUS LsarEnumerateAccountsWithUserRight( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in, unique] PRPC_UNICODE_STRING UserRight, + [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer); + + /* Function 36 */ + NTSTATUS LsarEnmuerateAccountRights( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID AccountSid, + [out] PLSAPR_USER_RIGHT_SET UserRights); + + /* Function 37 */ + NTSTATUS LsarAddAccountRights( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID AccountSid, + [in] PLSAPR_USER_RIGHT_SET UserRights); + + /* Function 38 */ + NTSTATUS LsarRemoveAccountRights( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID AccountSid, + [in] BOOL AllRights, + [in] PLSAPR_USER_RIGHT_SET UserRights); + + /* Function 39 */ + NTSTATUS LsarQueryTrustedDomainInfo( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID TrustedDomainSid, + [in] TRUSTED_INFORMATION_CLASS InformationClass, + [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); + + /* Function 40 */ + NTSTATUS LsarSetTrustedDomainInfo( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID TrustedDomainSid, + [in] TRUSTED_INFORMATION_CLASS InformationClass, + [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); + + /* Function 41 */ + NTSTATUS LsarDeleteTrustedDomain( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_SID TrustedDomainSid); + + /* Function 42 */ + NTSTATUS LsarStorePrivateData( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING KeyName, + [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData); + + /* Function 43 */ + NTSTATUS LsarRetrievePrivateData( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING KeyName, + [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData); + + /* Function 44 */ + NTSTATUS LsarOpenPolicy2( + [in] handle_t hBinding, + [in, unique, string] LPWSTR SystemName, + [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *PolicyHandle); + + /* Function 45 */ + NTSTATUS LsarGetUserName( + [in] handle_t hBinding, + [in, unique, string] LPWSTR SystemName, + [in, out] PRPC_UNICODE_STRING *UserName, + [in, out, unique] PRPC_UNICODE_STRING *DomainName); + +cpp_quote("#if _WIN32_WINNT >= 0x0500") + + /* Function 46 */ + NTSTATUS LsarQueryInformationPolicy2( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [out] unsigned long *PolicyInformation); + /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ + + /* Function 47 */ + NTSTATUS LsarSetInformationPolicy2( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [in] unsigned long PolicyInformation); + /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ + + /* Function 48 */ + NTSTATUS LsarQueryTrustedDomainInfoByName( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING TrustedDomainName, + [in] POLICY_INFORMATION_CLASS InformationClass, + [out] unsigned long *PolicyInformation); + /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ + + /* Function 49 */ + NTSTATUS LsarSetTrustedDomainInfoByName( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING TrustedDomainName, + [in] POLICY_INFORMATION_CLASS InformationClass, + [in] unsigned long PolicyInformation); + /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ + + /* Function 50 */ + NTSTATUS LsarEnumerateTrustedDomainsEx( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in, out] DWORD *EnumerationContext, + [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, + [in] DWORD PreferedMaximumLength); + + /* Function 51 */ + NTSTATUS LsarCreateTrustedDomainEx( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, + [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *TrustedDomainHandle); + + /* Function 52 */ + NTSTATUS LsarSetPolicyReplicationHandle( + [in] handle_t hBinding, + [in, out] PLSAPR_HANDLE PolicyHandle); + + /* Function 53 */ + NTSTATUS LsarQueryDomainInformationPolicy( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [out] unsigned long *PolicyInformation); + /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ + + /* Function 54 */ + NTSTATUS LsarSetDomainInformationPolicy( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] POLICY_INFORMATION_CLASS InformationClass, + [in] unsigned long PolicyInformation); + /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ + + /* Function 55 */ + NTSTATUS LsarOpenTrustedDomainByName( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING TrustedDomainName, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *TrustedDomainHandle); + + /* Function 56 */ + NTSTATUS LsarTestCall( + [in] handle_t hBinding); /* FIXME */ + + /* Function 57 */ + NTSTATUS LsarLookupSids2( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount, + [in] DWORD LookupOptions, + [in] DWORD ClientRevision); + + /* Function 58 */ + NTSTATUS LsarLookupNames2( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] DWORD Count, + [in, size_is(Count)] PRPC_UNICODE_STRING Names, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_SID_EX TranslatedSids, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount, + [in] DWORD LookupOptions, + [in] DWORD ClientRevision); + + /* Function 59 */ + NTSTATUS LsarCreateTrustedDomainEx2( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, + [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *TrustedDomainHandle); + +cpp_quote("#if _WIN32_WINNT >= 0x0501") + + /* Function 60 */ + NTSTATUS CredrWrite( + [in] handle_t hBinding); /* FIXME */ + + /* Function 61 */ + NTSTATUS CredrRead( + [in] handle_t hBinding); /* FIXME */ + + /* Function 62 */ + NTSTATUS CredrEnumerate( + [in] handle_t hBinding); /* FIXME */ + + /* Function 63 */ + NTSTATUS CredrWriteDomainCredentials( + [in] handle_t hBinding); /* FIXME */ + + /* Function 64 */ + NTSTATUS CredrReadDomainCredentials( + [in] handle_t hBinding); /* FIXME */ + + /* Function 65 */ + NTSTATUS CredrDelete( + [in] handle_t hBinding); /* FIXME */ + + /* Function 66 */ + NTSTATUS CredrGetTargetInfo( + [in] handle_t hBinding); /* FIXME */ + + /* Function 67 */ + NTSTATUS CredrProfileLoaded( + [in] handle_t hBinding); /* FIXME */ + + /* Function 68 */ + NTSTATUS LsarLookupNames3( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] DWORD Count, + [in, size_is(Count)] PRPC_UNICODE_STRING Names, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount, + [in] DWORD LookupOptions, + [in] DWORD ClientRevision); + + /* Function 69 */ + NTSTATUS CredrGetSessionTypes( + [in] handle_t hBinding); /* FIXME */ + + /* Function 70 */ + NTSTATUS LsarRegisterAuditEvent( + [in] handle_t hBinding); /* FIXME */ + + /* Function 71 */ + NTSTATUS LsarGenAuditEvent( + [in] handle_t hBinding); /* FIXME */ + + /* Function 72 */ + NTSTATUS LsarUnregisterAuditEvent( + [in] handle_t hBinding); /* FIXME */ + + /* Function 73 */ + NTSTATUS LsarQueryForestTrustInformation( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSA_UNICODE_STRING TrustedDomainName, + [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, + [out] PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo); + + /* Function 74 */ + NTSTATUS LsarSetForestTrustInformation( + [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, + [in] PLSA_UNICODE_STRING TrustedDomainName, + [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, + [in] PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, + [in] BOOL CheckOnly, + [out] PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo); + + /* Function 75 */ + NTSTATUS CredrRename( + [in] handle_t hBinding); /* FIXME */ + + /* Function 76 */ + NTSTATUS LsarLookupSids3( + [in] handle_t hBinding, + [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount, + [in] DWORD LookupOptions, + [in] DWORD ClientRevision); + + /* Function 77 */ + NTSTATUS LsarLookupNames4( + [in] handle_t hBinding, + [in] handle_t RpcHandle, + [in] DWORD Count, + [in, size_is(Count)] PRPC_UNICODE_STRING Names, + [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + [in, out] PLSAPR_TRANSLATED_SID_EX2 TranslatedSids, + [in] LSAP_LOOKUP_LEVEL LookupLevel, + [in, out] DWORD *MappedCount, + [in] DWORD LookupOptions, + [in] DWORD ClientRevision); + + /* Function 78 */ + NTSTATUS LsarOpenPolicySce( + [in] handle_t hBinding); /* FIXME */ + + /* Function 79 */ + NTSTATUS LsarAdtRegisterSecurityEventSource( + [in] handle_t hBinding); /* FIXME */ + + /* Function 80 */ + NTSTATUS LsarAdtUnregisterSecurityEventSource( + [in] handle_t hBinding); /* FIXME */ + + /* Function 81 */ + NTSTATUS LsarAdtReportSecurityEvent( + [in] handle_t hBinding); /* FIXME */ + +cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */") +cpp_quote("#endif /* _WIN32_WINNT >= 0x0500 */") +cpp_quote("#endif /* _WIN32_WINNT >= 0x0351 */") + }

1 0

[hpoussin] 35039: Support nested structures
by hpoussin＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: hpoussin Date: Sat Aug 2 10:34:14 2008 New Revision: 35039 URL: http://svn.reactos.org/svn/reactos?rev=35039&view=rev Log: Support nested structures Modified: trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Aug 2 10:34:14 2008 @@ -3299,8 +3299,9 @@ print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", iface, name, callback_offset); print_file(file, 0, "{\n"); - print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", - name, var_name, name, eval->baseoff); + print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", + is_struct(eval->structure->type) ? "struct " : "", name, var_name, + is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); write_struct_expr(file, eval->expr, 1, fields, var_name); Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Sat Aug 2 10:34:14 2008 @@ -46,6 +46,22 @@ print_server("#include \"%s\"\n", header_name); fprintf(server, "\n"); } +Index: typegen.c +=================================================================== +--- typegen.c (revision 32187) ++++ typegen.c (working copy) +@@ -3299,8 +3299,9 @@ + print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", + iface, name, callback_offset); + print_file(file, 0, "{\n"); +- print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", +- name, var_name, name, eval->baseoff); ++ print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", ++ is_struct(eval->structure->type) ? "struct " : "", name, var_name, ++ is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); + print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ + print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); + write_struct_expr(file, eval->expr, 1, fields, var_name); Index: typelib.c =================================================================== --- typelib.c (revision 32187)

1 0

[cgutman] 35038: - We must complete the IRP if we fail because the function we were called from expects the IRP to be completed after this call - Return the correct status
by cgutman＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cgutman Date: Sat Aug 2 09:52:19 2008 New Revision: 35038 URL: http://svn.reactos.org/svn/reactos?rev=35038&view=rev Log: - We must complete the IRP if we fail because the function we were called from expects the IRP to be completed after this call - Return the correct status Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 2 09:52:19 2008 @@ -18,7 +18,10 @@ PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; - if( !SocketAcquireStateLock( FCB ) ) return; + if( !SocketAcquireStateLock( FCB ) ) { + LostSocket( Irp ); + return; + } /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); @@ -203,7 +206,6 @@ NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -226,7 +228,7 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); - return Status; + return Irp->IoStatus.Status; } else { AFD_DbgPrint(MID_TRACE,("Holding\n")); @@ -311,10 +313,9 @@ FCB->PollState &= ~AFD_EVENT_ACCEPT; SocketStateUnlock( FCB ); - return Status; + return Irp->IoStatus.Status; } } - SocketStateUnlock( FCB ); - return STATUS_UNSUCCESSFUL; -} + return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0 , NULL ); +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs