Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[akhaldi] 64390: [MMDEVAPI] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 13:16:53 2014 New Revision: 64390 URL: http://svn.reactos.org/svn/reactos?rev=64390&view=rev Log: [MMDEVAPI] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c trunk/reactos/dll/win32/mmdevapi/mmdevapi_classes.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/devenum.c [iso-8859-1] Mon Sep 29 13:16:53 2014 @@ -1048,8 +1048,8 @@ notify_clients(flow, eMultimedia, id); } -static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, - const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) { WCHAR new_val[64], *id; DWORD size; @@ -1064,7 +1064,7 @@ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1073,23 +1073,23 @@ old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } /* system default -> system default, noop */ - return 0; + return FALSE; } if(!lstrcmpW(old_val, new_val)){ /* set by user -> same value */ - return 0; + return FALSE; } if(new_val[0] != 0){ /* set by user -> different value */ notify_clients(flow, role, new_val); memcpy(old_val, new_val, sizeof(new_val)); - return 1; + return TRUE; } /* set by user -> system default */ @@ -1097,7 +1097,7 @@ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ ERR("GetId failed: %08x\n", hr); - return 0; + return FALSE; } }else id = NULL; @@ -1106,7 +1106,7 @@ old_val[0] = 0; CoTaskMemFree(id); - return 1; + return TRUE; } static DWORD WINAPI notif_thread_proc(void *user) @@ -1325,10 +1325,10 @@ *nprops = 0; do { DWORD len = sizeof(buffer)/sizeof(*buffer); - if (RegEnumKeyExW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + if (RegEnumValueW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; i++; - } while (0); + } while (1); RegCloseKey(propkey); TRACE("Returning %i\n", i); *nprops = i; @@ -1351,16 +1351,16 @@ if (FAILED(hr)) return hr; - if (RegEnumKeyExW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS - || len <= 40) + if (RegEnumValueW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS + || len <= 39) { WARN("GetAt %u failed\n", prop); return E_INVALIDARG; } RegCloseKey(propkey); - buffer[39] = 0; + buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[40]); + key->pid = atoiW(&buffer[39]); return S_OK; } Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap… ============================================================================== --- trunk/reactos/dll/win32/mmdevapi/mmdevapi_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdevapi/mmdevapi_classes.idl [iso-8859-1] Mon Sep 29 13:16:53 2014 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ helpstring("MMDeviceEnumerator class"), threading(both), 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] Mon Sep 29 13:16:53 2014 @@ -107,7 +107,7 @@ reactos/dll/win32/mciwave # Synced to Wine-1.7.17 reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 reactos/dll/win32/mlang # Synced to Wine-1.7.17 -reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 +reactos/dll/win32/mmdevapi # Synced to Wine-1.7.27 reactos/dll/win32/mpr # Synced to Wine-1.7.17 reactos/dll/win32/mprapi # Synced to Wine-1.7.17 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17

10 years, 2 months

[akhaldi] 64389: [LSASRV] * "Fix" MSVC build. Eric, please review (MemSize is uninitialized here).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 13:07:46 2014 New Revision: 64389 URL: http://svn.reactos.org/svn/reactos?rev=64389&view=rev Log: [LSASRV] * "Fix" MSVC build. Eric, please review (MemSize is uninitialized here). Modified: trunk/reactos/dll/win32/lsasrv/session.c Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Mon Sep 29 13:07:46 2014 @@ -314,7 +314,7 @@ goto done; } - TRACE("MemSize: %lu\n", MemSize); + //TRACE("MemSize: %lu\n", MemSize); MemSize = Length; Status = NtAllocateVirtualMemory(ProcessHandle,

10 years, 2 months

[akhaldi] 64388: [MGMTAPI] * Import from Wine 1.7.27. CORE-8036 #resolve #comment Imported in r64388. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 12:51:45 2014 New Revision: 64388 URL: http://svn.reactos.org/svn/reactos?rev=64388&view=rev Log: [MGMTAPI] * Import from Wine 1.7.27. CORE-8036 #resolve #comment Imported in r64388. CORE-8540 Added: trunk/reactos/dll/win32/mgmtapi/ (with props) trunk/reactos/dll/win32/mgmtapi/CMakeLists.txt (with props) trunk/reactos/dll/win32/mgmtapi/mgmtapi.c (with props) trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Sep 29 12:51:45 2014 @@ -84,6 +84,7 @@ add_subdirectory(mciqtz32) add_subdirectory(mciseq) add_subdirectory(mciwave) +add_subdirectory(mgmtapi) add_subdirectory(mlang) add_subdirectory(mmdevapi) add_subdirectory(mmdrv) Propchange: trunk/reactos/dll/win32/mgmtapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 29 12:51:45 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/mgmtapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/mgmtapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/mgmtapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/mgmtapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/mgmtapi/CMakeLists.txt [iso-8859-1] Mon Sep 29 12:51:45 2014 @@ -0,0 +1,16 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mgmtapi.dll mgmtapi.spec) + +list(APPEND SOURCE + mgmtapi.c + ${CMAKE_CURRENT_BINARY_DIR}/mgmtapi_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/mgmtapi.def) + +add_library(mgmtapi SHARED ${SOURCE}) +set_module_type(mgmtapi win32dll) +target_link_libraries(mgmtapi wine) +add_importlibs(mgmtapi msvcrt kernel32 ntdll) +add_cd_file(TARGET mgmtapi DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/mgmtapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.c (added) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.c [iso-8859-1] Mon Sep 29 12:51:45 2014 @@ -0,0 +1,40 @@ +/* + * Copyright 2012 Stefan Leichter + * + * 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/mgmtapi/mgmtapi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mgmtapi/mgmtapi.… ============================================================================== --- trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec (added) +++ trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec [iso-8859-1] Mon Sep 29 12:51:45 2014 @@ -0,0 +1,9 @@ +@ stub SnmpMgrClose +@ stub SnmpMgrCtl +@ stub SnmpMgrGetTrap +@ stub SnmpMgrGetTrapEx +@ stub SnmpMgrOidToStr +@ stub SnmpMgrOpen +@ stub SnmpMgrRequest +@ stub SnmpMgrStrToOid +@ stub SnmpMgrTrapListen Propchange: trunk/reactos/dll/win32/mgmtapi/mgmtapi.spec ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon Sep 29 12:51:45 2014 @@ -105,6 +105,7 @@ reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.17 reactos/dll/win32/mciseq # Synced to Wine-1.7.17 reactos/dll/win32/mciwave # Synced to Wine-1.7.17 +reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 reactos/dll/win32/mlang # Synced to Wine-1.7.17 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.17

