ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2012
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
14 participants
211 discussions
Start a n
N
ew thread
[hbelusca] 57611: [WINSRV/WIN32CSR] - Move the last APIs which should be in winsrv and remove unneeded files and resources from win32csr. Keep only the desktop things. - I'm waiting for the patch o...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Oct 24 23:19:54 2012 New Revision: 57611 URL:
http://svn.reactos.org/svn/reactos?rev=57611&view=rev
Log: [WINSRV/WIN32CSR] - Move the last APIs which should be in winsrv and remove unneeded files and resources from win32csr. Keep only the desktop things. - I'm waiting for the patch of Giannis which would act on win32csr, then I will transfer the needed changes into winsrv and I will remove definitively win32csr. At the moment, winsrv doesn't compile, but win32csr does. Added: branches/ros-csrss/win32ss/user/winsrv/exitros.c - copied, changed from r57605, branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/winsrv/harderror.c - copied, changed from r57605, branches/ros-csrss/win32ss/user/win32csr/harderror.c branches/ros-csrss/win32ss/user/winsrv/winsrv.spec (with props) Removed: branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/harderror.c branches/ros-csrss/win32ss/user/win32csr/lang/ branches/ros-csrss/win32ss/user/win32csr/resource.h branches/ros-csrss/win32ss/user/win32csr/rsrc.rc branches/ros-csrss/win32ss/user/win32csr/w32csr.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrss.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.h branches/ros-csrss/win32ss/user/win32csr/dllmain.c branches/ros-csrss/win32ss/user/win32csr/win32csr.h branches/ros-csrss/win32ss/user/win32csr/win32csr.rc branches/ros-csrss/win32ss/user/winsrv/init.c (contents, props changed) branches/ros-csrss/win32ss/user/winsrv/rsrc.rc branches/ros-csrss/win32ss/user/winsrv/server.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrss.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -96,9 +96,11 @@ #define CLOSE_HANDLE (0x26) #define VERIFY_HANDLE (0x27) #define DUPLICATE_HANDLE (0x28) + #define CREATE_DESKTOP (0x2B) #define SHOW_DESKTOP (0x2C) #define HIDE_DESKTOP (0x2D) + #define SET_LOGON_NOTIFY_WINDOW (0x2F) #define REGISTER_LOGON_PROCESS (0x30) #define GET_INPUT_WAIT_HANDLE (0x35) Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -7,8 +7,7 @@ #define USERSRV_SERVERDLL_INDEX 3 #define USERSRV_FIRST_API_NUMBER 1024 -/* w32 user server - move to win.h */ -CSR_SERVER_DLL_INIT(UserServerDllInitialization); +// CSR_SERVER_DLL_INIT(UserServerDllInitialization); #endif // __WINMSG_H__ Modified: branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -11,8 +11,6 @@ list(APPEND SOURCE desktopbg.c dllmain.c - exitros.c - harderror.c win32csr.rc ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def) Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -24,14 +24,11 @@ */ -#include "w32csr.h" +#include "win32csr.h" #define NDEBUG #include <debug.h> -/*** - *** Move it into winsrv - ***/ #define DESKTOP_WINDOW_ATOM 32769 #define PM_SHOW_DESKTOP 1 Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -8,9 +8,6 @@ #pragma once -#include <csr/csrsrv.h> -//#include "api.h" - BOOL FASTCALL DtbgIsDesktopVisible(VOID); /* EOF */ Modified: branches/ros-csrss/win32ss/user/win32csr/dllmain.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -8,116 +8,36 @@ /* INCLUDES ******************************************************************/ -#include "w32csr.h" +#include "win32csr.h" #define NDEBUG #include <debug.h> - /* GLOBALS *******************************************************************/ HANDLE Win32CsrApiHeap; HINSTANCE Win32CsrDllHandle = NULL; -PCSR_API_ROUTINE Win32CsrApiDefinitions[] = +PCSR_API_ROUTINE Win32CsrApiDefinitions[3] = { - CsrGetHandle, - CsrGetHandle, - CsrCloseHandle, - CsrVerifyHandle, - CsrDuplicateHandle, - CsrGetInputWaitHandle, - CsrFillOutputChar, - CsrReadInputEvent, - CsrWriteConsoleOutputChar, - CsrWriteConsoleOutputAttrib, - CsrFillOutputAttrib, - CsrSetTextAttrib, - CsrWriteConsoleOutput, - CsrFlushInputBuffer, - CsrReadConsoleOutputChar, - CsrReadConsoleOutputAttrib, - CsrExitReactos, - CsrHardwareStateProperty, CsrCreateDesktop, CsrShowDesktop, CsrHideDesktop, - CsrSetLogonNotifyWindow, - CsrRegisterLogonProcess, - CsrGenerateCtrlEvent, }; +BOOLEAN Win32CsrApiServerValidTable[3] = +{ + FALSE, + FALSE, + FALSE +}; -/* -static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = +PCHAR Win32CsrApiNameTable[3] = { - CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetHandle), - CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetHandle), - CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), - CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), - CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), - CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), - CSRSS_DEFINE_API(WRITE_CONSOLE, CsrWriteConsole), - CSRSS_DEFINE_API(READ_CONSOLE, CsrReadConsole), - CSRSS_DEFINE_API(ALLOC_CONSOLE, CsrAllocConsole), - CSRSS_DEFINE_API(FREE_CONSOLE, CsrFreeConsole), - CSRSS_DEFINE_API(SCREEN_BUFFER_INFO, CsrGetScreenBufferInfo), - CSRSS_DEFINE_API(SET_CURSOR, CsrSetCursor), - CSRSS_DEFINE_API(FILL_OUTPUT, CsrFillOutputChar), - CSRSS_DEFINE_API(READ_INPUT, CsrReadInputEvent), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_CHAR, CsrWriteConsoleOutputChar), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_ATTRIB, CsrWriteConsoleOutputAttrib), - CSRSS_DEFINE_API(FILL_OUTPUT_ATTRIB, CsrFillOutputAttrib), - CSRSS_DEFINE_API(GET_CURSOR_INFO, CsrGetCursorInfo), - CSRSS_DEFINE_API(SET_CURSOR_INFO, CsrSetCursorInfo), - CSRSS_DEFINE_API(SET_ATTRIB, CsrSetTextAttrib), - CSRSS_DEFINE_API(GET_CONSOLE_MODE, CsrGetConsoleMode), - CSRSS_DEFINE_API(SET_CONSOLE_MODE, CsrSetConsoleMode), - CSRSS_DEFINE_API(CREATE_SCREEN_BUFFER, CsrCreateScreenBuffer), - CSRSS_DEFINE_API(SET_SCREEN_BUFFER, CsrSetScreenBuffer), - CSRSS_DEFINE_API(SET_TITLE, CsrSetTitle), - CSRSS_DEFINE_API(GET_TITLE, CsrGetTitle), - CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT, CsrWriteConsoleOutput), - CSRSS_DEFINE_API(FLUSH_INPUT_BUFFER, CsrFlushInputBuffer), - CSRSS_DEFINE_API(SCROLL_CONSOLE_SCREEN_BUFFER, CsrScrollConsoleScreenBuffer), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_CHAR, CsrReadConsoleOutputChar), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_ATTRIB, CsrReadConsoleOutputAttrib), - CSRSS_DEFINE_API(GET_NUM_INPUT_EVENTS, CsrGetNumberOfConsoleInputEvents), - CSRSS_DEFINE_API(EXIT_REACTOS, CsrExitReactos), - CSRSS_DEFINE_API(PEEK_CONSOLE_INPUT, CsrPeekConsoleInput), - CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT, CsrReadConsoleOutput), - CSRSS_DEFINE_API(WRITE_CONSOLE_INPUT, CsrWriteConsoleInput), - CSRSS_DEFINE_API(SETGET_CONSOLE_HW_STATE, CsrHardwareStateProperty), - CSRSS_DEFINE_API(GET_CONSOLE_WINDOW, CsrGetConsoleWindow), - CSRSS_DEFINE_API(CREATE_DESKTOP, CsrCreateDesktop), - CSRSS_DEFINE_API(SHOW_DESKTOP, CsrShowDesktop), - CSRSS_DEFINE_API(HIDE_DESKTOP, CsrHideDesktop), - CSRSS_DEFINE_API(SET_CONSOLE_ICON, CsrSetConsoleIcon), - CSRSS_DEFINE_API(SET_LOGON_NOTIFY_WINDOW, CsrSetLogonNotifyWindow), - CSRSS_DEFINE_API(REGISTER_LOGON_PROCESS, CsrRegisterLogonProcess), - CSRSS_DEFINE_API(GET_CONSOLE_CP, CsrGetConsoleCodePage), - CSRSS_DEFINE_API(SET_CONSOLE_CP, CsrSetConsoleCodePage), - CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), - CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), - CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), - CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), - CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), - CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), - CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), - CSRSS_DEFINE_API(GENERATE_CTRL_EVENT, CsrGenerateCtrlEvent), - CSRSS_DEFINE_API(SET_SCREEN_BUFFER_SIZE, CsrSetScreenBufferSize), - CSRSS_DEFINE_API(GET_CONSOLE_SELECTION_INFO, CsrGetConsoleSelectionInfo), - CSRSS_DEFINE_API(GET_COMMAND_HISTORY_LENGTH, CsrGetCommandHistoryLength), - CSRSS_DEFINE_API(GET_COMMAND_HISTORY, CsrGetCommandHistory), - CSRSS_DEFINE_API(EXPUNGE_COMMAND_HISTORY, CsrExpungeCommandHistory), - CSRSS_DEFINE_API(SET_HISTORY_NUMBER_COMMANDS, CsrSetHistoryNumberCommands), - CSRSS_DEFINE_API(GET_HISTORY_INFO, CsrGetHistoryInfo), - CSRSS_DEFINE_API(SET_HISTORY_INFO, CsrSetHistoryInfo), - { 0, 0, NULL } + "CsrCreateDesktop", + "CsrShowDesktop", + "CsrHideDesktop", }; -*/ static HHOOK hhk = NULL; @@ -131,149 +51,6 @@ LPARAM lParam) { return CallNextHookEx(hhk, nCode, wParam, lParam); -} - -ULONG -InitializeVideoAddressSpace(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); - NTSTATUS Status; - HANDLE PhysMemHandle; - PVOID BaseAddress; - LARGE_INTEGER Offset; - SIZE_T ViewSize; - CHAR IVTAndBda[1024+256]; - - /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ - BaseAddress = 0; - ViewSize = 1024 * 1024; - Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &BaseAddress, - &ViewSize, - MEM_RELEASE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); - return 0; - } - - /* Open the physical memory section */ - InitializeObjectAttributes(&ObjectAttributes, - &PhysMemName, - 0, - NULL, - NULL); - Status = ZwOpenSection(&PhysMemHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); - return 0; - } - - /* Map the BIOS and device registers into the address space */ - Offset.QuadPart = 0xa0000; - ViewSize = 0x100000 - 0xa0000; - BaseAddress = (PVOID)0xa0000; - Status = ZwMapViewOfSection(PhysMemHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &Offset, - &ViewSize, - ViewUnmap, - 0, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't map physical memory (%x)\n", Status); - ZwClose(PhysMemHandle); - return 0; - } - - /* Close physical memory section handle */ - ZwClose(PhysMemHandle); - - if (BaseAddress != (PVOID)0xa0000) - { - DPRINT1("Couldn't map physical memory at the right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Allocate some low memory to use for the non-BIOS - * parts of the v86 mode address space - */ - BaseAddress = (PVOID)0x1; - ViewSize = 0xa0000 - 0x1000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); - return 0; - } - if (BaseAddress != (PVOID)0x0) - { - DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Get the real mode IVT and BDA from the kernel */ - Status = NtVdmControl(VdmInitialize, IVTAndBda); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtVdmControl failed (status %x)\n", Status); - return 0; - } - - /* Return success */ - return 1; -} - -/********************************************************************** - * CsrpInitVideo/3 - * - * TODO: we need a virtual device for sessions other than - * TODO: the console one - */ -NTSTATUS -CsrpInitVideo (VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); - IO_STATUS_BLOCK Iosb; - HANDLE VideoHandle = (HANDLE) 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - InitializeVideoAddressSpace(); - - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = NtOpenFile(&VideoHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - 0); - if (NT_SUCCESS(Status)) - { - NtClose(VideoHandle); - } - return Status; } BOOL WINAPI @@ -296,18 +73,11 @@ return TRUE; } -NTSTATUS FASTCALL -Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context) -{ - return CsrEnumProcesses(EnumProc, Context); -} - VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check) { - NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); + NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); } DWORD @@ -326,25 +96,23 @@ NTSTATUS Status; Win32CsrApiHeap = RtlGetProcessHeap(); - - CsrpInitVideo(); // Must go into winsrv.dll NtUserInitialize(0, NULL, NULL); PrivateCsrssManualGuiCheck(0); /* Setup the DLL Object */ - LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; - LoadedServerDll->HighestApiSupported = UserpMaxApiNumber; + LoadedServerDll->ApiBase = 4; + LoadedServerDll->HighestApiSupported = 3; LoadedServerDll->DispatchTable = Win32CsrApiDefinitions; - // LoadedServerDll->ValidTable = Win32CsrApiServerValidTable; - // LoadedServerDll->NameTable = Win32CsrApiNameTable; + LoadedServerDll->ValidTable = Win32CsrApiServerValidTable; + LoadedServerDll->NameTable = Win32CsrApiNameTable; // LoadedServerDll->SizeOfProcessData = 0; // LoadedServerDll->ConnectCallback = NULL; // LoadedServerDll->DisconnectCallback = NULL; - LoadedServerDll->HardErrorCallback = Win32CsrHardError; - LoadedServerDll->NewProcessCallback = NULL; - LoadedServerDll->DisconnectCallback = NULL; + // LoadedServerDll->HardErrorCallback = Win32CsrHardError; + // LoadedServerDll->NewProcessCallback = NULL; + // LoadedServerDll->DisconnectCallback = NULL; /* Start Raw Input Threads */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); Removed: branches/ros-csrss/win32ss/user/win32csr/exitros.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/exitros.c (removed) @@ -1,937 +1,0 @@ -/* $Id: exitros.c 57570 2012-10-17 23:10:40Z hbelusca $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSRSS subsystem - * FILE: subsys/csrss/win32csr/exitros.c - * PURPOSE: Logout/shutdown - */ - - -/*** - *** Move it into winsrv - ***/ - -/* INCLUDES ******************************************************************/ - -#include "w32csr.h" -#include <sddl.h> - -#define NDEBUG -#include <debug.h> - -static HWND LogonNotifyWindow = NULL; -static HANDLE LogonProcess = NULL; - -CSR_API(CsrRegisterLogonProcess) -{ - if (ApiMessage->Data.RegisterLogonProcessRequest.Register) - { - if (0 != LogonProcess) - { - return STATUS_LOGON_SESSION_EXISTS; - } - LogonProcess = ApiMessage->Data.RegisterLogonProcessRequest.ProcessId; - } - else - { - if (ApiMessage->Header.ClientId.UniqueProcess != LogonProcess) - { - DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", - LogonProcess, ApiMessage->Header.ClientId.UniqueProcess); - return STATUS_NOT_LOGON_PROCESS; - } - LogonProcess = 0; - } - - return STATUS_SUCCESS; -} - -CSR_API(CsrSetLogonNotifyWindow) -{ - DWORD WindowCreator; - - if (0 == GetWindowThreadProcessId(ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow, - &WindowCreator)) - { - DPRINT1("Can't get window creator\n"); - return STATUS_INVALID_HANDLE; - } - if (WindowCreator != (DWORD_PTR)LogonProcess) - { - DPRINT1("Trying to register window not created by winlogon as notify window\n"); - return STATUS_ACCESS_DENIED; - } - - LogonNotifyWindow = ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow; - - return STATUS_SUCCESS; -} - -typedef struct tagSHUTDOWN_SETTINGS -{ - BOOL AutoEndTasks; - DWORD HungAppTimeout; - DWORD WaitToKillAppTimeout; -} SHUTDOWN_SETTINGS, *PSHUTDOWN_SETTINGS; - -#define DEFAULT_AUTO_END_TASKS FALSE -#define DEFAULT_HUNG_APP_TIMEOUT 5000 -#define DEFAULT_WAIT_TO_KILL_APP_TIMEOUT 20000 - -typedef struct tagNOTIFY_CONTEXT -{ - DWORD ProcessId; - UINT Msg; - WPARAM wParam; - LPARAM lParam; - HDESK Desktop; - DWORD StartTime; - DWORD QueryResult; - HWND Dlg; - DWORD EndNowResult; - BOOL ShowUI; - HANDLE UIThread; - HWND WndClient; - PSHUTDOWN_SETTINGS ShutdownSettings; - LPTHREAD_START_ROUTINE SendMessageProc; -} NOTIFY_CONTEXT, *PNOTIFY_CONTEXT; - -#define QUERY_RESULT_ABORT 0 -#define QUERY_RESULT_CONTINUE 1 -#define QUERY_RESULT_TIMEOUT 2 -#define QUERY_RESULT_ERROR 3 -#define QUERY_RESULT_FORCE 4 - -static void FASTCALL -UpdateProgressBar(HWND ProgressBar, PNOTIFY_CONTEXT NotifyContext) -{ - DWORD Passed; - - Passed = GetTickCount() - NotifyContext->StartTime; - Passed -= NotifyContext->ShutdownSettings->HungAppTimeout; - if (NotifyContext->ShutdownSettings->WaitToKillAppTimeout < Passed) - { - Passed = NotifyContext->ShutdownSettings->WaitToKillAppTimeout; - } - SendMessageW(ProgressBar, PBM_SETPOS, Passed / 2, 0); -} - -static INT_PTR CALLBACK -EndNowDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - INT_PTR Result; - PNOTIFY_CONTEXT NotifyContext; - HWND ProgressBar; - DWORD TitleLength; - int Len; - LPWSTR Title; - - switch(Msg) - { - case WM_INITDIALOG: - NotifyContext = (PNOTIFY_CONTEXT) lParam; - NotifyContext->EndNowResult = QUERY_RESULT_ABORT; - SetWindowLongPtrW(Dlg, DWLP_USER, (LONG_PTR) lParam); - TitleLength = SendMessageW(NotifyContext->WndClient, WM_GETTEXTLENGTH, - 0, 0) + - GetWindowTextLengthW(Dlg); - Title = HeapAlloc(Win32CsrApiHeap, 0, (TitleLength + 1) * sizeof(WCHAR)); - if (NULL != Title) - { - Len = GetWindowTextW(Dlg, Title, TitleLength + 1); - SendMessageW(NotifyContext->WndClient, WM_GETTEXT, - TitleLength + 1 - Len, (LPARAM) (Title + Len)); - SetWindowTextW(Dlg, Title); - HeapFree(Win32CsrApiHeap, 0, Title); - } - ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); - SendMessageW(ProgressBar, PBM_SETRANGE32, 0, - NotifyContext->ShutdownSettings->WaitToKillAppTimeout / 2); - UpdateProgressBar(ProgressBar, NotifyContext); - SetTimer(Dlg, 0, 200, NULL); - Result = FALSE; - break; - - case WM_TIMER: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); - UpdateProgressBar(ProgressBar, NotifyContext); - Result = TRUE; - break; - - case WM_COMMAND: - if (BN_CLICKED == HIWORD(wParam) && IDC_END_NOW == LOWORD(wParam)) - { - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - NotifyContext->EndNowResult = QUERY_RESULT_FORCE; - SendMessageW(Dlg, WM_CLOSE, 0, 0); - Result = TRUE; - } - else - { - Result = FALSE; - } - break; - - case WM_CLOSE: - DestroyWindow(Dlg); - Result = TRUE; - break; - - case WM_DESTROY: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - NotifyContext->Dlg = NULL; - KillTimer(Dlg, 0); - PostQuitMessage(NotifyContext->EndNowResult); - Result = TRUE; - break; - - default: - Result = FALSE; - break; - } - - return Result; -} - -typedef void (WINAPI *INITCOMMONCONTROLS_PROC)(void); - -static void -CallInitCommonControls() -{ - static BOOL Initialized = FALSE; - HMODULE Lib; - INITCOMMONCONTROLS_PROC InitProc; - - if (Initialized) - { - return; - } - - Lib = LoadLibraryW(L"COMCTL32.DLL"); - if (NULL == Lib) - { - return; - } - InitProc = (INITCOMMONCONTROLS_PROC) GetProcAddress(Lib, "InitCommonControls"); - if (NULL == InitProc) - { - return; - } - - (*InitProc)(); - - Initialized = TRUE; -} - -static DWORD WINAPI -EndNowThreadProc(LPVOID Parameter) -{ - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) Parameter; - MSG Msg; - - SetThreadDesktop(NotifyContext->Desktop); - SwitchDesktop(NotifyContext->Desktop); - CallInitCommonControls(); - NotifyContext->Dlg = CreateDialogParam(GetModuleHandleW(L"win32csr"), - MAKEINTRESOURCE(IDD_END_NOW), NULL, - EndNowDlgProc, (LPARAM) NotifyContext); - if (NULL == NotifyContext->Dlg) - { - return 0; - } - ShowWindow(NotifyContext->Dlg, SW_SHOWNORMAL); - - while (GetMessageW(&Msg, NULL, 0, 0)) - { - if (! IsDialogMessage(NotifyContext->Dlg, &Msg)) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } - } - - return Msg.wParam; -} - -typedef struct tagMESSAGE_CONTEXT -{ - HWND Wnd; - UINT Msg; - WPARAM wParam; - LPARAM lParam; - DWORD Timeout; -} MESSAGE_CONTEXT, *PMESSAGE_CONTEXT; - -static DWORD WINAPI -SendQueryEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - DWORD_PTR Result; - - if (SendMessageTimeoutW(Context->Wnd, WM_QUERYENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return Result ? QUERY_RESULT_CONTINUE : QUERY_RESULT_ABORT; - } - - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; -} - -static DWORD WINAPI -SendEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - DWORD_PTR Result; - - if (Context->wParam) - { - if (SendMessageTimeoutW(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return QUERY_RESULT_CONTINUE; - } - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; - } - else - { - SendMessage(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam); - return QUERY_RESULT_CONTINUE; - } -} - -static BOOL CALLBACK -NotifyTopLevelEnum(HWND Wnd, LPARAM lParam) -{ - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) lParam; - MESSAGE_CONTEXT MessageContext; - DWORD Now, Passed; - DWORD Timeout, WaitStatus; - DWORD ProcessId; - HANDLE MessageThread; - HANDLE Threads[2]; - - if (0 == GetWindowThreadProcessId(Wnd, &ProcessId)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - if (ProcessId == NotifyContext->ProcessId) - { - Now = GetTickCount(); - if (0 == NotifyContext->StartTime) - { - NotifyContext->StartTime = Now; - } - /* Note: Passed is computed correctly even when GetTickCount() wraps due - to unsigned arithmetic */ - Passed = Now - NotifyContext->StartTime; - MessageContext.Wnd = Wnd; - MessageContext.Msg = NotifyContext->Msg; - MessageContext.wParam = NotifyContext->wParam; - MessageContext.lParam = NotifyContext->lParam; - MessageContext.Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (! NotifyContext->ShutdownSettings->AutoEndTasks) - { - MessageContext.Timeout += NotifyContext->ShutdownSettings->WaitToKillAppTimeout; - } - if (Passed < MessageContext.Timeout) - { - MessageContext.Timeout -= Passed; - MessageThread = CreateThread(NULL, 0, NotifyContext->SendMessageProc, - (LPVOID) &MessageContext, 0, NULL); - if (NULL == MessageThread) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (Passed < Timeout) - { - Timeout -= Passed; - WaitStatus = WaitForSingleObjectEx(MessageThread, Timeout, FALSE); - } - else - { - WaitStatus = WAIT_TIMEOUT; - } - if (WAIT_TIMEOUT == WaitStatus) - { - NotifyContext->WndClient = Wnd; - if (NULL == NotifyContext->UIThread && NotifyContext->ShowUI) - { - NotifyContext->UIThread = CreateThread(NULL, 0, - EndNowThreadProc, - (LPVOID) NotifyContext, - 0, NULL); - } - Threads[0] = MessageThread; - Threads[1] = NotifyContext->UIThread; - WaitStatus = WaitForMultipleObjectsEx(NULL == NotifyContext->UIThread ? - 1 : 2, - Threads, FALSE, INFINITE, - FALSE); - if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else if (WAIT_OBJECT_0 + 1 == WaitStatus) - { - if (! GetExitCodeThread(NotifyContext->UIThread, - &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - if (WAIT_OBJECT_0 != WaitStatus) - { - TerminateThread(MessageThread, QUERY_RESULT_TIMEOUT); - } - } - else if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, - &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - CloseHandle(MessageThread); - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; - } - } - - return QUERY_RESULT_CONTINUE == NotifyContext->QueryResult; -} - -static BOOL CALLBACK -NotifyDesktopEnum(LPWSTR DesktopName, LPARAM lParam) -{ - PNOTIFY_CONTEXT Context = (PNOTIFY_CONTEXT) lParam; - - Context->Desktop = OpenDesktopW(DesktopName, 0, FALSE, - DESKTOP_ENUMERATE | DESKTOP_SWITCHDESKTOP); - if (NULL == Context->Desktop) - { - DPRINT1("OpenDesktop failed with error %d\n", GetLastError()); - Context->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - EnumDesktopWindows(Context->Desktop, NotifyTopLevelEnum, lParam); - - CloseDesktop(Context->Desktop); - - return QUERY_RESULT_CONTINUE == Context->QueryResult; -} - -static BOOL FASTCALL -NotifyTopLevelWindows(PNOTIFY_CONTEXT Context) -{ - HWINSTA WindowStation; - - WindowStation = GetProcessWindowStation(); - if (NULL == WindowStation) - { - DPRINT1("GetProcessWindowStation failed with error %d\n", GetLastError()); - return TRUE; - } - - EnumDesktopsW(WindowStation, NotifyDesktopEnum, (LPARAM) Context); - - return TRUE; -} - -static BOOL FASTCALL -NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, - PSHUTDOWN_SETTINGS ShutdownSettings, - UINT Flags) -{ - NOTIFY_CONTEXT Context; - HANDLE Process; - DWORD QueryResult = QUERY_RESULT_CONTINUE; - - Context.QueryResult = QUERY_RESULT_CONTINUE; - - if (0 == (Flags & EWX_FORCE)) - { - if (NULL != ProcessData->Console) - { - ConioConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData, - ShutdownSettings->WaitToKillAppTimeout); - } - else - { - Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; - Context.wParam = 0; - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.StartTime = 0; - Context.UIThread = NULL; - Context.ShowUI = DtbgIsDesktopVisible(); - Context.Dlg = NULL; - Context.ShutdownSettings = ShutdownSettings; - Context.SendMessageProc = SendQueryEndSession; - - NotifyTopLevelWindows(&Context); - - Context.wParam = (QUERY_RESULT_ABORT != Context.QueryResult); - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.SendMessageProc = SendEndSession; - Context.ShowUI = DtbgIsDesktopVisible() && - (QUERY_RESULT_ABORT != Context.QueryResult); - QueryResult = Context.QueryResult; - Context.QueryResult = QUERY_RESULT_CONTINUE; - - NotifyTopLevelWindows(&Context); - - if (NULL != Context.UIThread) - { - if (NULL != Context.Dlg) - { - SendMessageW(Context.Dlg, WM_CLOSE, 0, 0); - } - else - { - TerminateThread(Context.UIThread, QUERY_RESULT_ERROR); - } - CloseHandle(Context.UIThread); - } - } - - if (QUERY_RESULT_ABORT == QueryResult) - { - return FALSE; - } - } - - /* Terminate this process */ - Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return TRUE; - } - TerminateProcess(Process, 0); - CloseHandle(Process); - - return TRUE; -} - -typedef struct tagPROCESS_ENUM_CONTEXT -{ - UINT ProcessCount; - PCSR_PROCESS *ProcessData; - TOKEN_ORIGIN TokenOrigin; - DWORD ShellProcess; - DWORD CsrssProcess; -} PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT; - -static NTSTATUS WINAPI -ExitReactosProcessEnum(PCSR_PROCESS ProcessData, PVOID Data) -{ - HANDLE Process; - HANDLE Token; - TOKEN_ORIGIN Origin; - DWORD ReturnLength; - PPROCESS_ENUM_CONTEXT Context = (PPROCESS_ENUM_CONTEXT) Data; - PCSR_PROCESS *NewData; - - /* Do not kill winlogon or csrss */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->CsrssProcess || - ProcessData->ClientId.UniqueProcess == LogonProcess) - { - return STATUS_SUCCESS; - } - - /* Get the login session of this process */ - Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return STATUS_UNSUCCESSFUL; - } - - if (! OpenProcessToken(Process, TOKEN_QUERY, &Token)) - { - DPRINT1("Unable to open token for process %d, error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Process); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Process); - - if (! GetTokenInformation(Token, TokenOrigin, &Origin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed for process %d with error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Token); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Token); - - /* This process will be killed if it's in the correct logon session */ - if (RtlEqualLuid(&(Context->TokenOrigin.OriginatingLogonSession), - &(Origin.OriginatingLogonSession))) - { - /* Kill the shell process last */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->ShellProcess) - { - ProcessData->ShutdownLevel = 0; - } - NewData = HeapAlloc(Win32CsrApiHeap, 0, (Context->ProcessCount + 1) - * sizeof(PCSR_PROCESS)); - if (NULL == NewData) - { - return STATUS_NO_MEMORY; - } - if (0 != Context->ProcessCount) - { - memcpy(NewData, Context->ProcessData, - Context->ProcessCount * sizeof(PCSR_PROCESS)); - HeapFree(Win32CsrApiHeap, 0, Context->ProcessData); - } - Context->ProcessData = NewData; - Context->ProcessData[Context->ProcessCount] = ProcessData; - Context->ProcessCount++; - } - - return STATUS_SUCCESS; -} - -static int -ProcessDataCompare(const void *Elem1, const void *Elem2) -{ - const PCSR_PROCESS *ProcessData1 = (PCSR_PROCESS *) Elem1; - const PCSR_PROCESS *ProcessData2 = (PCSR_PROCESS *) Elem2; - - if ((*ProcessData1)->ShutdownLevel < (*ProcessData2)->ShutdownLevel) - { - return +1; - } - else if ((*ProcessData2)->ShutdownLevel < (*ProcessData1)->ShutdownLevel) - { - return -1; - } - else if ((*ProcessData1)->ClientId.UniqueProcess < (*ProcessData2)->ClientId.UniqueProcess) - { - return +1; - } - else if ((*ProcessData2)->ClientId.UniqueProcess < (*ProcessData1)->ClientId.UniqueProcess) - { - return -1; - } - - return 0; -} - -static DWORD FASTCALL -GetShutdownSetting(HKEY DesktopKey, LPCWSTR ValueName, DWORD DefaultValue) -{ - BYTE ValueBuffer[16]; - LONG ErrCode; - DWORD Type; - DWORD ValueSize; - UNICODE_STRING StringValue; - ULONG Value; - - ValueSize = sizeof(ValueBuffer); - ErrCode = RegQueryValueExW(DesktopKey, ValueName, NULL, &Type, ValueBuffer, - &ValueSize); - if (ERROR_SUCCESS != ErrCode) - { - DPRINT("GetShutdownSetting for %S failed with error code %ld\n", - ValueName, ErrCode); - return DefaultValue; - } - - if (REG_SZ == Type) - { - RtlInitUnicodeString(&StringValue, (LPCWSTR) ValueBuffer); - if (! NT_SUCCESS(RtlUnicodeStringToInteger(&StringValue, 10, &Value))) - { - DPRINT1("Unable to convert value %S for setting %S\n", - StringValue.Buffer, ValueName); - return DefaultValue; - } - return (DWORD) Value; - } - else if (REG_DWORD == Type) - { - return *((DWORD *) ValueBuffer); - } - - DPRINT1("Unexpected registry type %d for setting %S\n", Type, ValueName); - return DefaultValue; -} - -static void FASTCALL -LoadShutdownSettings(PSID Sid, PSHUTDOWN_SETTINGS ShutdownSettings) -{ - static WCHAR Subkey[] = L"\\Control Panel\\Desktop"; - LPWSTR StringSid; - WCHAR InitialKeyName[128]; - LPWSTR KeyName; - HKEY DesktopKey; - LONG ErrCode; - - ShutdownSettings->AutoEndTasks = DEFAULT_AUTO_END_TASKS; - ShutdownSettings->HungAppTimeout = DEFAULT_HUNG_APP_TIMEOUT; - ShutdownSettings->WaitToKillAppTimeout = DEFAULT_WAIT_TO_KILL_APP_TIMEOUT; - - if (! ConvertSidToStringSidW(Sid, &StringSid)) - { - DPRINT1("ConvertSidToStringSid failed with error %d, using default shutdown settings\n", - GetLastError()); - return; - } - if (wcslen(StringSid) + wcslen(Subkey) + 1 <= - sizeof(InitialKeyName) / sizeof(WCHAR)) - { - KeyName = InitialKeyName; - } - else - { - KeyName = HeapAlloc(Win32CsrApiHeap, 0, - (wcslen(StringSid) + wcslen(Subkey) + 1) * - sizeof(WCHAR)); - if (NULL == KeyName) - { - DPRINT1("Failed to allocate memory, using default shutdown settings\n"); - LocalFree(StringSid); - return; - } - } - wcscat(wcscpy(KeyName, StringSid), Subkey); - LocalFree(StringSid); - - ErrCode = RegOpenKeyExW(HKEY_USERS, KeyName, 0, KEY_QUERY_VALUE, &DesktopKey); - if (KeyName != InitialKeyName) - { - HeapFree(Win32CsrApiHeap, 0, KeyName); - } - if (ERROR_SUCCESS != ErrCode) - { - DPRINT1("RegOpenKeyEx failed with error %ld, using default shutdown settings\n", ErrCode); - return; - } - - ShutdownSettings->AutoEndTasks = (BOOL) GetShutdownSetting(DesktopKey, L"AutoEndTasks", - (DWORD) DEFAULT_AUTO_END_TASKS); - ShutdownSettings->HungAppTimeout = GetShutdownSetting(DesktopKey, - L"HungAppTimeout", - DEFAULT_HUNG_APP_TIMEOUT); - ShutdownSettings->WaitToKillAppTimeout = GetShutdownSetting(DesktopKey, - L"WaitToKillAppTimeout", - DEFAULT_WAIT_TO_KILL_APP_TIMEOUT); - - RegCloseKey(DesktopKey); -} - -static NTSTATUS FASTCALL -InternalExitReactos(DWORD ProcessId, DWORD ThreadId, UINT Flags) -{ - HANDLE CallerThread; - HANDLE CallerToken; - NTSTATUS Status; - PROCESS_ENUM_CONTEXT Context; - DWORD ReturnLength; - HWND ShellWnd; - UINT ProcessIndex; - char FixedUserInfo[64]; - TOKEN_USER *UserInfo; - SHUTDOWN_SETTINGS ShutdownSettings; - - if (ProcessId != (DWORD_PTR) LogonProcess) - { - DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); - return STATUS_ACCESS_DENIED; - } - - DPRINT1("FIXME: Need to close all user processes!\n"); - return STATUS_SUCCESS; - - CallerThread = OpenThread(THREAD_QUERY_INFORMATION, FALSE, ThreadId); - if (NULL == CallerThread) - { - DPRINT1("OpenThread failed with error %d\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - if (! OpenThreadToken(CallerThread, TOKEN_QUERY, FALSE, &CallerToken)) - { - DPRINT1("OpenThreadToken failed with error %d\n", GetLastError()); - CloseHandle(CallerThread); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(CallerThread); - - Context.ProcessCount = 0; - Context.ProcessData = NULL; - if (! GetTokenInformation(CallerToken, TokenOrigin, &Context.TokenOrigin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - if (! GetTokenInformation(CallerToken, TokenUser, FixedUserInfo, - sizeof(FixedUserInfo), &ReturnLength)) - { - if (sizeof(FixedUserInfo) < ReturnLength) - { - UserInfo = HeapAlloc(Win32CsrApiHeap, 0, ReturnLength); - if (NULL == UserInfo) - { - DPRINT1("Unable to allocate %u bytes for user info\n", - (unsigned) ReturnLength); - CloseHandle(CallerToken); - return STATUS_NO_MEMORY; - } - if (! GetTokenInformation(CallerToken, TokenUser, UserInfo, - ReturnLength, &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", - GetLastError()); - HeapFree(Win32CsrApiHeap, 0, UserInfo); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - UserInfo = (TOKEN_USER *) FixedUserInfo; - } - CloseHandle(CallerToken); - LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); - if (UserInfo != (TOKEN_USER *) FixedUserInfo) - { - HeapFree(Win32CsrApiHeap, 0, UserInfo); - } - Context.CsrssProcess = GetCurrentProcessId(); - ShellWnd = GetShellWindow(); - if (NULL == ShellWnd) - { - DPRINT("No shell present\n"); - Context.ShellProcess = 0; - } - else if (0 == GetWindowThreadProcessId(ShellWnd, &Context.ShellProcess)) - { - DPRINT1("Can't get process id of shell window\n"); - Context.ShellProcess = 0; - } - - Status = Win32CsrEnumProcesses(ExitReactosProcessEnum, &Context); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to enumerate registered processes, status 0x%x\n", - Status); - if (NULL != Context.ProcessData) - { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); - } - return Status; - } - - qsort(Context.ProcessData, Context.ProcessCount, sizeof(PCSR_PROCESS), - ProcessDataCompare); - - /* Terminate processes, stop if we find one kicking and screaming it doesn't - want to die */ - Status = STATUS_SUCCESS; - for (ProcessIndex = 0; - ProcessIndex < Context.ProcessCount && NT_SUCCESS(Status); - ProcessIndex++) - { - if (! NotifyAndTerminateProcess(Context.ProcessData[ProcessIndex], - &ShutdownSettings, Flags)) - { - Status = STATUS_REQUEST_ABORTED; - } - } - - /* Cleanup */ - if (NULL != Context.ProcessData) - { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); - } - - return Status; -} - -static NTSTATUS FASTCALL -UserExitReactos(DWORD UserProcessId, UINT Flags) -{ - NTSTATUS Status; - - if (NULL == LogonNotifyWindow) - { - DPRINT1("No LogonNotifyWindow registered\n"); - return STATUS_NOT_FOUND; - } - - /* FIXME Inside 2000 says we should impersonate the caller here */ - Status = SendMessageW(LogonNotifyWindow, PM_WINLOGON_EXITWINDOWS, - (WPARAM) UserProcessId, - (LPARAM) Flags); - /* If the message isn't handled, the return value is 0, so 0 doesn't indicate - success. Success is indicated by a 1 return value, if anything besides 0 - or 1 it's a NTSTATUS value */ - if (1 == Status) - { - Status = STATUS_SUCCESS; - } - else if (0 == Status) - { - Status = STATUS_NOT_IMPLEMENTED; - } - - return Status; -} - -CSR_API(CsrExitReactos) -{ - if (0 == (ApiMessage->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) - { - return UserExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - ApiMessage->Data.ExitReactosRequest.Flags); - } - else - { - return InternalExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - (DWORD_PTR) ApiMessage->Header.ClientId.UniqueThread, - ApiMessage->Data.ExitReactosRequest.Flags); - } -} - -/* EOF */ Removed: branches/ros-csrss/win32ss/user/win32csr/harderror.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/harderror.c (removed) @@ -1,580 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/dllmain.c - * PURPOSE: Initialization - * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) - * Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include "w32csr.h" - -#define NDEBUG -#include <debug.h> - -#include <strsafe.h> - -#define IDTRYAGAIN 10 -#define IDCONTINUE 11 - -/* FUNCTIONS *****************************************************************/ - -static -NTSTATUS -CsrpGetClientFileName( - OUT PUNICODE_STRING ClientFileNameU, - HANDLE hProcess) -{ - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - PPEB_LDR_DATA Ldr; - PROCESS_BASIC_INFORMATION ClientBasicInfo; - LDR_DATA_TABLE_ENTRY ModuleData; - PVOID ClientDllBase; - NTSTATUS Status; - PPEB Peb; - - /* Initialize string */ - ClientFileNameU->MaximumLength = 0; - ClientFileNameU->Length = 0; - ClientFileNameU->Buffer = NULL; - - /* Query process information */ - Status = NtQueryInformationProcess(hProcess, - ProcessBasicInformation, - &ClientBasicInfo, - sizeof(ClientBasicInfo), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - Peb = ClientBasicInfo.PebBaseAddress; - if (!Peb) return STATUS_UNSUCCESSFUL; - - Status = NtReadVirtualMemory(hProcess, &Peb->Ldr, &Ldr, sizeof(Ldr), NULL); - if (!NT_SUCCESS(Status)) return Status; - - ModuleListHead = &Ldr->InLoadOrderModuleList; - Status = NtReadVirtualMemory(hProcess, - &ModuleListHead->Flink, - &Entry, - sizeof(Entry), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - if (Entry == ModuleListHead) return STATUS_UNSUCCESSFUL; - - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - Status = NtReadVirtualMemory(hProcess, - Module, - &ModuleData, - sizeof(ModuleData), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - Status = NtReadVirtualMemory(hProcess, - &Peb->ImageBaseAddress, - &ClientDllBase, - sizeof(ClientDllBase), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - if (ClientDllBase != ModuleData.DllBase) return STATUS_UNSUCCESSFUL; - - ClientFileNameU->MaximumLength = ModuleData.BaseDllName.MaximumLength; - ClientFileNameU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - ClientFileNameU->MaximumLength); - - Status = NtReadVirtualMemory(hProcess, - ModuleData.BaseDllName.Buffer, - ClientFileNameU->Buffer, - ClientFileNameU->MaximumLength, - NULL); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ClientFileNameU->Buffer); - ClientFileNameU->Buffer = NULL; - ClientFileNameU->MaximumLength = 0; - return Status; - } - - ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer)*sizeof(wchar_t); - DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU); - - return STATUS_SUCCESS; -} - -static -VOID -CsrpFreeStringParameters( - IN OUT PULONG_PTR Parameters, - IN PHARDERROR_MSG HardErrorMessage) -{ - ULONG nParam; - - /* Loop all parameters */ - for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) - { - /* Check if the current parameter is a string */ - if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam) && Parameters[nParam]) - { - /* Free the string buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); - } - } -} - -static -NTSTATUS -CsrpCaptureStringParameters( - OUT PULONG_PTR Parameters, - OUT PULONG SizeOfAllUnicodeStrings, - IN PHARDERROR_MSG HardErrorMessage, - HANDLE hProcess) -{ - ULONG nParam, Size = 0; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING TempStringU, ParamStringU; - ANSI_STRING TempStringA; - - /* Read all strings from client space */ - for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) - { - Parameters[nParam] = 0; - - /* Check if the current parameter is a unicode string */ - if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) - { - /* Read the UNICODE_STRING from the process memory */ - Status = NtReadVirtualMemory(hProcess, - (PVOID)HardErrorMessage->Parameters[nParam], - &ParamStringU, - sizeof(ParamStringU), - NULL); - - if (!NT_SUCCESS(Status)) - break; - - /* Allocate a buffer for the string */ - TempStringU.MaximumLength = ParamStringU.Length; - TempStringU.Length = ParamStringU.Length; - TempStringU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TempStringU.MaximumLength); - - if (!TempStringU.Buffer) - { - DPRINT1("Cannot allocate memory %u\n", TempStringU.MaximumLength); - Status = STATUS_NO_MEMORY; - } - - /* Read the string buffer from the process memory */ - Status = NtReadVirtualMemory(hProcess, - ParamStringU.Buffer, - TempStringU.Buffer, - ParamStringU.Length, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtReadVirtualMemory failed with code: %lx\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - break; - } - - DPRINT("ParamString=\'%wZ\'\n", &TempStringU); - - /* Allocate a buffer for converted to ANSI string */ - TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); - TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TempStringA.MaximumLength); - - if (!TempStringA.Buffer) - { - DPRINT1("Cannot allocate memory %u\n", TempStringA.MaximumLength); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - Status = STATUS_NO_MEMORY; - break; - } - - /* Convert string to ANSI and free temporary buffer */ - Status = RtlUnicodeStringToAnsiString(&TempStringA, &TempStringU, FALSE); - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); - break; - } - - /* Note: RtlUnicodeStringToAnsiString returns NULL terminated string */ - Parameters[nParam] = (ULONG_PTR)TempStringA.Buffer; - Size += TempStringU.Length; - } - else - { - /* It's not a unicode string */ - Parameters[nParam] = HardErrorMessage->Parameters[nParam]; - } - } - - if (!NT_SUCCESS(Status)) - { - CsrpFreeStringParameters(Parameters, HardErrorMessage); - return Status; - } - - *SizeOfAllUnicodeStrings = Size; - return Status; -} - -static -NTSTATUS -CsrpFormatMessages( - OUT PUNICODE_STRING TextStringU, - OUT PUNICODE_STRING CaptionStringU, - IN PULONG_PTR Parameters, - IN ULONG SizeOfStrings, - IN PHARDERROR_MSG Message, - IN HANDLE hProcess) -{ - NTSTATUS Status; - UNICODE_STRING FileNameU, TempStringU, FormatU; - ANSI_STRING FormatA; - PMESSAGE_RESOURCE_ENTRY MessageResource; - PWSTR FormatString; - ULONG Size, ExceptionCode; - - /* Get the file name of the client process */ - CsrpGetClientFileName(&FileNameU, hProcess); - - /* Check if we have a file name */ - if (!FileNameU.Buffer) - { - /* No, use system */ - RtlInitUnicodeString(&FileNameU, L"System"); - } - - /* Get text string of the error code */ - Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), - (ULONG_PTR)RT_MESSAGETABLE, - LANG_NEUTRAL, - Message->Status, - &MessageResource); - - if (NT_SUCCESS(Status)) - { - if (MessageResource->Flags) - { - RtlInitUnicodeString(&FormatU, (PWSTR)MessageResource->Text); - FormatA.Buffer = NULL; - } - else - { - RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); - RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); - } - } - else - { - /* Fall back to hardcoded value */ - RtlInitUnicodeString(&FormatU, L"Unknown Hard Error"); - FormatA.Buffer = NULL; - } - - FormatString = FormatU.Buffer; - - /* Check whether a caption exists */ - if (FormatString[0] == L'{') - { - /* Set caption start */ - TempStringU.Buffer = ++FormatString; - - /* Get size of the caption */ - for (Size = 0; *FormatString != 0 && *FormatString != L'}'; Size++) - FormatString++; - - /* Skip '}', '\r', '\n' */ - FormatString += 3; - - TempStringU.Length = Size * sizeof(WCHAR); - TempStringU.MaximumLength = TempStringU.Length; - } - else - { - /* FIXME: Set string based on severity */ - RtlInitUnicodeString(&TempStringU, L"Application Error"); - } - - /* Calculate buffer length for the caption */ - CaptionStringU->MaximumLength = FileNameU.Length + TempStringU.Length + - 4 * sizeof(WCHAR); - - /* Allocate a buffer for the caption */ - CaptionStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - CaptionStringU->MaximumLength); - - /* Append the file name, seperator and the caption text */ - CaptionStringU->Length = 0; - RtlAppendUnicodeStringToString(CaptionStringU, &FileNameU); - RtlAppendUnicodeToString(CaptionStringU, L" - "); - RtlAppendUnicodeStringToString(CaptionStringU, &TempStringU); - - /* Zero terminate the buffer */ - CaptionStringU->Buffer[CaptionStringU->Length / sizeof(WCHAR)] = 0; - - /* Free the file name buffer */ - RtlFreeUnicodeString(&FileNameU); - - /* Check if this is an exception message */ - if (Message->Status == STATUS_UNHANDLED_EXCEPTION) - { - ExceptionCode = Parameters[0]; - - /* Handle special cases */ - if (ExceptionCode == STATUS_ACCESS_VIOLATION) - { - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; - if (Parameters[2]) Parameters[2] = (ULONG_PTR)L"written"; - else Parameters[2] = (ULONG_PTR)L"read"; - MessageResource = NULL; - } - else if (ExceptionCode == STATUS_IN_PAGE_ERROR) - { - Parameters[0] = Parameters[1]; - Parameters[1] = Parameters[3]; - MessageResource = NULL; - } - else - { - /* Fall back to hardcoded value */ - Parameters[2] = Parameters[1]; - Parameters[1] = Parameters[0]; - Parameters[0] = (ULONG_PTR)L"unknown software exception"; - } - - if (!MessageResource) - { - /* Get text string of the exception code */ - Status = RtlFindMessage(GetModuleHandleW(L"ntdll"), - (ULONG_PTR)RT_MESSAGETABLE, - LANG_NEUTRAL, - ExceptionCode, - &MessageResource); - - if (NT_SUCCESS(Status)) - { - if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); - - if (MessageResource->Flags) - { - RtlInitUnicodeString(&FormatU, (PWSTR)MessageResource->Text); - FormatA.Buffer = NULL; - } - else - { - RtlInitAnsiString(&FormatA, (PCHAR)MessageResource->Text); - RtlAnsiStringToUnicodeString(&FormatU, &FormatA, TRUE); - } - FormatString = FormatU.Buffer; - } - else - { - /* Fall back to hardcoded value */ - Parameters[2] = Parameters[1]; - Parameters[1] = Parameters[0]; - Parameters[0] = (ULONG_PTR)L"unknown software exception"; - } - } - } - - /* Calculate length of text buffer */ - TextStringU->MaximumLength = FormatU.Length + SizeOfStrings + 42 * sizeof(WCHAR); - - /* Allocate a buffer for the text */ - TextStringU->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TextStringU->MaximumLength); - - /* Wrap in SEH to protect from invalid string parameters */ - _SEH2_TRY - { - /* Print the string into the buffer */ - StringCbPrintfW(TextStringU->Buffer, - TextStringU->MaximumLength, - FormatString, - Parameters[0], - Parameters[1], - Parameters[2], - Parameters[3]); - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Set error and free buffers */ - Status = _SEH2_GetExceptionCode(); - RtlFreeHeap(RtlGetProcessHeap(), 0, TextStringU->Buffer); - RtlFreeHeap(RtlGetProcessHeap(), 0, CaptionStringU->Buffer); - } - _SEH2_END - - if (NT_SUCCESS(Status)) - { - TextStringU->Length = wcslen(TextStringU->Buffer) * sizeof(WCHAR); - } - - if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); - - return Status; -} - -static -ULONG -CsrpMessageBox( - PWSTR Text, - PWSTR Caption, - ULONG ValidResponseOptions, - ULONG Severity) -{ - ULONG Type, MessageBoxResponse; - - /* Set the message box type */ - switch (ValidResponseOptions) - { - case OptionAbortRetryIgnore: - Type = MB_ABORTRETRYIGNORE; - break; - case OptionOk: - Type = MB_OK; - break; - case OptionOkCancel: - Type = MB_OKCANCEL; - break; - case OptionRetryCancel: - Type = MB_RETRYCANCEL; - break; - case OptionYesNo: - Type = MB_YESNO; - break; - case OptionYesNoCancel: - Type = MB_YESNOCANCEL; - break; - case OptionShutdownSystem: - Type = MB_RETRYCANCEL; // FIXME??? - break; - /* Anything else is invalid */ - default: - return ResponseNotHandled; - } - - /* Set severity */ - if (Severity == STATUS_SEVERITY_INFORMATIONAL) Type |= MB_ICONINFORMATION; - else if (Severity == STATUS_SEVERITY_WARNING) Type |= MB_ICONWARNING; - else if (Severity == STATUS_SEVERITY_ERROR) Type |= MB_ICONERROR; - - Type |= MB_SYSTEMMODAL | MB_SETFOREGROUND; - - DPRINT("Text = '%S', Caption = '%S', Severity = %d, Type = 0x%lx\n", - Text, Caption, Severity, Type); - - /* Display a message box */ - MessageBoxResponse = MessageBoxW(0, Text, Caption, Type); - - /* Return response value */ - switch (MessageBoxResponse) - { - case IDOK: return ResponseOk; - case IDCANCEL: return ResponseCancel; - case IDYES: return ResponseYes; - case IDNO: return ResponseNo; - case IDABORT: return ResponseAbort; - case IDIGNORE: return ResponseIgnore; - case IDRETRY: return ResponseRetry; - case IDTRYAGAIN: return ResponseTryAgain; - case IDCONTINUE: return ResponseContinue; - } - - return ResponseNotHandled; -} - -VOID -WINAPI -Win32CsrHardError( - IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG Message) -{ -#if DBG - PCSR_PROCESS ProcessData = ThreadData->Process; -#endif - ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING TextU, CaptionU; - NTSTATUS Status; - HANDLE hProcess; - ULONG Size; - - /* Default to not handled */ - ASSERT(ProcessData != NULL); - Message->Response = ResponseNotHandled; - - /* Make sure we don't have too many parameters */ - if (Message->NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) - Message->NumberOfParameters = MAXIMUM_HARDERROR_PARAMETERS; - - /* Initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - - /* Open client process */ - Status = NtOpenProcess(&hProcess, - PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, - &ObjectAttributes, - &Message->h.ClientId); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenProcess failed with code: %lx\n", Status); - return; - } - - /* Capture all string parameters from the process memory */ - Status = CsrpCaptureStringParameters(Parameters, &Size, Message, hProcess); - if (!NT_SUCCESS(Status)) - { - NtClose(hProcess); - return; - } - - /* Format the caption and message box text */ - Status = CsrpFormatMessages(&TextU, - &CaptionU, - Parameters, - Size, - Message, - hProcess); - - /* Cleanup */ - CsrpFreeStringParameters(Parameters, Message); - NtClose(hProcess); - - if (!NT_SUCCESS(Status)) - { - return; - } - - /* Display the message box */ - Message->Response = CsrpMessageBox(TextU.Buffer, - CaptionU.Buffer, - Message->ValidResponseOptions, - (ULONG)Message->Status >> 30); - - RtlFreeUnicodeString(&TextU); - RtlFreeUnicodeString(&CaptionU); - - return; -} - Removed: branches/ros-csrss/win32ss/user/win32csr/resource.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/resource.h (removed) @@ -1,20 +1,0 @@ -/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 subsystem - * FILE: subsys/csrss/win32csr/resource.h - * PURPOSE: Resource #defines - */ - -#pragma once - -#define IDD_END_NOW 10 -#define IDD_NOT_RESPONDING 11 -#define IDD_SWITCH_APP 12 - -#define IDC_STATIC -1 -#define IDC_PROGRESS 101 -#define IDC_END_NOW 102 -#define IDC_STATIC_CUR_APP 103 - -/* EOF */ Removed: branches/ros-csrss/win32ss/user/win32csr/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/rsrc.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/rsrc.rc (removed) @@ -1,29 +1,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/no-NO.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/zh-CN.rc" -#include "lang/zh-TW.rc" - -// UTF-8 -#pragma code_page(65001) -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/tr-TR.rc" Removed: branches/ros-csrss/win32ss/user/win32csr/w32csr.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/w32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/w32csr.h (removed) @@ -1,28 +1,0 @@ -/* PSDK/NDK Headers */ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <psapi.h> - -/* External Winlogon Header */ -#include <winlogon.h> - -/* Internal CSRSS Headers */ -#include <win/winmsg.h> -//#include <conio.h> -//#include <csrplugin.h> -#include <desktopbg.h> - -/* Public Win32K Headers */ -#include <ntuser.h> - -#include "resource.h" - -VOID -WINAPI -Win32CsrHardError( - IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG Message); - -/* EOF */ Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -8,35 +8,34 @@ #pragma once +/* PSDK/NDK Headers */ +#define WIN32_NO_STATUS #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <psapi.h> + +/* External Winlogon Header */ +#include <winlogon.h> + +/* CSRSS Header */ +#include <csr/csrsrv.h> + +/* Internal CSRSS Headers */ +#include <win/winmsg.h> +#include <desktopbg.h> + +/* Public Win32K Headers */ +#include <ntuser.h> + #include <commctrl.h> extern HANDLE Win32CsrApiHeap; extern HINSTANCE Win32CsrDllHandle; -/* -typedef VOID (WINAPI *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object); - -typedef struct tagCSRSS_OBJECT_DEFINITION -{ - LONG Type; - CSR_CLEANUP_OBJECT_PROC CsrCleanupObjectProc; -} CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION; -*/ - -NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context); - /* desktopbg.c */ CSR_API(CsrCreateDesktop); CSR_API(CsrShowDesktop); CSR_API(CsrHideDesktop); -// CSR_API(CsrRegisterSystemClasses); - -/* exitros.c */ -/// Must go to winsrv.dll -CSR_API(CsrExitReactos); -CSR_API(CsrSetLogonNotifyWindow); -CSR_API(CsrRegisterLogonProcess); /* EOF */ Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/win32csr.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/win32csr.rc [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -1,10 +1,5 @@ -#include <win32csr.h> -#include "resource.h" - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "CSRSS subsystem usermode code\0" #define REACTOS_STR_INTERNAL_NAME "win32csr\0" #define REACTOS_STR_ORIGINAL_FILENAME "win32csr.dll\0" #include <reactos/version.rc> - -#include "rsrc.rc" Copied: branches/ros-csrss/win32ss/user/winsrv/exitros.c (from r57605, branches/ros-csrss/win32ss/user/win32csr/exitros.c) URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/e…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/exitros.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -1,16 +1,10 @@ -/* $Id: exitros.c 57570 2012-10-17 23:10:40Z hbelusca $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSRSS subsystem - * FILE: subsys/csrss/win32csr/exitros.c + * FILE: win32ss/user/winsrv/exitros.c * PURPOSE: Logout/shutdown */ - -/*** - *** Move it into winsrv - ***/ - /* INCLUDES ******************************************************************/ #include "w32csr.h" @@ -19,8 +13,20 @@ #define NDEBUG #include <debug.h> + + static HWND LogonNotifyWindow = NULL; static HANDLE LogonProcess = NULL; + + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS FASTCALL +Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, + PVOID Context) +{ + return CsrEnumProcesses(EnumProc, Context); +} CSR_API(CsrRegisterLogonProcess) { Copied: branches/ros-csrss/win32ss/user/winsrv/harderror.c (from r57605, branches/ros-csrss/win32ss/user/win32csr/harderror.c) URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/h…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/dllmain.c + * FILE: win32ss/user/winsrv/dllmain.c * PURPOSE: Initialization * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) * Timo Kreuzer (timo.kreuzer(a)reactos.org) Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization * * ReactOS Operating System @@ -22,109 +21,408 @@ * * -------------------------------------------------------------------- */ + #include "winsrv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> -HANDLE WinSrvApiPort = NULL; +HANDLE DllHandle = NULL; +// HANDLE WinSrvApiPort = NULL; + +/* Memory */ +HANDLE UserSrvHeap = NULL; // Our own heap. +// HANDLE BaseSrvSharedHeap = NULL; // Shared heap with CSR. (CsrSrvSharedSectionHeap) +// PBASE_STATIC_SERVER_DATA BaseStaticServerData = NULL; // Data that we can share amongst processes. Initialized inside BaseSrvSharedHeap. + + +PCSR_API_ROUTINE UserServerApiDispatchTable[UserpMaxApiNumber] = +{ + SrvExitWindowsEx, + SrvEndTask, + SrvLogon, + SrvRegisterServicesProcess, // Not present in Win7 + SrvActivateDebugger, + SrvGetThreadConsoleDesktop, // Not present in Win7 + SrvDeviceEvent, + SrvRegisterLogonProcess, // Not present in Win7 + SrvCreateSystemThreads, + SrvRecordShutdownReason, + SrvCancelShutdown, // Added in Vista + SrvConsoleHandleOperation, // Added in Win7 + SrvGetSetShutdownBlockReason, // Added in Vista +}; + +BOOLEAN UserServerApiServerValidTable[UserpMaxApiNumber] = +{ + + // FALSE +}; + +PCHAR UserServerApiNameTable[UserpMaxApiNumber] = +{ + "SrvExitWindowsEx", + "SrvEndTask", + "SrvLogon", + "SrvRegisterServicesProcess", + "SrvActivateDebugger", + "SrvGetThreadConsoleDesktop", + "SrvDeviceEvent", + "SrvRegisterLogonProcess", + "SrvCreateSystemThreads", + "SrvRecordShutdownReason", + "SrvCancelShutdown", + "SrvConsoleHandleOperation", + "SrvGetSetShutdownBlockReason", + + // NULL +}; + +/* +PCSR_API_ROUTINE Win32CsrApiDefinitions[] = +{ + CsrGetHandle, + CsrGetHandle, + CsrCloseHandle, + CsrVerifyHandle, + CsrDuplicateHandle, + CsrGetInputWaitHandle, + CsrFillOutputChar, + CsrReadInputEvent, + CsrWriteConsoleOutputChar, + CsrWriteConsoleOutputAttrib, + CsrFillOutputAttrib, + CsrSetTextAttrib, + CsrWriteConsoleOutput, + CsrFlushInputBuffer, + CsrReadConsoleOutputChar, + CsrReadConsoleOutputAttrib, + CsrExitReactos, + CsrHardwareStateProperty, + CsrCreateDesktop, + CsrShowDesktop, + CsrHideDesktop, + CsrSetLogonNotifyWindow, + CsrRegisterLogonProcess, + CsrGenerateCtrlEvent, +}; + +static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = +{ + CSRSS_DEFINE_API(GET_INPUT_HANDLE, CsrGetHandle), + CSRSS_DEFINE_API(GET_OUTPUT_HANDLE, CsrGetHandle), + CSRSS_DEFINE_API(CLOSE_HANDLE, CsrCloseHandle), + CSRSS_DEFINE_API(VERIFY_HANDLE, CsrVerifyHandle), + CSRSS_DEFINE_API(DUPLICATE_HANDLE, CsrDuplicateHandle), + CSRSS_DEFINE_API(GET_INPUT_WAIT_HANDLE, CsrGetInputWaitHandle), + CSRSS_DEFINE_API(WRITE_CONSOLE, CsrWriteConsole), + CSRSS_DEFINE_API(READ_CONSOLE, CsrReadConsole), + CSRSS_DEFINE_API(ALLOC_CONSOLE, CsrAllocConsole), + CSRSS_DEFINE_API(FREE_CONSOLE, CsrFreeConsole), + CSRSS_DEFINE_API(SCREEN_BUFFER_INFO, CsrGetScreenBufferInfo), + CSRSS_DEFINE_API(SET_CURSOR, CsrSetCursor), + CSRSS_DEFINE_API(FILL_OUTPUT, CsrFillOutputChar), + CSRSS_DEFINE_API(READ_INPUT, CsrReadInputEvent), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_CHAR, CsrWriteConsoleOutputChar), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT_ATTRIB, CsrWriteConsoleOutputAttrib), + CSRSS_DEFINE_API(FILL_OUTPUT_ATTRIB, CsrFillOutputAttrib), + CSRSS_DEFINE_API(GET_CURSOR_INFO, CsrGetCursorInfo), + CSRSS_DEFINE_API(SET_CURSOR_INFO, CsrSetCursorInfo), + CSRSS_DEFINE_API(SET_ATTRIB, CsrSetTextAttrib), + CSRSS_DEFINE_API(GET_CONSOLE_MODE, CsrGetConsoleMode), + CSRSS_DEFINE_API(SET_CONSOLE_MODE, CsrSetConsoleMode), + CSRSS_DEFINE_API(CREATE_SCREEN_BUFFER, CsrCreateScreenBuffer), + CSRSS_DEFINE_API(SET_SCREEN_BUFFER, CsrSetScreenBuffer), + CSRSS_DEFINE_API(SET_TITLE, CsrSetTitle), + CSRSS_DEFINE_API(GET_TITLE, CsrGetTitle), + CSRSS_DEFINE_API(WRITE_CONSOLE_OUTPUT, CsrWriteConsoleOutput), + CSRSS_DEFINE_API(FLUSH_INPUT_BUFFER, CsrFlushInputBuffer), + CSRSS_DEFINE_API(SCROLL_CONSOLE_SCREEN_BUFFER, CsrScrollConsoleScreenBuffer), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_CHAR, CsrReadConsoleOutputChar), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT_ATTRIB, CsrReadConsoleOutputAttrib), + CSRSS_DEFINE_API(GET_NUM_INPUT_EVENTS, CsrGetNumberOfConsoleInputEvents), + CSRSS_DEFINE_API(EXIT_REACTOS, CsrExitReactos), + CSRSS_DEFINE_API(PEEK_CONSOLE_INPUT, CsrPeekConsoleInput), + CSRSS_DEFINE_API(READ_CONSOLE_OUTPUT, CsrReadConsoleOutput), + CSRSS_DEFINE_API(WRITE_CONSOLE_INPUT, CsrWriteConsoleInput), + CSRSS_DEFINE_API(SETGET_CONSOLE_HW_STATE, CsrHardwareStateProperty), + CSRSS_DEFINE_API(GET_CONSOLE_WINDOW, CsrGetConsoleWindow), + CSRSS_DEFINE_API(CREATE_DESKTOP, CsrCreateDesktop), + CSRSS_DEFINE_API(SHOW_DESKTOP, CsrShowDesktop), + CSRSS_DEFINE_API(HIDE_DESKTOP, CsrHideDesktop), + CSRSS_DEFINE_API(SET_CONSOLE_ICON, CsrSetConsoleIcon), + CSRSS_DEFINE_API(SET_LOGON_NOTIFY_WINDOW, CsrSetLogonNotifyWindow), + CSRSS_DEFINE_API(REGISTER_LOGON_PROCESS, CsrRegisterLogonProcess), + CSRSS_DEFINE_API(GET_CONSOLE_CP, CsrGetConsoleCodePage), + CSRSS_DEFINE_API(SET_CONSOLE_CP, CsrSetConsoleCodePage), + CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), + CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), + CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), + CSRSS_DEFINE_API(ADD_CONSOLE_ALIAS, CsrAddConsoleAlias), + CSRSS_DEFINE_API(GET_CONSOLE_ALIAS, CsrGetConsoleAlias), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES, CsrGetAllConsoleAliases), + CSRSS_DEFINE_API(GET_ALL_CONSOLE_ALIASES_LENGTH, CsrGetAllConsoleAliasesLength), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES, CsrGetConsoleAliasesExes), + CSRSS_DEFINE_API(GET_CONSOLE_ALIASES_EXES_LENGTH, CsrGetConsoleAliasesExesLength), + CSRSS_DEFINE_API(GENERATE_CTRL_EVENT, CsrGenerateCtrlEvent), + CSRSS_DEFINE_API(SET_SCREEN_BUFFER_SIZE, CsrSetScreenBufferSize), + CSRSS_DEFINE_API(GET_CONSOLE_SELECTION_INFO, CsrGetConsoleSelectionInfo), + CSRSS_DEFINE_API(GET_COMMAND_HISTORY_LENGTH, CsrGetCommandHistoryLength), + CSRSS_DEFINE_API(GET_COMMAND_HISTORY, CsrGetCommandHistory), + CSRSS_DEFINE_API(EXPUNGE_COMMAND_HISTORY, CsrExpungeCommandHistory), + CSRSS_DEFINE_API(SET_HISTORY_NUMBER_COMMANDS, CsrSetHistoryNumberCommands), + CSRSS_DEFINE_API(GET_HISTORY_INFO, CsrGetHistoryInfo), + CSRSS_DEFINE_API(SET_HISTORY_INFO, CsrSetHistoryInfo), + { 0, 0, NULL } +}; +*/ + + +/* FUNCTIONS ******************************************************************/ + +/* +VOID WINAPI UserStaticServerThread(PVOID x) +{ + // NTSTATUS Status = STATUS_SUCCESS; + PPORT_MESSAGE Request = (PPORT_MESSAGE)x; + PPORT_MESSAGE Reply = NULL; + ULONG MessageType = 0; + + DPRINT("WINSRV: %s(%08lx) called\n", __FUNCTION__, x); + + MessageType = Request->u2.s2.Type; + DPRINT("WINSRV: %s(%08lx) received a message (Type=%d)\n", + __FUNCTION__, x, MessageType); + switch (MessageType) + { + default: + Reply = Request; + /\* Status = *\/ NtReplyPort(WinSrvApiPort, Reply); + break; + } +} +*/ + +ULONG +InitializeVideoAddressSpace(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + LARGE_INTEGER Offset; + SIZE_T ViewSize; + CHAR IVTAndBda[1024+256]; + + /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ + BaseAddress = 0; + ViewSize = 1024 * 1024; + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); + return 0; + } + + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return 0; + } + + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0xa0000; + ViewSize = 0x100000 - 0xa0000; + BaseAddress = (PVOID)0xa0000; + Status = ZwMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + ZwClose(PhysMemHandle); + return 0; + } + + /* Close physical memory section handle */ + ZwClose(PhysMemHandle); + + if (BaseAddress != (PVOID)0xa0000) + { + DPRINT1("Couldn't map physical memory at the right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Allocate some low memory to use for the non-BIOS + * parts of the v86 mode address space + */ + BaseAddress = (PVOID)0x1; + ViewSize = 0xa0000 - 0x1000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + return 0; + } + if (BaseAddress != (PVOID)0x0) + { + DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Get the real mode IVT and BDA from the kernel */ + Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtVdmControl failed (status %x)\n", Status); + return 0; + } + + /* Return success */ + return 1; +} /********************************************************************** - * NAME PRIVATE - * ConStaticServerThread/1 + * CsrpInitVideo/3 + * + * TODO: we need a virtual device for sessions other than + * TODO: the console one */ -VOID WINAPI ConStaticServerThread (PVOID x) -{ - NTSTATUS Status = STATUS_SUCCESS; - PPORT_MESSAGE Request = (PPORT_MESSAGE) x; - PPORT_MESSAGE Reply = NULL; - ULONG MessageType = 0; - - DPRINT("WINSRV: %s(%08lx) called\n", __FUNCTION__, x); - - MessageType = Request->u2.s2.Type; - DPRINT("WINSRV: %s(%08lx) received a message (Type=%d)\n", - __FUNCTION__, x, MessageType); - switch (MessageType) - { - default: - Reply = Request; - Status = NtReplyPort (WinSrvApiPort, Reply); - break; - } -} - -/********************************************************************** - * NAME PRIVATE - * UserStaticServerThread/1 - */ -VOID WINAPI UserStaticServerThread (PVOID x) -{ - NTSTATUS Status = STATUS_SUCCESS; - PPORT_MESSAGE Request = (PPORT_MESSAGE) x; - PPORT_MESSAGE Reply = NULL; - ULONG MessageType = 0; - - DPRINT("WINSRV: %s(%08lx) called\n", __FUNCTION__, x); - - MessageType = Request->u2.s2.Type; - DPRINT("WINSRV: %s(%08lx) received a message (Type=%d)\n", - __FUNCTION__, x, MessageType); - switch (MessageType) - { - default: - Reply = Request; - Status = NtReplyPort (WinSrvApiPort, Reply); - break; - } -} - -/*===================================================================== - * PUBLIC API - *===================================================================*/ - -NTSTATUS WINAPI ConServerDllInitialization (ULONG ArgumentCount, - LPWSTR *Argument) -{ - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("WINSRV: %s called\n", __FUNCTION__); - - // Get the listening port from csrsrv.dll - WinSrvApiPort = CsrQueryApiPort (); - if (NULL == WinSrvApiPort) - { - return STATUS_UNSUCCESSFUL; - } - // Register our message dispatcher - Status = CsrAddStaticServerThread (ConStaticServerThread); - if (NT_SUCCESS(Status)) - { - //TODO: perform the real console server internal initialization here - } - return Status; -} - -NTSTATUS WINAPI UserServerDllInitialization (ULONG ArgumentCount, - LPWSTR *Argument) -{ - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("WINSRV: %s called\n", __FUNCTION__); - - // Get the listening port from csrsrv.dll - WinSrvApiPort = CsrQueryApiPort (); - if (NULL == WinSrvApiPort) - { - return STATUS_UNSUCCESSFUL; - } - // Register our message dispatcher - Status = CsrAddStaticServerThread (UserStaticServerThread); - if (NT_SUCCESS(Status)) - { - //TODO: perform the real user server internal initialization here - } - return Status; +NTSTATUS +CsrpInitVideo (VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); + IO_STATUS_BLOCK Iosb; + HANDLE VideoHandle = (HANDLE) 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + InitializeVideoAddressSpace(); + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = NtOpenFile(&VideoHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status)) + { + NtClose(VideoHandle); + } + + return Status; +} + +VOID +WINAPI +PrivateCsrssManualGuiCheck(LONG Check) +{ + NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); +} + +CSR_SERVER_DLL_INIT(UserServerDllInitialization) +{ +/* + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("WINSRV: %s called\n", __FUNCTION__); + + // Get the listening port from csrsrv.dll + WinSrvApiPort = CsrQueryApiPort (); + if (NULL == WinSrvApiPort) + { + return STATUS_UNSUCCESSFUL; + } + // Register our message dispatcher + Status = CsrAddStaticServerThread (UserStaticServerThread); + if (NT_SUCCESS(Status)) + { + //TODO: perform the real user server internal initialization here + } + return Status; +*/ + + /* Initialize memory */ + UserSrvHeap = RtlGetProcessHeap(); // Initialize our own heap. + // BaseSrvSharedHeap = LoadedServerDll->SharedSection; // Get the CSR shared heap. + // LoadedServerDll->SharedSection = BaseStaticServerData; + + CsrpInitVideo(); + NtUserInitialize(0, NULL, NULL); + PrivateCsrssManualGuiCheck(0); + + /* Setup the DLL Object */ + LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; + LoadedServerDll->HighestApiSupported = UserpMaxApiNumber; + LoadedServerDll->DispatchTable = UserServerApiDispatchTable; + LoadedServerDll->ValidTable = UserServerApiServerValidTable; + LoadedServerDll->NameTable = UserServerApiNameTable; + LoadedServerDll->SizeOfProcessData = 0; + LoadedServerDll->ConnectCallback = NULL; + // LoadedServerDll->DisconnectCallback = Win32CsrReleaseConsole; + // LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; + LoadedServerDll->HardErrorCallback = Win32CsrHardError; + + /* All done */ + return STATUS_SUCCESS; +} + +// PUSER_SOUND_SENTRY. Used in basesrv.dll +BOOL WINAPI _UserSoundSentry(VOID) +{ + // Do something. + return TRUE; +} + +BOOL +WINAPI +DllMain(IN HANDLE hDll, + IN DWORD dwReason, + IN LPVOID lpReserved) +{ + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpReserved); + + if (DLL_PROCESS_ATTACH == dwReason) + { + DllHandle = hDll; + } + + return TRUE; } /* EOF */ Propchange: branches/ros-csrss/win32ss/user/winsrv/init.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/ros-csrss/win32ss/user/winsrv/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/rsrc.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/rsrc.rc [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 ICON DISCARDABLE res/terminal.ico #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -28,7 +28,7 @@ #include "winsrv.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -11,7 +11,33 @@ #include <win/base.h> #include <win/windows.h> - +VOID +WINAPI +Win32CsrHardError(IN PCSR_THREAD ThreadData, + IN PHARDERROR_MSG Message); + CSR_API(SrvRegisterServicesProcess); + + +/***************************** + +/\* +typedef VOID (WINAPI *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object); + +typedef struct tagCSRSS_OBJECT_DEFINITION +{ + LONG Type; + CSR_CLEANUP_OBJECT_PROC CsrCleanupObjectProc; +} CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION; +*\/ + +/\* exitros.c *\/ +CSR_API(CsrExitReactos); +CSR_API(CsrSetLogonNotifyWindow); +CSR_API(CsrRegisterLogonProcess); +// CSR_API(CsrRegisterSystemClasses); + +*****************************/ + /* EOF */ Added: branches/ros-csrss/win32ss/user/winsrv/winsrv.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.spec (added) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.spec [iso-8859-1] Wed Oct 24 23:19:54 2012 @@ -1,0 +1,2 @@ +@ stdcall UserServerDllInitialization(ptr) +@ stdcall _UserSoundSentry() Propchange: branches/ros-csrss/win32ss/user/winsrv/winsrv.spec ------------------------------------------------------------------------------ svn:eol-style = native
12 years, 2 months
1
0
0
0
[hbelusca] 57610: [CSRSRV/WINSRV] - Move the last User CSR api which was in csrsrv instead of in winsrv. - Remove unneeded file.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Oct 24 22:07:46 2012 New Revision: 57610 URL:
http://svn.reactos.org/svn/reactos?rev=57610&view=rev
Log: [CSRSRV/WINSRV] - Move the last User CSR api which was in csrsrv instead of in winsrv. - Remove unneeded file. Removed: branches/ros-csrss/subsystems/win32/csrsrv/user.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/win32ss/user/winsrv/server.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Wed Oct 24 22:07:46 2012 @@ -11,7 +11,6 @@ server.c session.c thredsup.c - user.c wait.c csrsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def) Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Wed Oct 24 22:07:46 2012 @@ -104,7 +104,6 @@ CSR_API(CsrSrvUnusedFunction); CSR_API(CsrSrvIdentifyAlertableThread); CSR_API(CsrSrvSetPriorityClass); -CSR_API(SrvRegisterServicesProcess); /*** @@ -156,7 +155,10 @@ IN PCSR_PROCESS CsrProcess); +#if 0 NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions); +#endif + VOID FASTCALL CsrApiCallHandler(IN OUT PCSR_API_MESSAGE ApiMessage, OUT PULONG Reply); NTSTATUS Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Wed Oct 24 22:07:46 2012 @@ -61,11 +61,6 @@ } } -CSRSS_API_DEFINITION NativeDefinitions[] = -{ - CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, SrvRegisterServicesProcess), // winsrv.dll -}; - /* === INIT ROUTINES === */ /*++ @@ -994,14 +989,6 @@ return Status; } -#if 0 - Status = CsrApiRegisterDefinitions(NativeDefinitions); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrApiRegisterDefinitions", Status); - } -#endif - /* Now initialize our API Port */ Status = CsrApiPortInitialize(); if (!NT_SUCCESS(Status)) Removed: branches/ros-csrss/subsystems/win32/csrsrv/user.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/user.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/user.c (removed) @@ -1,41 +1,0 @@ -/* - * subsystems/win32/csrss/csrsrv/api/user.c - * - * User functions - * - * ReactOS Operating System - * - * PROGRAMMER: Eric Kohl - */ - -/* INCLUDES ******************************************************************/ - -#include <srv.h> - -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -static BOOLEAN ServicesProcessIdValid = FALSE; -static ULONG_PTR ServicesProcessId; - - -/* FUNCTIONS *****************************************************************/ - -CSR_API(SrvRegisterServicesProcess) -{ - if (ServicesProcessIdValid == TRUE) - { - /* Only accept a single call */ - return STATUS_INVALID_PARAMETER; - } - else - { - ServicesProcessId = (ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId; - ServicesProcessIdValid = TRUE; - return STATUS_SUCCESS; - } -} - -/* EOF */ Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Wed Oct 24 22:07:46 2012 @@ -1,5 +1,4 @@ -/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization * * ReactOS Operating System @@ -21,11 +20,39 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * -------------------------------------------------------------------- + * + * PROGRAMMER: Eric Kohl */ + +/* INCLUDES ******************************************************************/ + #include "winsrv.h" //#define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +static BOOLEAN ServicesProcessIdValid = FALSE; +static ULONG_PTR ServicesProcessId; + + +/* FUNCTIONS *****************************************************************/ + +CSR_API(SrvRegisterServicesProcess) +{ + if (ServicesProcessIdValid == TRUE) + { + /* Only accept a single call */ + return STATUS_INVALID_PARAMETER; + } + else + { + ServicesProcessId = (ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId; + ServicesProcessIdValid = TRUE; + return STATUS_SUCCESS; + } +} + /* EOF */ Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Wed Oct 24 22:07:46 2012 @@ -10,3 +10,8 @@ #include <csr/server.h> #include <win/base.h> #include <win/windows.h> + + +CSR_API(SrvRegisterServicesProcess); + +/* EOF */
12 years, 2 months
1
0
0
0
[jgardou] 57609: [DLLS] - Those libraries are actual DLLs
by jgardou@svn.reactos.org
Author: jgardou Date: Wed Oct 24 22:03:25 2012 New Revision: 57609 URL:
http://svn.reactos.org/svn/reactos?rev=57609&view=rev
Log: [DLLS] - Those libraries are actual DLLs Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake…
============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Wed Oct 24 22:03:25 2012 @@ -58,6 +58,7 @@ jmemmgr.c jmemnobs.c) +set_module_type(libjpeg win32dll) add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL…
============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Wed Oct 24 22:03:25 2012 @@ -26,6 +26,7 @@ pngwtran.c pngwutil.c) +set_module_type(libpng win32dll) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) add_dependencies(libpng psdk)
12 years, 2 months
1
0
0
0
[hbelusca] 57608: [WINSRV] Add some resources. [CONSRV/WIN32CSR] Fix resources ids.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Oct 24 21:54:45 2012 New Revision: 57608 URL:
http://svn.reactos.org/svn/reactos?rev=57608&view=rev
Log: [WINSRV] Add some resources. [CONSRV/WIN32CSR] Fix resources ids. Added: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt (with props) branches/ros-csrss/win32ss/user/winsrv/lang/ (with props) branches/ros-csrss/win32ss/user/winsrv/lang/bg-BG.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/cs-CZ.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/de-DE.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/el-GR.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/en-US.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/es-ES.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/fr-FR.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/id-ID.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/it-IT.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/ja-JP.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/no-NO.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/pl-PL.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/pt-BR.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/ro-RO.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/ru-RU.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/sk-SK.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/sv-SE.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/tr-TR.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/uk-UA.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/zh-CN.rc (with props) branches/ros-csrss/win32ss/user/winsrv/lang/zh-TW.rc (with props) branches/ros-csrss/win32ss/user/winsrv/resource.h (with props) branches/ros-csrss/win32ss/user/winsrv/rsrc.rc (with props) Modified: branches/ros-csrss/win32ss/user/consrv/resource.h branches/ros-csrss/win32ss/user/win32csr/resource.h branches/ros-csrss/win32ss/user/winsrv/server.c (contents, props changed) branches/ros-csrss/win32ss/user/winsrv/winsrv.h (props changed) branches/ros-csrss/win32ss/user/winsrv/winsrv.rc (props changed) Modified: branches/ros-csrss/win32ss/user/consrv/resource.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r…
============================================================================== --- branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -7,16 +7,6 @@ */ #pragma once - -#define IDD_END_NOW 10 -#define IDD_NOT_RESPONDING 11 -#define IDD_SWITCH_APP 12 - -#define IDC_STATIC -1 -#define IDC_PROGRESS 101 -#define IDC_END_NOW 102 -#define IDC_STATIC_CUR_APP 103 - #define ID_SYSTEM_EDIT_MARK 1001 #define ID_SYSTEM_EDIT_COPY 1002 @@ -29,7 +19,7 @@ #define NCPOPUP_MENU 103 -#define IDS_EDIT 204 +#define IDS_EDIT 204 #define IDS_MARK 205 #define IDS_COPY 206 #define IDS_PASTE 207 @@ -39,7 +29,7 @@ #define IDS_DEFAULTS 211 #define IDS_PROPERTIES 212 -//scrollbar resource ids +// Scrollbar resource ids #define IDS_SCROLLHERE 304 #define IDS_SCROLLTOP 305 #define IDS_SCROLLBOTTOM 306 Modified: branches/ros-csrss/win32ss/user/win32csr/resource.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/resource.h [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -17,37 +17,4 @@ #define IDC_END_NOW 102 #define IDC_STATIC_CUR_APP 103 - -#define ID_SYSTEM_EDIT_MARK 1001 -#define ID_SYSTEM_EDIT_COPY 1002 -#define ID_SYSTEM_EDIT_PASTE 1003 -#define ID_SYSTEM_EDIT_SELECTALL 1004 -#define ID_SYSTEM_EDIT_SCROLL 1005 -#define ID_SYSTEM_EDIT_FIND 1006 -#define ID_SYSTEM_DEFAULTS 1007 -#define ID_SYSTEM_PROPERTIES 1008 - -#define NCPOPUP_MENU 103 - -#define IDS_EDIT 204 -#define IDS_MARK 205 -#define IDS_COPY 206 -#define IDS_PASTE 207 -#define IDS_SELECTALL 208 -#define IDS_SCROLL 209 -#define IDS_FIND 210 -#define IDS_DEFAULTS 211 -#define IDS_PROPERTIES 212 - -//scrollbar resource ids -#define IDS_SCROLLHERE 304 -#define IDS_SCROLLTOP 305 -#define IDS_SCROLLBOTTOM 306 -#define IDS_SCROLLPAGE_UP 307 -#define IDS_SCROLLPAGE_DOWN 308 -#define IDS_SCROLLUP 309 -#define IDS_SCROLLDOWN 310 - -#define IDS_COMMAND_PROMPT 500 - /* EOF */ Added: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/C…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt (added) +++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,25 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/win32ss/include) + +spec2def(winsrv.dll winsrv.spec) + +list(APPEND SOURCE + init.c + server.c + winsrv.rc + ${CMAKE_CURRENT_BINARY_DIR}/winsrv.def) + +add_library(winsrv SHARED ${SOURCE}) + +# target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() + +set_module_type(winsrv win32dll) + +# add_importlibs(winsrv psapi msvcrt kernel32 ntdll csrsrv) +add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) +add_delay_importlibs(winsrv user32 gdi32 advapi32) + +add_dependencies(winsrv bugcodes) +add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) Propchange: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 24 21:54:45 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ ------------------------------------------------------------------------------ bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-csrss/win32ss/user/winsrv/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/bg-BG.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/bg-BG.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,42 @@ +/* + * PROJECT: ReactOS CSRSS subsystem + * FILE: subsystems/win32/csrss/win32csr/lang/bg-BG.rc + * PURPOSE: Bulgarian resource file + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðåêðàòÿâàíå íà ïðèëîæåíèå - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïðåêðàòÿâàíå íà ïðèëîæåíèåòî... Ïî÷àêàéòå",IDC_STATIC,7,7,186,11 + CONTROL "Õîä",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå Ïðåêðàòÿâàíå âåäíàãà.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Ïðåêðàòÿâàíå âåäíàãà",IDC_END_NOW,150,71,60,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðåêðàòÿâàíå íà ïðèëîæåíèå - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Îòêàç",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Ïðåêðàòÿâàíå âåäíàãà",IDC_END_NOW,150,71,60,17 + LTEXT "Ïðèëîæåíèåòî íå îòãîâàðÿ",IDC_STATIC,7,7,178,8 + LTEXT "Çà äà ñå âúðíåòå â ÐåàêòÎÑ è äà ïðîâåðèòå ñúñòîÿíèåòî íà ïðèëîæåíèåòî, íàòèñíåòå Îòêàç.", + IDC_STATIC,7,26,178,16 + LTEXT "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå Ïðåêðàòÿâàíå âåäíàãà.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/cs-CZ.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/cs-CZ.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,41 @@ +/* FILE: subsystems/win32/csrss/win32csr/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2011-04-09 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèit program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Probíhá ukonèení programu... Èekejte, prosím",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "IPokud zvolíte okamité ukonèení programu, vechna neuloená data budou ztracena. Kliknutím na Ukonèit okamitì ukonèíte program.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Ukonèit okamitì",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèit program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Storno",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Ukonèit okamitì",IDC_END_NOW,78,98,43,17 + LTEXT "Tento program neodpovídá",IDC_STATIC,7,7,178,8 + LTEXT "Kliknutím na Storno se lze vrátit do systému ReactOS a ovìøit stav programu", + IDC_STATIC,7,26,178,16 + LTEXT "Pokud zvolíte okamité ukonèení programu, vechna neuloená data budou ztracena. Kliknutím na Ukonèit okamitì ukonèíte program.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/de-DE.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/de-DE.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programm beenden - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Programm wird beendet...",IDC_STATIC,7,7,186,11 + CONTROL "Fortschritt",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "J&etzt beenden",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programm beenden - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Abbechen",IDCANCEL,142,98,43,17 + PUSHBUTTON "J&etzt beenden",IDC_END_NOW,78,98,43,17 + LTEXT "Das Programm reagiert nicht",IDC_STATIC,7,7,178,8 + LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", + IDC_STATIC,7,26,178,16 + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/el-GR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/el-GR.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/el-GR.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Êëåßóéìï ðñïãñÜììáôïò - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Êëåßóéìï ðñïãñÜììáôïò... Ðáñáêáëþ ðåñéìÝíåôå",IDC_STATIC,7,7,186,11 + CONTROL "Ðñüïäïò",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Áí êëåßóåôå ôçí åöáñìïãÞ ôþñá , èá ÷Üóåôå üëá ôá ìç áðïèçêåõìÝíá äåäïìÝíá. Ãéá íá êëåßóåôå ôï ðñüãñáììá ôþñá, ðáôÞóôå 'Êëåßóéìï Ôþñá'.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Êëåßóéìï Ôþñá",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Êëåßóçìï ðñïãñÜììáôïò - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "¢êõñï",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Êëåßóéìï Ôþñá",IDC_END_NOW,78,98,43,17 + LTEXT "Ôï ðñüãñáììá äåí áðïêñßíåôáé",IDC_STATIC,7,7,178,8 + LTEXT "Ãéá íá åðéóôñÝøåôå óôï ReactOS êáé íá åëÝãîåôå ôçí êáôÜóôáóç ôïõ ðñïãñÜììáôïò, ðáôÞóôå '¢êõñï'", + IDC_STATIC,7,26,178,16 + LTEXT "Áí êëåßóåôå ôçí åöáñìïãÞ ôþñá , èá ÷Üóåôå üëá ôá ìç áðïèçêåõìÝíá äåäïìÝíá. Ãéá íá êëåßóåôå ôï ðñüãñáììá ôþñá, ðáôÞóôå 'Êëåßóéìï Ôþñá'.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/en-US.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/en-US.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 + PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 + LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 + LTEXT "To return to ReactOS and check the status of the program, click Cancel", + IDC_STATIC,7,26,178,16 + LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/es-ES.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/es-ES.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,41 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2008-26-01 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar programa - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Finalizando programa... Por favor, espere",IDC_STATIC,7,7,186,11 + CONTROL "Progreso",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Finalizar ahora",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar programa - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancelar",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Finalizar ahora",IDC_END_NOW,78,98,43,17 + LTEXT "Este programa no responde",IDC_STATIC,7,7,178,8 + LTEXT "Para volver a ReactOS y ver el estado del programa, haga clic en Cancelar", + IDC_STATIC,7,26,178,16 + LTEXT "Si elige finalizar el programa ahora, perderá todos los datos no guardados. Para finalizar el programa ahora, haga clic en Finalizar ahora.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/fr-FR.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/fr-FR.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fin du programme - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Termine le programme... Veuillez patienter",IDC_STATIC,7,7,186,11 + CONTROL "Avancement",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "T&erminer maintenant",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fin du programme - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annuler",IDCANCEL,142,98,43,17 + PUSHBUTTON "T&erminer maintenant",IDC_END_NOW,78,98,43,17 + LTEXT "Ce programme ne répond pas",IDC_STATIC,7,7,178,8 + LTEXT "Pour retourner à ReactOS et vérifier l'état du programme, cliquez sur Annuler", + IDC_STATIC,7,26,178,16 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/id-ID.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/id-ID.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Akhir Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mengakhiri Program... Harap menunggu",IDC_STATIC,7,7,186,11 + CONTROL "Progres",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Jika anda memilih untuk segera mengakhiri program, anda akan kehilangan data yang belum disimpan. Untuk mengakhiri program sekarang, klik Akhiri Sekarang.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Akhiri Sekarang",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mengakhiri Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Batal",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Akhiri Sekarang",IDC_END_NOW,78,98,43,17 + LTEXT "Program ini tidak merespon",IDC_STATIC,7,7,178,8 + LTEXT "Untuk kembali ke ReactOS dan memeriksa status program, klik Batal", + IDC_STATIC,7,26,178,16 + LTEXT "Jika anda memilih untuk segera mengakhiri program, anda akan kehilangan data yang belum disimpan. Untuk mengakhiri program sekarang, klik Akhiri Sekarang.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/id-ID.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/it-IT.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/it-IT.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,45 @@ +/* +* PROJECT: ReactOS Client/Server Runtime subsystem +* LICENSE: GPL - See COPYING in the top level directory +* FILE: subsystems/win32/csrss/win32csr/lang/it-IT.rc +* PURPOSE: Italian Translation of subsystems/win32/csrss/win32csr/lang/en-US.rc +* PROGRAMMERS: +* Copyright (C) 2007 Daniele Forsi (dforsi at
gmail.com
) Italian Translation +*/ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Arresto del programma - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Arresto del programma... Attendere",IDC_STATIC,7,7,186,11 + CONTROL "Progresso",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "T&ermina ora",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Arresto del programma - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annulla",IDCANCEL,142,98,43,17 + PUSHBUTTON "T&ermina ora",IDC_END_NOW,78,98,43,17 + LTEXT "Il programma non risponde",IDC_STATIC,7,7,178,8 + LTEXT "Per tornare a ReactOS e controllare lo stato del programma, selezionare Annulla", + IDC_STATIC,7,26,178,16 + LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/ja-JP.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/ja-JP.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/ja-JP.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "vOÌI¹ - " +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "vOðI¹µÄ¢Ü·... µÎç¨Ò¿¾³¢",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "vOð·®ÉI¹³¹éæ¤Iðµ½êAÛ¶³êĢȢf[^Í·×ĸíêÜ·BvOðI¹·éÉÍ[·®ÉI¹]ðNbNµÄ¾³¢B", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "·®ÉI¹(&E)",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "vOÌI¹ - " +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "LZ",IDCANCEL,142,98,43,17 + PUSHBUTTON "·®ÉI¹(&E)",IDC_END_NOW,78,98,43,17 + LTEXT "±ÌvO͵Ģܹñ",IDC_STATIC,7,7,178,8 + LTEXT "ReactOS ÉßÁÄvOÌóÔðmF·éÉÍ[LZ]ðNbNµÄ¾³¢", + IDC_STATIC,7,26,178,16 + LTEXT "vOð·®ÉI¹³¹éæ¤Iðµ½êAÛ¶³êĢȢf[^Í·×ĸíêÜ·BvOð¼¿ÉI¹·éÉÍ[·®ÉI¹]ðNbNµÄ¾³¢", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/no-NO.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/no-NO.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/no-NO.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avslutt program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Avslutt Program... Vennligst vent",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Avslutt nå",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avslutt program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Avbryt",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Avslutt nå",IDC_END_NOW,78,98,43,17 + LTEXT "Programmet svarer ikke",IDC_STATIC,7,7,178,8 + LTEXT "For å returnere til ReactOS for å sjekke statusen på programmet, trykk på avbryt", + IDC_STATIC,7,26,178,16 + LTEXT "Hvis du velger å avslutte programmet øyeblikkelig, vil du miste alt data som ikke er lagret. For å avslutte programmet nå, Trykk på Avslutt nå", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/pl-PL.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/pl-PL.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,44 @@ +/* + * translated by xrogers + * xxrogers(a)users.sourceforge.net + *
https://sourceforge.net/projects/reactospl
+ * translation update by Olaf Siejka (Caemyr), Apr 2011 + * UTF-8 conversion by Caemyr (May, 2011) + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ZakoÅcz program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Trwa zamykanie programu... ProszÄ czekaÄ",IDC_STATIC,7,7,186,11 + CONTROL "PostÄp",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "JeÅli zdecydujesz siÄ zamknÄ Ä program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ZakoÅcz program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Anuluj",IDCANCEL,142,98,43,17 + PUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,78,98,43,17 + LTEXT "Wybrany program nie odpowiada",IDC_STATIC,7,7,178,8 + LTEXT "Aby powróciÄ do ReactOS i sprawdziÄ status programu, kliknij Anuluj", + IDC_STATIC,7,26,178,16 + LTEXT "JeÅli zdecydujesz siÄ zamknÄ Ä program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/pt-BR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/pt-BR.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/pt-BR.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,38 @@ +/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar Programa - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Finalizando Programa... Por favor aguarde",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Se você finalizar o programa imediatamente, você irá perder qualquer alteração não salva. Para finalizar o programa agora, pressione Finalizar Agora.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Finalizar Agora",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar Programa - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancelar",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Finalizar Agora",IDC_END_NOW,78,98,43,17 + LTEXT "O programa não está respondendo",IDC_STATIC,7,7,178,8 + LTEXT "Parar retornar ao ReactOS e verificar o estado do programa, pressione Cancelar", + IDC_STATIC,7,26,178,16 + LTEXT "Se você finalizar o programa imediatamente, você irá perder qualquer alteração não salva. Para finalizar o programa agora, pressione Finalizar Agora", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/ro-RO.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/ro-RO.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/ro-RO.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,43 @@ +/* + * FILE: subsystems/win32/csrss/win32csr/lang/ro-RO.rc + * ReactOS Project (
http://www.reactos.org
) + * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) + * CHANGE LOG: 2011-10-16 initial translation + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Terminare execuÈie - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Terminare execuÈie⦠aÈteptaÈi",IDC_STATIC,7,7,186,11 + CONTROL "Progress", IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "DacÄ alegeÈi închiderea forÈatÄ, riscaÈi pierderi de date. Pentru a forÈa închiderea, apÄsaÈi âTerminÄ forÈatâ.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "TerminÄ &forÈat",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Terminare execuÈie - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "A&nuleazÄ", IDCANCEL,142,98,43,17 + PUSHBUTTON "TerminÄ &forÈat",IDC_END_NOW,78,98,43,17 + LTEXT "Acest program nu rÄspunde",IDC_STATIC,7,7,178,8 + LTEXT "Pentru a vÄ Ã®ntoarce în ReactOS Èi a verifica starea programului, apÄsaÈi âAnuleazÄâ", + IDC_STATIC,7,26,178,16 + LTEXT "DacÄ alegeÈi închiderea imediatÄ a programului, riscaÈi pierderi de date. Pentru a forÈa închiderea, apÄsaÈi âTerminÄ forÈatâ.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/ru-RU.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/ru-RU.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐавеÑÑение пÑогÑÐ°Ð¼Ð¼Ñ - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÐавеÑÑение пÑогÑаммÑ... ÐажалÑйÑÑа подождиÑе",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "ÐÑли Ð²Ñ Ð·Ð°Ð²ÐµÑÑиÑе пÑогÑÐ°Ð¼Ð¼Ñ ÑейÑаÑ, Ñо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе поÑеÑÑÑÑ Ð½ÐµÑÐ¾Ñ ÑаненнÑе даннÑе. ЧÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑиÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ ÑейÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸Ñе ""ÐавеÑÑиÑÑ""", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&ÐавеÑиÑÑ",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐавеÑÑение пÑогÑÐ°Ð¼Ð¼Ñ - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ÐÑмена",IDCANCEL,142,98,43,17 + PUSHBUTTON "&ÐавеÑÑиÑÑ",IDC_END_NOW,78,98,43,17 + LTEXT "ÐÑа пÑогÑамма не оÑвеÑаеÑ",IDC_STATIC,7,7,178,8 + LTEXT "ÐÐ»Ñ Ð²Ð¾Ð·Ð²ÑаÑа в ReactOS и ÑÐ¾Ñ ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÑ Ð½Ð°Ð¶Ð¼Ð¸Ñе ""ÐÑмена""", + IDC_STATIC,7,26,178,16 + LTEXT "ÐÑли Ð²Ñ Ð·Ð°Ð²ÐµÑÑиÑе пÑогÑÐ°Ð¼Ð¼Ñ ÑейÑаÑ, Ñо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе поÑеÑÑÑÑ Ð½ÐµÑÐ¾Ñ ÑаненнÑе даннÑе. ЧÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑиÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ ÑейÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸Ñе ""ÐавеÑÑиÑÑ""", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/sk-SK.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/sk-SK.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,41 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 29-05-2008 + * LastChange: 12-04-2011 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèenie programu - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ukonèujem program... Poèkajte, prosím.",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Ak zvolíte okamité ukonèenie programu, stratíte vetky neuloené údaje. Ak chcete program ukonèi okamite, kliknite na tlaèidlo Ukonèi ihneï.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Ukonèi ihneï",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ukonèenie programu - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Zrui",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Ukonèi ihneï",IDC_END_NOW,78,98,43,17 + LTEXT "Tento program neodpovedá.",IDC_STATIC,7,7,178,8 + LTEXT "Pre návrat do systému ReactOS a overenie stavu programu kliknite na tlaèidlo Zrui.", + IDC_STATIC,7,26,178,16 + LTEXT "Ak zvolíte okamité ukonèenie programu, stratíte vetky neuloené údaje. Ak chcete program ukonèi okamite, kliknite na tlaèidlo Ukonèi ihneï.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/sv-SE.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/sv-SE.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,43 @@ +/* + * PROJECT: ReactOS CSRSS subsystem + * FILE: subsystems/win32/csrss/win32csr/lang/sv-SE.rc + * PURPOSE: Swedish resource file + * Translation: Jaix Bly + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Avsluta Program... Var vänlig vänta",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Om du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Avsluta Nu",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avsluta Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Avbryt",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Avsluta Nu",IDC_END_NOW,78,98,43,17 + LTEXT "Detta programmet svarar inte",IDC_STATIC,7,7,178,8 + LTEXT "För att återgå till ReactOS och undersöka programmets status klicka Avbryt", + IDC_STATIC,7,26,178,16 + LTEXT "m du väljer att avsluta programmet omedelbart kommer du att förlora all osparad data. För att avsluta programmet, klicka Avsluta nu.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/tr-TR.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/tr-TR.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,56 @@ +/* + * Turkish resources + * + * Copyright 2012 Arda Tanrikulu <ardatanrikulu(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programı Sonlandır - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Program Sonlandırılıyor... Lütfen bekleyin",IDC_STATIC,7,7,186,11 + CONTROL "Ä°Ålem",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Programı hemen kapatmayı seçerseniz, kaydedilmemiÅ veriyi kaybedersiniz. Programdan Åimdi çıkmak için Åimdi Sonlandır'ı tıklatın.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Åimdi Sonlandır",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Ä°ptal",IDCANCEL,142,98,43,17 + PUSHBUTTON "Åimdi Sonlandır",IDC_END_NOW,78,98,43,17 + LTEXT "Bu program yanıt vermiyor.",IDC_STATIC,7,7,178,8 + LTEXT "ReactOS'a dönmek ve programın durumunu denetlemek için Ä°ptal'i tıklatın.", + IDC_STATIC,7,26,178,16 + LTEXT "Programı hemen kapatmayı seçerseniz, kaydedilmemiÅ veriyi kaybedersiniz. Programdan Åimdi çıkmak için Åimdi Sonlandır'ı tıklatın.", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/uk-UA.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/uk-UA.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS CSRSS subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/csrss/win32csr/lang/uk-UA.rc + * PURPOSE: Ukraianian resource file + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐавеÑÑÐµÐ½Ð½Ñ Ð¿ÑогÑами - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÐавеÑÑÐµÐ½Ð½Ñ Ð¿ÑогÑами... ÐаÑекайÑе",IDC_STATIC,7,7,186,11 + CONTROL "ÐÑогÑеÑ",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "ЯкÑо завеÑÑиÑи пÑогÑÐ°Ð¼Ñ Ð½ÐµÐ³Ð°Ð¹Ð½Ð¾, Ñо можна вÑÑаÑиÑи вÑÑ Ð½ÐµÐ·Ð±ÐµÑÐµÐ¶ÐµÐ½Ñ Ð´Ð°Ð½Ñ. Щоб завеÑÑиÑи пÑогÑÐ°Ð¼Ñ Ð·Ð°Ñаз, наÑиÑнÑÑÑ 'ÐавеÑÑиÑи заÑаз'", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&ÐавеÑÑиÑи заÑаз",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐавеÑÑÐµÐ½Ð½Ñ Ð¿ÑогÑами - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "СкаÑÑваÑи",IDCANCEL,142,98,43,17 + PUSHBUTTON "&ÐавеÑÑиÑи заÑаз",IDC_END_NOW,78,98,43,17 + LTEXT "Ð¦Ñ Ð¿ÑогÑама не вÑдповÑдаÑ",IDC_STATIC,7,7,178,8 + LTEXT "Щоб повеÑнÑÑиÑÑ Ñ ReactOS Ñ Ð¿ÐµÑевÑÑиÑи ÑÑан пÑогÑами, наÑиÑнÑÑÑ 'СкаÑÑваÑи'", + IDC_STATIC,7,26,178,16 + LTEXT "ЯкÑо завеÑÑиÑи пÑогÑÐ°Ð¼Ñ Ð½ÐµÐ³Ð°Ð¹Ð½Ð¾, Ñо можна вÑÑаÑиÑи вÑÑ Ð½ÐµÐ·Ð±ÐµÑÐµÐ¶ÐµÐ½Ñ Ð´Ð°Ð½Ñ. Щоб завеÑÑиÑи пÑогÑÐ°Ð¼Ñ Ð·Ð°Ñаз, наÑиÑнÑÑÑ 'ÐавеÑÑиÑи заÑаз'", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/zh-CN.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/zh-CN.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÖÕÖ¹³ÌÐò - " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "ÕýÔÚÖÕÖ¹³ÌÐò... ÇëµÈ´ý",IDC_STATIC,7,7,186,11 + CONTROL "½ø³Ì",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Èç¹ûÄúÑ¡ÔñÁ¢¼´ÖÕÖ¹³ÌÐò£¬Äú½«Ê§È¥ËùÓÐδ±£´æµÄÊý¾Ý¡£ÈôÒªÁ¢¼´½áÊø³ÌÐò£¬µ¥»÷¡°Á¢¼´ÖÕÖ¹¡±¡£", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "Á¢¼´ÖÕÖ¹(&E)",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÖÕÖ¹³ÌÐò - " +FONT 9, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "È¡Ïû",IDCANCEL,142,98,43,17 + PUSHBUTTON "Á¢¼´ÖÕÖ¹(&E)",IDC_END_NOW,78,98,43,17 + LTEXT "´Ë³ÌÐò²¢Î´ÏìÓ¦",IDC_STATIC,7,7,178,8 + LTEXT "ÈôÒª·µ»ØÖÁ ReactOS ²¢¼ì²é¸Ã³ÌÐòµÄ״̬£¬Çëµã»÷¡°È¡Ïû¡±¡£", + IDC_STATIC,7,26,178,16 + LTEXT "Èç¹ûÄúÑ¡ÔñÁ¢¼´ÖÕÖ¹³ÌÐò£¬Äú½«Ê§È¥ËùÓÐδ±£´æµÄÊý¾Ý¡£ÈôÒªÁ¢¼´½áÊø³ÌÐò£¬µ¥»÷¡°Á¢¼´ÖÕÖ¹¡±¡£", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 9, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/lang/zh-TW.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/l…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/lang/zh-TW.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/lang/zh-TW.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,36 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "µ²§ôµ{¦¡" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "¥¿¦bµ²§ôµ{¦¡... ½Ðµyµ¥",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "¦pªG±z¿ï¾Ü¥ß§Yµ²§ôµ{¦¡¡A±z±N¥¢¥h©Ò¦³¥¼Àx¦sªº¸ê®Æ¡CYn¥ß§Yµ²§ôµ{¦¡¡A½Ð«ö¤U¡§¥ß§Yµ²§ô¡¨¡C", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "¥ß§Yµ²§ô(&E)",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "µ²§ôµ{¦¡ - " +FONT 9, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "¨ú®ø",IDCANCEL,142,98,43,17 + PUSHBUTTON "¥ß§Yµ²§ô(&E) ",IDC_END_NOW,78,98,43,17 + LTEXT "¦¹µ{¦¡¨Ã¥¼ÅTÀ³",IDC_STATIC,7,7,178,8 + LTEXT "Ynªð¦^¦Ü ReactOS ¨ÃÀ˵øµ{¦¡ªºª¬ºA¡A½Ð«ö¤U¡§¨ú®ø¡¨", + IDC_STATIC,7,26,178,16 + LTEXT "¦pªG±z¿ï¾Ü¥ß§Yµ²§ôµ{¦¡¡A±z±N¥¢¥h©Ò¦³¥¼Àx¦sªº¸ê®Æ¡CYn¥ß§Yµ²§ôµ{¦¡¡A½Ð«ö¤U¡§¥ß§Yµ²§ô¡¨¡C", + IDC_STATIC,7,53,178,26 +END + +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 9, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END Propchange: branches/ros-csrss/win32ss/user/winsrv/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/resource.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/resource.h (added) +++ branches/ros-csrss/win32ss/user/winsrv/resource.h [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,20 @@ +/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 subsystem + * FILE: subsys/csrss/win32csr/resource.h + * PURPOSE: Resource #defines + */ + +#pragma once + +#define IDD_END_NOW 10 +#define IDD_NOT_RESPONDING 11 +#define IDD_SWITCH_APP 12 + +#define IDC_STATIC -1 +#define IDC_PROGRESS 101 +#define IDC_END_NOW 102 +#define IDC_STATIC_CUR_APP 103 + +/* EOF */ Propchange: branches/ros-csrss/win32ss/user/winsrv/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-csrss/win32ss/user/winsrv/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/rsrc.rc (added) +++ branches/ros-csrss/win32ss/user/winsrv/rsrc.rc [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,0 +1,31 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 ICON DISCARDABLE res/terminal.ico + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/no-NO.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/zh-CN.rc" +#include "lang/zh-TW.rc" + +// UTF-8 +#pragma code_page(65001) +#include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" +#include "lang/tr-TR.rc" Propchange: branches/ros-csrss/win32ss/user/winsrv/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Wed Oct 24 21:54:45 2012 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $ * * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization * Propchange: branches/ros-csrss/win32ss/user/winsrv/server.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: branches/ros-csrss/win32ss/user/winsrv/winsrv.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: branches/ros-csrss/win32ss/user/winsrv/winsrv.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision
12 years, 2 months
1
0
0
0
[jgardou] 57607: [libjpeg] - fix build
by jgardou@svn.reactos.org
Author: jgardou Date: Wed Oct 24 21:49:09 2012 New Revision: 57607 URL:
http://svn.reactos.org/svn/reactos?rev=57607&view=rev
Log: [libjpeg] - fix build Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake…
============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:49:09 2012 @@ -3,7 +3,8 @@ -DWIN32 -D_WINDOWS -D_MBCS - -DJPEG_DLL) + -DJPEG_DLL + -Dmain=mainptr) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
12 years, 2 months
1
0
0
0
[jgardou] 57606: [DLLs] - Don't set entrypoint to 0 for those which don't provide DllMain
by jgardou@svn.reactos.org
Author: jgardou Date: Wed Oct 24 21:44:47 2012 New Revision: 57606 URL:
http://svn.reactos.org/svn/reactos?rev=57606&view=rev
Log: [DLLs] - Don't set entrypoint to 0 for those which don't provide DllMain Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake…
============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -3,8 +3,7 @@ -DWIN32 -D_WINDOWS -D_MBCS - -DJPEG_DLL - -Dmain=mainptr) + -DJPEG_DLL) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg @@ -58,7 +57,6 @@ jmemmgr.c jmemnobs.c) -set_entrypoint(libjpeg 0) add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL…
============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -26,7 +26,6 @@ pngwtran.c pngwutil.c) -set_entrypoint(libpng 0) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) add_dependencies(libpng psdk) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake…
============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -50,7 +50,7 @@ tif_write.c tif_zip.c) -set_module_type(libtiff win32dll ENTRYPOINT 0) +set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_dependencies(libtiff psdk) Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake…
============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -33,7 +33,7 @@ xsltlocale.c xsltutils.c) -set_module_type(libxslt win32dll ENTRYPOINT 0) +set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32)
12 years, 2 months
1
0
0
0
[hbelusca] 57605: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build.
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Oct 24 21:37:22 2012 New Revision: 57605 URL:
http://svn.reactos.org/svn/reactos?rev=57605&view=rev
Log: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build. Removed: branches/ros-csrss/win32ss/user/winsrv/dllmain.c branches/ros-csrss/win32ss/user/winsrv/winsrv.def Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.h branches/ros-csrss/win32ss/user/win32csr/dllmain.c branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/harderror.c branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc branches/ros-csrss/win32ss/user/win32csr/rsrc.rc branches/ros-csrss/win32ss/user/win32csr/w32csr.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h branches/ros-csrss/win32ss/user/winsrv/winsrv.rc Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr…
============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS BASE API Server DLL\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Base API Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "basesrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "basesrv.dll\0" #include <reactos/version.rc> Modified: branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include <reactos/version.rc> Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx…
============================================================================== --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -15,6 +15,7 @@ add_subdirectory(user/consrv) add_subdirectory(user/user32) add_subdirectory(user/win32csr) +add_subdirectory(user/winsrv) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i…
============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -328,12 +328,16 @@ CSR_SERVER_DLL_INIT(ConServerDllInitialization) { - // NTSTATUS Status = STATUS_SUCCESS; - /* + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("BASSRV: %s(%ld,...) called\n", __FUNCTION__, ArgumentCount); - BaseApiPort = CsrQueryApiPort (); + // Get the listening port from csrsrv.dll + BaseApiPort = CsrQueryApiPort(); + if (BaseApiPort == NULL) return STATUS_UNSUCCESSFUL; + + // Register our message dispatcher Status = CsrAddStaticServerThread(ConsoleStaticServerThread); if (NT_SUCCESS(Status)) { @@ -366,7 +370,7 @@ } BOOL -NTAPI +WINAPI DllMain(IN HANDLE hDll, IN DWORD dwReason, IN LPVOID lpReserved) Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -24,9 +24,9 @@ */ +#include "w32csr.h" + #define NDEBUG - -#include "w32csr.h" #include <debug.h> /*** Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -11,12 +11,6 @@ #include <csr/csrsrv.h> //#include "api.h" -/* Api functions */ -CSR_API(CsrCreateDesktop); -CSR_API(CsrShowDesktop); -CSR_API(CsrHideDesktop); -CSR_API(CsrRegisterSystemClasses); - BOOL FASTCALL DtbgIsDesktopVisible(VOID); /* EOF */ Modified: branches/ros-csrss/win32ss/user/win32csr/dllmain.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -7,8 +7,10 @@ */ /* INCLUDES ******************************************************************/ + +#include "w32csr.h" + #define NDEBUG -#include "w32csr.h" #include <debug.h> @@ -332,17 +334,17 @@ PrivateCsrssManualGuiCheck(0); /* Setup the DLL Object */ - LoadedServerDll->ApiBase = BASESRV_FIRST_API_NUMBER; - LoadedServerDll->HighestApiSupported = BasepMaxApiNumber; + LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; + LoadedServerDll->HighestApiSupported = UserpMaxApiNumber; LoadedServerDll->DispatchTable = Win32CsrApiDefinitions; - // LoadedServerDll->ValidTable = BaseServerApiServerValidTable; - // LoadedServerDll->NameTable = BaseServerApiNameTable; + // LoadedServerDll->ValidTable = Win32CsrApiServerValidTable; + // LoadedServerDll->NameTable = Win32CsrApiNameTable; // LoadedServerDll->SizeOfProcessData = 0; // LoadedServerDll->ConnectCallback = NULL; // LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = Win32CsrHardError; - LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; - LoadedServerDll->DisconnectCallback = Win32CsrReleaseConsole; + LoadedServerDll->NewProcessCallback = NULL; + LoadedServerDll->DisconnectCallback = NULL; /* Start Raw Input Threads */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); Modified: branches/ros-csrss/win32ss/user/win32csr/exitros.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -12,10 +12,11 @@ ***/ /* INCLUDES ******************************************************************/ -#define NDEBUG + #include "w32csr.h" #include <sddl.h> -#include "resource.h" + +#define NDEBUG #include <debug.h> static HWND LogonNotifyWindow = NULL; Modified: branches/ros-csrss/win32ss/user/win32csr/harderror.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -9,9 +9,11 @@ /* INCLUDES ******************************************************************/ +#include "w32csr.h" + #define NDEBUG -#include "w32csr.h" #include <debug.h> + #include <strsafe.h> #define IDTRYAGAIN 10 Modified: branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -40,25 +40,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Îáðàáîòêà" - IDS_MARK "Îòáåëÿçâàíå" - IDS_COPY "Çàïîìíÿíå\tEnter" - IDS_PASTE "Ïîñòàâÿíå" - IDS_SELECTALL "Èçáîð íà âñè÷êî" - IDS_SCROLL "Ïðåëèñòâàíå" - IDS_FIND "Òúðñåíå..." - IDS_DEFAULTS "Ïîäðàçáèðàíè" - IDS_PROPERTIES "Ñâîéñòâà" - IDS_SCROLLHERE "Ïðåëèñòâàíå òóê" - IDS_SCROLLTOP "Ïðåëèñòâàíå äî ãîðå" - IDS_SCROLLBOTTOM "Ïðåëèñòâàíå äî äîëó" - IDS_SCROLLPAGE_UP "Ãîðíà ñòðàíèöà" - IDS_SCROLLPAGE_DOWN "Äîëíà ñòðàíèöà" - IDS_SCROLLUP "Ïðåëèñòâàíå íàãîðå" - IDS_SCROLLDOWN "Ïðåëèñòâàíå íàäîëó" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravit" - IDS_MARK "Oznaèit" - IDS_COPY "Kopírovat\tEnter" - IDS_PASTE "Vloit" - IDS_SELECTALL "Oznaèit ve" - IDS_SCROLL "Posunout" - IDS_FIND "Najít..." - IDS_DEFAULTS "Výchozí" - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Posunout sem" - IDS_SCROLLTOP "Posunout na zaèátek" - IDS_SCROLLBOTTOM "Posunout na konec" - IDS_SCROLLPAGE_UP "O stránku výe" - IDS_SCROLLPAGE_DOWN "O stránku níe" - IDS_SCROLLUP "Posunout nahoru" - IDS_SCROLLDOWN "Posunout dolù" - - IDS_COMMAND_PROMPT "Pøíkazový øádek" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Bearbeiten" - IDS_MARK "Markieren" - IDS_COPY "Kopieren\tEnter" - IDS_PASTE "Einfügen" - IDS_SELECTALL "Alles auswählen" - IDS_SCROLL "Scrollen" - IDS_FIND "Suchen..." - IDS_DEFAULTS "Standardwerte" - IDS_PROPERTIES "Eigenschaften" - IDS_SCROLLHERE "Hier scrollen" - IDS_SCROLLTOP "Ganz nach oben scrollen" - IDS_SCROLLBOTTOM "Ganz nach unten scrollen" - IDS_SCROLLPAGE_UP "Seite nach oben" - IDS_SCROLLPAGE_DOWN "Seite nach unten" - IDS_SCROLLUP "Nach oben scrollen" - IDS_SCROLLDOWN "Nach unten scrollen" - - IDS_COMMAND_PROMPT "Eingabeaufforderung" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Åðåîåñãáóßá" - IDS_MARK "ÌáñêÜñéóìá" - IDS_COPY "ÁíôéãñáöÞ\tEnter" - IDS_PASTE "Åðéêüëëçóç" - IDS_SELECTALL "ÅðéëïãÞ üëùí" - IDS_SCROLL "Êýëéóç" - IDS_FIND "Åýñåóç..." - IDS_DEFAULTS "ÐñïåðéëïãÞ" - IDS_PROPERTIES "Éäéüôçôåò" - IDS_SCROLLHERE "Êýëéóç åäþ" - IDS_SCROLLTOP "Áñ÷Þ" - IDS_SCROLLBOTTOM "ÔÝëïò" - IDS_SCROLLPAGE_UP "Ðñïçãïýìåíç óåëßäá" - IDS_SCROLLPAGE_DOWN "Åðüìåíç óåëßäá" - IDS_SCROLLUP "Êýëéóç ðÜíù" - IDS_SCROLLDOWN "Êýëéóç êÜôù" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edit" - IDS_MARK "Mark" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Select All" - IDS_SCROLL "Scroll" - IDS_FIND "Find..." - IDS_DEFAULTS "Defaults" - IDS_PROPERTIES "Properties" - IDS_SCROLLHERE "Scroll here" - IDS_SCROLLTOP "Scroll top" - IDS_SCROLLBOTTOM "Scroll bottom" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tIntroducir" - IDS_PASTE "Pegar" - IDS_SELECTALL "Seleccionar Todo" - IDS_SCROLL "Desplazar" - IDS_FIND "Buscar..." - IDS_DEFAULTS "Por defecto" - IDS_PROPERTIES "Propiedades" - IDS_SCROLLHERE "Desplazar aquí" - IDS_SCROLLTOP "Desplazar hasta arriba" - IDS_SCROLLBOTTOM "Desplazar hasta abajo" - IDS_SCROLLPAGE_UP "Subir página" - IDS_SCROLLPAGE_DOWN "Bajar página" - IDS_SCROLLUP "Desplazar arriba" - IDS_SCROLLDOWN "Desplazar abajo" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,27 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -/* Fixme : Translation could be really improved, with context - La traduction pourrait réellement être améliorée grâce au contexte */ -STRINGTABLE -BEGIN - IDS_EDIT "Éditer" - IDS_MARK "Marquer" - IDS_COPY "Copier\tEntrée" - IDS_PASTE "Coller" - IDS_SELECTALL "Tout sélectionner" - IDS_SCROLL "Défiler" - IDS_FIND "Trouver..." - IDS_DEFAULTS "Défauts" - IDS_PROPERTIES "Propriétés" - IDS_SCROLLHERE "Défiler ici" - IDS_SCROLLTOP "Défiler tout en haut" - IDS_SCROLLBOTTOM "Défiler tout en bas" - IDS_SCROLLPAGE_UP "Page précédente" - IDS_SCROLLPAGE_DOWN "Page suivante" - IDS_SCROLLUP "Défiler en haut" - IDS_SCROLLDOWN "Défiler en bas" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edit" - IDS_MARK "Tandai" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Pilih Semua" - IDS_SCROLL "Gulung" - IDS_FIND "Cari..." - IDS_DEFAULTS "Standar" - IDS_PROPERTIES "Properti" - IDS_SCROLLHERE "Gulung ke Sini" - IDS_SCROLLTOP "Gulung ke Atas" - IDS_SCROLLBOTTOM "Gulung ke Bawah" - IDS_SCROLLPAGE_UP "Halaman Naik" - IDS_SCROLLPAGE_DOWN "Halaman Turun" - IDS_SCROLLUP "Gulung Naik" - IDS_SCROLLDOWN "Gulung Turun" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -43,25 +43,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Modifica" - IDS_MARK "Seleziona" - IDS_COPY "Copia\tInvio" - IDS_PASTE "Incolla" - IDS_SELECTALL "Seleziona tutto" - IDS_SCROLL "Scorri" - IDS_FIND "Trova..." - IDS_DEFAULTS "Impostazioni predefinite" - IDS_PROPERTIES "Proprietà" - IDS_SCROLLHERE "Scorri qui" - IDS_SCROLLTOP "Scorri in cima" - IDS_SCROLLBOTTOM "Scorri in fondo" - IDS_SCROLLPAGE_UP "Pagina sù" - IDS_SCROLLPAGE_DOWN "Pagina giù" - IDS_SCROLLUP "Scorri sù" - IDS_SCROLLDOWN "Scorri giù" - - IDS_COMMAND_PROMPT "Prompt dei commandi" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "ÒW" - IDS_MARK "ÍÍwè" - IDS_COPY "Rs[\tEnter" - IDS_PASTE "\\èt¯" - IDS_SELECTALL "·×ÄIð" - IDS_SCROLL "XN[" - IDS_FIND "õ..." - IDS_DEFAULTS "Kèl" - IDS_PROPERTIES "vpeB" - IDS_SCROLLHERE "±±ÉXN[" - IDS_SCROLLTOP "êÔãÉXN[" - IDS_SCROLLBOTTOM "êÔºÉXN[" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "ãÉXN[" - IDS_SCROLLDOWN "ºÉXN[" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Rediger" - IDS_MARK "Merk" - IDS_COPY "Kopier\tEnter" - IDS_PASTE "Lim inn" - IDS_SELECTALL "Velg alt" - IDS_SCROLL "Rull" - IDS_FIND "Finn..." - IDS_DEFAULTS "Standard" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Rull her" - IDS_SCROLLTOP "Rull til toppen" - IDS_SCROLLBOTTOM "Rull knapp" - IDS_SCROLLPAGE_UP "Side opp" - IDS_SCROLLPAGE_DOWN "Side ned" - IDS_SCROLLUP "Rull opp" - IDS_SCROLLDOWN "Rull ned" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -42,25 +42,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edytuj" - IDS_MARK "Zaznacz" - IDS_COPY "Kopiuj\tWejdź" - IDS_PASTE "Wklej" - IDS_SELECTALL "Zaznacz wszystko" - IDS_SCROLL "PrzewiÅ" - IDS_FIND "Znajdź..." - IDS_DEFAULTS "Ustawienia domyÅlne" - IDS_PROPERTIES "WÅaÅciwoÅci" - IDS_SCROLLHERE "PrzewiÅ tutaj" - IDS_SCROLLTOP "PrzewiÅ na poczÄ tek" - IDS_SCROLLBOTTOM "PrzewiÅ na koniec" - IDS_SCROLLPAGE_UP "Poprzednia strona" - IDS_SCROLLPAGE_DOWN "NastÄpna strona" - IDS_SCROLLUP "PrzewiÅ do góry" - IDS_SCROLLDOWN "PrzewiÅ na dóÅ" - - IDS_COMMAND_PROMPT "Wiersz polecenia" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -36,25 +36,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tEnter" - IDS_PASTE "Colar" - IDS_SELECTALL "Selecionar Tudo" - IDS_SCROLL "Rolar" - IDS_FIND "Procurar..." - IDS_DEFAULTS "Padrões" - IDS_PROPERTIES "Propriedades" - IDS_SCROLLHERE "Rolar aqui" - IDS_SCROLLTOP "Rolar até o topo" - IDS_SCROLLBOTTOM "Rolar até o fim" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" - - IDS_COMMAND_PROMPT "Prompt de Comando" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -41,25 +41,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editare" - IDS_MARK "MarcheazÄ" - IDS_COPY "CopiazÄ\tEnter" - IDS_PASTE "LipeÈte" - IDS_SELECTALL "SelecteazÄ tot" - IDS_SCROLL "DeruleazÄ" - IDS_FIND "GÄsireâ¦" - IDS_DEFAULTS "Implicite" - IDS_PROPERTIES "ProprietÄÈi" - IDS_SCROLLHERE "DeruleazÄ aici" - IDS_SCROLLTOP "DeruleazÄ la început" - IDS_SCROLLBOTTOM "DeruleazÄ la sfârÈit" - IDS_SCROLLPAGE_UP "Pagina anterioarÄ" - IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" - IDS_SCROLLUP "DeruleazÄ Ã®n sus" - IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" - - IDS_COMMAND_PROMPT "Linie de comandÄ" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "ÐзмениÑÑ" - IDS_MARK "ÐомеÑиÑÑ" - IDS_COPY "ÐопиÑоваÑÑ\tEnter" - IDS_PASTE "ÐÑÑавиÑÑ" - IDS_SELECTALL "ÐÑделиÑÑ Ð²Ñе" - IDS_SCROLL "ÐÑокÑÑÑиÑÑ" - IDS_FIND "ÐÑкаÑÑ..." - IDS_DEFAULTS "УмолÑаниÑ" - IDS_PROPERTIES "СвойÑÑва" - IDS_SCROLLHERE "Scroll Here" - IDS_SCROLLTOP "Scroll Top" - IDS_SCROLLBOTTOM "ÐÑокÑÑÑиÑÑ Ð²Ð½Ð¸Ð·" - IDS_SCROLLPAGE_UP "ÐвеÑÑ ÑÑÑаниÑÑ" - IDS_SCROLLPAGE_DOWN "Ðниз ÑÑÑаниÑÑ" - IDS_SCROLLUP "ÐÑокÑÑÑиÑÑ Ð²Ð²ÐµÑÑ " - IDS_SCROLLDOWN "Scroll Down" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravi" - IDS_MARK "Oznaèi" - IDS_COPY "Kopírova\tEnter" - IDS_PASTE "Vloi" - IDS_SELECTALL "Vybra vetko" - IDS_SCROLL "Rolova" - IDS_FIND "Nájs..." //Find - IDS_DEFAULTS "Predvolené" //Defaults - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Rolova sem" - IDS_SCROLLTOP "K hornému okraju" - IDS_SCROLLBOTTOM "K dolnému okraju" - IDS_SCROLLPAGE_UP "O stránku vyie" - IDS_SCROLLPAGE_DOWN "O stránku niie" - IDS_SCROLLUP "Rolova nahor" - IDS_SCROLLDOWN "Rolova nadol" - - IDS_COMMAND_PROMPT "Príkazový riadok" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -41,25 +41,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Redigera" - IDS_MARK "Markera" - IDS_COPY "Kopiera\tEnter" - IDS_PASTE "Klistra in" - IDS_SELECTALL "Markera Allt" - IDS_SCROLL "Skrolla" - IDS_FIND "Sök..." - IDS_DEFAULTS "Ursprunglig" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Skrolla hit" - IDS_SCROLLTOP "Skrolla till topp" - IDS_SCROLLBOTTOM "Skrolla till botten" - IDS_SCROLLPAGE_UP "Sida upp" - IDS_SCROLLPAGE_DOWN "Sida ner" - IDS_SCROLLUP "Skrolla upp" - IDS_SCROLLDOWN "Skrolla ner" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -54,25 +54,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Düzenle" - IDS_MARK "Ä°Åaretle" - IDS_COPY "Kopyala\tEnter" - IDS_PASTE "YapıÅtır" - IDS_SELECTALL "Tümünü Seç" - IDS_SCROLL "Yuvarla" - IDS_FIND "Bul..." - IDS_DEFAULTS "Varsayılanlar" - IDS_PROPERTIES "Ãzellikler" - IDS_SCROLLHERE "Buraya yuvarla" - IDS_SCROLLTOP "Ãste yuvarla" - IDS_SCROLLBOTTOM "Alta yuvarla" - IDS_SCROLLPAGE_UP "Sayfa yukarı" - IDS_SCROLLPAGE_DOWN "Sayfa aÅaÄı" - IDS_SCROLLUP "Yukarı yuvarla" - IDS_SCROLLDOWN "AÅaÄı yuvarla" - - IDS_COMMAND_PROMPT "Komut Ä°stemi" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -42,25 +42,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "РедагÑваÑи" - IDS_MARK "ÐидÑлиÑи" - IDS_COPY "ÐопÑÑваÑи\tEnter" - IDS_PASTE "ÐÑÑавиÑи" - IDS_SELECTALL "ÐидÑлиÑи вÑе" - IDS_SCROLL "ÐÑокÑÑÑиÑи" - IDS_FIND "ÐнайÑи..." - IDS_DEFAULTS "ÐамовÑÑваннÑ" - IDS_PROPERTIES "ÐлаÑÑивоÑÑÑ" - IDS_SCROLLHERE "ÐÑокÑÑÑиÑи ÑÑди" - IDS_SCROLLTOP "ÐÑокÑÑÑиÑи на поÑаÑок" - IDS_SCROLLBOTTOM "ÐÑокÑÑÑиÑи на кÑнеÑÑ" - IDS_SCROLLPAGE_UP "ÐопеÑÐµÐ´Ð½Ñ ÑоÑÑÑнка" - IDS_SCROLLPAGE_DOWN "ÐаÑÑÑпна ÑÑоÑÑнка" - IDS_SCROLLUP "ÐÑокÑÑÑиÑи догоÑи" - IDS_SCROLLDOWN "ÐÑокÑÑÑиÑи донизÑ" - - IDS_COMMAND_PROMPT "Ðомандний ÑÑдок" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "±à¼" - IDS_MARK "±ê¼Ç" - IDS_COPY "¸´ÖÆ\tEnter" - IDS_PASTE "ð¤Ìù" - IDS_SELECTALL "È«²¿Ñ¡Ôñ" - IDS_SCROLL "¹ö¶¯" - IDS_FIND "²éÕÒ..." - IDS_DEFAULTS "ĬÈÏ" - IDS_PROPERTIES "ÊôÐÔ" - IDS_SCROLLHERE "¹ö¶¯µ½´Ë" - IDS_SCROLLTOP "¹ö¶¯ÖÁ¶¥¶Ë" - IDS_SCROLLBOTTOM "¹ö¶¯ÖÁÄ©¶Ë" - IDS_SCROLLPAGE_UP "ÉÏÒ»Ò³" - IDS_SCROLLPAGE_DOWN "ÏÂÒ»Ò³" - IDS_SCROLLUP "ÏòÉϹö¶¯" - IDS_SCROLLDOWN "ÏòϹö¶¯" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "½s¿è" - IDS_MARK "¼Ð°O" - IDS_COPY "½Æ»s\tEnter" - IDS_PASTE "ÂH¶K" - IDS_SELECTALL "¥þ³¡¿ï¾Ü" - IDS_SCROLL "ºu°Ê" - IDS_FIND "´M§ä..." - IDS_DEFAULTS "¹w³]" - IDS_PROPERTIES "ÄÝ©Ê" - IDS_SCROLLHERE "ºu°Ê¨ì¦¹ " - IDS_SCROLLTOP "ºu°Ê¨ì³»¸m" - IDS_SCROLLBOTTOM "ºu°Ê¨ì¥½ºÝ" - IDS_SCROLLPAGE_UP "¤W¤@¶" - IDS_SCROLLPAGE_DOWN "¤U¤@¶" - IDS_SCROLLUP "¦V¤Wºu°Ê" - IDS_SCROLLDOWN "¦V¤Uºu°Ê" - - IDS_COMMAND_PROMPT "Command Prompt" -END Modified: branches/ros-csrss/win32ss/user/win32csr/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/rsrc.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/rsrc.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -2,8 +2,6 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 ICON DISCARDABLE res/terminal.ico #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" Modified: branches/ros-csrss/win32ss/user/win32csr/w32csr.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/w32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/w32csr.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -9,8 +9,9 @@ #include <winlogon.h> /* Internal CSRSS Headers */ -#include <conio.h> -#include <csrplugin.h> +#include <win/winmsg.h> +//#include <conio.h> +//#include <csrplugin.h> #include <desktopbg.h> /* Public Win32K Headers */ Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -27,6 +27,12 @@ NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); +/* desktopbg.c */ +CSR_API(CsrCreateDesktop); +CSR_API(CsrShowDesktop); +CSR_API(CsrHideDesktop); +// CSR_API(CsrRegisterSystemClasses); + /* exitros.c */ /// Must go to winsrv.dll CSR_API(CsrExitReactos); Removed: branches/ros-csrss/win32ss/user/winsrv/dllmain.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/d…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/dllmain.c (removed) @@ -1,44 +1,0 @@ -/* $Id$ - * - * dllmain.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- - */ -#include "winsrv.h" - -#define NDEBUG -#include <debug.h> - -HANDLE DllHandle = 0; - -/* FUNCTIONS *****************************************************************/ - -BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) -{ - if (DLL_PROCESS_ATTACH == dwReason) - { - DllHandle = hDll; - } - - return TRUE; -} - -/* EOF */ Removed: branches/ros-csrss/win32ss/user/winsrv/winsrv.def URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.def [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.def (removed) @@ -1,6 +1,0 @@ -; $Id$ -LIBRARY winsrv.dll -EXPORTS -ConServerDllInitialization@8 -UserServerDllInitialization@8 -; EOF Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.rc URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w…
============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,4 +1,7 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 console+user usermode server\0" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "winsrv\0" -#define REACTOS_STR_ORIGINAL_FILENAME "winsrv.exe\0" +#define REACTOS_STR_ORIGINAL_FILENAME "winsrv.dll\0" #include <reactos/version.rc> + +#include "rsrc.rc"
12 years, 2 months
1
0
0
0
[janderwald] 57604: [USBHUB] - Implement IOCTL_USB_GET_NODE_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME
by janderwald@svn.reactos.org
Author: janderwald Date: Wed Oct 24 15:40:46 2012 New Revision: 57604 URL:
http://svn.reactos.org/svn/reactos?rev=57604&view=rev
Log: [USBHUB] - Implement IOCTL_USB_GET_NODE_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r…
============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Wed Oct 24 15:40:46 2012 @@ -1133,7 +1133,7 @@ ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; UNICODE_STRING DeviceName; - ULONG ConfigDescSize, DeviceDescSize; + ULONG ConfigDescSize, DeviceDescSize, DeviceInfoSize; PVOID HubInterfaceBusContext; USB_CONFIGURATION_DESCRIPTOR ConfigDesc; @@ -1312,6 +1312,14 @@ DPRINT1("USBHUB: GetUsbDeviceDescriptor failed with status %x\n", Status); goto Cleanup; } + + // query device details + Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext, + UsbChildExtension->UsbDeviceHandle, + &UsbChildExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &DeviceInfoSize); + //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); @@ -2047,8 +2055,164 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdoHandleDeviceControl\n"); - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_NODE_INFORMATION NodeInformation; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_NODE_CONNECTION_INFORMATION NodeConnectionInfo; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME NodeKey; + ULONG Index, Length; + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) + { + // is the buffer big enough + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get buffer + NodeInformation = (PUSB_NODE_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity check + ASSERT(NodeInformation); + + // init buffer + NodeInformation->NodeType = UsbHub; + RtlCopyMemory(&NodeInformation->u.HubInformation.HubDescriptor, &HubDeviceExtension->HubDescriptor, sizeof(USB_HUB_DESCRIPTOR)); + + // FIXME is hub powered + NodeInformation->u.HubInformation.HubIsBusPowered = TRUE; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + + + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_INFORMATION) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeConnectionInfo = (PUSB_NODE_CONNECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeConnectionInfo); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeConnectionInfo->ConnectionIndex) + continue; + + // init node connection info + RtlCopyMemory(&NodeConnectionInfo->DeviceDescriptor, &ChildDeviceExtension->DeviceDesc, sizeof(USB_DEVICE_DESCRIPTOR)); + NodeConnectionInfo->CurrentConfigurationValue = ChildDeviceExtension->FullConfigDesc->bConfigurationValue; + NodeConnectionInfo->DeviceIsHub = FALSE; //FIXME support hubs + NodeConnectionInfo->LowSpeed = ChildDeviceExtension->DeviceInformation.DeviceSpeed == UsbLowSpeed; + NodeConnectionInfo->DeviceAddress = ChildDeviceExtension->DeviceInformation.DeviceAddress; + NodeConnectionInfo->NumberOfOpenPipes = ChildDeviceExtension->DeviceInformation.NumberOfOpenPipes; + NodeConnectionInfo->ConnectionStatus = DeviceConnected; //FIXME + + if (NodeConnectionInfo->NumberOfOpenPipes) + { + DPRINT1("Need to copy pipe information\n"); + } + break; + } + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeKey = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeKey); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeKey->ConnectionIndex) + continue; + + // get driver key + Status = IoGetDeviceProperty(HubDeviceExtension->ChildDeviceObject[Index], DevicePropertyDriverKeyName, + IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME), + NodeKey->DriverKeyName, + &Length); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // normalize status + Status = STATUS_SUCCESS; + } + + if (Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // terminate node key name + NodeKey->DriverKeyName[0] = 0; + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + else + { + // result size + Irp->IoStatus.Information = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + + // length of driver name + NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + break; + } + } + } + else + { + DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + } + + // finish irp + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.…
============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Wed Oct 24 15:40:46 2012 @@ -68,6 +68,7 @@ PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; + USB_DEVICE_INFORMATION_0 DeviceInformation; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION
12 years, 2 months
1
0
0
0
[janderwald] 57603: [MOUHID] - Report absolute mouse in Flags MOUSE_INPUT_DATA member [HIDPARSER] - Fix data conversion when extracting unscaled data from reports - Fixes VBOX absolute pointing dev...
by janderwald@svn.reactos.org
Author: janderwald Date: Wed Oct 24 09:37:08 2012 New Revision: 57603 URL:
http://svn.reactos.org/svn/reactos?rev=57603&view=rev
Log: [MOUHID] - Report absolute mouse in Flags MOUSE_INPUT_DATA member [HIDPARSER] - Fix data conversion when extracting unscaled data from reports - Fixes VBOX absolute pointing device - Tested with VBOX 4.1.22 - #Core-6553 #resolve Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.…
============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Oct 24 09:37:08 2012 @@ -92,7 +92,8 @@ VOID MouHid_GetButtonFlags( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, - OUT PUSHORT ButtonFlags) + OUT PUSHORT ButtonFlags, + OUT PUSHORT Flags) { NTSTATUS Status; USAGE Usage; @@ -102,6 +103,7 @@ /* init flags */ *ButtonFlags = 0; + *Flags = 0; /* get usages */ CurrentUsageListLength = DeviceExtension->UsageListLength; @@ -170,7 +172,7 @@ if (DeviceExtension->MouseAbsolute) { // mouse operates absolute - *ButtonFlags |= MOUSE_MOVE_ABSOLUTE; + *Flags |= MOUSE_MOVE_ABSOLUTE; } } @@ -212,6 +214,7 @@ NTSTATUS Status; LONG LastX, LastY; MOUSE_INPUT_DATA MouseInputData; + USHORT Flags; /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; @@ -239,13 +242,14 @@ MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags, &Flags); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); /* init input data */ MouseInputData.ButtonFlags = ButtonFlags; + MouseInputData.Flags = Flags; MouseInputData.LastX = LastX; MouseInputData.LastY = LastY; Modified: trunk/reactos/lib/drivers/hidparser/api.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.…
============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Wed Oct 24 09:37:08 2012 @@ -630,11 +630,10 @@ ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); // - // one extra shift for skipping the prepended report id - // - Data = 0; - Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset +1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); - //Data = ReportDescriptor[ReportItem->ByteOffset + 1]; + // FIXME: support items with variable bitlength + // + ASSERT(ReportItem->BitCount == 16); + Data = (ReportDescriptor[ReportItem->ByteOffset +1] & 0xFF) | (ReportDescriptor[ReportItem->ByteOffset +2] & 0xFF) << 8; // // shift data
12 years, 2 months
1
0
0
0
[hbelusca] 57602: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and temporary acti...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Tue Oct 23 22:31:36 2012 New Revision: 57602 URL:
http://svn.reactos.org/svn/reactos?rev=57602&view=rev
Log: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and temporary activate a symbol. [WIN32CSR] - Clean a header. Added: branches/ros-csrss/win32ss/user/consrv/resource.h - copied unchanged from r57599, branches/ros-csrss/win32ss/user/win32csr/resource.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/subsystems/win32/csrsrv/srv.h branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
Modified: branches/ros-csrss/subsystems/win32/csrsrv/srv.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx…
Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C…
Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a…
Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g…
Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g…
Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h…
Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i…
Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l…
Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t…
Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t…
Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…
12 years, 2 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Results per page:
10
25
50
100
200