Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[akhaldi] 71776: [STDOLE32.TLB] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 11:18:44 2016 New Revision: 71776 URL: http://svn.reactos.org/svn/reactos?rev=71776&view=rev Log: [STDOLE32.TLB] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/sdk/include/psdk/stdole32.idl (with props) Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/cmake/widl-support.cmake Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -20,121 +20,4 @@ #pragma makedep regtypelib -[ - uuid(00020430-0000-0000-C000-000000000046), - restricted, - version(1.0), - helpstring("OLE Automation") -] -library stdole -{ - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - - typedef void *VARIANT; - typedef wchar_t *BSTR; - typedef unsigned long SCODE; - typedef unsigned long HRESULT; - - typedef struct GUID { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[ 8 ]; - } GUID; - - typedef struct DISPPARAMS { - VARIANT *rgvarg; - long *rgdispidNamedArgs; - unsigned int cArgs; - unsigned int cNamedArgs; - } DISPPARAMS; - - typedef struct EXCEPINFO { - unsigned short wCode; - unsigned short wReserved; - BSTR bstrSource; - BSTR bstrDescription; - BSTR bstrHelpFile; - unsigned long dwHelpContext; - void *pvReserved; - void *pfnDeferredFillIn; - SCODE scode; - } EXCEPINFO; - - [ - odl, - uuid(00000000-0000-0000-C000-000000000046) - ] - interface IUnknown - { - [restricted] - HRESULT QueryInterface( - [in] GUID *riid, - [out] void **ppvObj); - - [restricted] - unsigned long AddRef(); - - [restricted] - unsigned long Release(); - } - - [ - odl, - uuid(00020400-0000-0000-C000-000000000046) - ] - interface IDispatch : IUnknown - { - [restricted] - HRESULT GetTypeInfoCount( - [out] unsigned int *pctinfo); - - [restricted] - HRESULT GetTypeInfo( - [in] unsigned int itinfo, - [in] unsigned long lcid, - [out] void **pptinfo); - - [restricted] - HRESULT GetIDsOfNames( - [in] GUID *riid, - [in] char **rgszNames, - [in] unsigned int cNames, - [in] unsigned long lcid, - [out] long *rgdispid); - - [restricted] - HRESULT Invoke( - [in] long dispidMember, - [in] GUID *riid, - [in] unsigned long lcid, - [in] unsigned short wFlags, - [in] DISPPARAMS *pdispparams, - [out] VARIANT *pvarResult, - [out] EXCEPINFO *pexcepinfo, - [out] unsigned int *puArgErr); - - } - - [ - odl, - uuid(00020404-0000-0000-C000-000000000046) - ] - interface IEnumVARIANT : IUnknown - { - HRESULT Next( - [in] unsigned long celt, - [in] VARIANT *rgvar, - [out] unsigned long *pceltFetched); - - HRESULT Skip( - [in] unsigned long celt); - - HRESULT Reset(); - - HRESULT Clone( - [out] IEnumVARIANT **ppenum); - } -}; +#include "stdole32.idl" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -183,7 +183,7 @@ reactos/dll/win32/softpub # Synced to WineStaging-1.9.4 reactos/dll/win32/spoolss # Synced to WineStaging-1.9.4 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.4 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.4 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/sti # Synced to WineStaging-1.9.4 reactos/dll/win32/sxs # Synced to WineStaging-1.9.4 reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 Modified: trunk/reactos/sdk/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/widl-support.cma… ============================================================================== --- trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -12,6 +12,9 @@ get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) + if(${FILE} STREQUAL "std_ole_v1.idl") + set(IDL_FLAGS ${IDL_FLAGS} --oldtlb) + endif() get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb Added: trunk/reactos/sdk/include/psdk/stdole32.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/stdole32.… ============================================================================== --- trunk/reactos/sdk/include/psdk/stdole32.idl (added) +++ trunk/reactos/sdk/include/psdk/stdole32.idl [iso-8859-1] Sun Jul 3 11:18:44 2016 @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#if 0 +#pragma makedep install +#pragma makedep typelib +#endif + +[ + uuid(00020430-0000-0000-C000-000000000046), + restricted, + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Propchange: trunk/reactos/sdk/include/psdk/stdole32.idl ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 4 months

[akhaldi] 71775: [WIDL] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 11:16:23 2016 New Revision: 71775 URL: http://svn.reactos.org/svn/reactos?rev=71775&view=rev Log: [WIDL] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/reactos/sdk/tools/widl/write_sltg.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/widl/CMakeLists.txt trunk/reactos/sdk/tools/widl/header.c trunk/reactos/sdk/tools/widl/parser.h trunk/reactos/sdk/tools/widl/parser.l trunk/reactos/sdk/tools/widl/parser.tab.c trunk/reactos/sdk/tools/widl/parser.tab.h trunk/reactos/sdk/tools/widl/parser.y trunk/reactos/sdk/tools/widl/parser.yy.c trunk/reactos/sdk/tools/widl/typelib.c trunk/reactos/sdk/tools/widl/typelib.h trunk/reactos/sdk/tools/widl/typelib_struct.h trunk/reactos/sdk/tools/widl/widl.c trunk/reactos/sdk/tools/widl/widl.h trunk/reactos/sdk/tools/widl/widltypes.h trunk/reactos/sdk/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/sdk/tools/widl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/CMakeLists.… Modified: trunk/reactos/sdk/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/header.c?re… Modified: trunk/reactos/sdk/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.h?re… Modified: trunk/reactos/sdk/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.l?re… Modified: trunk/reactos/sdk/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.tab.… Modified: trunk/reactos/sdk/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.tab.… Modified: trunk/reactos/sdk/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.y?re… Modified: trunk/reactos/sdk/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/parser.yy.c… Modified: trunk/reactos/sdk/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib.c?r… Modified: trunk/reactos/sdk/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib.h?r… Modified: trunk/reactos/sdk/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/typelib_str… Modified: trunk/reactos/sdk/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widl.c?rev=… Modified: trunk/reactos/sdk/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widl.h?rev=… Modified: trunk/reactos/sdk/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/widltypes.h… Modified: trunk/reactos/sdk/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/write_msft.… Added: trunk/reactos/sdk/tools/widl/write_sltg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/write_sltg.…

8 years, 4 months