10 years, 2 months

[akhaldi] 64387: [LOCALUI] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 12:39:56 2014 New Revision: 64387 URL: http://svn.reactos.org/svn/reactos?rev=64387&view=rev Log: [LOCALUI] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/localui/lang/ui_Da.rc trunk/reactos/dll/win32/localui/lang/ui_De.rc trunk/reactos/dll/win32/localui/lang/ui_En.rc trunk/reactos/dll/win32/localui/lang/ui_Es.rc trunk/reactos/dll/win32/localui/lang/ui_Fr.rc trunk/reactos/dll/win32/localui/lang/ui_He.rc trunk/reactos/dll/win32/localui/lang/ui_Hu.rc trunk/reactos/dll/win32/localui/lang/ui_It.rc trunk/reactos/dll/win32/localui/lang/ui_Ja.rc trunk/reactos/dll/win32/localui/lang/ui_Ko.rc trunk/reactos/dll/win32/localui/lang/ui_Lt.rc trunk/reactos/dll/win32/localui/lang/ui_Nl.rc trunk/reactos/dll/win32/localui/lang/ui_No.rc trunk/reactos/dll/win32/localui/lang/ui_Pl.rc trunk/reactos/dll/win32/localui/lang/ui_Pt.rc trunk/reactos/dll/win32/localui/lang/ui_Ro.rc trunk/reactos/dll/win32/localui/lang/ui_Ru.rc trunk/reactos/dll/win32/localui/lang/ui_Si.rc trunk/reactos/dll/win32/localui/lang/ui_Sq.rc trunk/reactos/dll/win32/localui/lang/ui_Sv.rc trunk/reactos/dll/win32/localui/lang/ui_Tr.rc trunk/reactos/dll/win32/localui/lang/ui_Uk.rc trunk/reactos/dll/win32/localui/lang/ui_Zh.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/localui/lang/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Da.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "'%s' er ikke et gyldigt port navn" + IDS_PORTEXISTS "Porten %s findes allerede" + IDS_NOTHINGTOCONFIG "Denne port har ingen indstillinger" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Skriv navnet på den nye port:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuller", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuller", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Annuller", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "'%s' er ikke et gyldigt port navn" - IDS_PORTEXISTS "Porten %s findes allerede" - IDS_NOTHINGTOCONFIG "Denne port har ingen indstillinger" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_De.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -23,6 +24,14 @@ #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_LOCALPORT "Lokaler Anschluss" + IDS_INVALIDNAME "'%s' ist kein gÃ¼ltiger Anschlussname" + IDS_PORTEXISTS "Der Anschluss %s existiert bereits" + IDS_NOTHINGTOCONFIG "Dieser Anschluss besitzt keine zu konfigurierenden Optionen" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -47,12 +56,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokaler Anschluss" - IDS_INVALIDNAME "'%s' ist kein gÃ¼ltiger Anschlussname" - IDS_PORTEXISTS "Der Anschluss %s existiert bereits" - IDS_NOTHINGTOCONFIG "Dieser Anschluss besitzt keine zu konfigurierenden Optionen" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_En.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "Local Port" + IDS_INVALIDNAME "'%s' is not a valid port name" + IDS_PORTEXISTS "Port %s already exists" + IDS_NOTHINGTOCONFIG "This port has no options to configure" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Enter the port name to add:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancel", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Cancel", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Local Port" - IDS_INVALIDNAME "'%s' is not a valid port name" - IDS_PORTEXISTS "Port %s already exists" - IDS_NOTHINGTOCONFIG "This port has no options to configure" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Es.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -24,6 +25,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_LOCALPORT "Puerto local" + IDS_INVALIDNAME "'%s' no es un nombre de puerto vÃ¡lido" + IDS_PORTEXISTS "El puerto %s ya existe" + IDS_NOTHINGTOCONFIG "Este puerto no tiene opciones para configurar" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Agregar un puerto local" @@ -31,8 +40,8 @@ BEGIN LTEXT "&Ingrese el nombre del puerto a agregar:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Aceptar", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "Aceptar", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -47,12 +56,3 @@ DEFPUSHBUTTON "Aceptar", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Puerto local" - IDS_INVALIDNAME "'%s' no es un nombre de puerto vÃ¡lido" - IDS_PORTEXISTS "El puerto %s ya existe" - IDS_NOTHINGTOCONFIG "Este puerto no tiene opciones para configurar" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Fr.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -24,6 +25,14 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_LOCALPORT "Port local" + IDS_INVALIDNAME "Â«Â %sÂ Â» n'est pas un nom de port valide" + IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " + IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ajouter un port local" @@ -31,8 +40,8 @@ BEGIN LTEXT "&Saisisser le nom du port Ã ajouterÂ :", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -47,12 +56,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Annuler", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port local" - IDS_INVALIDNAME "Â«Â %sÂ Â» n'est pas un nom de port valide" - IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " - IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_He.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -18,11 +18,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "××¦××× ××§××××ª" + IDS_INVALIDNAME "'%s' ××× × ×©× ××¦××× ×××§×" + IDS_PORTEXISTS "××¦××× %s ×××¨ ×§××××ª" + IDS_NOTHINGTOCONFIG "×××¦××× ××× ××× ××¤×©×¨××××ª ××××××¨" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -31,8 +40,8 @@ BEGIN LTEXT "××× ××ª ×©× ×××¦××× ××× ××××¡××¤×:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "×××©××¨", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "×××××", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "×××©××¨", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "×××××", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -47,12 +56,3 @@ DEFPUSHBUTTON "×××©××¨", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "×××××", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "××¦××× ××§××××ª" - IDS_INVALIDNAME "'%s' ××× × ×©× ××¦××× ×××§×" - IDS_PORTEXISTS "××¦××× %s ×××¨ ×§××××ª" - IDS_NOTHINGTOCONFIG "×××¦××× ××× ××× ××¤×©×¨××××ª ××××××¨" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Hu.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_LOCALPORT "Helyi port" + IDS_INVALIDNAME "A(z) '%s' nem egy Ã©rvÃ©nyes portnÃ©v" + IDS_PORTEXISTS "A port: %s mÃ¡r lÃ©tezik" + IDS_NOTHINGTOCONFIG "Ennek a portnak nincsenek beÃ¡llÃthatÃ³ tulajdonsÃ¡gai" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Helyi port hozzÃ¡adÃ¡sa" @@ -32,8 +41,8 @@ BEGIN LTEXT "Adja meg a &hozzÃ¡adni kÃvÃ¡nt port nevÃ©t:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "MÃ©gse", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "MÃ©gse", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -48,12 +57,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "MÃ©gse", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Helyi port" - IDS_INVALIDNAME "A(z) '%s' nem egy Ã©rvÃ©nyes portnÃ©v" - IDS_PORTEXISTS "A port: %s mÃ¡r lÃ©tezik" - IDS_NOTHINGTOCONFIG "Ennek a portnak nincsenek beÃ¡llÃthatÃ³ tulajdonsÃ¡gai" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_It.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -17,6 +17,7 @@ * 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 + * */ #include "localui.h" @@ -26,6 +27,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_LOCALPORT "Porta locale" + IDS_INVALIDNAME "'%s' non Ã¨ un nome di porta valido" + IDS_PORTEXISTS "La porta %s giÃ esiste" + IDS_NOTHINGTOCONFIG "Questa porta non ha opzioni da configurare" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Aggiungi una porta locale" @@ -33,8 +42,8 @@ BEGIN LTEXT "&Inserisci il nome della porta da aggiungere:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annulla", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annulla", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -49,12 +58,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Annulla", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Porta locale" - IDS_INVALIDNAME "'%s' non Ã¨ un nome di porta valido" - IDS_PORTEXISTS "La porta %s giÃ esiste" - IDS_NOTHINGTOCONFIG "Questa porta non ha opzioni da configurare" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Ja.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_LOCALPORT "ãã¼ã«ã« ãã¼ã" + IDS_INVALIDNAME "'%s' ã¯ãã¼ãåã¨ãã¦æ£ããããã¾ãã" + IDS_PORTEXISTS "ãã¼ã %s ã¯ãã§ã«åå¨ãã¾ã" + IDS_NOTHINGTOCONFIG "ãã®ãã¼ãã«ã¯è¨å®é ç®ãããã¾ãã" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ãã¼ã«ã« ãã¼ãã®è¿½å " @@ -32,8 +41,8 @@ BEGIN LTEXT "è¿½å ãããã¼ãã®åå(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -48,12 +57,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "ãã¼ã«ã« ãã¼ã" - IDS_INVALIDNAME "'%s' ã¯ãã¼ãåã¨ãã¦æ£ããããã¾ãã" - IDS_PORTEXISTS "ãã¼ã %s ã¯ãã§ã«åå¨ãã¾ã" - IDS_NOTHINGTOCONFIG "ãã®ãã¼ãã«ã¯è¨å®é ç®ãããã¾ãã" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Ko.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -17,11 +17,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "Áö¿ª Æ÷Æ®" + IDS_INVALIDNAME "'%s'´Â ¿Ã¹Ù¸¥ Æ÷Æ® ÀÌ¸§ÀÌ ¾Æ´Õ´Ï´Ù" + IDS_PORTEXISTS "Æ÷Æ® %s´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù" + IDS_NOTHINGTOCONFIG "ÀÌ Æ÷Æ®´Â ¼³Á¤ÇÒ ¿É¼ÇÀÌ ¾ø½À´Ï´Ù" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -30,8 +39,8 @@ BEGIN LTEXT "´õÇÒ Æ÷Æ® ÀÌ¸§ ÀÔ·Â(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "È®ÀÎ", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "È®ÀÎ", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -46,12 +55,3 @@ DEFPUSHBUTTON "È®ÀÎ", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Ãë¼Ò", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Áö¿ª Æ÷Æ®" - IDS_INVALIDNAME "'%s'´Â ¿Ã¹Ù¸¥ Æ÷Æ® ÀÌ¸§ÀÌ ¾Æ´Õ´Ï´Ù" - IDS_PORTEXISTS "Æ÷Æ® %s´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù" - IDS_NOTHINGTOCONFIG "ÀÌ Æ÷Æ®´Â ¼³Á¤ÇÒ ¿É¼ÇÀÌ ¾ø½À´Ï´Ù" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Lt.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_LOCALPORT "Vietinis prievadas" + IDS_INVALIDNAME "â%sâ yra netinkamas prievado vardas" + IDS_PORTEXISTS "Prievadas %s jau egzistuoja" + IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄiÅ³ konfigÅ«ravimui" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "PridÄti vietinÄ¯ prievadÄ" @@ -32,8 +41,8 @@ BEGIN LTEXT "&Ä®veskite pridedamo prievado vardÄ:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Atsisakyti", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "Gerai", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -48,12 +57,3 @@ DEFPUSHBUTTON "Gerai", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Atsisakyti", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Vietinis prievadas" - IDS_INVALIDNAME "â%sâ yra netinkamas prievado vardas" - IDS_PORTEXISTS "Prievadas %s jau egzistuoja" - IDS_NOTHINGTOCONFIG "Å is prievadas neturi parinkÄiÅ³ konfigÅ«ravimui" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Nl.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_LOCALPORT "Lokale Poort" + IDS_INVALIDNAME "'%s' is geen valide poort naam" + IDS_PORTEXISTS "Poort %s bestaat reeds" + IDS_NOTHINGTOCONFIG "Deze poort heeft geen opties om in te stellen" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Voer de toe te voegen poort naam in:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Annuleren", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuleren", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Annuleren", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokale Poort" - IDS_INVALIDNAME "'%s' is geen valide poort naam" - IDS_PORTEXISTS "Poort %s bestaat reeds" - IDS_NOTHINGTOCONFIG "Deze poort heeft geen opties om in te stellen" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_No.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "«%s» er ikke et gyldig portnavn" + IDS_PORTEXISTS "Porten %s finnes allerede" + IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "Skriv inn navn&et på den nye porten:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "«%s» er ikke et gyldig portnavn" - IDS_PORTEXISTS "Porten %s finnes allerede" - IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Pl.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -17,11 +17,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "Port lokalny" + IDS_INVALIDNAME "'%s' nie jest poprawn¹ nazw¹ portu" + IDS_PORTEXISTS "Port %s ju¿ istnieje" + IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -30,8 +39,8 @@ BEGIN LTEXT "&Nazwa nowego portu:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "&OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "&OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -46,12 +55,3 @@ DEFPUSHBUTTON "&OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "&Anuluj", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port lokalny" - IDS_INVALIDNAME "'%s' nie jest poprawn¹ nazw¹ portu" - IDS_PORTEXISTS "Port %s ju¿ istnieje" - IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Pt.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_LOCALPORT "Porta Local" + IDS_INVALIDNAME "'%s' não é um nome de porta válido" + IDS_PORTEXISTS "Porta %s já existe" + IDS_NOTHINGTOCONFIG "Esta porta não possui opções de configuração" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Introduza o nome da porta a adicionar:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Porta Local" - IDS_INVALIDNAME "'%s' não é um nome de porta válido" - IDS_PORTEXISTS "Porta %s já existe" - IDS_NOTHINGTOCONFIG "Esta porta não possui opções de configuração" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Ro.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,23 +16,32 @@ * 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 + * */ #include "localui.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + IDS_LOCALPORT "Port local" + IDS_INVALIDNAME "â%sâ nu este un nume valid de port" + IDS_PORTEXISTS "Portul %s existsÄ deja" + IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Adaugare port local" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "N&umele portului adÄugat:", -1, 7, 13, 194, 13, WS_VISIBLE - EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Con&firmÄ", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + LTEXT "N&umele portului adÄugat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Con&firmÄ", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -41,18 +50,9 @@ CAPTION "Configurare port LPT" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Temporizare (secunde)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX - LTEXT "&ReÃ®ncearcÄ transmisia:", -1, 14, 22, 90, 13, WS_VISIBLE - EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER - DEFPUSHBUTTON "Con&firmÄ", IDOK, 164, 10, 50, 14, WS_VISIBLE - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE + GROUPBOX "Temporizare (secunde)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&ReÃ®ncearcÄ transmisia:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "Con&firmÄ", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Port local" - IDS_INVALIDNAME "â%sâ nu este un nume valid de port" - IDS_PORTEXISTS "Portul %s existsÄ deja" - IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Ru.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿Ð¾ÑÑ" + IDS_INVALIDNAME "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾ÑÑÐ° '%s'" + IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" + IDS_NOTHINGTOCONFIG "ÐÑÐ¾Ñ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿Ð¾ÑÑ" @@ -32,8 +41,8 @@ BEGIN LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ &Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ°:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -48,12 +57,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ Ð¿Ð¾ÑÑ" - IDS_INVALIDNAME "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð¾ÑÑÐ° '%s'" - IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ" - IDS_NOTHINGTOCONFIG "ÐÑÐ¾Ñ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð½Ð°ÑÑÑÐ¾ÐµÐº" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Si.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -24,6 +25,14 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_LOCALPORT "Lokalna vrata" + IDS_INVALIDNAME "'%s' ni veljavno ime vrat" + IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" + IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Dodaj lokalna vrata" @@ -31,8 +40,8 @@ BEGIN LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "PrekliÄi", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "V redu", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "PrekliÄi", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -47,12 +56,3 @@ DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "PrekliÄi", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokalna vrata" - IDS_INVALIDNAME "'%s' ni veljavno ime vrat" - IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" - IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Sq.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -17,11 +17,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_LOCALPORT "Porti Vendor" + IDS_INVALIDNAME "'%s' nuk Ã«shtÃ« emer e vlefshem porti" + IDS_PORTEXISTS "Porti %s ekziston" + IDS_NOTHINGTOCONFIG "Ky port ska opsione pÃ«r tÃ« konfiguruar" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -30,8 +39,8 @@ BEGIN LTEXT "Fut emrin e Portit pÃ«r tÃ« shtuar:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Anulo", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Anulo", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -46,12 +55,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Anulo", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Porti Vendor" - IDS_INVALIDNAME "'%s' nuk Ã«shtÃ« emer e vlefshem porti" - IDS_PORTEXISTS "Porti %s ekziston" - IDS_NOTHINGTOCONFIG "Ky port ska opsione pÃ«r tÃ« konfiguruar" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Sv.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "'%s' är inte ett giltigt portnamn" + IDS_PORTEXISTS "Porten %s finns redan" + IDS_NOTHINGTOCONFIG "Denna port har inga alternativ att konfigurera" +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Ange portnamnet att lägga till:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Lokal port" - IDS_INVALIDNAME "'%s' är inte ett giltigt portnamn" - IDS_PORTEXISTS "Porten %s finns redan" - IDS_NOTHINGTOCONFIG "Denna port har inga alternativ att konfigurera" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Tr.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,11 +16,20 @@ * 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 + * */ #include "localui.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_LOCALPORT "Yerli GiriÅ" + IDS_INVALIDNAME """%s"", geÃ§erli bir giriÅ adÄ± deÄil." + IDS_PORTEXISTS "%s giriÅi Ã¶nceden var." + IDS_NOTHINGTOCONFIG "Bu giriÅin yapÄ±landÄ±rmak iÃ§in seÃ§eneÄi yok." +} ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -29,8 +38,8 @@ BEGIN LTEXT "&Eklemek iÃ§in giriÅ adÄ±nÄ± giriniz:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Tamam", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Ä°ptal", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "Tamam", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Ä°ptal", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -45,12 +54,3 @@ DEFPUSHBUTTON "Tamam", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Ä°ptal", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "Yerli GiriÅ" - IDS_INVALIDNAME """%s"", geÃ§erli bir giriÅ adÄ± deÄil." - IDS_PORTEXISTS "%s giriÅi Ã¶nceden var." - IDS_NOTHINGTOCONFIG "Bu giriÅin yapÄ±landÄ±rmak iÃ§in seÃ§eneÄi yok." -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Uk.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ" + IDS_INVALIDNAME "'%s' Ð½Ðµ Ð´ÑÐ¹ÑÐ½Ð° Ð½Ð°Ð·Ð²Ð° Ð¿Ð¾ÑÑÑ" + IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' Ð²Ð¶Ðµ ÑÑÐ½ÑÑ" + IDS_NOTHINGTOCONFIG "Ð¦ÐµÐ¹ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¼Ð°Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ñ" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÐÐ¾Ð´Ð°ÑÐ¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ" @@ -32,8 +41,8 @@ BEGIN LTEXT "ÐÐ²ÐµÐ´ÑÑÑ &Ð½Ð°Ð·Ð²Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ°:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -48,12 +57,3 @@ DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ" - IDS_INVALIDNAME "'%s' Ð½Ðµ Ð´ÑÐ¹ÑÐ½Ð° Ð½Ð°Ð·Ð²Ð° Ð¿Ð¾ÑÑÑ" - IDS_PORTEXISTS "ÐÐ¾ÑÑ '%s' Ð²Ð¶Ðµ ÑÑÐ½ÑÑ" - IDS_NOTHINGTOCONFIG "Ð¦ÐµÐ¹ Ð¿Ð¾ÑÑ Ð½Ðµ Ð¼Ð°Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ñ" -} Modified: trunk/reactos/dll/win32/localui/lang/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… ============================================================================== --- trunk/reactos/dll/win32/localui/lang/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/lang/ui_Zh.rc [iso-8859-1] Mon Sep 29 12:39:56 2014 @@ -16,6 +16,7 @@ * 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 + * */ #include "localui.h" @@ -25,6 +26,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE +{ + IDS_LOCALPORT "æ¬å°ç«¯å£" + IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç§°" + IDS_PORTEXISTS "ç«¯å£ %s å·²ç»åå¨" + IDS_NOTHINGTOCONFIG "è¿ä¸ªç«¯å£æ²¡æå¯è®¾ç½®éé¡¹" +} + ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "æ·»å æ¬å°ç«¯å£" @@ -32,8 +41,8 @@ BEGIN LTEXT "æ·»å æ¬å°ç«¯å£åç§°(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "ç¡®å®", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "ç¡®å®", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -49,16 +58,15 @@ PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE { IDS_LOCALPORT "æ¬å°ç«¯å£" - IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç§°" - IDS_PORTEXISTS "ç«¯å£ %s å·²ç»åå¨" - IDS_NOTHINGTOCONFIG "è¿ä¸ªç«¯å£æ²¡æå¯è®¾ç½®éé¡¹" + IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç¨±" + IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" + IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " } - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL ADDPORT_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -67,8 +75,8 @@ BEGIN LTEXT "æ·»å æ¬å°ç«¯å£åç¨±(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "ç¢ºå®", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "ç¢ºå®", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE END @@ -83,12 +91,3 @@ DEFPUSHBUTTON "ç¢ºå®", IDOK, 164, 10, 50, 14, WS_VISIBLE PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE END - - -STRINGTABLE -{ - IDS_LOCALPORT "æ¬å°ç«¯å£" - IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç¨±" - IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" - IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " -} 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] Mon Sep 29 12:39:56 2014 @@ -97,7 +97,7 @@ reactos/dll/win32/jsproxy # Synced to Wine-1.7.27 reactos/dll/win32/loadperf # Synced to Wine-1.7.17 reactos/dll/win32/localspl # Synced to Wine-1.7.17 -reactos/dll/win32/localui # Synced to Wine-1.7.17 +reactos/dll/win32/localui # Synced to Wine-1.7.27 reactos/dll/win32/lz32 # Synced to Wine-1.7.17 reactos/dll/win32/mapi32 # Synced to Wine-1.7.17 reactos/dll/win32/mciavi32 # Synced to Wine-1.7.17

