[WINSRV/WIN32CSR]
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 24 Oct 2012 23:19:54 +0000 (23:19 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 24 Oct 2012 23:19:54 +0000 (23:19 +0000)
- 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.

svn path=/branches/ros-csrss/; revision=57611

39 files changed:
include/reactos/subsys/csr/csrss.h
include/reactos/subsys/win/winmsg.h
win32ss/user/win32csr/CMakeLists.txt
win32ss/user/win32csr/desktopbg.c
win32ss/user/win32csr/desktopbg.h
win32ss/user/win32csr/dllmain.c
win32ss/user/win32csr/lang/bg-BG.rc [deleted file]
win32ss/user/win32csr/lang/cs-CZ.rc [deleted file]
win32ss/user/win32csr/lang/de-DE.rc [deleted file]
win32ss/user/win32csr/lang/el-GR.rc [deleted file]
win32ss/user/win32csr/lang/en-US.rc [deleted file]
win32ss/user/win32csr/lang/es-ES.rc [deleted file]
win32ss/user/win32csr/lang/fr-FR.rc [deleted file]
win32ss/user/win32csr/lang/id-ID.rc [deleted file]
win32ss/user/win32csr/lang/it-IT.rc [deleted file]
win32ss/user/win32csr/lang/ja-JP.rc [deleted file]
win32ss/user/win32csr/lang/no-NO.rc [deleted file]
win32ss/user/win32csr/lang/pl-PL.rc [deleted file]
win32ss/user/win32csr/lang/pt-BR.rc [deleted file]
win32ss/user/win32csr/lang/ro-RO.rc [deleted file]
win32ss/user/win32csr/lang/ru-RU.rc [deleted file]
win32ss/user/win32csr/lang/sk-SK.rc [deleted file]
win32ss/user/win32csr/lang/sv-SE.rc [deleted file]
win32ss/user/win32csr/lang/tr-TR.rc [deleted file]
win32ss/user/win32csr/lang/uk-UA.rc [deleted file]
win32ss/user/win32csr/lang/zh-CN.rc [deleted file]
win32ss/user/win32csr/lang/zh-TW.rc [deleted file]
win32ss/user/win32csr/resource.h [deleted file]
win32ss/user/win32csr/rsrc.rc [deleted file]
win32ss/user/win32csr/w32csr.h [deleted file]
win32ss/user/win32csr/win32csr.h
win32ss/user/win32csr/win32csr.rc
win32ss/user/winsrv/exitros.c [moved from win32ss/user/win32csr/exitros.c with 98% similarity]
win32ss/user/winsrv/harderror.c [moved from win32ss/user/win32csr/harderror.c with 99% similarity]
win32ss/user/winsrv/init.c
win32ss/user/winsrv/rsrc.rc
win32ss/user/winsrv/server.c
win32ss/user/winsrv/winsrv.h
win32ss/user/winsrv/winsrv.spec [new file with mode: 0644]

index 485533b..be0c97b 100644 (file)
@@ -96,9 +96,11 @@ typedef struct
 #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)
index 7166203..4c380fa 100644 (file)
@@ -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__
 
index 778eab7..b0947cb 100644 (file)
@@ -11,8 +11,6 @@ spec2def(win32csr.dll win32csr.spec)
 list(APPEND SOURCE
     desktopbg.c
     dllmain.c
-    exitros.c
-    harderror.c
     win32csr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def)
 
index 90e632c..bc4b063 100644 (file)
  
  */
 
-#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
index a570980..c072e88 100644 (file)
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#include <csr/csrsrv.h>
-//#include "api.h"
-
 BOOL FASTCALL DtbgIsDesktopVisible(VOID);
 
 /* EOF */
index c68b6be..be11a29 100644 (file)
 
 /* 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;
 
@@ -133,149 +53,6 @@ KeyboardHookProc(
    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
 DllMain(HANDLE hDll,
         DWORD dwReason,
@@ -296,18 +73,11 @@ DllMain(HANDLE hDll,
     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 @@ CSR_SERVER_DLL_INIT(Win32CsrInitialization)
     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);
diff --git a/win32ss/user/win32csr/lang/bg-BG.rc b/win32ss/user/win32csr/lang/bg-BG.rc
deleted file mode 100644 (file)
index d0cdfe9..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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           "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå \84Ïðåêðàòÿâàíå âåäíàãà\84.",
-                    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           "Çà äà ñå âúðíåòå â ÐåàêòÎÑ è äà ïðîâåðèòå ñúñòîÿíèåòî íà ïðèëîæåíèåòî, íàòèñíåòå \84Îòêàç\93.",
-                    IDC_STATIC,7,26,178,16
-    LTEXT           "Àêî ðåøèòå äà çàòâîðèòå ïðèëîæåíèåòî âåäíàãà, ùå èçãóáèòå âñè÷êè íåçàïèñàíè äàííè. Çà äà ïðåêðàòèòå ïðèëîæåíèåòî âåäíàãà, íàòèñíåòå \84Ïðåêðàòÿâàíå âåäíàãà\93.",
-                    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
diff --git a/win32ss/user/win32csr/lang/cs-CZ.rc b/win32ss/user/win32csr/lang/cs-CZ.rc
deleted file mode 100644 (file)
index 7773d68..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 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 okam\9eité ukonèení programu, v\9aechna neulo\9eená data budou ztracena. Kliknutím na Ukonèit okam\9eitì ukonèíte program.",
-                    IDC_STATIC,7,40,186,26
-    DEFPUSHBUTTON   "&Ukonèit okam\9eitì",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 okam\9eitì",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 okam\9eité ukonèení programu, v\9aechna neulo\9eená data budou ztracena. Kliknutím na Ukonèit okam\9eitì 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
diff --git a/win32ss/user/win32csr/lang/de-DE.rc b/win32ss/user/win32csr/lang/de-DE.rc
deleted file mode 100644 (file)
index 779ca50..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/el-GR.rc b/win32ss/user/win32csr/lang/el-GR.rc
deleted file mode 100644 (file)
index 9b02f0c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/en-US.rc b/win32ss/user/win32csr/lang/en-US.rc
deleted file mode 100644 (file)
index 35074c2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/es-ES.rc b/win32ss/user/win32csr/lang/es-ES.rc
deleted file mode 100644 (file)
index e0107af..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *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
diff --git a/win32ss/user/win32csr/lang/fr-FR.rc b/win32ss/user/win32csr/lang/fr-FR.rc
deleted file mode 100644 (file)
index c2f1a06..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/id-ID.rc b/win32ss/user/win32csr/lang/id-ID.rc
deleted file mode 100644 (file)
index 30a59ed..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/it-IT.rc b/win32ss/user/win32csr/lang/it-IT.rc
deleted file mode 100644 (file)
index 849e653..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* 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
diff --git a/win32ss/user/win32csr/lang/ja-JP.rc b/win32ss/user/win32csr/lang/ja-JP.rc
deleted file mode 100644 (file)
index 2012542..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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 "\83v\83\8d\83O\83\89\83\80\82Ì\8fI\97¹ - "
-FONT 9, "MS UI Gothic"
-BEGIN
-    LTEXT           "\83v\83\8d\83O\83\89\83\80\82ð\8fI\97¹\82µ\82Ä\82¢\82Ü\82·... \82µ\82Î\82ç\82­\82¨\91Ò\82¿\82­\82¾\82³\82¢",IDC_STATIC,7,7,186,11
-    CONTROL         "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER,
-                    7,20,186,13
-    LTEXT           "\83v\83\8d\83O\83\89\83\80\82ð\82·\82®\82É\8fI\97¹\82³\82¹\82é\82æ\82¤\91I\91ð\82µ\82½\8fê\8d\87\81A\95Û\91\82³\82ê\82Ä\82¢\82È\82¢\83f\81[\83^\82Í\82·\82×\82Ä\8e¸\82í\82ê\82Ü\82·\81B\83v\83\8d\83O\83\89\83\80\82ð\8fI\97¹\82·\82é\82É\82Í[\82·\82®\82É\8fI\97¹]\82ð\83N\83\8a\83b\83N\82µ\82Ä\82­\82¾\82³\82¢\81B",
-                    IDC_STATIC,7,40,186,26
-    DEFPUSHBUTTON   "\82·\82®\82É\8fI\97¹(&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 "\83v\83\8d\83O\83\89\83\80\82Ì\8fI\97¹ - "
-FONT 9, "MS UI Gothic"
-BEGIN
-    DEFPUSHBUTTON   "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,142,98,43,17
-    PUSHBUTTON      "\82·\82®\82É\8fI\97¹(&E)",IDC_END_NOW,78,98,43,17
-    LTEXT           "\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\89\9e\93\9a\82µ\82Ä\82¢\82Ü\82¹\82ñ",IDC_STATIC,7,7,178,8
-    LTEXT           "ReactOS \82É\96ß\82Á\82Ä\83v\83\8d\83O\83\89\83\80\82Ì\8fó\91Ô\82ð\8am\94F\82·\82é\82É\82Í[\83L\83\83\83\93\83Z\83\8b]\82ð\83N\83\8a\83b\83N\82µ\82Ä\82­\82¾\82³\82¢",
-                    IDC_STATIC,7,26,178,16
-    LTEXT           "\83v\83\8d\83O\83\89\83\80\82ð\82·\82®\82É\8fI\97¹\82³\82¹\82é\82æ\82¤\91I\91ð\82µ\82½\8fê\8d\87\81A\95Û\91\82³\82ê\82Ä\82¢\82È\82¢\83f\81[\83^\82Í\82·\82×\82Ä\8e¸\82í\82ê\82Ü\82·\81B\83v\83\8d\83O\83\89\83\80\82ð\92¼\82¿\82É\8fI\97¹\82·\82é\82É\82Í[\82·\82®\82É\8fI\97¹]\82ð\83N\83\8a\83b\83N\82µ\82Ä\82­\82¾\82³\82¢",
-                    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
diff --git a/win32ss/user/win32csr/lang/no-NO.rc b/win32ss/user/win32csr/lang/no-NO.rc
deleted file mode 100644 (file)
index 8bf9388..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/pl-PL.rc b/win32ss/user/win32csr/lang/pl-PL.rc
deleted file mode 100644 (file)
index 0ac89f7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *         translated by xrogers
- *         xxrogers@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
diff --git a/win32ss/user/win32csr/lang/pt-BR.rc b/win32ss/user/win32csr/lang/pt-BR.rc
deleted file mode 100644 (file)
index 5d2c834..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Translation and UTF-8 Conversion by mkbu95 <mkbu95@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
diff --git a/win32ss/user/win32csr/lang/ro-RO.rc b/win32ss/user/win32csr/lang/ro-RO.rc
deleted file mode 100644 (file)
index 25ab05b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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
diff --git a/win32ss/user/win32csr/lang/ru-RU.rc b/win32ss/user/win32csr/lang/ru-RU.rc
deleted file mode 100644 (file)
index e39f401..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/sk-SK.rc b/win32ss/user/win32csr/lang/sk-SK.rc
deleted file mode 100644 (file)
index 9063b45..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* TRANSLATOR:  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@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 okam\9eité ukonèenie programu, stratíte v\9aetky neulo\9eené údaje. Ak chcete program ukonèi\9d okam\9eite, kliknite na tlaèidlo Ukonèi\9d ihneï.",
-                    IDC_STATIC,7,40,186,26
-    DEFPUSHBUTTON   "&Ukonèi\9d 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   "Zru\9ai\9d",IDCANCEL,142,98,43,17
-    PUSHBUTTON      "&Ukonèi\9d 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 Zru\9ai\9d.",
-                    IDC_STATIC,7,26,178,16
-    LTEXT           "Ak zvolíte okam\9eité ukonèenie programu, stratíte v\9aetky neulo\9eené údaje. Ak chcete program ukonèi\9d okam\9eite, kliknite na tlaèidlo Ukonèi\9d 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
diff --git a/win32ss/user/win32csr/lang/sv-SE.rc b/win32ss/user/win32csr/lang/sv-SE.rc
deleted file mode 100644 (file)
index 27292a5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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
diff --git a/win32ss/user/win32csr/lang/tr-TR.rc b/win32ss/user/win32csr/lang/tr-TR.rc
deleted file mode 100644 (file)
index 834b51c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Turkish resources
- *
- *  Copyright 2012 Arda Tanrikulu <ardatanrikulu@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
diff --git a/win32ss/user/win32csr/lang/uk-UA.rc b/win32ss/user/win32csr/lang/uk-UA.rc
deleted file mode 100644 (file)
index 7deab89..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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
diff --git a/win32ss/user/win32csr/lang/zh-CN.rc b/win32ss/user/win32csr/lang/zh-CN.rc
deleted file mode 100644 (file)
index 3eba3c5..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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
diff --git a/win32ss/user/win32csr/lang/zh-TW.rc b/win32ss/user/win32csr/lang/zh-TW.rc
deleted file mode 100644 (file)
index cc35afb..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-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ªº¸ê®Æ¡C­Y­n¥ß§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           "­Y­nªð¦^¦Ü ReactOS ¨ÃÀ˵øµ{¦¡ªºª¬ºA¡A½Ð«ö¤U¡§¨ú®ø¡¨",
-                    IDC_STATIC,7,26,178,16
-    LTEXT           "¦pªG±z¿ï¾Ü¥ß§Yµ²§ôµ{¦¡¡A±z±N¥¢¥h©Ò¦³¥¼Àx¦sªº¸ê®Æ¡C­Y­n¥ß§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
diff --git a/win32ss/user/win32csr/resource.h b/win32ss/user/win32csr/resource.h
deleted file mode 100644 (file)
index 1c54971..0000000
+++ /dev/null
@@ -1,20 +0,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 */
diff --git a/win32ss/user/win32csr/rsrc.rc b/win32ss/user/win32csr/rsrc.rc
deleted file mode 100644 (file)
index a0abb32..0000000
+++ /dev/null
@@ -1,29 +0,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"
diff --git a/win32ss/user/win32csr/w32csr.h b/win32ss/user/win32csr/w32csr.h
deleted file mode 100644 (file)
index 5d28acf..0000000
+++ /dev/null
@@ -1,28 +0,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 */
index 288843e..2a15d3b 100644 (file)
@@ -8,35 +8,34 @@
 
 #pragma once
 
+/* PSDK/NDK Headers */
+#define WIN32_NO_STATUS
 #include <windows.h>
-#include <commctrl.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+#include <psapi.h>
 
-extern HANDLE Win32CsrApiHeap;
-extern HINSTANCE Win32CsrDllHandle;
+/* External Winlogon Header */
+#include <winlogon.h>
 
-/*
-typedef VOID (WINAPI *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object);
+/* CSRSS Header */
+#include <csr/csrsrv.h>
 
-typedef struct tagCSRSS_OBJECT_DEFINITION
-{
-  LONG Type;
-  CSR_CLEANUP_OBJECT_PROC CsrCleanupObjectProc;
-} CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION;
-*/
+/* Internal CSRSS Headers */
+#include <win/winmsg.h>
+#include <desktopbg.h>
 
-NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc,
-                                        PVOID Context);
+/* Public Win32K Headers */
+#include <ntuser.h>
+
+#include <commctrl.h>
+
+extern HANDLE Win32CsrApiHeap;
+extern HINSTANCE Win32CsrDllHandle;
 
 /* 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 */
