mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 12:23:31 +00:00
* Sync up to trunk HEAD (r62309).
svn path=/branches/shell-experiments/; revision=62310
This commit is contained in:
Amine Khaldi
+9
-2
@@ -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})
|
||||
|
||||
+13
-1
@@ -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);
|
||||
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user