10 years, 2 months

[akhaldi] 64386: [CONSRV] * Add missing psdk dependency. CORE-8577 #resolve #comment Fixed in r64386. Thanks!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 11:28:17 2014 New Revision: 64386 URL: http://svn.reactos.org/svn/reactos?rev=64386&view=rev Log: [CONSRV] * Add missing psdk dependency. CORE-8577 #resolve #comment Fixed in r64386. Thanks! Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Mon Sep 29 11:28:17 2014 @@ -50,6 +50,7 @@ endif() add_library(consrv ${CONSRV_SOURCE}) +add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE})

10 years, 2 months

[tkreuzer] 64385: [NTOSKRNL] Fix a bug I introduced in r64369. CORE-8573

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 29 07:34:39 2014 New Revision: 64385 URL: http://svn.reactos.org/svn/reactos?rev=64385&view=rev Log: [NTOSKRNL] Fix a bug I introduced in r64369. CORE-8573 Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Sep 29 07:34:39 2014 @@ -130,13 +130,6 @@ ExpressionPosition++; } - /* If star is at the end, then eat all rest and leave */ - if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) - { - NamePosition = Name->Length / sizeof(WCHAR); - break; - } - /* Save star position */ StarFound++; if (StarFound >= BackTrackingSize) @@ -149,6 +142,13 @@ } BackTracking[StarFound] = ExpressionPosition++; + + /* If star is at the end, then eat all rest and leave */ + if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) + { + NamePosition = Name->Length / sizeof(WCHAR); + break; + } /* Allow null matching */ if (Expression->Buffer[ExpressionPosition] != L'?' &&