index f62f25e..4a8e412 100644 (file)
@@ -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"
similarity index 98%
rename from win32ss/user/win32csr/exitros.c
rename to win32ss/user/winsrv/exitros.c
index 391649c..8f78bcc 100644 (file)
@@ -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"
 #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)
 {
     if (ApiMessage->Data.RegisterLogonProcessRequest.Register)
similarity index 99%
rename from win32ss/user/win32csr/harderror.c
rename to win32ss/user/winsrv/harderror.c
index 2ab585c..8bb9d4e 100644 (file)
@@ -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@mail.ru)
  *                  Timo Kreuzer (timo.kreuzer@reactos.org)
index 0540247..372e9f9 100644 (file)
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  * 
  * ReactOS Operating System
  *
  * --------------------------------------------------------------------
  */
+
 #include "winsrv.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
-HANDLE WinSrvApiPort = NULL;
+HANDLE DllHandle = NULL;
+// HANDLE WinSrvApiPort = NULL;
 
-/**********************************************************************
- * NAME                                                        PRIVATE
- *     ConStaticServerThread/1
- */
-VOID WINAPI ConStaticServerThread (PVOID x)
+/* 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] =
 {
-       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;
-       }
+    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
- *     UserStaticServerThread/1
+ * CsrpInitVideo/3
+ *
+ * TODO: we need a virtual device for sessions other than
+ * TODO: the console one
  */
