Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[ekohl] 64410: [WINLOGON] Implement the RPC server for remote registry and system shutdown. Server functions are not implemented yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 30 17:13:16 2014 New Revision: 64410 URL: http://svn.reactos.org/svn/reactos?rev=64410&view=rev Log: [WINLOGON] Implement the RPC server for remote registry and system shutdown. Server functions are not implemented yet. Added: trunk/reactos/base/system/winlogon/rpcserver.c (with props) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Tue Sep 30 17:13:16 2014 @@ -1,16 +1,24 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${CMAKE_CURRENT_BINARY_DIR}) + +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/winreg.idl) list(APPEND SOURCE environment.c + rpcserver.c sas.c screensaver.c setup.c winlogon.c wlx.c - winlogon.h) + winlogon.h + ${CMAKE_CURRENT_BINARY_DIR}/winreg_s.c) add_executable(winlogon ${SOURCE} winlogon.rc) target_link_libraries(winlogon wine) set_module_type(winlogon win32gui) -add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) +add_importlibs(winlogon user32 advapi32 userenv secur32 rpcrt4 msvcrt kernel32 ntdll) add_pch(winlogon winlogon.h SOURCE) add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/system/winlogon/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rpcse… ============================================================================== --- trunk/reactos/base/system/winlogon/rpcserver.c (added) +++ trunk/reactos/base/system/winlogon/rpcserver.c [iso-8859-1] Tue Sep 30 17:13:16 2014 @@ -0,0 +1,570 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winlogon + * FILE: base/system/winlogon/rpcserver.c + * PURPOSE: RPC server interface for the remote registry calls + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "winlogon.h" + +#include <rpc.h> +#include <winreg_s.h> + + +/* FUNCTIONS *****************************************************************/ + +BOOL +StartRpcServer(VOID) +{ + RPC_STATUS Status; + + TRACE("ScmStartRpcServer() called\n"); + + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 10, + L"\\pipe\\winreg", + NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return FALSE; + } + + Status = RpcServerRegisterIf(winreg_v1_0_s_ifspec, + NULL, + NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return FALSE; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + return FALSE; + } + + TRACE("StartRpcServer() done\n"); + return TRUE; +} + + +void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +void __RPC_USER RPC_HKEY_rundown(RPC_HKEY hSCObject) +{ +} + + +/* Function 0 */ +error_status_t +WINAPI +OpenClassesRoot( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 1 */ +error_status_t +WINAPI +OpenCurrentUser( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 2 */ +error_status_t +WINAPI +OpenLocalMachine( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 3 */ +error_status_t +WINAPI +OpenPerformanceData( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 4 */ +error_status_t +WINAPI +OpenUsers( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 5 */ +error_status_t +WINAPI +BaseRegCloseKey( + PRPC_HKEY hKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 6 */ +error_status_t +WINAPI +BaseRegCreateKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey, + PRPC_UNICODE_STRING lpClass, + DWORD dwOptions, + REGSAM samDesired, + PRPC_SECURITY_ATTRIBUTES lpSecurityAttributes, + PRPC_HKEY phkResult, + LPDWORD lpdwDisposition) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 7 */ +error_status_t +WINAPI +BaseRegDeleteKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 8 */ +error_status_t +WINAPI +BaseRegDeleteValue( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpValueName) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 9 */ +error_status_t +WINAPI +BaseRegEnumKey( + RPC_HKEY hKey, + DWORD dwIndex, + PRPC_UNICODE_STRING lpNameIn, + PRPC_UNICODE_STRING lpNameOut, + PRPC_UNICODE_STRING lpClassIn, + PRPC_UNICODE_STRING *lplpClassOut, + PFILETIME lpftLastWriteTime) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 10 */ +error_status_t +WINAPI +BaseRegEnumValue( + RPC_HKEY hKey, + DWORD dwIndex, + PRPC_UNICODE_STRING lpValueNameIn, + PRPC_UNICODE_STRING lpValueNameOut, + LPDWORD lpType, + LPBYTE lpData, + LPDWORD lpcbData, + LPDWORD lpcbLen) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 11 */ +error_status_t +__stdcall +BaseRegFlushKey( + RPC_HKEY hKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 12 */ +error_status_t +__stdcall +BaseRegGetKeySecurity( + RPC_HKEY hKey, + SECURITY_INFORMATION SecurityInformation, + PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptorIn, + PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptorOut) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 13 */ +error_status_t +__stdcall +BaseRegLoadKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey, + PRPC_UNICODE_STRING lpFile) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 14 */ +void +__stdcall +Opnum14NotImplemented( + handle_t IDL_handle) +{ + TRACE("\n"); +} + + +/* Function 15 */ +error_status_t +__stdcall +BaseRegOpenKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey, + DWORD dwOptions, + REGSAM samDesired, + PRPC_HKEY phkResult) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 16 */ +error_status_t +__stdcall +BaseRegQueryInfoKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpClassIn, + PRPC_UNICODE_STRING lpClassOut, + LPDWORD lpcSubKeys, + LPDWORD lpcbMaxSubKeyLen, + LPDWORD lpcbMaxClassLen, + LPDWORD lpcValues, + LPDWORD lpcbMaxValueNameLen, + LPDWORD lpcbMaxValueLen, + LPDWORD lpcbSecurityDescriptor, + PFILETIME lpftLastWriteTime) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 17 */ +error_status_t +__stdcall +BaseRegQueryValue( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpValueName, + LPDWORD lpType, + LPBYTE lpData, + LPDWORD lpcbData, + LPDWORD lpcbLen) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 18 */ +error_status_t +__stdcall +BaseRegReplaceKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey, + PRPC_UNICODE_STRING lpNewFile, + PRPC_UNICODE_STRING lpOldFile) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 19 */ +error_status_t +__stdcall +BaseRegRestoreKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpFile, + DWORD Flags) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 20 */ +error_status_t +__stdcall +BaseRegSaveKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpFile, + PRPC_SECURITY_ATTRIBUTES pSecurityAttributes) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 21 */ +error_status_t +__stdcall +BaseRegSetKeySecurity( + RPC_HKEY hKey, + SECURITY_INFORMATION SecurityInformation, + PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptor) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 22 */ +error_status_t +__stdcall +BaseRegSetValue( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpValueName, + DWORD dwType, + LPBYTE lpData, + DWORD cbData) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 23 */ +error_status_t +__stdcall +BaseRegUnLoadKey( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 24 */ +ULONG +__stdcall +BaseInitiateSystemShutdown( + PREGISTRY_SERVER_NAME ServerName, + PRPC_UNICODE_STRING lpMessage, + ULONG dwTimeout, + BOOLEAN bForceAppsClosed, + BOOLEAN bRebootAfterShutdown) +{ + TRACE("BaseInitiateSystemShutdown()\n"); + return ERROR_SUCCESS; +} + + +/* Function 25 */ +ULONG +__stdcall +BaseAbortSystemShutdown( + PREGISTRY_SERVER_NAME ServerName) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 26 */ +error_status_t +__stdcall +BaseRegGetVersion( + RPC_HKEY hKey, + LPDWORD lpdwVersion) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 27 */ +error_status_t +__stdcall +OpenCurrentConfig( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 28 */ +void +__stdcall +Opnum28NotImplemented( + handle_t IDL_handle) +{ + TRACE("\n"); +} + + +/* Function 29 */ +error_status_t +__stdcall +BaseRegQueryMultipleValues( + RPC_HKEY hKey, + PRVALENT val_listIn, + PRVALENT val_listOut, + DWORD num_vals, + char *lpvalueBuf, + LPDWORD ldwTotsize) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 30 */ +ULONG +__stdcall +BaseInitiateSystemShutdownEx( + PREGISTRY_SERVER_NAME ServerName, + PRPC_UNICODE_STRING lpMessage, + ULONG dwTimeout, + BOOLEAN bForceAppsClosed, + BOOLEAN bRebootAfterShutdown, + ULONG dwReason) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 31 */ +error_status_t +__stdcall +BaseRegSaveKeyEx( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpFile, + PRPC_SECURITY_ATTRIBUTES pSecurityAttributes, + DWORD Flags) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 32 */ +error_status_t +__stdcall +OpenPerformanceText( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 33 */ +error_status_t +__stdcall +OpenPerformanceNlsText( + PREGISTRY_SERVER_NAME ServerName, + REGSAM samDesired, + PRPC_HKEY phKey) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 34 */ +error_status_t +__stdcall +BaseRegQueryMultipleValues2( + RPC_HKEY hKey, + PRVALENT val_listIn, + PRVALENT val_listOut, + DWORD num_vals, + char *lpvalueBuf, + LPDWORD ldwTotsize, + LPDWORD ldwRequiredSize) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + + +/* Function 35 */ +error_status_t +__stdcall +BaseRegDeleteKeyEx( + RPC_HKEY hKey, + PRPC_UNICODE_STRING lpSubKey, + REGSAM AccessMask, + DWORD Reserved) +{ + TRACE("\n"); + return ERROR_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/base/system/winlogon/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Tue Sep 30 17:13:16 2014 @@ -356,6 +356,13 @@ ExitProcess(1); } + if (!StartRpcServer()) + { + ERR("WL: Could not start the RPC server\n"); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); + ExitProcess(1); + } + if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Tue Sep 30 17:13:16 2014 @@ -258,6 +258,10 @@ /* environment.c */ BOOL CreateUserEnvironment(IN PWLSESSION Session); + +/* rpcserver.c */ +BOOL +StartRpcServer(VOID); /* sas.c */ BOOL