10 years, 2 months

[ekohl] 64384: [LSASRV][SECUR32] - Implement a first version of LsaGetLogonSessionData. - Add a simple way to disable LsaEnumerateLogonSessions and LsaGetLogonSessionData in case they cause problems.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 28 23:02:09 2014 New Revision: 64384 URL: http://svn.reactos.org/svn/reactos?rev=64384&view=rev Log: [LSASRV][SECUR32] - Implement a first version of LsaGetLogonSessionData. - Add a simple way to disable LsaEnumerateLogonSessions and LsaGetLogonSessionData in case they cause problems. Modified: trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.c trunk/reactos/dll/win32/secur32/lsalpc.c trunk/reactos/include/reactos/subsys/lsass/lsass.h Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sun Sep 28 23:02:09 2014 @@ -237,6 +237,11 @@ ReplyMsg = &RequestMsg; break; + case LSASS_REQUEST_GET_LOGON_SESSION_DATA: + RequestMsg.Status = LsapGetLogonSessionData(&RequestMsg); + ReplyMsg = &RequestMsg; + break; + default: RequestMsg.Status = STATUS_INVALID_SYSTEM_SERVICE; ReplyMsg = &RequestMsg; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Sep 28 23:02:09 2014 @@ -407,6 +407,9 @@ NTSTATUS LsapEnumLogonSessions(IN OUT PLSA_API_MSG RequestMsg); +NTSTATUS +LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Sun Sep 28 23:02:09 2014 @@ -12,6 +12,16 @@ { LIST_ENTRY Entry; LUID LogonId; + ULONG LogonType; + ULONG Session; + LARGE_INTEGER LogonTime; + PSID Sid; + UNICODE_STRING UserName; + UNICODE_STRING LogonDomain; + UNICODE_STRING AuthenticationPackage; + UNICODE_STRING LogonServer; + UNICODE_STRING DnsDomainName; + UNICODE_STRING Upn; } LSAP_LOGON_SESSION, *PLSAP_LOGON_SESSION; @@ -58,7 +68,7 @@ { PLSAP_LOGON_SESSION Session; - TRACE("()\n"); + TRACE("LsapSetLogonSessionData()\n"); Session = LsapGetLogonSession(LogonId); if (Session == NULL) @@ -92,7 +102,7 @@ RtlCopyLuid(&Session->LogonId, LogonId); /* Insert the new session into the session list */ - InsertTailList(&SessionListHead, &Session->Entry); + InsertHeadList(&SessionListHead, &Session->Entry); SessionCount++; return STATUS_SUCCESS; @@ -115,6 +125,28 @@ /* Remove the session entry from the list */ RemoveEntryList(&Session->Entry); SessionCount--; + + /* Free the session data */ + if (Session->Sid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->Sid); + + if (Session->UserName.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->UserName.Buffer); + + if (Session->LogonDomain.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->LogonDomain.Buffer); + + if (Session->AuthenticationPackage.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->AuthenticationPackage.Buffer); + + if (Session->LogonServer.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->LogonServer.Buffer); + + if (Session->DnsDomainName.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->DnsDomainName.Buffer); + + if (Session->Upn.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Session->Upn.Buffer); /* Free the session entry */ RtlFreeHeap(RtlGetProcessHeap(), 0, Session); @@ -135,7 +167,7 @@ PVOID ClientBaseAddress = NULL; NTSTATUS Status; - TRACE("LsapEnumLogonSessions()\n"); + TRACE("LsapEnumLogonSessions(%p)\n", RequestMsg); Length = SessionCount * sizeof(LUID); SessionList = RtlAllocateHeap(RtlGetProcessHeap(), @@ -166,7 +198,7 @@ NULL); Status = NtOpenProcess(&ProcessHandle, - PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION | PROCESS_DUP_HANDLE, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION, &ObjectAttributes, &RequestMsg->h.ClientId); if (!NT_SUCCESS(Status)) @@ -174,6 +206,8 @@ TRACE("NtOpenProcess() failed (Status %lx)\n", Status); goto done; } + + TRACE("Length: %lu\n", Length); MemSize = Length; Status = NtAllocateVirtualMemory(ProcessHandle, @@ -188,6 +222,9 @@ goto done; } + TRACE("MemSize: %lu\n", MemSize); + TRACE("ClientBaseAddress: %p\n", ClientBaseAddress); + Status = NtWriteVirtualMemory(ProcessHandle, ClientBaseAddress, SessionList, @@ -212,4 +249,110 @@ return Status; } + +NTSTATUS +LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ProcessHandle = NULL; + PLSAP_LOGON_SESSION Session; + PSECURITY_LOGON_SESSION_DATA LocalSessionData; + PVOID ClientBaseAddress = NULL; + ULONG Length, MemSize; + LPWSTR Ptr; + NTSTATUS Status; + + TRACE("LsapGetLogonSessionData(%p)\n", RequestMsg); + + TRACE("LogonId: %lx\n", RequestMsg->GetLogonSessionData.Request.LogonId.LowPart); + Session = LsapGetLogonSession(&RequestMsg->GetLogonSessionData.Request.LogonId); + if (Session == NULL) + return STATUS_NO_SUCH_LOGON_SESSION; + + Length = sizeof(SECURITY_LOGON_SESSION_DATA); +/* + Session->UserName.MaximumLength + + Session->LogonDomain.MaximumLength + + Session->AuthenticationPackage.MaximumLength + + Session->LogonServer.MaximumLength + + Session->DnsDomainName.MaximumLength + + Session->Upn.MaximumLength; + + if (Session->Sid != NULL) + RtlLengthSid(Session->Sid); +*/ + + TRACE("Length: %lu\n", Length); + + LocalSessionData = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + if (LocalSessionData == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Ptr = (LPWSTR)((ULONG_PTR)LocalSessionData + sizeof(SECURITY_LOGON_SESSION_DATA)); + TRACE("LocalSessionData: %p Ptr: %p\n", LocalSessionData, Ptr); + + LocalSessionData->Size = sizeof(SECURITY_LOGON_SESSION_DATA); + + RtlCopyLuid(&LocalSessionData->LogonId, + &RequestMsg->GetLogonSessionData.Request.LogonId); + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + Status = NtOpenProcess(&ProcessHandle, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION, + &ObjectAttributes, + &RequestMsg->h.ClientId); + if (!NT_SUCCESS(Status)) + { + TRACE("NtOpenProcess() failed (Status %lx)\n", Status); + goto done; + } + + TRACE("MemSize: %lu\n", MemSize); + + MemSize = Length; + Status = NtAllocateVirtualMemory(ProcessHandle, + &ClientBaseAddress, + 0, + &MemSize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + TRACE("NtAllocateVirtualMemory() failed (Status %lx)\n", Status); + goto done; + } + + TRACE("MemSize: %lu\n", MemSize); + TRACE("ClientBaseAddress: %p\n", ClientBaseAddress); + + Status = NtWriteVirtualMemory(ProcessHandle, + ClientBaseAddress, + LocalSessionData, + Length, + NULL); + if (!NT_SUCCESS(Status)) + { + TRACE("NtWriteVirtualMemory() failed (Status %lx)\n", Status); + goto done; + } + + RequestMsg->GetLogonSessionData.Reply.SessionDataBuffer = ClientBaseAddress; + +done: + if (ProcessHandle != NULL) + NtClose(ProcessHandle); + + if (LocalSessionData != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalSessionData); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsalpc.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] Sun Sep 28 23:02:09 2014 @@ -108,9 +108,11 @@ */ NTSTATUS NTAPI -LsaEnumerateLogonSessions(PULONG LogonSessionCount, - PLUID *LogonSessionList) -{ +LsaEnumerateLogonSessions( + PULONG LogonSessionCount, + PLUID *LogonSessionList) +{ +#if 1 LSA_API_MSG ApiMessage; NTSTATUS Status; @@ -144,6 +146,10 @@ *LogonSessionList = ApiMessage.EnumLogonSessions.Reply.LogonSessionBuffer; return Status; +#else + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +#endif } @@ -152,11 +158,59 @@ */ NTSTATUS NTAPI -LsaGetLogonSessionData(PLUID LogonId, - PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +LsaGetLogonSessionData( + PLUID LogonId, + PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) +{ +#if 1 + LSA_API_MSG ApiMessage; + PSECURITY_LOGON_SESSION_DATA SessionData; + NTSTATUS Status; + + TRACE("LsaGetLogonSessionData(%p %p)\n", LogonId, ppLogonSessionData); + + Status = LsapOpenLsaPort(); + if (!NT_SUCCESS(Status)) + return Status; + + ApiMessage.ApiNumber = LSASS_REQUEST_GET_LOGON_SESSION_DATA; + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.GetLogonSessionData); + ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; + ApiMessage.h.u2.ZeroInit = 0; + + RtlCopyLuid(&ApiMessage.GetLogonSessionData.Request.LogonId, + LogonId); + + Status = NtRequestWaitReplyPort(LsaPortHandle, + (PPORT_MESSAGE)&ApiMessage, + (PPORT_MESSAGE)&ApiMessage); + if (!NT_SUCCESS(Status)) + { + ERR("NtRequestWaitReplyPort() failed (Status 0x%08lx)\n", Status); + return Status; + } + + if (!NT_SUCCESS(ApiMessage.Status)) + { + ERR("NtRequestWaitReplyPort() failed (ApiMessage.Status 0x%08lx)\n", ApiMessage.Status); + return ApiMessage.Status; + } + + SessionData = ApiMessage.GetLogonSessionData.Reply.SessionDataBuffer; + + if (SessionData->UserName.Buffer != NULL) + SessionData->UserName.Buffer = (LPWSTR)((ULONG_PTR)&SessionData->UserName.Buffer + (ULONG_PTR)SessionData->UserName.Buffer); + + if (SessionData->Sid != NULL) + SessionData->Sid = (LPWSTR)((ULONG_PTR)&SessionData->Sid + (ULONG_PTR)SessionData->Sid); + + *ppLogonSessionData = SessionData; + + return Status; +#else + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +#endif } Modified: trunk/reactos/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] Sun Sep 28 23:02:09 2014 @@ -22,6 +22,7 @@ LSASS_REQUEST_LOGON_USER, LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE, LSASS_REQUEST_ENUM_LOGON_SESSIONS, + LSASS_REQUEST_GET_LOGON_SESSION_DATA, LSASS_REQUEST_MAXIMUM } LSA_API_NUMBER, *PLSA_API_NUMBER; @@ -129,11 +130,26 @@ struct { ULONG LogonSessionCount; - ULONG LogonSessionBufferLength; PVOID LogonSessionBuffer; } Reply; }; } LSA_ENUM_LOGON_SESSIONS_MSG, *PLSA_ENUM_LOGON_SESSIONS_MSG; + + +typedef struct _LSA_GET_LOGON_SESSION_DATA_MSG +{ + union + { + struct + { + LUID LogonId; + } Request; + struct + { + PVOID SessionDataBuffer; + } Reply; + }; +} LSA_GET_LOGON_SESSION_DATA_MSG, *PLSA_GET_LOGON_SESSION_DATA_MSG; typedef struct _LSA_API_MSG @@ -153,6 +169,7 @@ LSA_DEREGISTER_LOGON_PROCESS_MSG DeregisterLogonProcess; LSA_LOOKUP_AUTHENTICATION_PACKAGE_MSG LookupAuthenticationPackage; LSA_ENUM_LOGON_SESSIONS_MSG EnumLogonSessions; + LSA_GET_LOGON_SESSION_DATA_MSG GetLogonSessionData; }; }; };