[ekohl] 71774: [TRANSLATION] Romanian resources maintenance. Patch by Ștefan Fulea. CORE-11439 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 3 09:51:22 2016 New Revision: 71774 URL: http://svn.reactos.org/svn/reactos?rev=71774&view=rev Log: [TRANSLATION] Romanian resources maintenance. Patch by Ștefan Fulea. CORE-11439 #resolve #comment Thanks a lot! Added: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/network/telnet/telnet.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/subst/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1,11 +1,4 @@ -/* - * FILE: base/applications/cacls/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) - * CHANGE LOG: 2011-08-20 initial translation - * 2011-10-17 diacritics change - */ - +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE @@ -18,7 +11,7 @@ /T ModificÄ ACL pentru fiÈierele specificate Ã®n\n\ directorul curent Èi toate subdirectoarele sale.\n\ /E EditeazÄ ACL curentÄ evitÃ¢nd astfel Ã®nlocuirea ei.\n\ - /C ContinuÄ Èi la erori de acces interzis.\n\ + /C ContinuÄ Èi la erori de acces respins.\n\ /G utilizator:acces AcordÄ drepturile de acces specificate pentru utilizator.\n\ acces poate fi de: R Citire\n\ W Scriere\n\ Modified: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,7 +7,7 @@ COMP [/L] [/A] [data1] [data2]\n\n\ data1 Calea Èi numele primului fiÈier de comparat.\n\ data2 Calea Èi numele celui de-al doilea fiÈier de comparat.\n\ - /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (default: hexadecimal).\n\ + /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (implicit: hexazecimal).\n\ /L AfiÈeazÄ numÄrul liniei pentru diferenÈe.\n" IDS_INVALIDSWITCH "Parametru nevalid - /%c\n" IDS_BADSYNTAX "SintaxÄ eronatÄ\n" Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -30,12 +30,12 @@ STRING_DELETE_VALUE, "Sigur doriÈi Ètergerea valorii de registru Â«%1Â»?" STRING_DELETE_VALUEALL, "Sigur doriÈi Ètergerea tuturor valorilor de registru din Â«%1Â»?" STRING_DELETE_SUBKEY, "Sigur doriÈi Ètergerea cheii de registru Â«%1Â»?" - STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n" - STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n" - STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n" - STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n" - STRING_INVALID_SYNTAX, "reg: Invalid syntax. " - STRING_INVALID_OPTION, "reg: Invalid option [%1]. " - STRING_REG_HELP, "Type ""REG /?"" for help.\n" - STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" + STRING_INVALID_STRING, "reg: OpÈiunea [/d] trebuie urmatÄ de un Èir valid\n" + STRING_VALUEALL_FAILED, "reg: Nu se pot Èterge toate valorile de registru din Â«%1Â». A survenit o eroare neaÈteptatÄ.\n" + STRING_GENERAL_FAILURE, "reg: Nu se poate completa operaÈia specificatÄ. A survenit o eroare neaÈteptatÄ.\n" + STRING_MATCHES_FOUND, "CÄutare efectuatÄ. NumÄrul de potriviri gÄsite: %1!d!\n" + STRING_INVALID_SYNTAX, "reg: SintaxÄ nerespectatÄ. " + STRING_INVALID_OPTION, "reg: OpÈiune nevalidÄ [%1]. " + STRING_REG_HELP, "TastaÈi Â«REG /?Â» pentru mai multe informaÈii.\n" + STRING_FUNC_HELP, "TastaÈi Â«REG %1 /?Â» pentru mai multe informaÈii.\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,5 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Eroare: ComandÄ nerecunoscutÄ.\n" STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate gÄsi alias.\n" STRING_INVALID_QUERY, "Eroare: Cerere nevalidÄ.\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "ConÈinutul din Â«PATHÂ» este sintactic nevalid.\n" } Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1,4 +1,7 @@ -/* 2011.10.18 - Fulea Ètefan: minor changes */ +/* + * Translators: Petru Dimitriu (petrimetri at gmail dot com) + * Ètefan Fulea (stefan dot fulea at mail dot md) + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -37,17 +40,17 @@ BEGIN DEFPUSHBUTTON "Ã&nchide", IDOK, 96, 161, 50, 14 PUSHBUTTON "&Manualâ¦", IDC_BUTTON_HELP, 38, 161, 50, 14 - LTEXT "Factoru&l de mÄrire:", IDC_STATIC, 6, 8, 68, 8 + LTEXT "&Factorul de mÄrire:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "UrmÄrire", IDC_STATIC, 7, 25, 139, 59 GROUPBOX "Prezentare", IDC_STATIC, 7, 87, 139, 57 CONTROL "UrmÄreÈte &cursorul Èoricelului", IDC_FOLLOWMOUSECHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 42, 114, 10 - CONTROL "UrmÄreÈte &focalizarea tastaturii", IDC_FOLLOWKEYBOARDCHECK, "Button", + CONTROL "UrmÄreÈte f&ocalizarea tastaturii", IDC_FOLLOWKEYBOARDCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 54, 114, 10 - CONTROL "UrmÄreÈte editarea &textului", IDC_FOLLOWTEXTEDITINGCHECK, "Button", + CONTROL "UrmÄreÈte &editarea textului", IDC_FOLLOWTEXTEDITINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 66, 114, 10 - CONTROL "&InverseazÄ culorile", IDC_INVERTCOLORSCHECK, "Button", + CONTROL "In&verseazÄ culorile", IDC_INVERTCOLORSCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 102, 114, 10 CONTROL "&PorneÈte minimizat", IDC_STARTMINIMIZEDCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 114, 114, 10 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -9,7 +9,7 @@ BEGIN POPUP "&Jurnal" BEGIN - MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG, GRAYED + MENUITEM "&PÄstrare jurnal de evenimente caâ¦", IDM_SAVE_EVENTLOG, GRAYED MENUITEM SEPARATOR MENUITEM "ÃnlÄt&urÄ toate evenimentele", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR @@ -97,7 +97,7 @@ IDS_APP_TITLE "Observator de evenimente" IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\" IDS_STATUS_MSG "%s are %lu eveniment(e)" - IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea.\n\nThe following information is part of the event:\n\n" + IDS_EVENTSTRINGIDNOTFOUND "Nu se poate gÄsi descrierea evenimentului cu ID-ul ( %lu ) Ã®n sursa ( %s ). Este posibil ca Ã®n calculatorul local sÄ nu existe informaÈiile de registru necesare sau fiÈierele dll de mesaje sÄ afiÈeze mesaje de la un calculator din reÈea.\n\nInformaÈii aferente evenimentului:\n\n" IDS_EVENTLOG_ERROR_TYPE "Eroare" IDS_EVENTLOG_WARNING_TYPE "Avertisment" IDS_EVENTLOG_INFORMATION_TYPE "InformaÈie" Added: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -0,0 +1,97 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + MSG_COPYRIGHT "Telnet Win32 v2.1b2, Drept de autor (C) 2000 Paul Brannan <pbranna(a)clemson.edu>\nÈi echipa. Acest program nu are ataÈatÄ ABSOLUT NICI O GARANÈIE; pentru detalii\ncitiÈi LICENSE.TXT. " + MSG_COPYRIGHT_1 "Acesta este un program gratuit, aveÈi libertatea de a-l re-\ndistribui sub anumite condiÈii.\n\n" + MSG_USAGE "Utilizare: TELNET [parametri] [gazdÄ [port]]\n\n parametri\n -d:FIÈIER.EXT Scrie toate datele recepÈionate Ã®n Â«FIÈIER.EXTÂ».\n gazdÄ Numele gazdei sau adresa IP a gazdei aflate la distanÈÄ.\n" + MSG_USAGE_1 " port Portul de serviciu (implicit pentru telnet este portul 23).\n\n" + MSG_HELP "Comenzile pot fi abreviate. Acestea sunt:\n \ncl[ose] Ãnchide conexiunea curentÄ.\nop[en] ConecteazÄ la un sit.\nq[uit] IeÈire din telnet.\n" + MSG_HELP_1 "ke[ys] AfiÈeazÄ/altereazÄ configuraÈii de taste.\nse[t] AfiÈeazÄ/altereazÄ opÈiunile de configurare.\nz SuspendÄ.\n? h[elp] AfiÈeazÄ informaÈiile de utilizare.\n" + MSG_INVCMD "ComandÄ nevalidÄ. TastaÈi ? pentru informaÈii.\n" + MSG_ERROR "%1 a eÈuat.\n" + MSG_INFO "%1\n" + MSG_WARNING "%1\n" + MSG_TRYING "Se Ã®ncearcÄ %1.%2.%3.%4:%5...\n" + MSG_CONNECTED "Conectat la %1. Pentru ieÈire apÄsaÈi ALT-%2.\n" + MSG_TERMBYREM "Conexiune Ã®ncheiatÄ.\n" + MSG_KEYMAP "Se Ã®ncarcÄ %1 de la %2.\n" + MSG_ERRKEYMAP "EÈec la Ã®ncÄrcarea configuraÈiei de taste.\n" + MSG_DUMPFILE "Se scriu Ã®n fiÈierul %1 informaÈii de ieÈire.\n" + MSG_CONFIG "Se Ã®ncarcÄ din %1 opÈiunile de configurare.\n" + MSG_NOINI "Eroare la Ã®ncÄrcarea fiÈierului de configurare %1.\nSe Ã®ncarcÄ opÈiunile implicite.\n" + MSG_BADVAL "Avertisment: variabila %1 nu este validÄ.\n" + MSG_NOSPAWN "Nu se reuÈeÈte lansarea procesului.\n" + MSG_RESOLVING "Se cautÄ gazda: %1..." + MSG_NOSERVICE "Nu se poate gÄsi serviciul TCP %1.\n" + MSG_SIZEALIAS "Avertisment: dimensiunea de alias %1 este prea mare, se ignorÄ.\n" + MSG_ERRPIPE "Eroare: nu se reuÈeÈte lansarea procesului pentru conexiune.\n" + MSG_BADUSAGE "Eroare: utilizare nevalidÄ a comenzii.\n" + MSG_ALREADYCONNECTED "Conexiunea la %1 a fost deja stabilitÄ.\n" + MSG_WSAEINTR "Apel de funcÈie Ã®ntrerupt.\n" + MSG_WSAEBADF "WSAEBADF\n" + MSG_WSAEACCESS "Acces respins.\n" + MSG_WSAEDEFAULT "WSAEDEFAULT\n" + MSG_WSAEINVAL "Argument nevalid.\n" + MSG_WSAEMFILE "Prea multe fiÈiere deschise.\n" + MSG_WSAEWOULDBLOCK "Resursa nu este momentan disponibilÄ.\n" + MSG_WSAEINPROGRESS "OperaÈia este Ã®n curs de execuÈie.\n" + MSG_WSAEALREADY "OperaÈia este deja Ã®n curs de execuÈie.\n" + MSG_WSAENOTSOCK "OperaÈia de soclu nu poate fi aplicatÄ pe non-soclu.\n" + MSG_WSAEDESTADDRREQ "Este necesarÄ adresa de destinaÈie.\n" + MSG_WSAEMSGSIZE "Mesajul este prea lung.\n" + MSG_WSAEPROTOTYPE "Protocolul este nepotrivit pentru soclu.\n" + MSG_WSAENOPROTOOPT "OpÈiunea de protocol nu este validÄ.\n" + MSG_WSAEPROTONOTSUPPORT "Protocolul nu este recunoscut.\n" + MSG_WSAESOCKNOTSUPPORT "Tipul de soclu nu este recunoscut.\n" + MSG_WSAEOPNOTSUPP "OperaÈia nu este recunoscutÄ.\n" + MSG_WSAEPFNOTSUPPORT "Familia de protocoale nu este cunoscutÄ.\n" + MSG_WSAEAFNOTSUPPORT "Familia de adrese nu este cunoscutÄ de familia de protocoale.\n" + MSG_WSAEADDRINUSE "Adresa este deja Ã®n uz.\n" + MSG_WSAEADDRNOTAVAIL "Nu se poate atribui adresa solicitatÄ.\n" + MSG_WSAENETDOWN "ReÈeaua este scoasÄ din funcÈiune.\n" + MSG_WSAENETUNREACH "ReÈeaua nu poate fi accesatÄ.\n" + MSG_WSAENETRESET "Conexiunea de reÈea a cÄzut la Ã®ntrerupere.\n" + MSG_WSAECONNABORTED "Conexiunea a fost Ã®ntreruptÄ de program.\n" + MSG_WSAECONNRESET "Conexiunea a fost Ã®ntreruptÄ de partener.\n" + MSG_WSAENOBUFS "Nu existÄ memorie intermediarÄ disponibilÄ.\n" + MSG_WSAEISCONN "Soclul este deja Ã®n conexiune.\n" + MSG_WSAENOTCONN "Soclul nu este Ã®n conexiune.\n" + MSG_WSAESHUTDOWN "Nu se poate transmite dupÄ Ã®nchiderea soclului.\n" + MSG_WSAETOOMANYREFS "WSAETOOMANYREFS\n" + MSG_WSAETIMEDOUT "Conexiunea a expirat.\n" + MSG_WSAECONNREFUSED "Conexiunea este refuzatÄ.\n" + MSG_WSAELOOP "WSAELOOP\n" + MSG_WSAENAMETOOLONG "Numele este prea lung.\n" + MSG_WSAEHOSTDOWN "Gazda nu este disponibilÄ.\n" + MSG_WSAEHOSTUNREACH "Nu existÄ canale disponibile cÄtre gazdÄ.\n" + MSG_WSAESYSNOTREADY "Subsistemul de reÈea nu este disponibil.\n" + MSG_WSAVERNOTSUPPORTED "Versiunea pentru WINSOCK.DLL nu este compatibilÄ.\n" + MSG_WSANOTINITIALISED "IniÈializarea cu succes Ã®ncÄ nu a avut loc.\n" + MSG_WSAHOST_NOT_FOUND "Gazda nu a fost gÄsitÄ.\n" + MSG_WSATRY_AGAIN "Gazda ne-autoritatÄ nu a fost gÄsitÄ.\n" + MSG_WSANO_RECOVERY "Eroare, stare nerecuperabilÄ.\n" + MSG_WSANO_DATA "Numeele este valid, nu existÄ date de tipul solicitat.\n" + MSG_KEYNOVAL "[GLOBAL]: Nu existÄ valoare pentru %1.\n" + MSG_KEYBADVAL "[GLOBAL]: Valoarea pentru %1 este eronatÄ.\n" + MSG_KEYBADSTRUCT "%1: StructurÄ eronatÄ.\n" + MSG_KEYBADCHARS "%1: Caractere eronate? %1 -> %3.\n" + MSG_KEYUNEXPLINE "RÃ¢nd neprevÄzut Â«%1Â».\n" + MSG_KEYUNEXPEOF "SfÃ¢rÈit neprevÄzut de fiÈier.\n" + MSG_KEYUNEXPTOK "Simbol neprevÄzut %1.\n" + MSG_KEYUNEXPTOKIN "Simbol neprevÄzut la %1.\n" + MSG_KEYUNEXP "SfÃ¢rÈit neprevÄzut de fiÈier sau simbol.\n" + MSG_KEYNOGLOBAL "Nu existÄ definiÈie pentru [GLOBAL]!\n" + MSG_KEYNOCONFIG "Nu existÄ [CONFIG %1].\n" + MSG_KEYUSECONFIG "Utilizare configuraÈie: %1.\n" + MSG_KEYNOSWKEY "Nu existÄ tastÄ de comutare pentru Â«%1Â».\n" + MSG_KEYCANNOTDEF "Se ignorÄ, nu se definesc taste de comutare Ã®n configuraÈia implicitÄ.\n" + MSG_KEYDUPSWKEY "Duplicare tastÄ de comutare.\n" + MSG_KEYUNKNOWNMAP "%1 este o configuraÈie de taste necunoscutÄ.\n" + MSG_KEYNOCHARMAPS "Nu au fost Ã®ncÄrcate configuraÈii de caractere.\n" + MSG_KEYNOKEYMAPS "Nu au fost Ã®ncÄrcate configuraÈii de taste.\n" + MSG_KEYNUMMAPS "Ãn total existÄ %1 configuraÈii.\n" + MSG_KEYBADMAP "NumÄr de configuraÈie de taste nevalid, Ã®ncercaÈi Â«keys displayÂ»\n" + MSG_KEYMAPSWITCHED "ConfiguraÈia de taste a fost comutatÄ.\n" +END Propchange: trunk/reactos/base/applications/network/telnet/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/telnet/telnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -16,6 +16,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -553,7 +553,7 @@ STRING_REPLACE_ERROR2 "Calea nu este gÄsitÄ - %s\n" STRING_REPLACE_ERROR3 "Numele fiÈierului, directorului sau eticheta volumului este incorectÄ.\n" STRING_REPLACE_ERROR4 "CombinaÈia de argumente nu este validÄ!\n" - STRING_REPLACE_ERROR5 "Acces nepermis - %s\n" + STRING_REPLACE_ERROR5 "Acces respins - %s\n" STRING_REPLACE_ERROR6 "FiÈierele nu au fost gÄsite - %s\n" STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" STRING_CMD_INFOLINE " Interpretorul de comenzi ReactOS TastaÈi HELP = Ajutor " Modified: trunk/reactos/base/system/subst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ro-… ============================================================================== --- trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -7,8 +7,8 @@ IDS_INCORRECT_PARAMETER_COUNT "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER "NumÄr eronat de parametri - %s\n" IDS_INVALID_PARAMETER2 "Parametru eronat - %s\n" - IDS_PATH_NOT_FOUND "Path not found - %s\n" - IDS_ACCESS_DENIED "Access denied - %s\n" + IDS_PATH_NOT_FOUND "Cale inexistentÄ - %s\n" + IDS_ACCESS_DENIED "Acces respins - %s\n" IDS_DRIVE_ALREADY_SUBSTED "Unitatea este deja SUBSTituitÄ\n" IDS_FAILED_WITH_ERRORCODE "OperaÈia a eÈuat. Codul de eroare 0x%x: %s\n" IDS_USAGE "Substituie un director cu o unitate de stocare.\n\n\ Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -83,44 +83,44 @@ IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connetions using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "AlegeÈi o configuraÈie tipicÄ sau una particularizatÄ:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "ConfiguraÈie tipicÄ", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ConfiguraÈie particularizatÄ", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "CreazÄ conexiuni de reÈea utilizÃ¢nd Clientela de reÈele ReactOS, Partajarea de fiÈiere Èi imprimante pentru reÈele ReactOS, Èi (protocolul) TCP/IP pentru adresare automatÄ.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Permite configurarea manualÄ a componentelor de reÈea.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 - LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 + LTEXT "Pentru dispozitiv:", IDC_STATIC, 33, 2, 160, 20 + LTEXT "nespecificat", IDC_NETWORK_DEVICE, 135, 2, 253, 20 + LTEXT "AceastÄ conexiune utilizeazÄ urmÄtoarele componente bifate:", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP - GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX + PUSHBUTTON "&Instalareâ¦", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&DezinstaleazÄ", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&ProprietÄÈi", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "Descriere", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "DoriÈi ca acest calculator sÄ fie membru al unui domeniu?\n\ +(PuteÈi afla aceastÄ informaÈie de la administratorul de reÈea.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Nu, acest calculator va fi parte a unui grup de lucru.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Da, acest calculator va fi parte a unui domeniu.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Grup de Lucru sau Nume de Domeniu:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "NOTÄ: DacÄ acest calculator nu va fi parte a unei reÈele, nu sunt disponibile privelegiile necesare apartenenÈei la un domeniu, sau nu cunoaÈteÈi ce sÄ specificaÈi, lÄsaÈi valoarea implicitÄ. VeÈi putea modifica aceastÄ opÈiune mai tÃ¢rziu.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -170,12 +170,12 @@ STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administator. A workgroup is a group of computers sharing the same workgroup name." - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_NETWORKSETTINGSTITLE "ConfiguraÈie de reÈea" + IDS_NETWORKSETTINGSSUBTITLE "Instalare Èi configurare reÈea pentru conectarea la alte reÈele, calculatoare Èi Internet." + IDS_NETWORKCOMPONENTTITLE "Componente de reÈea" + IDS_NETWORKCOMPONENTSUBTITLE "Determinare componente de reÈea necesare calculatorului. Pentru adÄugare de noi componente, apÄsaÈi âInstalareâ." + IDS_NETWORKDOMAINTITLE "Grup de lucru sau domeniu de calculator" + IDS_NETWORKDOMAINSUBTITLE "Un domeniu sau un grup de calculatoare definit de administratorul de reÈea. Un grup de lucru este un grup de calculatoare avÃ¢nd acelaÈi nume de grup." + IDS_REACTOS_SETUP "Asistent de instalare ReactOS" + IDS_WZD_DOMAIN_NAME "Asistentul nu poate continua pÃ¢nÄ\nnu veÈi introduce un nume de domeniu\nsau grup de lucru." END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -684,7 +684,7 @@ IDS_RENAME "Rede&numeÈte" IDS_PASTE "&LipeÈte" - IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Eroare de permisiune." + IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Acces respins." IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" IDS_DELETEITEM_CAPTION "Confirmarea Ètergerii fiÈierului" IDS_DELETEFOLDER_CAPTION "Confirmarea Ètergerii dosarului" Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sun Jul 3 09:51:22 2016 @@ -1163,6 +1163,9 @@ COMMUNICATIONS=CommunicaÈii GAMES=Jocuri +README_TITLE=De citit +README_DESC=FiÈier de informare ReactOS + CMD_TITLE=Linie de comandÄ CMD_DESC=Mediu textual cu operaÈii lansate de la linia de comandÄ. EXPLORER_TITLE=Explorator ReactOS

