From 574d00dc196e7d9f5bc1e30ab04507dd707ddb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 24 Oct 2012 21:37:22 +0000 Subject: [PATCH] [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build. svn path=/branches/ros-csrss/; revision=57605 --- subsystems/win/basesrv/basesrv.rc | 2 +- subsystems/win32/csrsrv/csrsrv.rc | 2 +- win32ss/CMakeLists.txt | 1 + win32ss/user/consrv/init.c | 12 +++++--- win32ss/user/win32csr/desktopbg.c | 4 +-- win32ss/user/win32csr/desktopbg.h | 6 ---- win32ss/user/win32csr/dllmain.c | 16 ++++++----- win32ss/user/win32csr/exitros.c | 5 ++-- win32ss/user/win32csr/harderror.c | 4 ++- win32ss/user/win32csr/lang/bg-BG.rc | 22 --------------- win32ss/user/win32csr/lang/cs-CZ.rc | 22 --------------- win32ss/user/win32csr/lang/de-DE.rc | 22 --------------- win32ss/user/win32csr/lang/el-GR.rc | 22 --------------- win32ss/user/win32csr/lang/en-US.rc | 22 --------------- win32ss/user/win32csr/lang/es-ES.rc | 22 --------------- win32ss/user/win32csr/lang/fr-FR.rc | 24 ---------------- win32ss/user/win32csr/lang/id-ID.rc | 22 --------------- win32ss/user/win32csr/lang/it-IT.rc | 22 --------------- win32ss/user/win32csr/lang/ja-JP.rc | 22 --------------- win32ss/user/win32csr/lang/no-NO.rc | 22 --------------- win32ss/user/win32csr/lang/pl-PL.rc | 22 --------------- win32ss/user/win32csr/lang/pt-BR.rc | 22 --------------- win32ss/user/win32csr/lang/ro-RO.rc | 22 --------------- win32ss/user/win32csr/lang/ru-RU.rc | 22 --------------- win32ss/user/win32csr/lang/sk-SK.rc | 22 --------------- win32ss/user/win32csr/lang/sv-SE.rc | 22 --------------- win32ss/user/win32csr/lang/tr-TR.rc | 22 --------------- win32ss/user/win32csr/lang/uk-UA.rc | 22 --------------- win32ss/user/win32csr/lang/zh-CN.rc | 22 --------------- win32ss/user/win32csr/lang/zh-TW.rc | 22 --------------- win32ss/user/win32csr/rsrc.rc | 2 -- win32ss/user/win32csr/w32csr.h | 5 ++-- win32ss/user/win32csr/win32csr.h | 6 ++++ win32ss/user/winsrv/dllmain.c | 44 ----------------------------- win32ss/user/winsrv/winsrv.def | 6 ---- win32ss/user/winsrv/winsrv.rc | 7 +++-- 36 files changed, 42 insertions(+), 544 deletions(-) delete mode 100644 win32ss/user/winsrv/dllmain.c delete mode 100644 win32ss/user/winsrv/winsrv.def diff --git a/subsystems/win/basesrv/basesrv.rc b/subsystems/win/basesrv/basesrv.rc index bfd2c93e468..54ffa2658e7 100644 --- a/subsystems/win/basesrv/basesrv.rc +++ b/subsystems/win/basesrv/basesrv.rc @@ -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 diff --git a/subsystems/win32/csrsrv/csrsrv.rc b/subsystems/win32/csrsrv/csrsrv.rc index fbe30d31c97..cf865bc1662 100644 --- a/subsystems/win32/csrsrv/csrsrv.rc +++ b/subsystems/win32/csrsrv/csrsrv.rc @@ -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 diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index ef2042f8620..f741756d6b8 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -15,6 +15,7 @@ add_subdirectory(reactx) add_subdirectory(user/consrv) add_subdirectory(user/user32) add_subdirectory(user/win32csr) +add_subdirectory(user/winsrv) spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) diff --git a/win32ss/user/consrv/init.c b/win32ss/user/consrv/init.c index 63bcfdb6dd7..0b5cb6e3192 100644 --- a/win32ss/user/consrv/init.c +++ b/win32ss/user/consrv/init.c @@ -328,12 +328,16 @@ VOID WINAPI ConsoleStaticServerThread(PVOID x) 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 @@ CSR_SERVER_DLL_INIT(ConServerDllInitialization) } BOOL -NTAPI +WINAPI DllMain(IN HANDLE hDll, IN DWORD dwReason, IN LPVOID lpReserved) diff --git a/win32ss/user/win32csr/desktopbg.c b/win32ss/user/win32csr/desktopbg.c index 7168a11c215..90e632c708f 100644 --- a/win32ss/user/win32csr/desktopbg.c +++ b/win32ss/user/win32csr/desktopbg.c @@ -24,9 +24,9 @@ */ -#define NDEBUG - #include "w32csr.h" + +#define NDEBUG #include /*** diff --git a/win32ss/user/win32csr/desktopbg.h b/win32ss/user/win32csr/desktopbg.h index a009490bf2d..a570980c091 100644 --- a/win32ss/user/win32csr/desktopbg.h +++ b/win32ss/user/win32csr/desktopbg.h @@ -11,12 +11,6 @@ #include //#include "api.h" -/* Api functions */ -CSR_API(CsrCreateDesktop); -CSR_API(CsrShowDesktop); -CSR_API(CsrHideDesktop); -CSR_API(CsrRegisterSystemClasses); - BOOL FASTCALL DtbgIsDesktopVisible(VOID); /* EOF */ diff --git a/win32ss/user/win32csr/dllmain.c b/win32ss/user/win32csr/dllmain.c index 6e615dadace..c68b6be4fdb 100644 --- a/win32ss/user/win32csr/dllmain.c +++ b/win32ss/user/win32csr/dllmain.c @@ -7,8 +7,10 @@ */ /* INCLUDES ******************************************************************/ -#define NDEBUG + #include "w32csr.h" + +#define NDEBUG #include @@ -332,17 +334,17 @@ CSR_SERVER_DLL_INIT(Win32CsrInitialization) 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); diff --git a/win32ss/user/win32csr/exitros.c b/win32ss/user/win32csr/exitros.c index bd04f01bc93..391649c4c60 100644 --- a/win32ss/user/win32csr/exitros.c +++ b/win32ss/user/win32csr/exitros.c @@ -12,10 +12,11 @@ ***/ /* INCLUDES ******************************************************************/ -#define NDEBUG + #include "w32csr.h" #include -#include "resource.h" + +#define NDEBUG #include static HWND LogonNotifyWindow = NULL; diff --git a/win32ss/user/win32csr/harderror.c b/win32ss/user/win32csr/harderror.c index 128b16bc433..2ab585c5d2d 100644 --- a/win32ss/user/win32csr/harderror.c +++ b/win32ss/user/win32csr/harderror.c @@ -9,9 +9,11 @@ /* INCLUDES ******************************************************************/ -#define NDEBUG #include "w32csr.h" + +#define NDEBUG #include + #include #define IDTRYAGAIN 10 diff --git a/win32ss/user/win32csr/lang/bg-BG.rc b/win32ss/user/win32csr/lang/bg-BG.rc index 2166ae0d236..d0cdfe95741 100644 --- a/win32ss/user/win32csr/lang/bg-BG.rc +++ b/win32ss/user/win32csr/lang/bg-BG.rc @@ -40,25 +40,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/cs-CZ.rc b/win32ss/user/win32csr/lang/cs-CZ.rc index 283cdfe48c3..7773d68271d 100644 --- a/win32ss/user/win32csr/lang/cs-CZ.rc +++ b/win32ss/user/win32csr/lang/cs-CZ.rc @@ -39,25 +39,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravit" - IDS_MARK "Oznait" - IDS_COPY "Koprovat\tEnter" - IDS_PASTE "Vloit" - IDS_SELECTALL "Oznait ve" - IDS_SCROLL "Posunout" - IDS_FIND "Najt..." - IDS_DEFAULTS "Vchoz" - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Posunout sem" - IDS_SCROLLTOP "Posunout na zatek" - IDS_SCROLLBOTTOM "Posunout na konec" - IDS_SCROLLPAGE_UP "O strnku ve" - IDS_SCROLLPAGE_DOWN "O strnku ne" - IDS_SCROLLUP "Posunout nahoru" - IDS_SCROLLDOWN "Posunout dol" - - IDS_COMMAND_PROMPT "Pkazov dek" -END diff --git a/win32ss/user/win32csr/lang/de-DE.rc b/win32ss/user/win32csr/lang/de-DE.rc index b5084f4f0cc..779ca50009f 100644 --- a/win32ss/user/win32csr/lang/de-DE.rc +++ b/win32ss/user/win32csr/lang/de-DE.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 "Einfgen" - IDS_SELECTALL "Alles auswhlen" - 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 diff --git a/win32ss/user/win32csr/lang/el-GR.rc b/win32ss/user/win32csr/lang/el-GR.rc index 4990fb194c4..9b02f0c4fcf 100644 --- a/win32ss/user/win32csr/lang/el-GR.rc +++ b/win32ss/user/win32csr/lang/el-GR.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/en-US.rc b/win32ss/user/win32csr/lang/en-US.rc index a9bf212513a..35074c27a19 100644 --- a/win32ss/user/win32csr/lang/en-US.rc +++ b/win32ss/user/win32csr/lang/en-US.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/es-ES.rc b/win32ss/user/win32csr/lang/es-ES.rc index d24849f9c38..e0107af00e0 100644 --- a/win32ss/user/win32csr/lang/es-ES.rc +++ b/win32ss/user/win32csr/lang/es-ES.rc @@ -39,25 +39,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 pgina" - IDS_SCROLLPAGE_DOWN "Bajar pgina" - IDS_SCROLLUP "Desplazar arriba" - IDS_SCROLLDOWN "Desplazar abajo" - - IDS_COMMAND_PROMPT "Command Prompt" -END diff --git a/win32ss/user/win32csr/lang/fr-FR.rc b/win32ss/user/win32csr/lang/fr-FR.rc index 8dbe9f55a05..c2f1a062299 100644 --- a/win32ss/user/win32csr/lang/fr-FR.rc +++ b/win32ss/user/win32csr/lang/fr-FR.rc @@ -34,27 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 rellement tre amliore grce au contexte */ -STRINGTABLE -BEGIN - IDS_EDIT "diter" - IDS_MARK "Marquer" - IDS_COPY "Copier\tEntre" - IDS_PASTE "Coller" - IDS_SELECTALL "Tout slectionner" - IDS_SCROLL "Dfiler" - IDS_FIND "Trouver..." - IDS_DEFAULTS "Dfauts" - IDS_PROPERTIES "Proprits" - IDS_SCROLLHERE "Dfiler ici" - IDS_SCROLLTOP "Dfiler tout en haut" - IDS_SCROLLBOTTOM "Dfiler tout en bas" - IDS_SCROLLPAGE_UP "Page prcdente" - IDS_SCROLLPAGE_DOWN "Page suivante" - IDS_SCROLLUP "Dfiler en haut" - IDS_SCROLLDOWN "Dfiler en bas" - - IDS_COMMAND_PROMPT "Command Prompt" -END diff --git a/win32ss/user/win32csr/lang/id-ID.rc b/win32ss/user/win32csr/lang/id-ID.rc index 3df62722928..30a59ed602c 100644 --- a/win32ss/user/win32csr/lang/id-ID.rc +++ b/win32ss/user/win32csr/lang/id-ID.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/it-IT.rc b/win32ss/user/win32csr/lang/it-IT.rc index a6402c1b5e4..849e653360a 100644 --- a/win32ss/user/win32csr/lang/it-IT.rc +++ b/win32ss/user/win32csr/lang/it-IT.rc @@ -43,25 +43,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/ja-JP.rc b/win32ss/user/win32csr/lang/ja-JP.rc index fd87c2d86d1..2012542f0a2 100644 --- a/win32ss/user/win32csr/lang/ja-JP.rc +++ b/win32ss/user/win32csr/lang/ja-JP.rc @@ -34,25 +34,3 @@ FONT 9, "MS UI Gothic", 400, 0, 0x1 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 "Kl" - 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 diff --git a/win32ss/user/win32csr/lang/no-NO.rc b/win32ss/user/win32csr/lang/no-NO.rc index 684b28ddb86..8bf938808d6 100644 --- a/win32ss/user/win32csr/lang/no-NO.rc +++ b/win32ss/user/win32csr/lang/no-NO.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/pl-PL.rc b/win32ss/user/win32csr/lang/pl-PL.rc index ee4baf9419b..0ac89f7e5f9 100644 --- a/win32ss/user/win32csr/lang/pl-PL.rc +++ b/win32ss/user/win32csr/lang/pl-PL.rc @@ -42,25 +42,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/pt-BR.rc b/win32ss/user/win32csr/lang/pt-BR.rc index c2f772c3852..5d2c834f755 100644 --- a/win32ss/user/win32csr/lang/pt-BR.rc +++ b/win32ss/user/win32csr/lang/pt-BR.rc @@ -36,25 +36,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/ro-RO.rc b/win32ss/user/win32csr/lang/ro-RO.rc index e1d4213a85d..25ab05b7118 100644 --- a/win32ss/user/win32csr/lang/ro-RO.rc +++ b/win32ss/user/win32csr/lang/ro-RO.rc @@ -41,25 +41,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/ru-RU.rc b/win32ss/user/win32csr/lang/ru-RU.rc index a8acd99f5e0..e39f40146f0 100644 --- a/win32ss/user/win32csr/lang/ru-RU.rc +++ b/win32ss/user/win32csr/lang/ru-RU.rc @@ -34,25 +34,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/sk-SK.rc b/win32ss/user/win32csr/lang/sk-SK.rc index 9c009370114..9063b45a8b6 100644 --- a/win32ss/user/win32csr/lang/sk-SK.rc +++ b/win32ss/user/win32csr/lang/sk-SK.rc @@ -39,25 +39,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravi" - IDS_MARK "Oznai" - IDS_COPY "Koprova\tEnter" - IDS_PASTE "Vloi" - IDS_SELECTALL "Vybra vetko" - IDS_SCROLL "Rolova" - IDS_FIND "Njs..." //Find - IDS_DEFAULTS "Predvolen" //Defaults - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Rolova sem" - IDS_SCROLLTOP "K hornmu okraju" - IDS_SCROLLBOTTOM "K dolnmu okraju" - IDS_SCROLLPAGE_UP "O strnku vyie" - IDS_SCROLLPAGE_DOWN "O strnku niie" - IDS_SCROLLUP "Rolova nahor" - IDS_SCROLLDOWN "Rolova nadol" - - IDS_COMMAND_PROMPT "Prkazov riadok" -END diff --git a/win32ss/user/win32csr/lang/sv-SE.rc b/win32ss/user/win32csr/lang/sv-SE.rc index 2642ffbb1df..27292a57a4b 100644 --- a/win32ss/user/win32csr/lang/sv-SE.rc +++ b/win32ss/user/win32csr/lang/sv-SE.rc @@ -41,25 +41,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 "Sk..." - 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 diff --git a/win32ss/user/win32csr/lang/tr-TR.rc b/win32ss/user/win32csr/lang/tr-TR.rc index 7a52434a221..834b51c05c5 100644 --- a/win32ss/user/win32csr/lang/tr-TR.rc +++ b/win32ss/user/win32csr/lang/tr-TR.rc @@ -54,25 +54,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/uk-UA.rc b/win32ss/user/win32csr/lang/uk-UA.rc index 8b6e67bf543..7deab89e127 100644 --- a/win32ss/user/win32csr/lang/uk-UA.rc +++ b/win32ss/user/win32csr/lang/uk-UA.rc @@ -42,25 +42,3 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/zh-CN.rc b/win32ss/user/win32csr/lang/zh-CN.rc index 4c32bdd6e04..3eba3c58a37 100644 --- a/win32ss/user/win32csr/lang/zh-CN.rc +++ b/win32ss/user/win32csr/lang/zh-CN.rc @@ -34,25 +34,3 @@ FONT 9, "MS Shell Dlg", 400, 0, 0x1 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 diff --git a/win32ss/user/win32csr/lang/zh-TW.rc b/win32ss/user/win32csr/lang/zh-TW.rc index 1d24b7dda9b..cc35afb0a20 100644 --- a/win32ss/user/win32csr/lang/zh-TW.rc +++ b/win32ss/user/win32csr/lang/zh-TW.rc @@ -34,25 +34,3 @@ FONT 9, "MS Shell Dlg", 400, 0, 0x1 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 "HK" - 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 "VWu" - IDS_SCROLLDOWN "VUu" - - IDS_COMMAND_PROMPT "Command Prompt" -END diff --git a/win32ss/user/win32csr/rsrc.rc b/win32ss/user/win32csr/rsrc.rc index 71a2f171c2f..a0abb32fd99 100644 --- a/win32ss/user/win32csr/rsrc.rc +++ b/win32ss/user/win32csr/rsrc.rc @@ -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" diff --git a/win32ss/user/win32csr/w32csr.h b/win32ss/user/win32csr/w32csr.h index b0b6e513c08..5d28acf2f43 100644 --- a/win32ss/user/win32csr/w32csr.h +++ b/win32ss/user/win32csr/w32csr.h @@ -9,8 +9,9 @@ #include /* Internal CSRSS Headers */ -#include -#include +#include +//#include +//#include #include /* Public Win32K Headers */ diff --git a/win32ss/user/win32csr/win32csr.h b/win32ss/user/win32csr/win32csr.h index 887c9454897..288843e7665 100644 --- a/win32ss/user/win32csr/win32csr.h +++ b/win32ss/user/win32csr/win32csr.h @@ -27,6 +27,12 @@ typedef struct tagCSRSS_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); diff --git a/win32ss/user/winsrv/dllmain.c b/win32ss/user/winsrv/dllmain.c deleted file mode 100644 index 88fdb9b4efd..00000000000 --- a/win32ss/user/winsrv/dllmain.c +++ /dev/null @@ -1,44 +0,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 - -HANDLE DllHandle = 0; - -/* FUNCTIONS *****************************************************************/ - -BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) -{ - if (DLL_PROCESS_ATTACH == dwReason) - { - DllHandle = hDll; - } - - return TRUE; -} - -/* EOF */ diff --git a/win32ss/user/winsrv/winsrv.def b/win32ss/user/winsrv/winsrv.def deleted file mode 100644 index 90684149e7d..00000000000 --- a/win32ss/user/winsrv/winsrv.def +++ /dev/null @@ -1,6 +0,0 @@ -; $Id$ -LIBRARY winsrv.dll -EXPORTS -ConServerDllInitialization@8 -UserServerDllInitialization@8 -; EOF diff --git a/win32ss/user/winsrv/winsrv.rc b/win32ss/user/winsrv/winsrv.rc index 7d4bd05bf36..3fc72c61a54 100644 --- a/win32ss/user/winsrv/winsrv.rc +++ b/win32ss/user/winsrv/winsrv.rc @@ -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 + +#include "rsrc.rc"