10 years, 2 months

[aandrejevic] 64409: [NTVDM] The AX register value can't fit in a BYTE.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Sep 30 15:07:42 2014 New Revision: 64409 URL: http://svn.reactos.org/svn/reactos?rev=64409&view=rev Log: [NTVDM] The AX register value can't fit in a BYTE. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue Sep 30 15:07:42 2014 @@ -205,7 +205,8 @@ * In return, if CF is set we continue processing the scan code * stored in AL, and if not, we skip it. */ - BYTE CF, AX; + BYTE CF; + WORD AX; CF = getCF(); AX = getAX();

10 years, 2 months

[ekohl] 64408: [IDL] Add the remote registry interface definition files.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 30 13:45:38 2014 New Revision: 64408 URL: http://svn.reactos.org/svn/reactos?rev=64408&view=rev Log: [IDL] Add the remote registry interface definition files. Added: trunk/reactos/include/reactos/idl/winreg.acf (with props) trunk/reactos/include/reactos/idl/winreg.idl (with props) Added: trunk/reactos/include/reactos/idl/winreg.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/winreg… ============================================================================== --- trunk/reactos/include/reactos/idl/winreg.acf (added) +++ trunk/reactos/include/reactos/idl/winreg.acf [iso-8859-1] Tue Sep 30 13:45:38 2014 @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface winreg +{ +} Propchange: trunk/reactos/include/reactos/idl/winreg.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/winreg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/winreg… ============================================================================== --- trunk/reactos/include/reactos/idl/winreg.idl (added) +++ trunk/reactos/include/reactos/idl/winreg.idl [iso-8859-1] Tue Sep 30 13:45:38 2014 @@ -0,0 +1,363 @@ +/* + * Directory Service Setup interface definition + */ + +#include <ms-dtyp.idl> + +typedef [context_handle] HANDLE RPC_HKEY; +typedef RPC_HKEY *PRPC_HKEY; + +typedef [handle] PWCHAR PREGISTRY_SERVER_NAME; + +typedef struct value_ent +{ + PRPC_UNICODE_STRING ve_valuename; + DWORD ve_valuelen; + LPDWORD ve_valueptr; + DWORD ve_type; +} RVALENT, *PRVALENT; + +typedef ULONG REGSAM; + +typedef struct _RPC_SECURITY_DESCRIPTOR +{ + [size_is(cbInSecurityDescriptor), length_is(cbOutSecurityDescriptor)] PBYTE lpSecurityDescriptor; + DWORD cbInSecurityDescriptor; + DWORD cbOutSecurityDescriptor; +} RPC_SECURITY_DESCRIPTOR, *PRPC_SECURITY_DESCRIPTOR; + +typedef struct _RPC_SECURITY_ATTRIBUTES +{ + DWORD nLength; + RPC_SECURITY_DESCRIPTOR RpcSecurityDescriptor; + BOOLEAN bInheritHandle; +} RPC_SECURITY_ATTRIBUTES, *PRPC_SECURITY_ATTRIBUTES; + +[ + uuid(338CD001-2244-31F1-AAAA-900038001003), + version(1.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\winreg]") +#ifndef __midl + ,explicit_handle +#endif +] +interface winreg +{ + /* Function 0 */ + error_status_t + __stdcall + OpenClassesRoot( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 1 */ + error_status_t + __stdcall + OpenCurrentUser( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 2 */ + error_status_t + __stdcall + OpenLocalMachine( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 3 */ + error_status_t + __stdcall + OpenPerformanceData( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 4 */ + error_status_t + __stdcall + OpenUsers( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 5 */ + error_status_t + __stdcall + BaseRegCloseKey( + [in, out] PRPC_HKEY hKey); + + /* Function 6 */ + error_status_t + __stdcall + BaseRegCreateKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey, + [in] PRPC_UNICODE_STRING lpClass, + [in] DWORD dwOptions, + [in] REGSAM samDesired, + [in, unique] PRPC_SECURITY_ATTRIBUTES lpSecurityAttributes, + [out] PRPC_HKEY phkResult, + [in, out, unique] LPDWORD lpdwDisposition); + + /* Function 7 */ + error_status_t + __stdcall + BaseRegDeleteKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey); + + /* Function 8 */ + error_status_t + __stdcall + BaseRegDeleteValue( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpValueName); + + /* Function 9 */ + error_status_t + __stdcall + BaseRegEnumKey( + [in] RPC_HKEY hKey, + [in] DWORD dwIndex, + [in] PRPC_UNICODE_STRING lpNameIn, + [out] PRPC_UNICODE_STRING lpNameOut, + [in, unique] PRPC_UNICODE_STRING lpClassIn, + [out] PRPC_UNICODE_STRING *lplpClassOut, + [in, out, unique] PFILETIME lpftLastWriteTime); + + /* Function 10 */ + error_status_t + __stdcall + BaseRegEnumValue( + [in] RPC_HKEY hKey, + [in] DWORD dwIndex, + [in] PRPC_UNICODE_STRING lpValueNameIn, + [out] PRPC_UNICODE_STRING lpValueNameOut, + [in, out, unique] LPDWORD lpType, + [in, out, unique, size_is(lpcbData ? *lpcbData : 0), length_is(lpcbLen ? *lpcbLen : 0)] LPBYTE lpData, /* range(0, 0x4000000) */ + [in, out, unique] LPDWORD lpcbData, + [in, out, unique] LPDWORD lpcbLen); + + /* Function 11 */ + error_status_t + __stdcall + BaseRegFlushKey( + [in] RPC_HKEY hKey); + + /* Function 12 */ + error_status_t + __stdcall + BaseRegGetKeySecurity( + [in] RPC_HKEY hKey, + [in] SECURITY_INFORMATION SecurityInformation, + [in] PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptorIn, + [out] PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptorOut); + + /* Function 13 */ + error_status_t + __stdcall + BaseRegLoadKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey, + [in] PRPC_UNICODE_STRING lpFile); + + /* Function 14 */ + void + __stdcall + Opnum14NotImplemented(void); + + /* Function 15 */ + error_status_t + __stdcall + BaseRegOpenKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey, + [in] DWORD dwOptions, + [in] REGSAM samDesired, + [out] PRPC_HKEY phkResult); + + /* Function 16 */ + error_status_t + __stdcall + BaseRegQueryInfoKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpClassIn, + [out] PRPC_UNICODE_STRING lpClassOut, + [out] LPDWORD lpcSubKeys, + [out] LPDWORD lpcbMaxSubKeyLen, + [out] LPDWORD lpcbMaxClassLen, + [out] LPDWORD lpcValues, + [out] LPDWORD lpcbMaxValueNameLen, + [out] LPDWORD lpcbMaxValueLen, + [out] LPDWORD lpcbSecurityDescriptor, + [out] PFILETIME lpftLastWriteTime); + + /* Function 17 */ + error_status_t + __stdcall + BaseRegQueryValue( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpValueName, + [in, out, unique] LPDWORD lpType, + [in, out, unique, size_is(lpcbData ? *lpcbData : 0), length_is(lpcbLen ? *lpcbLen : 0)] LPBYTE lpData, /* range(0, 0x4000000) */ + [in, out, unique] LPDWORD lpcbData, + [in, out, unique] LPDWORD lpcbLen); + + /* Function 18 */ + error_status_t + __stdcall + BaseRegReplaceKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey, + [in] PRPC_UNICODE_STRING lpNewFile, + [in] PRPC_UNICODE_STRING lpOldFile); + + /* Function 19 */ + error_status_t + __stdcall + BaseRegRestoreKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpFile, + [in] DWORD Flags); + + /* Function 20 */ + error_status_t + __stdcall + BaseRegSaveKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpFile, + [in, unique] PRPC_SECURITY_ATTRIBUTES pSecurityAttributes); + + /* Function 21 */ + error_status_t + __stdcall + BaseRegSetKeySecurity( + [in] RPC_HKEY hKey, + [in] SECURITY_INFORMATION SecurityInformation, + [in] PRPC_SECURITY_DESCRIPTOR pRpcSecurityDescriptor); + + /* Function 22 */ + error_status_t + __stdcall + BaseRegSetValue( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpValueName, + [in] DWORD dwType, + [in, size_is(cbData)] LPBYTE lpData, + [in] DWORD cbData); + + /* Function 23 */ + error_status_t + __stdcall + BaseRegUnLoadKey( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey); + + /* Function 24 */ + ULONG + __stdcall + BaseInitiateSystemShutdown( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in, unique] PRPC_UNICODE_STRING lpMessage, + [in] ULONG dwTimeout, + [in] BOOLEAN bForceAppsClosed, + [in] BOOLEAN bRebootAfterShutdown); + + /* Function 25 */ + ULONG + __stdcall + BaseAbortSystemShutdown( + [in, unique] PREGISTRY_SERVER_NAME ServerName); + + /* Function 26 */ + error_status_t + __stdcall + BaseRegGetVersion( + [in] RPC_HKEY hKey, + [out] LPDWORD lpdwVersion); + + /* Function 27 */ + error_status_t + __stdcall + OpenCurrentConfig( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 28 */ + void + __stdcall + Opnum28NotImplemented(void); + + /* Function 29 */ + error_status_t + __stdcall + BaseRegQueryMultipleValues( + [in] RPC_HKEY hKey, + [in, size_is(num_vals), length_is(num_vals)] PRVALENT val_listIn, + [out, size_is(num_vals), length_is(num_vals)] PRVALENT val_listOut, + [in] DWORD num_vals, + [in, out, unique, size_is(*ldwTotsize), length_is(*ldwTotsize)] char *lpvalueBuf, + [in, out, ref] LPDWORD ldwTotsize); + + /* Function 30 */ + ULONG + __stdcall + BaseInitiateSystemShutdownEx( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in, unique] PRPC_UNICODE_STRING lpMessage, + [in] ULONG dwTimeout, + [in] BOOLEAN bForceAppsClosed, + [in] BOOLEAN bRebootAfterShutdown, + [in] ULONG dwReason); + + /* Function 31 */ + error_status_t + __stdcall + BaseRegSaveKeyEx( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpFile, + [in, unique] PRPC_SECURITY_ATTRIBUTES pSecurityAttributes, + [in] DWORD Flags); + + /* Function 32 */ + error_status_t + __stdcall + OpenPerformanceText( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 33 */ + error_status_t + __stdcall + OpenPerformanceNlsText( + [in, unique] PREGISTRY_SERVER_NAME ServerName, + [in] REGSAM samDesired, + [out] PRPC_HKEY phKey); + + /* Function 34 */ + error_status_t + __stdcall + BaseRegQueryMultipleValues2( + [in] RPC_HKEY hKey, + [in, size_is(num_vals), length_is(num_vals)] PRVALENT val_listIn, + [out, size_is(num_vals), length_is(num_vals)] PRVALENT val_listOut, + [in] DWORD num_vals, + [in, out, unique, size_is(*ldwTotsize), length_is(*ldwTotsize)] char *lpvalueBuf, + [in] LPDWORD ldwTotsize, + [out] LPDWORD ldwRequiredSize); + + /* Function 35 */ + error_status_t + __stdcall + BaseRegDeleteKeyEx( + [in] RPC_HKEY hKey, + [in] PRPC_UNICODE_STRING lpSubKey, + [in] REGSAM AccessMask, + [in] DWORD Reserved); +} Propchange: trunk/reactos/include/reactos/idl/winreg.idl ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 2 months