10 years, 2 months

[hbelusca] 64383: [NTVDM]: Use the 0xCC (int 3) instruction as the memory fill byte.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 28 22:35:05 2014 New Revision: 64383 URL: http://svn.reactos.org/svn/reactos?rev=64383&view=rev Log: [NTVDM]: Use the 0xCC (int 3) instruction as the memory fill byte. Modified: trunk/reactos/subsystems/ntvdm/emulator.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Sep 28 22:35:05 2014 @@ -549,8 +549,12 @@ wprintf(L"FATAL: Failed to allocate VDM memory.\n"); return FALSE; } - // For diagnostics purposes!! - RtlFillMemory(BaseAddress, MAX_ADDRESS, 0xFF); + /* + * For diagnostics purposes, we fill the memory with INT 0x03 codes + * so that if a program wants to execute random code in memory, we can + * retrieve the exact CS:IP where the problem happens. + */ + RtlFillMemory(BaseAddress, MAX_ADDRESS, 0xCC); /* Initialize I/O ports */ /* Initialize RAM */

10 years, 2 months

[hbelusca] 64382: [FAST486] - Display a DPRINT when the CPU triple-faults. - Add the Ac flag to the dump function.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 28 22:00:04 2014 New Revision: 64382 URL: http://svn.reactos.org/svn/reactos?rev=64382&view=rev Log: [FAST486] - Display a DPRINT when the CPU triple-faults. - Add the Ac flag to the dump function. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sun Sep 28 22:00:04 2014 @@ -317,6 +317,10 @@ /* Check if this is a triple fault */ if (State->ExceptionCount == 3) { + DPRINT("Fast486ExceptionWithErrorCode(%04X:%08X) -- Triple fault\n", + State->SegmentRegs[FAST486_REG_CS].Selector, + State->InstPtr.Long); + /* Reset the CPU */ Fast486Reset(State); return; Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Sep 28 22:00:04 2014 @@ -346,7 +346,7 @@ State->SegmentRegs[FAST486_REG_GS].Base, State->SegmentRegs[FAST486_REG_GS].Limit, State->SegmentRegs[FAST486_REG_GS].Dpl); - DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", + DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", State->Flags.Long, State->Flags.Cf ? "CF" : "cf", State->Flags.Pf ? "PF" : "pf", @@ -360,6 +360,7 @@ State->Flags.Nt ? "NT" : "nt", State->Flags.Rf ? "RF" : "rf", State->Flags.Vm ? "VM" : "vm", + State->Flags.Ac ? "AC" : "ac", State->Flags.Iopl); DbgPrint("\nControl Registers:\n" "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n",

10 years, 2 months

[hbelusca] 64381: [NTVDM]: We do not have an Extended BIOS Data Area yet. Make INT 15h, C1h report correctly this fact.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 28 21:48:46 2014 New Revision: 64381 URL: http://svn.reactos.org/svn/reactos?rev=64381&view=rev Log: [NTVDM]: We do not have an Extended BIOS Data Area yet. Make INT 15h, C1h report correctly this fact. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Sep 28 21:48:46 2014 @@ -240,10 +240,22 @@ break; } + /* Return Extended-Bios Data-Area Segment Address (PS) */ case 0xC1: + { + // Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + // setES(???); + + /* We do not support EBDA yet */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + + break; + } + + /* Pointing Device BIOS Interface (PS) */ case 0xC2: { - DPRINT1("INT 15h, AH = 0x%02X must be implemented in order to support vendor mouse drivers\n"); + DPRINT1("INT 15h, AH = C2h must be implemented in order to support vendor mouse drivers\n"); break; }

10 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014