From 56bf9b6dbd9db3cb527bd05589f47f9d124b6bfd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 23 Feb 2014 18:28:37 +0000 Subject: [PATCH] * Sync up to trunk HEAD (r62309). svn path=/branches/shell-experiments/; revision=62310 --- cmake/msvc.cmake | 11 +++++++++-- dll/win32/msgina/gui.c | 14 +++++++++++++- dll/win32/msgina/lang/bg-BG.rc | 4 ++-- dll/win32/msgina/lang/cs-CZ.rc | 4 ++-- dll/win32/msgina/lang/de-DE.rc | 4 ++-- dll/win32/msgina/lang/en-US.rc | 5 ++--- dll/win32/msgina/lang/es-ES.rc | 4 ++-- dll/win32/msgina/lang/fr-FR.rc | 4 ++-- dll/win32/msgina/lang/he-IL.rc | 4 ++-- dll/win32/msgina/lang/id-ID.rc | 4 ++-- dll/win32/msgina/lang/it-IT.rc | 4 ++-- dll/win32/msgina/lang/ja-JP.rc | 4 ++-- dll/win32/msgina/lang/no-NO.rc | 4 ++-- dll/win32/msgina/lang/pl-PL.rc | 4 ++-- dll/win32/msgina/lang/ro-RO.rc | 4 ++-- dll/win32/msgina/lang/ru-RU.rc | 4 ++-- dll/win32/msgina/lang/sk-SK.rc | 4 ++-- dll/win32/msgina/lang/sq-AL.rc | 4 ++-- dll/win32/msgina/lang/tr-TR.rc | 4 ++-- dll/win32/msgina/lang/uk-UA.rc | 4 ++-- dll/win32/netapi32/wksta.c | 3 +++ dll/win32/syssetup/logfile.c | 24 ++++++++++++++++++++++++ 22 files changed, 85 insertions(+), 40 deletions(-) diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index ff82dfab108..7d213195eee 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -121,7 +121,14 @@ set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) 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 @@ macro(add_asm_files _target) 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}) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index b14de46b5bc..e9ad0a99276 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -145,11 +145,21 @@ GUIDisplayStatusMessage( &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 @@ ShutDownOnInit( IN PGINA_CONTEXT pgContext) { WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; HWND hwndList; INT idx, count, i; @@ -651,7 +662,8 @@ ShutDownOnInit( /* 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); diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index e6933af4b1a..d06701b5941 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index a84bfbe3f82..00ebf875e69 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -155,14 +155,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index a2e465925e9..79710d88509 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index 5f424785f7b..e442a6a9e49 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -150,15 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index badf1b51aef..fff68d7c5c8 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -152,14 +152,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 5bf4e503e3d..ebe178564e3 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 0796163a213..0a364801c19 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index c58f86367cd..a8c593ba557 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -149,14 +149,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index f4a7571652d..7ab86e7f6f9 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -158,14 +158,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index f69607e45e3..a1731d0296c 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index 0be753a7239..41b0af8ee2d 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index efe84fe1db6..aad32ffc51f 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -159,14 +159,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 59db80699c1..f63e48c638a 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -152,14 +152,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index a884a19831b..0c69e47cfed 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -152,14 +152,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 20d16321a68..ead0f3a5d43 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -155,14 +155,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 00a631781ee..8c18c16d80f 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -150,14 +150,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 2ba7bb56427..9eebba74ed5 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -152,14 +152,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 79b08953a0c..34be98fe154 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -158,14 +158,14 @@ END /* 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_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_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." 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." diff --git a/dll/win32/netapi32/wksta.c b/dll/win32/netapi32/wksta.c index 3512d31c06c..4cef46cd02e 100644 --- a/dll/win32/netapi32/wksta.c +++ b/dll/win32/netapi32/wksta.c @@ -570,6 +570,9 @@ NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( { 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; diff --git a/dll/win32/syssetup/logfile.c b/dll/win32/syssetup/logfile.c index ea0db8e547d..5a941d03865 100644 --- a/dll/win32/syssetup/logfile.c +++ b/dll/win32/syssetup/logfile.c @@ -97,6 +97,8 @@ SYSSETUP_LogItem(IN const LPSTR lpFileName, DWORD dwMessageSize; DWORD dwWritten; CHAR Buffer[6]; + CHAR TimeBuffer[30]; + SYSTEMTIME stTime; /* Get the severity code string */ switch (dwSeverity) @@ -148,6 +150,28 @@ SYSSETUP_LogItem(IN const LPSTR lpFileName, 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,