[ekohl] 64407: [LSASRV] Remove obsolete TRACE message. CORE-8579 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 30 11:16:45 2014 New Revision: 64407 URL: http://svn.reactos.org/svn/reactos?rev=64407&view=rev Log: [LSASRV] Remove obsolete TRACE message. CORE-8579 #resolve 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] Tue Sep 30 11:16:45 2014 @@ -314,8 +314,6 @@ goto done; } - //TRACE("MemSize: %lu\n", MemSize); - MemSize = Length; Status = NtAllocateVirtualMemory(ProcessHandle, &ClientBaseAddress,

10 years, 2 months

[dquintana] 64406: [MSGINA] * We don't keep changelogs in the file headers anymore. That's what the SVN commit history is for. CORE-7559

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Sep 29 21:49:42 2014 New Revision: 64406 URL: http://svn.reactos.org/svn/reactos?rev=64406&view=rev Log: [MSGINA] * We don't keep changelogs in the file headers anymore. That's what the SVN commit history is for. CORE-7559 Modified: branches/shell-experiments/dll/win32/msgina/shutdown.c Modified: branches/shell-experiments/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/shutdown.c [iso-8859-1] Mon Sep 29 21:49:42 2014 @@ -4,8 +4,6 @@ * FILE: lib/msgina/shutdown.c * PURPOSE: Shutdown Dialog Box * PROGRAMMER: Lee Schroeder (spaceseel at gmail dot com) - * UPDATE HISTORY: - * 24-11-2003 Created */ #include "msgina.h"

10 years, 2 months

