Author: akhaldi Date: Sun Feb 23 18:28:37 2014 New Revision: 62310
URL: http://svn.reactos.org/svn/reactos?rev=62310&view=rev Log: * Sync up to trunk HEAD (r62309).
Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/cmake/msvc.cmake branches/shell-experiments/dll/win32/msgina/gui.c 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/netapi32/wksta.c branches/shell-experiments/dll/win32/syssetup/logfile.c
Propchange: branches/shell-experiments/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 23 18:28:37 2014 @@ -16,4 +16,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:61927-62285 +/trunk/reactos:61927-62309
Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cma... ============================================================================== --- branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] (original) +++ branches/shell-experiments/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -121,7 +121,14 @@
if(PCH) macro(add_pch _target _pch _sources) - set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + + # Workaround for the MSVC toolchain (MSBUILD) /MP bug + set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + if(MSVC_IDE) + file(TO_NATIVE_PATH ${_temp_gch} _gch) + else() + set(_gch ${_temp_gch}) + endif()
if(IS_CPP) set(_pch_language CXX) @@ -343,9 +350,9 @@ get_directory_property(_defines COMPILE_DEFINITIONS) foreach(_source_file ${ARGN}) get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.tmp) set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.obj) - set(_source_file_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${_source_file}) get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) unset(_source_file_defines) foreach(_define ${_defines_semicolon_list})
Modified: branches/shell-experiments/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- branches/shell-experiments/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -145,10 +145,20 @@ &ThreadId); if (Thread) { + /* 'msg' will be freed by 'StartupWindowThread' */ + CloseHandle(Thread); WaitForSingleObject(msg->StartupEvent, INFINITE); CloseHandle(msg->StartupEvent); return TRUE; + } + else + { + /* + * The 'StartupWindowThread' thread couldn't be created, + * so we need to free the allocated 'msg'. + */ + HeapFree(GetProcessHeap(), 0, msg); }
return FALSE; @@ -641,6 +651,7 @@ IN PGINA_CONTEXT pgContext) { WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; HWND hwndList; INT idx, count, i;
@@ -651,7 +662,8 @@
/* Log off */ LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + wsprintfW(szBuffer2, szBuffer, pgContext->UserName); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2); if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF);
Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,15 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ - + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -149,14 +149,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -159,14 +159,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msgi... ============================================================================== --- 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] Sun Feb 23 18:28:37 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."
Modified: branches/shell-experiments/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/neta... ============================================================================== --- branches/shell-experiments/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/netapi32/wksta.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -570,6 +570,9 @@ { FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type);
+ if (Name == NULL || type == NULL) + return ERROR_INVALID_PARAMETER; + *Name = NULL; *type = NetSetupUnknownStatus;
Modified: branches/shell-experiments/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/syss... ============================================================================== --- branches/shell-experiments/dll/win32/syssetup/logfile.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/syssetup/logfile.c [iso-8859-1] Sun Feb 23 18:28:37 2014 @@ -97,6 +97,8 @@ DWORD dwMessageSize; DWORD dwWritten; CHAR Buffer[6]; + CHAR TimeBuffer[30]; + SYSTEMTIME stTime;
/* Get the severity code string */ switch (dwSeverity) @@ -148,6 +150,28 @@ NULL, FILE_END);
+ /* Write Time/Date */ + GetLocalTime(&stTime); + + snprintf(TimeBuffer, sizeof(TimeBuffer), + "%02d/%02d/%02d %02d:%02d:%02d.%03d", + stTime.wMonth, + stTime.wDay, + stTime.wYear, + stTime.wHour, + stTime.wMinute, + stTime.wSecond, + stTime.wMilliseconds); + + WriteFile(hLogFile, + TimeBuffer, + strlen(TimeBuffer), + &dwWritten, + NULL); + + /* Write comma */ + WriteFile(hLogFile, ",", 1, &dwWritten, NULL); + /* Write file name */ WriteFile(hLogFile, lpFileName,