8 years, 4 months

[tfaber] 71773: [KMTESTS] - Addendum to r71770 CORE-11509

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 3 09:23:37 2016 New Revision: 71773 URL: http://svn.reactos.org/svn/reactos?rev=71773&view=rev Log: [KMTESTS] - Addendum to r71770 CORE-11509 Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Jul 3 09:23:37 2016 @@ -54,6 +54,7 @@ KMT_TESTFUNC Test_NpfsVolumeInfo; KMT_TESTFUNC Test_ObHandle; KMT_TESTFUNC Test_ObReference; +KMT_TESTFUNC Test_ObSymbolicLink; KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; KMT_TESTFUNC Test_ObTypeNoClean; @@ -122,6 +123,7 @@ { "NpfsVolumeInfo", Test_NpfsVolumeInfo }, { "ObHandle", Test_ObHandle }, { "ObReference", Test_ObReference }, + { "ObSymbolicLink", Test_ObSymbolicLink }, { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, { "-ObTypeNoClean", Test_ObTypeNoClean },

8 years, 4 months

[ekohl] 71772: [SC] Failure command: - Parse the actions parameter. - Adjust the shutdown privilege in order to set the failure actions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 3 08:56:43 2016 New Revision: 71772 URL: http://svn.reactos.org/svn/reactos?rev=71772&view=rev Log: [SC] Failure command: - Parse the actions parameter. - Adjust the shutdown privilege in order to set the failure actions. Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/failure.c trunk/reactos/base/applications/sc/misc.c trunk/reactos/base/applications/sc/sc.h Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -22,6 +22,6 @@ add_executable(sc ${SOURCE} sc.rc) set_module_type(sc win32cui UNICODE) -add_importlibs(sc advapi32 msvcrt kernel32) +add_importlibs(sc advapi32 msvcrt kernel32 ntdll) add_pch(sc sc.h SOURCE) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sc/failure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/failu… ============================================================================== --- trunk/reactos/base/applications/sc/failure.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/failure.c [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -126,6 +126,9 @@ BOOL bResult = TRUE; SERVICE_FAILURE_ACTIONS FailureActions; LPCTSTR lpServiceName = NULL; + BOOLEAN Old = FALSE; + + ZeroMemory(&FailureActions, sizeof(SERVICE_FAILURE_ACTIONS)); if (!ParseFailureArguments(ServiceArgs, ArgCount, &lpServiceName, &FailureActions)) { @@ -145,13 +148,15 @@ hService = OpenService(hManager, lpServiceName, - SERVICE_CHANGE_CONFIG); + SERVICE_CHANGE_CONFIG | SERVICE_START); if (hService == NULL) { _tprintf(_T("[SC] OpenService FAILED %lu:\n\n"), GetLastError()); bResult = FALSE; goto done; } + + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); if (!ChangeServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, @@ -165,8 +170,13 @@ _tprintf(_T("[SC] ChangeServiceConfig2 SUCCESS\n\n")); done: + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); + if (bResult == FALSE) ReportLastError(); + + if (FailureActions.lpsaActions != NULL) + HeapFree(GetProcessHeap(), 0, FailureActions.lpsaActions); if (hService) CloseServiceHandle(hService); Modified: trunk/reactos/base/applications/sc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/misc.… ============================================================================== --- trunk/reactos/base/applications/sc/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/misc.c [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -161,6 +161,101 @@ BOOL +ParseFailureActions( + IN LPCTSTR lpActions, + OUT DWORD *pcActions, + OUT SC_ACTION **ppActions) +{ + SC_ACTION *pActions = NULL; + LPTSTR pStringBuffer = NULL; + LPTSTR p; + INT nLength; + INT nCount = 0; + + *pcActions = 0; + *ppActions = NULL; + + nLength = _tcslen(lpActions); + + /* Allocate the string buffer */ + pStringBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 2) * sizeof(TCHAR)); + if (pStringBuffer == NULL) + { + return FALSE; + } + + /* Copy the actions string into the string buffer */ + CopyMemory(pStringBuffer, lpActions, nLength * sizeof(TCHAR)); + + /* Replace all slashes by null characters */ + p = pStringBuffer; + while (*p != 0 /*_T('\0')*/) + { + if (*p == _T('/')) + *p = 0; //_T('\0'); + p++; + } + + /* Count the arguments in the buffer */ + p = pStringBuffer; + while (*p != 0 /*_T('\0')*/) + { + nCount++; + + nLength = _tcslen(p); + p = (LPTSTR)((LONG_PTR)p + ((nLength + 1) * sizeof(TCHAR))); + } + + /* Allocate the actions buffer */ + pActions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCount / 2 * sizeof(SC_ACTION)); + if (pActions == NULL) + { + HeapFree(GetProcessHeap(), 0, pStringBuffer); + return FALSE; + } + + /* Parse the string buffer */ + nCount = 0; + p = pStringBuffer; + while (*p != _T('\0')) + { + nLength = _tcslen(p); + + if (nCount % 2 == 0) + { + /* Action */ + if (_tcsicmp(p, _T("reboot"))) + pActions[nCount / 2].Type = SC_ACTION_REBOOT; + else if (_tcsicmp(p, _T("restart"))) + pActions[nCount / 2].Type = SC_ACTION_RESTART; + else if (_tcsicmp(p, _T("run"))) + pActions[nCount / 2].Type = SC_ACTION_RUN_COMMAND; + else + break; + } + else + { + /* Delay */ + pActions[nCount / 2].Delay = _tcstoul(p, NULL, 10); + if (pActions[nCount / 2].Delay == 0 && errno == ERANGE) + break; + } + + p = (LPTSTR)((LONG_PTR)p + ((nLength + 1) * sizeof(TCHAR))); + nCount++; + } + + /* Free the string buffer */ + HeapFree(GetProcessHeap(), 0, pStringBuffer); + + *pcActions = nCount / 2; + *ppActions = pActions; + + return TRUE; +} + + +BOOL ParseFailureArguments( IN LPCTSTR *ServiceArgs, IN INT ArgCount, @@ -220,7 +315,12 @@ if (lpActions != NULL) { - /* FIXME */ + if (!ParseFailureActions(lpActions, + &pFailureActions->cActions, + &pFailureActions->lpsaActions)) + { + return FALSE; + } } return (ArgCount == 0); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sun Jul 3 08:56:43 2016 @@ -3,11 +3,16 @@ #include <stdarg.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winsvc.h> #include <sddl.h> #include <tchar.h> + +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> + #define SCDBG