[dquintana] 64405: * Sync with trunk r64401.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Sep 29 21:34:53 2014 New Revision: 64405 URL: http://svn.reactos.org/svn/reactos?rev=64405&view=rev Log: * Sync with trunk r64401. Added: branches/shell-experiments/dll/directx/wine/d3drm/ - copied from r64404, trunk/reactos/dll/directx/wine/d3drm/ branches/shell-experiments/dll/win32/mgmtapi/ - copied from r64404, trunk/reactos/dll/win32/mgmtapi/ branches/shell-experiments/include/dxsdk/dsdriver.h - copied unchanged from r64404, trunk/reactos/include/dxsdk/dsdriver.h branches/shell-experiments/include/psdk/d3drmobj.h - copied unchanged from r64404, trunk/reactos/include/psdk/d3drmobj.h branches/shell-experiments/include/psdk/d3drmwin.h - copied unchanged from r64404, trunk/reactos/include/psdk/d3drmwin.h Removed: branches/shell-experiments/dll/directx/wine/dsound/fir.h branches/shell-experiments/include/dxsdk/d3drmwin.h Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/dll/directx/wine/CMakeLists.txt branches/shell-experiments/dll/directx/wine/dsound/CMakeLists.txt branches/shell-experiments/dll/directx/wine/dsound/buffer.c branches/shell-experiments/dll/directx/wine/dsound/capture.c branches/shell-experiments/dll/directx/wine/dsound/dsound.c branches/shell-experiments/dll/directx/wine/dsound/dsound_convert.c branches/shell-experiments/dll/directx/wine/dsound/dsound_main.c branches/shell-experiments/dll/directx/wine/dsound/dsound_private.h branches/shell-experiments/dll/directx/wine/dsound/duplex.c branches/shell-experiments/dll/directx/wine/dsound/guid.c branches/shell-experiments/dll/directx/wine/dsound/mixer.c branches/shell-experiments/dll/directx/wine/dsound/primary.c branches/shell-experiments/dll/directx/wine/dsound/propset.c branches/shell-experiments/dll/directx/wine/dsound/sound3d.c branches/shell-experiments/dll/win32/CMakeLists.txt branches/shell-experiments/dll/win32/localui/lang/ui_Da.rc branches/shell-experiments/dll/win32/localui/lang/ui_De.rc branches/shell-experiments/dll/win32/localui/lang/ui_En.rc branches/shell-experiments/dll/win32/localui/lang/ui_Es.rc branches/shell-experiments/dll/win32/localui/lang/ui_Fr.rc branches/shell-experiments/dll/win32/localui/lang/ui_He.rc branches/shell-experiments/dll/win32/localui/lang/ui_Hu.rc branches/shell-experiments/dll/win32/localui/lang/ui_It.rc branches/shell-experiments/dll/win32/localui/lang/ui_Ja.rc branches/shell-experiments/dll/win32/localui/lang/ui_Ko.rc branches/shell-experiments/dll/win32/localui/lang/ui_Lt.rc branches/shell-experiments/dll/win32/localui/lang/ui_Nl.rc branches/shell-experiments/dll/win32/localui/lang/ui_No.rc branches/shell-experiments/dll/win32/localui/lang/ui_Pl.rc branches/shell-experiments/dll/win32/localui/lang/ui_Pt.rc branches/shell-experiments/dll/win32/localui/lang/ui_Ro.rc branches/shell-experiments/dll/win32/localui/lang/ui_Ru.rc branches/shell-experiments/dll/win32/localui/lang/ui_Si.rc branches/shell-experiments/dll/win32/localui/lang/ui_Sq.rc branches/shell-experiments/dll/win32/localui/lang/ui_Sv.rc branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc branches/shell-experiments/dll/win32/localui/lang/ui_Uk.rc branches/shell-experiments/dll/win32/localui/lang/ui_Zh.rc branches/shell-experiments/dll/win32/lsasrv/authport.c branches/shell-experiments/dll/win32/lsasrv/lsasrv.h branches/shell-experiments/dll/win32/lsasrv/session.c branches/shell-experiments/dll/win32/mmdevapi/devenum.c branches/shell-experiments/dll/win32/mmdevapi/mmdevapi_classes.idl branches/shell-experiments/dll/win32/mpr/lang/mpr_Bg.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Cs.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Da.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_De.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_En.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Es.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Fr.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_He.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Hu.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_It.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Ja.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Ko.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Lt.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Nl.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_No.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Pl.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Pt.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Ro.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Ru.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Si.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Sq.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Sv.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Tr.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Uk.rc branches/shell-experiments/dll/win32/mpr/lang/mpr_Zh.rc branches/shell-experiments/dll/win32/mpr/wnet.c branches/shell-experiments/dll/win32/secur32/lsalpc.c branches/shell-experiments/include/dxsdk/dxfile.h branches/shell-experiments/include/ndk/cmtypes.h branches/shell-experiments/include/psdk/d3drm.h branches/shell-experiments/include/psdk/d3drmdef.h branches/shell-experiments/include/psdk/ddraw.h branches/shell-experiments/include/reactos/subsys/lsass/lsass.h branches/shell-experiments/lib/fast486/common.c branches/shell-experiments/lib/fast486/fast486.c branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/ntoskrnl/config/cmapi.c branches/shell-experiments/ntoskrnl/fsrtl/name.c branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/tools/spec2def/spec2def.c branches/shell-experiments/win32ss/user/winsrv/consrv.cmake [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/capture.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/duplex.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Removed: branches/shell-experiments/dll/directx/wine/dsound/fir.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/guid.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/primary.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/propset.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dsound/sound3d.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/CMa… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/lsa… Modified: branches/shell-experiments/dll/win32/mmdevapi/devenum.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mmd… Modified: branches/shell-experiments/dll/win32/mmdevapi/mmdevapi_classes.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mmd… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sec… Removed: branches/shell-experiments/include/dxsdk/d3drmwin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/dxsdk… Modified: branches/shell-experiments/include/dxsdk/dxfile.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/dxsdk… Modified: branches/shell-experiments/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/c… Modified: branches/shell-experiments/include/psdk/d3drm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/c… Modified: branches/shell-experiments/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/fsrt… Modified: branches/shell-experiments/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/spec2de… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

10 years, 2 months

[dquintana] 64404: Stupid SVN doesn't add new files to the working cope when importing a patch, for some reason I can't comprehend.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Sep 29 20:22:22 2014 New Revision: 64404 URL: http://svn.reactos.org/svn/reactos?rev=64404&view=rev Log: Stupid SVN doesn't add new files to the working cope when importing a patch, for some reason I can't comprehend. Added: branches/shell-experiments/dll/win32/msgina/shutdown.c (with props) Added: branches/shell-experiments/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/shutdown.c (added) +++ branches/shell-experiments/dll/win32/msgina/shutdown.c [iso-8859-1] Mon Sep 29 20:22:22 2014 @@ -0,0 +1,272 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS msgina.dll + * FILE: lib/msgina/shutdown.c + * PURPOSE: Shutdown Dialog Box + * PROGRAMMER: Lee Schroeder (spaceseel at gmail dot com) + * UPDATE HISTORY: + * 24-11-2003 Created + */ + +#include "msgina.h" +#include <powrprof.h> +#include <strsafe.h> +#include <wingdi.h> +#include <stdlib.h> + +int g_shutdownCode = 0; +BOOL g_logoffHideState = FALSE; + +VOID UpdateShutdownShellDesc(HWND hwnd) +{ + WCHAR tmpBuffer[256]; + UINT shutdownDescId = 0; + HWND shutdownHwnd = GetDlgItem(hwnd, IDC_SHUTDOWN_DESCRIPTION); + int shutdownCode = 0; + + shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + + if(!g_logoffHideState) + { + switch (shutdownCode) + { + case 0: /* Log off */ + shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC; + break; + case 1: /* Shut down */ + shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + break; + case 2: /* Restart */ + shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + break; + default: + break; + } + + if (IsPwrSuspendAllowed()) + { + if (shutdownCode == 3) /* Sleep */ + { + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + } + else if (shutdownCode == 4) /* Hibernate */ + { + shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + } + } + else + { + if (shutdownCode == 3) /* Hibernate */ + { + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + } + } + } + else + { + switch (shutdownCode) + { + case 0: /* Shut down */ + shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + break; + case 1: /* Restart */ + shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + break; + default: + break; + } + + if (IsPwrSuspendAllowed()) + { + if (shutdownCode == 2) /* Sleep */ + { + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + } + else if (shutdownCode == 3) /* Hibernate */ + { + shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + } + } + else + { + if (shutdownCode == 2) /* Hibernate */ + { + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + } + } + } + + LoadStringW(hDllInstance, shutdownDescId, tmpBuffer, sizeof(tmpBuffer)); + SetWindowTextW(shutdownHwnd, tmpBuffer); +} + +BOOL CALLBACK ExitWindowsDialogShellProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA); + + switch (Message) + { + case WM_INITDIALOG: + { + int defSelect = 0; + WCHAR userBuffer[256]; + DWORD userBufferSize = _countof(userBuffer); + WCHAR tmpBuffer[256]; + WCHAR tmpBuffer2[512]; + + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwnd, GWL_USERDATA, (DWORD_PTR)pgContext); + + /* Clears the content before it's used */ + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_RESETCONTENT, 0, 0); + + if(!g_logoffHideState) + { + /* Log off */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + GetUserNameW(userBuffer, &userBufferSize); + StringCchPrintfW(tmpBuffer2, 512, tmpBuffer, userBuffer); + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); + } + + /* Shut down - DEFAULT */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + defSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + + /* Restart */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + + /* Sleep */ + if (IsPwrSuspendAllowed()) + { + LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + } + + /* Hibernate */ + if (IsPwrHibernateAllowed()) + { + LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + } + + /* Sets the default shut down selection */ + SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_SETCURSEL, defSelect, 0); + + /* Updates the choice description based on the current selection */ + UpdateShutdownShellDesc(hwnd); + + /* Draw the logo graphic */ + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + return TRUE; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) + { + hdc = BeginPaint(hwnd, &ps); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwnd, &ps); + } + return TRUE; + } + case WM_DESTROY: + { + DeleteObject(pgContext->hBitmap); + return TRUE; + } + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + g_shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + case IDHELP: + EndDialog(hwnd, IDHELP); + break; + case IDC_SHUTDOWN_LIST: + UpdateShutdownShellDesc(hwnd); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + +/* + * NOTES: + * - Based upon observations on the ShellShutdownDialog() function, the function doesn't actually + * do anything except show a dialog box and returning a value based upon the value chosen. That + * means that any code that calls the function has to execute the chosen action (shut down, + * restart, etc.). + * - When this function is called in Windows XP, it shows the classic dialog box regardless if + * SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\LogonType is enabled or not. + * - When the Help button is pushed, it sends the same return value as IDCANCEL (0x00), but + * at the same time, it calls the help file directly from the dialog box. + * - When the dialog is created, it doesn't disable all other input from the other windows. + * This is done elsewhere. When running the function ShellShutdownDialog() from XP/2K3, if the user clicks + * out of the window, it automatically closes itself. + * - The parameter, lpUsername never seems to be used when calling the function from Windows XP. Either + * it was a parameter that was never used in the final version before release, or it has a use that + * is currently not known. + */ +DWORD WINAPI +ShellShutdownDialog( + HWND hParent, + LPWSTR lpUsername, + BOOL bHideLogoff) +{ + int dlgValue = 0; + + g_logoffHideState = bHideLogoff; + + UNREFERENCED_PARAMETER(lpUsername); + + // Loads the shut down dialog box + dlgValue = DialogBox(hDllInstance, + MAKEINTRESOURCE(IDD_SHUTDOWN_SHELL), + hParent, + ExitWindowsDialogShellProc); + + // Determines what to do based on user selection + if (dlgValue == IDOK) + { + switch (g_shutdownCode) + { + case 0: /* Log off */ + return 0x01; + case 1: /* Shut down */ + return 0x02; + case 2: /* Reboot */ + return 0x04; + case 3: /* Sleep */ + return 0x10; + case 4: /* Hibernate */ + return 0x40; + } + } + /* Help file is called directly here */ + else if (dlgValue == IDHELP) + { + FIXME("Help is not implemented yet."); + MessageBoxW(hParent, L"Help is not implemented yet.", L"Message", MB_OK | MB_ICONEXCLAMATION); + } + else if (dlgValue == -1) + { + ERR("Failed to create dialog\n"); + } + + return 0x00; +} Propchange: branches/shell-experiments/dll/win32/msgina/shutdown.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 2 months