-VOID WINAPI UserStaticServerThread (PVOID x)
+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)
 {
-       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;
-       }
+    NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK);
 }
 
-/*=====================================================================
- *     PUBLIC API
- *===================================================================*/
+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;
 
-NTSTATUS WINAPI ConServerDllInitialization (ULONG ArgumentCount,
-                                            LPWSTR *Argument)
+    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)
 {
-       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;
+    // Do something.
+    return TRUE;
 }
 
-NTSTATUS WINAPI UserServerDllInitialization (ULONG ArgumentCount,
-                                             LPWSTR *Argument)
+BOOL
+WINAPI
+DllMain(IN HANDLE hDll,
+        IN DWORD dwReason,
+        IN LPVOID lpReserved)
 {
-       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;
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpReserved);
+
+    if (DLL_PROCESS_ATTACH == dwReason)
+    {
+        DllHandle = hDll;
+    }
+
+    return TRUE;
 }
 
 /* EOF */
index 13d5651..a0abb32 100644 (file)
@@ -3,8 +3,6 @@
 
 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"
index 70bc906..c4a657f 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "winsrv.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 
index 99dcb6a..53bd463 100644 (file)
 #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 */
diff --git a/win32ss/user/winsrv/winsrv.spec b/win32ss/user/winsrv/winsrv.spec
new file mode 100644 (file)
index 0000000..79e7e25
--- /dev/null
@@ -0,0 +1,2 @@
+@ stdcall UserServerDllInitialization(ptr)
+@ stdcall _UserSoundSentry()