8 years, 4 months

[tfaber] 71771: [NTOS:OB] - Use the correct buffer size for the link target in NtCreateSymbolicLinkObject CORE-11509

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 3 08:54:20 2016 New Revision: 71771 URL: http://svn.reactos.org/svn/reactos?rev=71771&view=rev Log: [NTOS:OB] - Use the correct buffer size for the link target in NtCreateSymbolicLinkObject CORE-11509 Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sun Jul 3 08:54:20 2016 @@ -589,8 +589,7 @@ /* Setup the target name */ SymbolicLink->LinkTarget.Length = CapturedLinkTarget.Length; - SymbolicLink->LinkTarget.MaximumLength = CapturedLinkTarget.Length + - sizeof(WCHAR); + SymbolicLink->LinkTarget.MaximumLength = CapturedLinkTarget.MaximumLength; SymbolicLink->LinkTarget.Buffer = ExAllocatePoolWithTag(PagedPool, CapturedLinkTarget.MaximumLength,

8 years, 4 months

[tfaber] 71770: [KMTESTS:OB] - Add a test for ZwCreateSymbolicLinkObject/ZwQuerySymbolicLinkObject CORE-11509

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 3 08:31:28 2016 New Revision: 71770 URL: http://svn.reactos.org/svn/reactos?rev=71770&view=rev Log: [KMTESTS:OB] - Add a test for ZwCreateSymbolicLinkObject/ZwQuerySymbolicLinkObject CORE-11509 Added: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sun Jul 3 08:31:28 2016 @@ -79,6 +79,7 @@ ntos_mm/ZwMapViewOfSection.c ntos_ob/ObHandle.c ntos_ob/ObReference.c + ntos_ob/ObSymbolicLink.c ntos_ob/ObType.c ntos_ob/ObTypes.c ntos_ob/ObWait.c Added: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObSymboli… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c (added) +++ trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c [iso-8859-1] Sun Jul 3 08:31:28 2016 @@ -0,0 +1,282 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test for Zw*SymbolicLinkObject + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +static +VOID +TestQueryLink( + _In_ HANDLE LinkHandle, + _In_ PCUNICODE_STRING ExpectedTarget) +{ + NTSTATUS Status; + WCHAR QueriedTargetBuffer[32]; + UNICODE_STRING QueriedTarget; + ULONG ResultLength; + PULONG pResultLength; + ULONG i; + + for (i = 0; i < 2; i++) + { + if (i == 0) + { + pResultLength = &ResultLength; + } + else + { + pResultLength = NULL; + } + + /* Query with NULL Buffer just gives us the length */ + RtlInitEmptyUnicodeString(&QueriedTarget, NULL, 0); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.MaximumLength, 0); + ok_eq_pointer(QueriedTarget.Buffer, NULL); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + + /* Query with Length-1 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length - 1); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length - 1); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + + /* Query with Length buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + if (pResultLength && + QueriedTarget.MaximumLength < ExpectedTarget->MaximumLength) + { + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with Length+1 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length + 1); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length + 1); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + if (pResultLength && + QueriedTarget.MaximumLength < ExpectedTarget->MaximumLength) + { + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + ok_eq_uint(QueriedTarget.Length, 0); + ok_eq_uint(QueriedTarget.Buffer[0], 0x5555); + if (pResultLength) ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with Length+2 buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + ExpectedTarget->Length + sizeof(WCHAR)); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok_eq_uint(QueriedTarget.MaximumLength, ExpectedTarget->Length + sizeof(WCHAR)); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + if (pResultLength) + { + if (ExpectedTarget->MaximumLength >= ExpectedTarget->Length + sizeof(UNICODE_NULL)) + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0); + ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + + /* Query with full-sized buffer */ + RtlInitEmptyUnicodeString(&QueriedTarget, + QueriedTargetBuffer, + sizeof(QueriedTargetBuffer)); + RtlFillMemory(&QueriedTargetBuffer, sizeof(QueriedTargetBuffer), 0x55); + if (pResultLength) ResultLength = 0x55555555; + Status = ZwQuerySymbolicLinkObject(LinkHandle, + &QueriedTarget, + pResultLength); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(QueriedTarget.Length, ExpectedTarget->Length); + ok_eq_uint(QueriedTarget.MaximumLength, sizeof(QueriedTargetBuffer)); + ok_eq_pointer(QueriedTarget.Buffer, QueriedTargetBuffer); + ok(RtlEqualUnicodeString(&QueriedTarget, ExpectedTarget, FALSE), "%wZ != %wZ\n", &QueriedTarget, ExpectedTarget); + if (pResultLength) + { + if (ExpectedTarget->MaximumLength >= ExpectedTarget->Length + sizeof(UNICODE_NULL)) + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0); + ok_eq_ulong(ResultLength, ExpectedTarget->MaximumLength); + } + else + { + ok_eq_uint(QueriedTarget.Buffer[QueriedTarget.Length / sizeof(WCHAR)], 0x5555); + } + } +} + +START_TEST(ObSymbolicLink) +{ + NTSTATUS Status; + HANDLE LinkHandle; + HANDLE LinkHandle2; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\Device\\ObSymbolicLinkKmtestNamedPipe"); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DefaultLinkTarget = RTL_CONSTANT_STRING(L"\\Device\\NamedPipe"); + UNICODE_STRING LinkTarget = DefaultLinkTarget; + + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create it */ + LinkHandle = KmtInvalidPointer; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle != NULL && LinkHandle != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (skip(NT_SUCCESS(Status), "Failed to create link\n")) + { + return; + } + + /* Now we should be able to open it */ + LinkHandle2 = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle2, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle2 != NULL && LinkHandle2 != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle2); + if (!skip(NT_SUCCESS(Status), "Failed to open symlink\n")) + { + TestQueryLink(LinkHandle2, &LinkTarget); + ObCloseHandle(LinkHandle2, KernelMode); + } + + /* Close it */ + ObCloseHandle(LinkHandle, KernelMode); + + /* Open fails again */ + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create with broken LinkTarget */ + LinkHandle = KmtInvalidPointer; + LinkTarget.Buffer = NULL; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_ACCESS_VIOLATION); + ok(LinkHandle == KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Since it failed, open should also fail */ + LinkHandle = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + ok_eq_pointer(LinkHandle, NULL); + if (NT_SUCCESS(Status)) ObCloseHandle(LinkHandle, KernelMode); + + /* Create with valid, but not null-terminated LinkTarget */ + LinkTarget = DefaultLinkTarget; + LinkTarget.MaximumLength = LinkTarget.Length; + LinkHandle = KmtInvalidPointer; + Status = ZwCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes, + &LinkTarget); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle != NULL && LinkHandle != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle); + if (skip(NT_SUCCESS(Status), "Failed to create link\n")) + { + return; + } + + /* Now we should be able to open it */ + LinkHandle2 = KmtInvalidPointer; + Status = ZwOpenSymbolicLinkObject(&LinkHandle2, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(LinkHandle2 != NULL && LinkHandle2 != KmtInvalidPointer, "LinkHandle = %p\n", LinkHandle2); + if (!skip(NT_SUCCESS(Status), "Failed to open symlink\n")) + { + TestQueryLink(LinkHandle2, &LinkTarget); + ObCloseHandle(LinkHandle2, KernelMode); + } + + /* Close it */ + ObCloseHandle(LinkHandle, KernelMode); +} Propchange: trunk/rostests/kmtests/ntos_ob/ObSymbolicLink.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 4 months