[dquintana] 64403: [MSGINA] [SHELL32] * Implement shell shutdown using a proper shutdown dialog. Patch by Lee Schroeder with a small change to fix MSVC build. CORE-7559 #comment Commited into shell...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Sep 29 20:14:21 2014 New Revision: 64403 URL: http://svn.reactos.org/svn/reactos?rev=64403&view=rev Log: [MSGINA] [SHELL32] * Implement shell shutdown using a proper shutdown dialog. Patch by Lee Schroeder with a small change to fix MSVC build. CORE-7559 #comment Commited into shell-experiments branch r64403. Modified: branches/shell-experiments/dll/win32/msgina/CMakeLists.txt branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc branches/shell-experiments/dll/win32/msgina/lang/en-US.rc branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc branches/shell-experiments/dll/win32/msgina/resource.h branches/shell-experiments/dll/win32/msgina/stubs.c branches/shell-experiments/dll/win32/shell32/CMakeLists.txt branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/precomp.h Modified: branches/shell-experiments/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -9,6 +9,7 @@ gui.c lsa.c msgina.c + shutdown.c stubs.c tui.c msgina.h) @@ -21,7 +22,7 @@ set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) add_delay_importlibs(msgina secur32) add_pch(msgina msgina.h SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÐ°ÐºÐ²Ð¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "ÐÐ¾Ð¼Ð¾&Ñ", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -142,6 +142,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vypnout ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Storno", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&NÃ¡povÄda", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOS herunterfahren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Welcher Vorgang soll durchgefÃ¼hrt werden?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Hilfe", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!" Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Apagar ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "Â¿&Que quieres que haga el equipo?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Aceptar", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Ayuda", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Fermer ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Aide", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -144,6 +144,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Spegnimento di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Aiuto", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOSã®ã·ã£ãããã¦ã³" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ã³ã³ãã¥ã¼ã¿ã®åä½ãé¸æãã¦ãã ãã", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "ãã«ã(&H)", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ãããã!" Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "SlÃ¥ av ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Hva vil du at datamaskinen skal gjÃ¸re?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Avbryt", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Hjelp", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -145,6 +145,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Zamknij ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co chcesz, aby zrobiÅ komputer?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Pomoc", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -144,6 +144,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "Ã&nchide", IDOK, 115, 179, 50, 14 +END + +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Ãnchidere ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Ce doriÈi sÄ se Ã®ntÃ¢mple?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Manualâ¦", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ.", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -142,6 +142,21 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vypnutie systÃ©mu ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Äo chcete aby poÄÃtaÄ urobil?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&PomocnÃk", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -128,7 +128,7 @@ COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 + PUSHBUTTON "Anulo", IDCANCEL, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -138,6 +138,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Anulo", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&NdihmÃ«", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ DEFPUSHBUTTON "Tamam", IDOK, 115, 179, 50, 14 END +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Oturumu Kapat" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&BilgisayarÄ±nÄ±zÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Tamam", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Ä°ptal", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&YardÄ±m", IDHELP, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!" Modified: branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -143,6 +143,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 +END + +IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð´Ð½Ñ Ð· ÑÐ°ÐºÐ¸Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÐµÐ¹?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 143, 122, 55, 14 + PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/resource.h [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -8,6 +8,7 @@ #define IDD_LOCKED_DLG 104 #define IDD_UNLOCK_DLG 105 #define IDD_SHUTDOWN_DLG 108 +#define IDD_SHUTDOWN_SHELL 109 #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002 Modified: branches/shell-experiments/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/stubs.c [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -10,32 +10,6 @@ */ #include "msgina.h" - -/* - * @unimplemented - */ -DWORD WINAPI -ShellShutdownDialog( - HWND hParent, - LPWSTR lpUsername, - BOOL bHideLogoff) -{ - UNREFERENCED_PARAMETER(hParent); - UNREFERENCED_PARAMETER(lpUsername); - UNREFERENCED_PARAMETER(bHideLogoff); - - /* Return values: - * 0x00: Cancelled/Help - * 0x01: Log off user - * 0x02: Shutdown - * 0x04: Reboot - * 0x10: Standby - * 0x40: Hibernate - */ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -98,6 +98,7 @@ browseui gdi32 user32 + powrprof comctl32 comdlg32 shdocvw Modified: branches/shell-experiments/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -116,6 +116,7 @@ pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); @@ -695,6 +696,44 @@ return RestartDialogEx(hWndOwner, lpstrReason, uFlags, 0); } + /************************************************************************* + * Used to get the shutdown privilege + */ +VOID ExitWindows_GetShutdownPrivilege(VOID) +{ + HANDLE hToken; + TOKEN_PRIVILEGES npr; + + /* enable shut down privilege for current process */ + if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); + + npr.PrivilegeCount = 1; + npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); + + CloseHandle(hToken); + } +} + +/************************************************************************* + * ExitWindowsDialog_backup + * + * NOTES + * used as a backup solution to shutdown the OS in case msgina.dll somehow + * cannot be found. + */ +VOID ExitWindowsDialog_backup(HWND hWndOwner) +{ + TRACE("(%p)\n", hWndOwner); + + if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE)) + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_SHUTDOWN, 0); + } +} /************************************************************************* * ExitWindowsDialog [SHELL32.60] @@ -702,24 +741,85 @@ * NOTES * exported by ordinal */ +/* + * TODO: + * - Implement the ability to show either the Welcome Screen or the classic dialog boxes based upon the + * registry value: SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\LogonType. + */ void WINAPI ExitWindowsDialog(HWND hWndOwner) { + typedef DWORD (WINAPI *ShellShFunc)(HWND hParent, WCHAR *Username, BOOL bHideLogoff); + HINSTANCE msginaDll = LoadLibraryA("msgina.dll"); + TRACE("(%p)\n", hWndOwner); - if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE)) - { - HANDLE hToken; - TOKEN_PRIVILEGES npr; - - /* enable shutdown privilege for current process */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); - npr.PrivilegeCount = 1; - npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); - CloseHandle(hToken); - } - ExitWindowsEx(EWX_SHUTDOWN, 0); - } -} + /* If the DLL cannot be found for any reason, then it simply uses a + dialog box to ask if the user wants to shut down the computer. */ + if(!msginaDll) + { + TRACE("Unable to load msgina.dll.\n"); + ExitWindowsDialog_backup(hWndOwner); + return; + } + + ShellShFunc pShellShutdownDialog = (ShellShFunc) GetProcAddress(msginaDll, "ShellShutdownDialog"); + + if(pShellShutdownDialog) + { + /* Actually call the function */ + DWORD returnValue = pShellShutdownDialog(hWndOwner, NULL, FALSE); + + switch(returnValue) + { + case 0x01: /* Log off user */ + { + ExitWindowsEx(EWX_LOGOFF, 0); + break; + } + case 0x02: /* Shut down */ + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_SHUTDOWN, 0); + break; + } + case 0x03: /* Install Updates/Shutdown (?) */ + { + break; + } + case 0x04: /* Reboot */ + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_REBOOT, 0); + break; + } + case 0x10: /* Sleep */ + { + if(IsPwrSuspendAllowed()) + { + ExitWindows_GetShutdownPrivilege(); + SetSuspendState(FALSE, FALSE, FALSE); + } + break; + } + case 0x40: /* Hibernate */ + { + if(IsPwrHibernateAllowed()) + { + ExitWindows_GetShutdownPrivilege(); + SetSuspendState(TRUE, FALSE, TRUE); + } + break; + } + /* If the option is any other value */ + default: + break; + } + } + else + { + /* If the function cannot be found, then revert to using the backup solution */ + TRACE("Unable to find the 'ShellShutdownDialog' function"); + FreeLibrary(msginaDll); + ExitWindowsDialog_backup(hWndOwner); + } +} Modified: branches/shell-experiments/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/precomp.h [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -29,6 +29,7 @@ #include <strsafe.h> #include <atlbase.h> #include <atlcom.h> +#include <powrprof.h> //#include "base/shell/explorer-new/todo.h" //#include "dlgs.h"

10 years, 2 months

[jgardou] 64402: [ADVAPI32_APITEST] - Add tests testing behaviour of RegOpen/Create for HKEY_CLASSES_ROOT subkeys - Clean up a bit the other tests CORE-8582

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Sep 29 19:13:37 2014 New Revision: 64402 URL: http://svn.reactos.org/svn/reactos?rev=64402&view=rev Log: [ADVAPI32_APITEST] - Add tests testing behaviour of RegOpen/Create for HKEY_CLASSES_ROOT subkeys - Clean up a bit the other tests CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Mon Sep 29 19:13:37 2014 @@ -13,31 +13,322 @@ #include <ndk/cmfuncs.h> #include <ndk/cmtypes.h> -#define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) +#define IS_HKCR(hk) (((UINT_PTR)hk & 3) == 2) + +/* HKCU and HKLM system paths */ +static UNICODE_STRING HKLM_ClassesPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes"); +static UNICODE_STRING HKCU_ClassesPath; + +static +LONG +DeleteSubKey(HKEY hKey, LPWSTR Root, LPWSTR SubKey) +{ + HKEY RootKey; + LONG ErrorCode; + + ErrorCode = RegOpenKeyExW( + hKey, + Root, + 0, + MAXIMUM_ALLOWED, + &RootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ErrorCode = RegDeleteKeyW(RootKey, SubKey); + RegCloseKey(RootKey); + + return ErrorCode; +} static void -Test_KeyInformation(void) +GetKeyName(HKEY hKey, PUNICODE_STRING KeyName) +{ + UNICODE_STRING InfoName; + PKEY_NAME_INFORMATION NameInformation; + ULONG InfoLength; + NTSTATUS Status; + + /* Get info length */ + InfoLength = 0; + Status = NtQueryKey(hKey, KeyNameInformation, NULL, 0, &InfoLength); + ok_ntstatus(Status, STATUS_BUFFER_TOO_SMALL); + + /* Get it for real */ + NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); + ok(NameInformation != NULL, "\n"); + + Status = NtQueryKey(hKey, KeyNameInformation, NameInformation, InfoLength, &InfoLength); + ok_ntstatus(Status, STATUS_SUCCESS); + + RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Length = NameInformation->NameLength; + + RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &InfoName, KeyName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); +} + +static void _test_key_deleted(HKEY hKey, BOOL Deleted, ULONG LineNumber) +{ + DWORD ErrorCode = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (Deleted) + ok_(__FILE__, LineNumber)(ErrorCode == ERROR_KEY_DELETED, "\n"); + else + ok_(__FILE__, LineNumber)(ErrorCode == ERROR_SUCCESS, "\n"); +} +#define ok_key_deleted(hKey) _test_key_deleted(hKey, TRUE, __LINE__) +#define ok_key_not_deleted(hKey) _test_key_deleted(hKey, FALSE, __LINE__) + +static void _test_key_name(HKEY hKey, PUNICODE_STRING Prefix, LPCWSTR Name, ULONG LineNumber) +{ + UNICODE_STRING ExpectedName, KeyName; + WCHAR Buffer[1024]; + + ExpectedName.Length = 0; + ExpectedName.MaximumLength = sizeof(Buffer); + ExpectedName.Buffer = Buffer; + + RtlAppendUnicodeStringToString(&ExpectedName, Prefix); + RtlAppendUnicodeToString(&ExpectedName, L"\\"); + RtlAppendUnicodeToString(&ExpectedName, Name); + + GetKeyName(hKey, &KeyName); + + ok_(__FILE__, LineNumber)(RtlCompareUnicodeString(&KeyName, &ExpectedName, TRUE) == 0, + "Key name is %.*S, expected %.*S\n", + KeyName.Length, KeyName.Buffer, + ExpectedName.Length, ExpectedName.Buffer); + + RtlFreeUnicodeString(&KeyName); +} + +#define ok_key_name(hKey, Prefix, Name) _test_key_name(hKey, Prefix, Name, __LINE__) + +static +void +Test_CreateOpenKey(void) +{ + HKEY MachineKey, UserKey, ClassesRootKey; + DWORD ErrorCode; + + /* First create a subkey in HKLM */ + ErrorCode = RegCreateKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKLM_Only", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &MachineKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* Open it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_Only", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKLM_ClassesPath, L"Apitest_HKLM_Only"); + + /* Try opening it in HKCU */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKLM_Only", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* Cleanup */ + RegCloseKey(ClassesRootKey); + RegCloseKey(MachineKey); + ErrorCode = DeleteSubKey(HKEY_LOCAL_MACHINE, L"Software\\Classes", L"Apitest_HKLM_Only"); + ok_dec(ErrorCode, ERROR_SUCCESS); + + /* Try creating in HKCR */ + ErrorCode = RegCreateKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKCR", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKLM_ClassesPath, L"Apitest_HKCR"); + + /* It should be present in HKLM */ + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* But not in HKCU */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* This must delete the one in HKLM */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKCR"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(ClassesRootKey); + ok_key_deleted(MachineKey); + RegCloseKey(ClassesRootKey); + RegCloseKey(MachineKey); + + /* Test that it is really not present anymore */ + MachineKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(MachineKey, NULL); + + /* Try creating in HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserKey), "\n"); + + /* Try opening it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + + /* And in HKLM */ + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(MachineKey, NULL); + + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(ClassesRootKey); + ok_key_deleted(UserKey); + RegCloseKey(ClassesRootKey); + RegCloseKey(UserKey); + + /* Test that it is really not present anymore */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* Try creating in both HKLM and HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserKey), "\n"); + + ErrorCode = RegCreateKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &MachineKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* Open it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_HKCU", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + + /* Deleting it from HKCR first deletes the one in HKCU */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(UserKey); + ok_key_deleted(ClassesRootKey); + ok_key_not_deleted(MachineKey); + + RegCloseKey(UserKey); + RegCloseKey(ClassesRootKey); + + /* This deletes it from HKLM this time */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(MachineKey); + RegCloseKey(MachineKey); +} + +static +void +Test_KeyName(void) { HKEY KeyHandle; DWORD ErrorCode; - NTSTATUS Status; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes\\CLSID"); - UNICODE_STRING InfoName; - CHAR Buffer[FIELD_OFFSET(KEY_NAME_INFORMATION, Name[512])]; - PKEY_NAME_INFORMATION NameInfo = (PKEY_NAME_INFORMATION)Buffer; - ULONG ResultLength; ErrorCode = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &KeyHandle); ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(KeyHandle), "\n"); - - Status = NtQueryKey(KeyHandle, KeyNameInformation, NameInfo, sizeof(Buffer), &ResultLength); - ok_ntstatus(Status, STATUS_SUCCESS); - RtlInitUnicodeString(&InfoName, NameInfo->Name); - InfoName.Length = NameInfo->NameLength; - ok(RtlCompareUnicodeString(&KeyName, &InfoName, TRUE) == 0, "%.*S\n", InfoName.Length, InfoName.Buffer); + ok_key_name(KeyHandle, &HKLM_ClassesPath, L"CLSID"); RegCloseKey(KeyHandle); } @@ -49,13 +340,6 @@ HKEY KeyHandle, DupHandle; DWORD ErrorCode; BOOL Duplicated; - NTSTATUS Status; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes\\CLSID"); - UNICODE_STRING InfoName; - CHAR Buffer[FIELD_OFFSET(KEY_NAME_INFORMATION, Name[512])]; - PKEY_NAME_INFORMATION NameInfo = (PKEY_NAME_INFORMATION)Buffer; - ULONG ResultLength; - ErrorCode = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &KeyHandle); ok_dec(ErrorCode, ERROR_SUCCESS); @@ -66,11 +350,7 @@ ok(DupHandle != NULL, "\n"); ok(!IS_HKCR(DupHandle), "\n"); - Status = NtQueryKey(DupHandle, KeyNameInformation, NameInfo, sizeof(Buffer), &ResultLength); - ok_ntstatus(Status, STATUS_SUCCESS); - RtlInitUnicodeString(&InfoName, NameInfo->Name); - InfoName.Length = NameInfo->NameLength; - ok(RtlCompareUnicodeString(&KeyName, &InfoName, TRUE) == 0, "%S\n", NameInfo->Name); + ok_key_name(DupHandle, &HKLM_ClassesPath, L"CLSID"); RegCloseKey(KeyHandle); RegCloseKey(DupHandle); @@ -78,6 +358,21 @@ START_TEST(HKEY_CLASSES_ROOT) { - Test_KeyInformation(); + HKEY UserKey; + LONG ErrorCode; + + /* Get HKCU real key name */ + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes", + 0, + KEY_READ, + &UserKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + GetKeyName(UserKey, &HKCU_ClassesPath); + RegCloseKey(UserKey); + + Test_CreateOpenKey(); Test_DuplicateHandle(); -} + Test_KeyName(); +}