[tfaber] 71769: [NTOS:OB] - Use SEH to access the link target buffer in NtQuerySymbolicLinkObject CORE-11509

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 3 08:22:43 2016 New Revision: 71769 URL: http://svn.reactos.org/svn/reactos?rev=71769&view=rev Log: [NTOS:OB] - Use SEH to access the link target buffer in NtQuerySymbolicLinkObject CORE-11509 Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sun Jul 3 08:22:43 2016 @@ -603,9 +603,18 @@ } /* Copy it */ - RtlCopyMemory(SymbolicLink->LinkTarget.Buffer, - CapturedLinkTarget.Buffer, - CapturedLinkTarget.MaximumLength); + _SEH2_TRY + { + RtlCopyMemory(SymbolicLink->LinkTarget.Buffer, + CapturedLinkTarget.Buffer, + CapturedLinkTarget.MaximumLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ObDereferenceObject(SymbolicLink); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; /* Initialize the remaining name, dos drive index and target object */ SymbolicLink->LinkTargetObject = NULL;

8 years, 4 months

[hbelusca] 71768: [KERNEL32]: Formatting fixes (whitespace...) only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 2 20:52:25 2016 New Revision: 71768 URL: http://svn.reactos.org/svn/reactos?rev=71768&view=rev Log: [KERNEL32]: Formatting fixes (whitespace...) only. Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] Sat Jul 2 20:52:25 2016 @@ -71,19 +71,19 @@ TRUE, L"DBWinMutex"); - if(hMutex != NULL) + if (hMutex != NULL) { /* success */ return hMutex; } /* error other than the mutex not being found */ - else if(GetLastError() != ERROR_FILE_NOT_FOUND) + else if (GetLastError() != ERROR_FILE_NOT_FOUND) { /* failure */ return NULL; } - /* if the mutex doesn't exist, create it */ + /* if the mutex doesn't exist, create it */ /* first, set up the mutex security */ /* allocate the NT AUTHORITY\SYSTEM SID */ @@ -100,7 +100,7 @@ &psidSystem); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate the BUILTIN\Administrators SID */ nErrCode = RtlAllocateAndInitializeSid(&siaNTAuth, @@ -116,7 +116,7 @@ &psidAdministrators); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate the Everyone SID */ nErrCode = RtlAllocateAndInitializeSid(&siaWorldAuth, @@ -132,7 +132,7 @@ &psidEveryone); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* allocate space for the SIDs too */ nDaclBufSize += RtlLengthSid(psidSystem); @@ -143,13 +143,13 @@ pDaclBuf = GlobalAlloc(GMEM_FIXED, nDaclBufSize); /* failure */ - if(pDaclBuf == NULL) goto l_Cleanup; + if (pDaclBuf == NULL) goto l_Cleanup; /* create the DACL */ nErrCode = RtlCreateAcl(pDaclBuf, nDaclBufSize, ACL_REVISION); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant the minimum required access to Everyone */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -160,7 +160,7 @@ psidEveryone); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant full access to BUILTIN\Administrators */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -169,7 +169,7 @@ psidAdministrators); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* grant full access to NT AUTHORITY\SYSTEM */ nErrCode = RtlAddAccessAllowedAce(pDaclBuf, @@ -178,14 +178,14 @@ psidSystem); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* create the security descriptor */ nErrCode = RtlCreateSecurityDescriptor(&sdMutexSecurity, SECURITY_DESCRIPTOR_REVISION); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* set the descriptor's DACL to the ACL we created */ nErrCode = RtlSetDaclSecurityDescriptor(&sdMutexSecurity, @@ -194,19 +194,19 @@ FALSE); /* failure */ - if(!NT_SUCCESS(nErrCode)) goto l_Cleanup; + if (!NT_SUCCESS(nErrCode)) goto l_Cleanup; /* create the mutex */ hMutex = CreateMutexW(&saMutexAttribs, FALSE, L"DBWinMutex"); l_Cleanup: /* free the buffers */ - if(pDaclBuf) GlobalFree(pDaclBuf); - if(psidEveryone) RtlFreeSid(psidEveryone); - if(psidAdministrators) RtlFreeSid(psidAdministrators); - if(psidSystem) RtlFreeSid(psidSystem); - - return hMutex; + if (pDaclBuf) GlobalFree(pDaclBuf); + if (psidEveryone) RtlFreeSid(psidEveryone); + if (psidAdministrators) RtlFreeSid(psidAdministrators); + if (psidSystem) RtlFreeSid(psidSystem); + + return hMutex; } VOID @@ -425,8 +425,8 @@ /* Check if the process has a debug object/port */ Status = NtQueryInformationProcess(hProcess, ProcessDebugPort, - (PVOID)&DebugPort, - sizeof(HANDLE), + &DebugPort, + sizeof(DebugPort), NULL); if (NT_SUCCESS(Status)) { @@ -558,7 +558,7 @@ /* Send the breakin request */ Status = DbgUiIssueRemoteBreakin(Process); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { /* Failure */ BaseSetLastNTError(Status); @@ -727,212 +727,212 @@ WINAPI OutputDebugStringA(IN LPCSTR _OutputString) { - _SEH2_TRY - { - ULONG_PTR a_nArgs[2]; - - a_nArgs[0] = (ULONG_PTR)(strlen(_OutputString) + 1); - a_nArgs[1] = (ULONG_PTR)_OutputString; - - /* send the string to the user-mode debugger */ - RaiseException(DBG_PRINTEXCEPTION_C, 0, 2, a_nArgs); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* no user-mode debugger: try the systemwide debug message monitor, or the - kernel debugger as a last resort */ - - /* mutex used to synchronize invocations of OutputDebugString */ - static HANDLE s_hDBMonMutex = NULL; - /* true if we already attempted to open/create the mutex */ - static BOOL s_bDBMonMutexTriedOpen = FALSE; - - /* local copy of the mutex handle */ - volatile HANDLE hDBMonMutex = s_hDBMonMutex; - /* handle to the Section of the shared buffer */ - volatile HANDLE hDBMonBuffer = NULL; - - /* pointer to the mapped view of the shared buffer. It consist of the current - process id followed by the message string */ - struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; - - /* event: signaled by the debug message monitor when OutputDebugString can write - to the shared buffer */ - volatile HANDLE hDBMonBufferReady = NULL; - - /* event: to be signaled by OutputDebugString when it's done writing to the - shared buffer */ - volatile HANDLE hDBMonDataReady = NULL; - - /* mutex not opened, and no previous attempts to open/create it */ - if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) - { - /* open/create the mutex */ - hDBMonMutex = K32CreateDBMonMutex(); - /* store the handle */ - s_hDBMonMutex = hDBMonMutex; - } - - _SEH2_TRY - { - volatile PCHAR a_cBuffer = NULL; - - /* opening the mutex failed */ - if(hDBMonMutex == NULL) - { - /* remember next time */ - s_bDBMonMutexTriedOpen = TRUE; - } - /* opening the mutex succeeded */ - else - { - do - { - /* synchronize with other invocations of OutputDebugString */ - WaitForSingleObject(hDBMonMutex, INFINITE); - - /* buffer of the system-wide debug message monitor */ - hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); - - /* couldn't open the buffer: send the string to the kernel debugger */ - if(hDBMonBuffer == NULL) break; - - /* map the buffer */ - pDBMonBuffer = MapViewOfFile(hDBMonBuffer, - SECTION_MAP_READ | SECTION_MAP_WRITE, - 0, - 0, - 0); - - /* couldn't map the buffer: send the string to the kernel debugger */ - if(pDBMonBuffer == NULL) break; - - /* open the event signaling that the buffer can be accessed */ - hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); - - /* couldn't open the event: send the string to the kernel debugger */ - if(hDBMonBufferReady == NULL) break; - - /* open the event to be signaled when the buffer has been filled */ - hDBMonDataReady = OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); - } - while(0); - - /* we couldn't connect to the system-wide debug message monitor: send the - string to the kernel debugger */ - if(hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); - } - - _SEH2_TRY - { - /* size of the current output block */ - volatile SIZE_T nRoundLen; - - /* size of the remainder of the string */ - volatile SIZE_T nOutputStringLen; - - /* output the whole string */ - nOutputStringLen = strlen(_OutputString); - - do - { - /* we're connected to the debug monitor: - write the current block to the shared buffer */ - if(hDBMonDataReady) - { - /* wait a maximum of 10 seconds for the debug monitor - to finish processing the shared buffer */ - if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) - { - /* timeout or failure: give up */ - break; - } - - /* write the process id into the buffer */ - pDBMonBuffer->ProcessId = GetCurrentProcessId(); - - /* write only as many bytes as they fit in the buffer */ - if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) - nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; - else - nRoundLen = nOutputStringLen; - - /* copy the current block into the buffer */ - memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - pDBMonBuffer->Buffer[nRoundLen] = 0; - - /* signal that the data contains meaningful data and can be read */ - SetEvent(hDBMonDataReady); - } - /* else, send the current block to the kernel debugger */ - else - { - /* output in blocks of 512 characters */ - a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); - - if (!a_cBuffer) - { - DbgPrint("OutputDebugStringA: Failed\n"); - break; - } - - /* write a maximum of 511 bytes */ - if(nOutputStringLen > 510) - nRoundLen = 510; - else - nRoundLen = nOutputStringLen; - - /* copy the current block */ - memcpy(a_cBuffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - a_cBuffer[nRoundLen] = 0; - - /* send the current block to the kernel debugger */ - DbgPrint("%s", a_cBuffer); - - if (a_cBuffer) - { - HeapFree(GetProcessHeap(), 0, a_cBuffer); - a_cBuffer = NULL; - } - } - - /* move to the next block */ - _OutputString += nRoundLen; - nOutputStringLen -= nRoundLen; - } - /* repeat until the string has been fully output */ - while (nOutputStringLen > 0); - } - /* ignore access violations and let other exceptions fall through */ - _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) - { - if (a_cBuffer) - HeapFree(GetProcessHeap(), 0, a_cBuffer); - - /* string copied verbatim from Microsoft's kernel32.dll */ - DbgPrint("\nOutputDebugString faulted during output\n"); - } - _SEH2_END; - } - _SEH2_FINALLY - { - /* close all the still open resources */ - if(hDBMonBufferReady) CloseHandle(hDBMonBufferReady); - if(pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); - if(hDBMonBuffer) CloseHandle(hDBMonBuffer); - if(hDBMonDataReady) CloseHandle(hDBMonDataReady); - - /* leave the critical section */ - if(hDBMonDataReady != NULL) - ReleaseMutex(hDBMonMutex); - } - _SEH2_END; - } - _SEH2_END; + _SEH2_TRY + { + ULONG_PTR a_nArgs[2]; + + a_nArgs[0] = (ULONG_PTR)(strlen(_OutputString) + 1); + a_nArgs[1] = (ULONG_PTR)_OutputString; + + /* send the string to the user-mode debugger */ + RaiseException(DBG_PRINTEXCEPTION_C, 0, 2, a_nArgs); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* no user-mode debugger: try the systemwide debug message monitor, or the + kernel debugger as a last resort */ + + /* mutex used to synchronize invocations of OutputDebugString */ + static HANDLE s_hDBMonMutex = NULL; + /* true if we already attempted to open/create the mutex */ + static BOOL s_bDBMonMutexTriedOpen = FALSE; + + /* local copy of the mutex handle */ + volatile HANDLE hDBMonMutex = s_hDBMonMutex; + /* handle to the Section of the shared buffer */ + volatile HANDLE hDBMonBuffer = NULL; + + /* pointer to the mapped view of the shared buffer. It consist of the current + process id followed by the message string */ + struct { DWORD ProcessId; CHAR Buffer[1]; } * pDBMonBuffer = NULL; + + /* event: signaled by the debug message monitor when OutputDebugString can write + to the shared buffer */ + volatile HANDLE hDBMonBufferReady = NULL; + + /* event: to be signaled by OutputDebugString when it's done writing to the + shared buffer */ + volatile HANDLE hDBMonDataReady = NULL; + + /* mutex not opened, and no previous attempts to open/create it */ + if (hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) + { + /* open/create the mutex */ + hDBMonMutex = K32CreateDBMonMutex(); + /* store the handle */ + s_hDBMonMutex = hDBMonMutex; + } + + _SEH2_TRY + { + volatile PCHAR a_cBuffer = NULL; + + /* opening the mutex failed */ + if (hDBMonMutex == NULL) + { + /* remember next time */ + s_bDBMonMutexTriedOpen = TRUE; + } + /* opening the mutex succeeded */ + else + { + do + { + /* synchronize with other invocations of OutputDebugString */ + WaitForSingleObject(hDBMonMutex, INFINITE); + + /* buffer of the system-wide debug message monitor */ + hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); + + /* couldn't open the buffer: send the string to the kernel debugger */ + if (hDBMonBuffer == NULL) break; + + /* map the buffer */ + pDBMonBuffer = MapViewOfFile(hDBMonBuffer, + SECTION_MAP_READ | SECTION_MAP_WRITE, + 0, + 0, + 0); + + /* couldn't map the buffer: send the string to the kernel debugger */ + if (pDBMonBuffer == NULL) break; + + /* open the event signaling that the buffer can be accessed */ + hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); + + /* couldn't open the event: send the string to the kernel debugger */ + if (hDBMonBufferReady == NULL) break; + + /* open the event to be signaled when the buffer has been filled */ + hDBMonDataReady = OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); + } + while(0); + + /* we couldn't connect to the system-wide debug message monitor: send the + string to the kernel debugger */ + if (hDBMonDataReady == NULL) ReleaseMutex(hDBMonMutex); + } + + _SEH2_TRY + { + /* size of the current output block */ + volatile SIZE_T nRoundLen; + + /* size of the remainder of the string */ + volatile SIZE_T nOutputStringLen; + + /* output the whole string */ + nOutputStringLen = strlen(_OutputString); + + do + { + /* we're connected to the debug monitor: + write the current block to the shared buffer */ + if (hDBMonDataReady) + { + /* wait a maximum of 10 seconds for the debug monitor + to finish processing the shared buffer */ + if (WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) + { + /* timeout or failure: give up */ + break; + } + + /* write the process id into the buffer */ + pDBMonBuffer->ProcessId = GetCurrentProcessId(); + + /* write only as many bytes as they fit in the buffer */ + if (nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) + nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block into the buffer */ + memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + pDBMonBuffer->Buffer[nRoundLen] = 0; + + /* signal that the data contains meaningful data and can be read */ + SetEvent(hDBMonDataReady); + } + /* else, send the current block to the kernel debugger */ + else + { + /* output in blocks of 512 characters */ + a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); + + if (!a_cBuffer) + { + DbgPrint("OutputDebugStringA: Failed\n"); + break; + } + + /* write a maximum of 511 bytes */ + if (nOutputStringLen > 510) + nRoundLen = 510; + else + nRoundLen = nOutputStringLen; + + /* copy the current block */ + memcpy(a_cBuffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + a_cBuffer[nRoundLen] = 0; + + /* send the current block to the kernel debugger */ + DbgPrint("%s", a_cBuffer); + + if (a_cBuffer) + { + HeapFree(GetProcessHeap(), 0, a_cBuffer); + a_cBuffer = NULL; + } + } + + /* move to the next block */ + _OutputString += nRoundLen; + nOutputStringLen -= nRoundLen; + } + /* repeat until the string has been fully output */ + while (nOutputStringLen > 0); + } + /* ignore access violations and let other exceptions fall through */ + _SEH2_EXCEPT((_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) + { + if (a_cBuffer) + HeapFree(GetProcessHeap(), 0, a_cBuffer); + + /* string copied verbatim from Microsoft's kernel32.dll */ + DbgPrint("\nOutputDebugString faulted during output\n"); + } + _SEH2_END; + } + _SEH2_FINALLY + { + /* close all the still open resources */ + if (hDBMonBufferReady) CloseHandle(hDBMonBufferReady); + if (pDBMonBuffer) UnmapViewOfFile(pDBMonBuffer); + if (hDBMonBuffer) CloseHandle(hDBMonBuffer); + if (hDBMonDataReady) CloseHandle(hDBMonDataReady); + + /* leave the critical section */ + if (hDBMonDataReady != NULL) + ReleaseMutex(hDBMonMutex); + } + _SEH2_END; + } + _SEH2_END; } /* Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sat Jul 2 20:52:25 2016 @@ -3,8 +3,8 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/except.c * PURPOSE: Exception functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) + * Modified from WINE [ Onno Hovers, (onno(a)stack.urc.tue.nl) ] * UPDATE HISTORY: * Created 01/11/98 */ @@ -24,18 +24,18 @@ _module_name_from_addr(const void* addr, void **module_start_addr, char* psz, size_t nChars) { - MEMORY_BASIC_INFORMATION mbi; - if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || - !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) - { - psz[0] = '\0'; - *module_start_addr = 0; - } - else - { - *module_start_addr = (void *)mbi.AllocationBase; - } - return psz; + MEMORY_BASIC_INFORMATION mbi; + if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || + !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) + { + psz[0] = '\0'; + *module_start_addr = 0; + } + else + { + *module_start_addr = (void *)mbi.AllocationBase; + } + return psz; } @@ -43,45 +43,45 @@ _dump_context(PCONTEXT pc) { #ifdef _M_IX86 - /* - * Print out the CPU registers - */ - DbgPrint("CS:EIP %x:%x\n", pc->SegCs&0xffff, pc->Eip ); - DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, - pc->SegFs&0xffff, pc->SegGs&0xfff); - DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", pc->Eax, pc->Ebx, pc->Ecx); - DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, - pc->Ebp, pc->Esi, pc->Esp); - DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); + /* + * Print out the CPU registers + */ + DbgPrint("CS:EIP %x:%x\n", pc->SegCs&0xffff, pc->Eip ); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, + pc->SegFs&0xffff, pc->SegGs&0xfff); + DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", pc->Eax, pc->Ebx, pc->Ecx); + DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, + pc->Ebp, pc->Esi, pc->Esp); + DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); #elif defined(_M_AMD64) - DbgPrint("CS:RIP %x:%I64x\n", pc->SegCs&0xffff, pc->Rip ); - DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, - pc->SegFs&0xffff, pc->SegGs&0xfff); - DbgPrint("RAX: %I64x RBX: %I64x RCX: %I64x RDI: %I64x\n", pc->Rax, pc->Rbx, pc->Rcx, pc->Rdi); - DbgPrint("RDX: %I64x RBP: %I64x RSI: %I64x RSP: %I64x\n", pc->Rdx, pc->Rbp, pc->Rsi, pc->Rsp); - DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); - DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); - DbgPrint("EFLAGS: %.8x\n", pc->EFlags); + DbgPrint("CS:RIP %x:%I64x\n", pc->SegCs&0xffff, pc->Rip ); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs&0xffff, pc->SegEs&0xffff, + pc->SegFs&0xffff, pc->SegGs&0xfff); + DbgPrint("RAX: %I64x RBX: %I64x RCX: %I64x RDI: %I64x\n", pc->Rax, pc->Rbx, pc->Rcx, pc->Rdi); + DbgPrint("RDX: %I64x RBP: %I64x RSI: %I64x RSP: %I64x\n", pc->Rdx, pc->Rbp, pc->Rsi, pc->Rsp); + DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); + DbgPrint("EFLAGS: %.8x\n", pc->EFlags); #elif defined(_M_ARM) - DbgPrint("PC: %08lx LR: %08lx SP: %08lx\n", pc->Pc); - DbgPrint("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", pc->R0, pc->R1, pc->R2, pc->R3); - DbgPrint("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", pc->R4, pc->R5, pc->R6, pc->R7); - DbgPrint("R8: %08lx R9: %08lx R10: %08lx R11: %08lx\n", pc->R8, pc->R9, pc->R10, pc->R11); - DbgPrint("R12: %08lx CPSR: %08lx FPSCR: %08lx\n", pc->R12, pc->Cpsr, pc->R1, pc->Fpscr, pc->R3); + DbgPrint("PC: %08lx LR: %08lx SP: %08lx\n", pc->Pc); + DbgPrint("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", pc->R0, pc->R1, pc->R2, pc->R3); + DbgPrint("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", pc->R4, pc->R5, pc->R6, pc->R7); + DbgPrint("R8: %08lx R9: %08lx R10: %08lx R11: %08lx\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %08lx CPSR: %08lx FPSCR: %08lx\n", pc->R12, pc->Cpsr, pc->R1, pc->Fpscr, pc->R3); #else -#error "Unknown architecture" + #error "Unknown architecture" #endif } static VOID -PrintStackTrace(struct _EXCEPTION_POINTERS *ExceptionInfo) +PrintStackTrace(IN PEXCEPTION_POINTERS ExceptionInfo) { PVOID StartAddr; CHAR szMod[128] = ""; PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; PCONTEXT ContextRecord = ExceptionInfo->ContextRecord; - /* Print a stack trace. */ + /* Print a stack trace */ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionRecord->ExceptionCode); @@ -91,7 +91,7 @@ DbgPrint("Faulting Address: %8x\n", ExceptionRecord->ExceptionInformation[1]); } - _dump_context (ContextRecord); + _dump_context(ContextRecord); _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); DbgPrint("Address:\n %8x+%-8x %s\n", (PVOID)StartAddr, @@ -368,9 +368,7 @@ { /* We do, normalize the count */ if (nNumberOfArguments > EXCEPTION_MAXIMUM_PARAMETERS) - { nNumberOfArguments = EXCEPTION_MAXIMUM_PARAMETERS; - } /* Set the count of parameters and copy them */ ExceptionRecord.NumberParameters = nNumberOfArguments; @@ -388,14 +386,14 @@ } /* Trace the wine special error and show the modulename and functionname */ - if (dwExceptionCode == 0x80000100 /*EXCEPTION_WINE_STUB*/) - { - /* Numbers of parameter must be equal to two */ - if (ExceptionRecord.NumberParameters == 2) - { - DPRINT1("Missing function in : %s\n", ExceptionRecord.ExceptionInformation[0]); - DPRINT1("with the functionname : %s\n", ExceptionRecord.ExceptionInformation[1]); - } + if (dwExceptionCode == 0x80000100 /* EXCEPTION_WINE_STUB */) + { + /* Numbers of parameter must be equal to two */ + if (ExceptionRecord.NumberParameters == 2) + { + DPRINT1("Missing function in : %s\n", ExceptionRecord.ExceptionInformation[0]); + DPRINT1("with the functionname : %s\n", ExceptionRecord.ExceptionInformation[1]); + } } /* Raise the exception */