10 years, 2 months

[akhaldi] 64401: [MPR] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 29 18:56:31 2014 New Revision: 64401 URL: http://svn.reactos.org/svn/reactos?rev=64401&view=rev Log: [MPR] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc trunk/reactos/dll/win32/mpr/lang/mpr_De.rc trunk/reactos/dll/win32/mpr/lang/mpr_En.rc trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc trunk/reactos/dll/win32/mpr/lang/mpr_He.rc trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc trunk/reactos/dll/win32/mpr/lang/mpr_It.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc trunk/reactos/dll/win32/mpr/lang/mpr_No.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Bg.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Öÿëàòà ìðåæà" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Âúâåäåòå ìðåæîâà ïàðîëà" FONT 8, "MS Shell Dlg" { - LTEXT "Âúâåäåòå âàøåòî ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñè", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Îòìåíè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Âúâåäåòå âàøåòî ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Ïðîêñè", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Ïîòðåáèòåë", -1, 6, 66, 60, 10 + LTEXT "Ïàðîëà", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Îòìåíè", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Cs.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "Celá sí" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zadání síového hesla" FONT 8, "MS Shell Dlg" { - LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Uivatel", -1, 40, 66, 50, 10 - LTEXT "Heslo", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Uivatel", -1, 6, 66, 60, 10 + LTEXT "Heslo", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Uloit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Zruit", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zruit", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Da.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hele netværket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Skriv netværkskodeord" FONT 8, "MS Shell Dlg" { - LTEXT "Skriv dit brugernavn og kodeord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Brugernavn", -1, 40, 66, 50, 10 - LTEXT "Kodeord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Skriv dit brugernavn og kodeord:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Brugernavn", -1, 6, 66, 60, 10 + LTEXT "Kodeord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Gem dette ko&deord (usikkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuller", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_De.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "Gesamtes Netzwerk" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Netzwerkkennung eingeben" FONT 8, "MS Shell Dlg" { - LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Bereich", -1, 40, 46, 50, 10 */ - LTEXT "Benutzername", -1, 40, 66, 50, 10 - LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Bereich", -1, 6, 46, 60, 10 */ + LTEXT "Benutzername", -1, 6, 66, 60, 10 + LTEXT "Kennwort", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_En.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Entire Network" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Enter Network Password" FONT 8, "MS Shell Dlg" { - LTEXT "Please enter your username and password:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "User", -1, 40, 66, 50, 10 - LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Please enter your username and password:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "User", -1, 6, 66, 60, 10 + LTEXT "Password", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Es.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Toda la red" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Introduzca contraseña de red" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, introduzca su nombre de usuario y contraseña:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usuario", -1, 40, 66, 50, 10 - LTEXT "Contraseña", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, introduzca su nombre de usuario y contraseña:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Usuario", -1, 6, 66, 60, 10 + LTEXT "Contraseña", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta contraseña (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Fr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -29,22 +29,22 @@ IDS_ENTIRENETWORK "Le rÃ©seau entier" } -IDD_PROXYDLG DIALOG 36, 24, 210, 146 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entrez le mot de passe rÃ©seau" FONT 8, "MS Shell Dlg" { - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 10, 6, 150, 17 - LTEXT "Proxy", -1, 10, 31, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 10, 68, 45, 10 - LTEXT "Mot de passe", -1, 10, 88, 45, 10 - LTEXT "", IDC_PROXY, 56, 32, 144, 14, 0 - LTEXT "", IDC_REALM, 56, 46, 144, 14, 0 - EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilisateur", -1, 6, 66, 60, 10 + LTEXT "Mot de passe", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, - 56, 106, 144, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 68, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 128, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_He.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "××¨×©×ª ××××" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "××× ×¡××¡××ª ×¨×©×ª" FONT 8, "MS Shell Dlg" { - LTEXT "× × ××× ×¡ ××ª ×©× ×××ª×©××© ×××¡××¡×× ×©××:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "×©×¨×ª ××ª××× (Proxy)", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "×©× ××©×ª××©", -1, 40, 66, 50, 10 - LTEXT "×¡××¡××", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "× × ××× ×¡ ××ª ×©× ×××ª×©××© ×××¡××¡×× ×©××:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "×©×¨×ª ××ª××× (Proxy)", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "×©× ××©×ª××©", -1, 6, 66, 60, 10 + LTEXT "×¡××¡××", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "××××¨ ××ª ××¡××¡×× (×× ××××)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "×××©××¨", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "×××××", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "×××©××¨", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "×××××", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Hu.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Teljes hálózat" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hálózati jelszó megadása" FONT 8, "MS Shell Dlg" { - LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Felhasználónév", -1, 40, 66, 50, 10 - LTEXT "Jelszó", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Felhasználónév", -1, 6, 66, 60, 10 + LTEXT "Jelszó", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Mégse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Mégse", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_It.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Tutta la rete" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Inserisci la Password di Rete" FONT 8, "MS Shell Dlg" { -LTEXT "Inserire nome utente e password:", IDC_EXPLAIN, 40, 6, 150, 15 -LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -LTEXT "Utente", -1, 40, 66, 50, 10 -LTEXT "Password", -1, 40, 86, 50, 10 -LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 -LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 -EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, -80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Inserire nome utente e password:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utente", -1, 6, 66, 60, 10 + LTEXT "Password", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ja.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "ãããã¯ã¼ã¯å¨ä½" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ãããã¯ã¼ã¯ç¨ãã¹ã¯ã¼ããå¥å" FONT 8, "MS Shell Dlg" { - LTEXT "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããå¥åãã¦ãã ãã:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ãããã·", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ã¦ã¼ã¶ã¼å", -1, 40, 66, 50, 10 - LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããå¥åãã¦ãã ãã:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ãããã·", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ã¦ã¼ã¶ã¼å", -1, 6, 66, 60, 10 + LTEXT "ãã¹ã¯ã¼ã", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ko.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "ÀüÃ¼ ³×Æ®¿öÅ©" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" FONT 9, "MS Shell Dlg" { - LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10 - LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÇÁ·Ï½Ã", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "»ç¿ëÀÚ", -1, 6, 66, 60, 10 + LTEXT "¾ÏÈ£", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (º¸¾È¿¡ ÁÖÀÇ)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "È®ÀÎ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "È®ÀÎ", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Lt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "Visas tinklas" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ä®veskite tinklo slaptaÅ¾odÄ¯" FONT 8, "MS Shell Dlg" { - LTEXT "Ä®veskite savo naudotojo vardÄ ir slaptaÅ¾odÄ¯:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ä®galiot. serv.", -1, 40, 26, 50, 10 -/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ - LTEXT "Naudotojas", -1, 40, 66, 50, 10 - LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ä®veskite savo naudotojo vardÄ ir slaptaÅ¾odÄ¯:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Ä®galiot. serv.", -1, 6, 26, 60, 10 +/* LTEXT "Sritis", -1, 6, 46, 60, 10 */ + LTEXT "Naudotojas", -1, 6, 66, 60, 10 + LTEXT "SlaptaÅ¾odis", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Gerai", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Nl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Gehele netwerk" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Voer het Netwerk Wachtwoord in" FONT 8, "MS Shell Dlg" { - LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Gebruiker", -1, 40, 66, 50, 10 - LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Gebruiker", -1, 6, 66, 60, 10 + LTEXT "Wachtwoord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Sla dit wachtwoord op (Onveilig)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_No.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hele nettverket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Skriv inn nettverkspassord" FONT 8, "MS Shell Dlg" { - LTEXT "Skriv inn brukernavnet og passordet ditt:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Mellomtjener", -1, 40, 26, 50, 10 -/* LTEXT "Område", -1, 40, 46, 50, 10 */ - LTEXT "Bruker", -1, 40, 66, 50, 10 - LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Skriv inn brukernavnet og passordet ditt:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Mellomtjener", -1, 6, 26, 60, 10 +/* LTEXT "Område", -1, 6, 46, 60, 10 */ + LTEXT "Bruker", -1, 6, 66, 60, 10 + LTEXT "Passord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Ca³a sieæ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wpisz has³o sieci" FONT 8, "MS Shell Dlg" { - LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ - LTEXT "U¿ytkownik", -1, 40, 66, 50, 10 - LTEXT "Has³o", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Obszar", -1, 6, 46, 60, 10 */ + LTEXT "U¿ytkownik", -1, 6, 66, 60, 10 + LTEXT "Has³o", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Zapisz to has³o (niebezpieczne)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -31,44 +31,44 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 - LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "UsuÃ¡rio", -1, 6, 66, 60, 10 + LTEXT "Senha", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Indique a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilizador", -1, 40, 66, 50, 10 - LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilizador", -1, 6, 66, 60, 10 + LTEXT "Senha", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ro.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,21 +27,22 @@ IDS_ENTIRENETWORK "ToatÄ reÈeaua" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Introducere parolÄ de reÈea" FONT 8, "MS Shell Dlg" { - LTEXT "IntroduceÈi numele de utilizator Èi parola:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Mandatar", -1, 40, 26, 50, 10 - LTEXT "Utilizator", -1, 40, 66, 50, 10 - LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&PÄstreazÄ aceastÄ parolÄ (nerecomandat)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Con&firmÄ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "IntroduceÈi numele de utilizator Èi parola:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Mandatar", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilizator", -1, 6, 66, 60, 10 + LTEXT "ParolÄ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&PÄstreazÄ aceastÄ parolÄ (nerecomandat)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Con&firmÄ", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ru.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "ÐÑÑ ÑÐµÑÑ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÐÑÐ¾ÐºÑÐ¸", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ÐÐ¼Ñ", -1, 40, 66, 50, 10 - LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÐÑÐ¾ÐºÑÐ¸", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ÐÐ¼Ñ", -1, 6, 66, 60, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾!)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Si.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "Celotno omreÅ¾je" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vnesite omreÅ¾no geslo" FONT 8, "MS Shell Dlg" { - LTEXT "Vnesite uporabniÅ¡ko ime in geslo:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proksi", -1, 40, 26, 50, 10 -/* LTEXT "Kraljestvo", -1, 40, 46, 50, 10 */ - LTEXT "UporabniÅ¡ko ime", -1, 40, 66, 50, 10 - LTEXT "Geslo", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Vnesite uporabniÅ¡ko ime in geslo:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proksi", -1, 6, 26, 60, 10 +/* LTEXT "Kraljestvo", -1, 6, 46, 60, 10 */ + LTEXT "UporabniÅ¡ko ime", -1, 6, 66, 60, 10 + LTEXT "Geslo", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "PrekliÄi", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sq.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "GjithÃ« Rrjeti" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FjalÃ«kalimi i GjithÃ« Rrjetit" FONT 8, "MS Shell Dlg" { - LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxi", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "PÃ«rdoruesi", -1, 40, 66, 50, 10 - LTEXT "FjalÃ«kalimi", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxi", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "PÃ«rdoruesi", -1, 6, 66, 60, 10 + LTEXT "FjalÃ«kalimi", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ruaj kÃ«tÃ« fjalÃ«kalim (i pasigurt)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anulo", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anulo", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sv.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hela nätverket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ange nätverkslösenord" FONT 8, "MS Shell Dlg" { - LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Användare", -1, 40, 66, 50, 10 - LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Användare", -1, 6, 66, 60, 10 + LTEXT "Lösenord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "TÃ¼m AÄ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "AÄ Åifresini Gir" FONT 8, "MS Shell Dlg" { - LTEXT "LÃ¼tfen kullanÄ±cÄ± adÄ±nÄ±zÄ± ve Åifrenizi giriniz:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Vekil", -1, 40, 26, 50, 10 -/* LTEXT "EriÅim AlanÄ±", -1, 40, 46, 50, 10 */ - LTEXT "KullanÄ±cÄ±", -1, 40, 66, 50, 10 - LTEXT "Åifre", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "LÃ¼tfen kullanÄ±cÄ± adÄ±nÄ±zÄ± ve Åifrenizi giriniz:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Vekil", -1, 6, 26, 60, 10 +/* LTEXT "EriÅim AlanÄ±", -1, 6, 46, 60, 10 */ + LTEXT "KullanÄ±cÄ±", -1, 6, 66, 60, 10 + LTEXT "Åifre", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Bu Åifreyi Sakla (GÃ¼vensiz)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ä°ptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Tamam", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ä°ptal", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Uk.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -29,22 +29,22 @@ IDS_ENTIRENETWORK "ÐÑÑ ÐÐµÑÐµÐ¶Ð°" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ²ÐµÐ´ÑÑÑ ÐÐµÑÐµÐ¶Ð½Ð¸Ð¹ ÐÐ°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÐÐ°ÑÑ ÑÐ¼'Ñ ÑÐ° Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÐÑÐ¾ÐºÑÑ", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 40, 66, 50, 10 - LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÐÐ°ÑÑ ÑÐ¼'Ñ ÑÐ° Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÐÑÐ¾ÐºÑÑ", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 6, 66, 60, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑÐ½Ð¾)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Zh.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,24 +28,24 @@ IDS_ENTIRENETWORK "æ´ä¸ªç½ç»" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¾å¥ç½ç»å¯ç " FONT 9, "MS Shell Dlg" { - LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ä»£ç", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ç¨æ·å", -1, 40, 66, 50, 10 - LTEXT "å¯ç ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ä»£ç", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ç¨æ·å", -1, 6, 66, 60, 10 + LTEXT "å¯ç ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "ç¡®å®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "åæ¶", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -55,22 +55,22 @@ IDS_ENTIRENETWORK "æ´åç¶²è·¯" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" FONT 9, "MS Shell Dlg" { - LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ä»£ç", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ç¨æ¶å", -1, 40, 66, 50, 10 - LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ä»£ç", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ç¨æ¶å", -1, 6, 66, 60, 10 + LTEXT "å¯ç¢¼", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¢ºå®", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "åæ¶", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -1753,6 +1753,7 @@ struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; DWORD ret = WN_NOT_CONNECTED; + DWORD bytes_returned; if ((mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -1764,7 +1765,7 @@ memset( data, 0, sizeof(*data) ); data->letter = letter; if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, data, sizeof(*data), - data, sizeof(buffer), NULL, NULL )) + data, sizeof(buffer), &bytes_returned, NULL )) { char *p, *mount_point = buffer + data->mount_point_offset; DWORD len; 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 18:56:31 2014 @@ -109,7 +109,7 @@ 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.27 -reactos/dll/win32/mpr # Synced to Wine-1.7.17 +reactos/dll/win32/mpr # Synced to Wine-1.7.27 reactos/dll/win32/mprapi # Synced to Wine-1.7.17 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17

10 years, 2 months

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