8 years, 4 months

[hbelusca] 71767: [NTDLL] Export RtlMapSecurityErrorToNtStatus since we have it available in our RTL library (however it is still only stubbed). [RTL][NDK] - NT-ify a bit error.c - Add the prototyp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 2 20:37:35 2016 New Revision: 71767 URL: http://svn.reactos.org/svn/reactos?rev=71767&view=rev Log: [NTDLL] Export RtlMapSecurityErrorToNtStatus since we have it available in our RTL library (however it is still only stubbed). [RTL][NDK] - NT-ify a bit error.c - Add the prototypes of the functions that manipulate the "last Win32 error" and "last NT status". - Add the prototypes of the functions that get & set the thread-error-mode (for hard-errors). - Define some prototypes for NTOS_MODE_USER only. [CONSRV] RtlGetLastNtStatus is now in the NDK, no need to keep its prototype there anymore. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/lib/rtl/error.c trunk/reactos/win32ss/user/winsrv/consrv/console.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -771,7 +771,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) 767 stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) 768 stdcall RtlMapGenericMask(long ptr) -# stdcall RtlMapSecurityErrorToNtStatus +769 stdcall RtlMapSecurityErrorToNtStatus(long) 770 stdcall RtlMoveMemory(ptr ptr long) 771 stdcall RtlMultiAppendUnicodeStringBuffer(ptr long ptr) 772 stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -609,7 +609,7 @@ #endif /* RTL_USE_AVL_TABLES */ // -// Error and Exception Functions +// Exception and Error Functions // NTSYSAPI PVOID @@ -637,6 +637,84 @@ _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter ); +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + +NTSYSAPI +PVOID +NTAPI +RtlEncodePointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlDecodePointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlEncodeSystemPointer( + _In_ PVOID Pointer +); + +NTSYSAPI +PVOID +NTAPI +RtlDecodeSystemPointer( + _In_ PVOID Pointer +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlGetLastNtStatus( + VOID +); + +NTSYSAPI +ULONG +NTAPI +RtlGetLastWin32Error( + VOID +); + +NTSYSAPI +VOID +NTAPI +RtlSetLastWin32Error( + _In_ ULONG LastError +); + +NTSYSAPI +VOID +NTAPI +RtlSetLastWin32ErrorAndNtStatusFromNtStatus( + _In_ NTSTATUS Status +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlSetThreadErrorMode( + _In_ ULONG NewMode, + _Out_opt_ PULONG OldMode +); + +NTSYSAPI +ULONG +NTAPI +RtlGetThreadErrorMode( + VOID +); + #endif /* NTOS_MODE_USER */ NTSYSAPI @@ -644,34 +722,6 @@ NTAPI RtlCaptureContext( _Out_ PCONTEXT ContextRecord -); - -NTSYSAPI -PVOID -NTAPI -RtlEncodePointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlDecodePointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlEncodeSystemPointer( - _In_ PVOID Pointer -); - -NTSYSAPI -PVOID -NTAPI -RtlDecodeSystemPointer( - _In_ PVOID Pointer ); NTSYSAPI @@ -702,10 +752,10 @@ ); NTSYSAPI -VOID -NTAPI -RtlSetLastWin32ErrorAndNtStatusFromNtStatus( - _In_ NTSTATUS Status +NTSTATUS +NTAPI +RtlMapSecurityErrorToNtStatus( + _In_ ULONG SecurityError ); NTSYSAPI @@ -721,13 +771,6 @@ NTAPI RtlRaiseStatus( _In_ NTSTATUS Status -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI Modified: trunk/reactos/sdk/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/error.c?rev=71… ============================================================================== --- trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -46,21 +46,23 @@ * The mapped Win32 error code, or ERROR_MR_MID_NOT_FOUND if there is no * mapping defined. */ -ULONG WINAPI RtlNtStatusToDosErrorNoTeb( NTSTATUS status ) +ULONG +NTAPI +RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status) { const struct error_table *table = error_table; - if (!status || (status & 0x20000000)) return status; + if (!Status || (Status & 0x20000000)) return Status; /* 0xd... is equivalent to 0xc... */ - if ((status & 0xf0000000) == 0xd0000000) status &= ~0x10000000; + if ((Status & 0xf0000000) == 0xd0000000) Status &= ~0x10000000; while (table->start) { - if ((ULONG)status < table->start) break; - if ((ULONG)status < table->end) + if ((ULONG)Status < table->start) break; + if ((ULONG)Status < table->end) { - DWORD ret = table->table[status - table->start]; + DWORD ret = table->table[Status - table->start]; /* unknown entries are 0 */ if (!ret) goto no_mapping; return ret; @@ -69,11 +71,11 @@ } /* now some special cases */ - if (HIWORD(status) == 0xc001) return LOWORD(status); - if (HIWORD(status) == 0x8007) return LOWORD(status); + if (HIWORD(Status) == 0xc001) return LOWORD(Status); + if (HIWORD(Status) == 0x8007) return LOWORD(Status); no_mapping: - DPRINT1( "no mapping for %08x\n", status ); + DPRINT1( "no mapping for %08x\n", Status ); return ERROR_MR_MID_NOT_FOUND; } @@ -89,15 +91,17 @@ * The mapped Win32 error code, or ERROR_MR_MID_NOT_FOUND if there is no * mapping defined. */ -ULONG WINAPI RtlNtStatusToDosError( NTSTATUS status ) -{ - PTEB Teb = NtCurrentTeb (); +ULONG +NTAPI +RtlNtStatusToDosError(IN NTSTATUS Status) +{ + PTEB Teb = NtCurrentTeb(); if (NULL != Teb) { - Teb->LastStatusValue = status; + Teb->LastStatusValue = Status; } - return RtlNtStatusToDosErrorNoTeb( status ); + return RtlNtStatusToDosErrorNoTeb(Status); } /********************************************************************** @@ -105,7 +109,9 @@ * * Get the current per-thread status. */ -NTSTATUS WINAPI RtlGetLastNtStatus(void) +NTSTATUS +NTAPI +RtlGetLastNtStatus(VOID) { return NtCurrentTeb()->LastStatusValue; } @@ -121,7 +127,9 @@ * RETURNS * The current error value for the thread, as set by SetLastWin32Error() or SetLastError(). */ -DWORD WINAPI RtlGetLastWin32Error(void) +ULONG +NTAPI +RtlGetLastWin32Error(VOID) { return NtCurrentTeb()->LastErrorValue; } @@ -138,9 +146,11 @@ * RETURNS * Nothing. */ -void WINAPI RtlSetLastWin32Error( DWORD err ) -{ - NtCurrentTeb()->LastErrorValue = err; +VOID +NTAPI +RtlSetLastWin32Error(IN ULONG LastError) +{ + NtCurrentTeb()->LastErrorValue = LastError; } /*********************************************************************** @@ -154,9 +164,11 @@ * RETURNS * Nothing. */ -void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( NTSTATUS status ) -{ - NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError( status ); +VOID +NTAPI +RtlSetLastWin32ErrorAndNtStatusFromNtStatus(IN NTSTATUS Status) +{ + NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Status); } /* @@ -164,9 +176,7 @@ */ NTSTATUS NTAPI -RtlMapSecurityErrorToNtStatus( - IN ULONG SecurityError - ) +RtlMapSecurityErrorToNtStatus(IN ULONG SecurityError) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sat Jul 2 20:37:35 2016 @@ -24,8 +24,6 @@ #define NDEBUG #include <debug.h> -// FIXME: Add this prototype to winternl.h / rtlfuncs.h / ... -NTSTATUS NTAPI RtlGetLastNtStatus(VOID); /* GLOBALS ********************************************************************/

8 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016