Author: hbelusca Date: Wed Oct 24 21:37:22 2012 New Revision: 57605
URL: http://svn.reactos.org/svn/reactos?rev=57605&view=rev Log: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build.
Removed: branches/ros-csrss/win32ss/user/winsrv/dllmain.c branches/ros-csrss/win32ss/user/winsrv/winsrv.def Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.c branches/ros-csrss/win32ss/user/win32csr/desktopbg.h branches/ros-csrss/win32ss/user/win32csr/dllmain.c branches/ros-csrss/win32ss/user/win32csr/exitros.c branches/ros-csrss/win32ss/user/win32csr/harderror.c branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc branches/ros-csrss/win32ss/user/win32csr/rsrc.rc branches/ros-csrss/win32ss/user/win32csr/w32csr.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h branches/ros-csrss/win32ss/user/winsrv/winsrv.rc
Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesrv... ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/basesrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS BASE API Server DLL\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Base API Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "basesrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "basesrv.dll\0" #include <reactos/version.rc>
Modified: branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsr... ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/csrsrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include <reactos/version.rc>
Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.txt... ============================================================================== --- branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -15,6 +15,7 @@ add_subdirectory(user/consrv) add_subdirectory(user/user32) add_subdirectory(user/win32csr) +add_subdirectory(user/winsrv)
spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/in... ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -328,12 +328,16 @@
CSR_SERVER_DLL_INIT(ConServerDllInitialization) { - // NTSTATUS Status = STATUS_SUCCESS; - /* + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("BASSRV: %s(%ld,...) called\n", __FUNCTION__, ArgumentCount);
- BaseApiPort = CsrQueryApiPort (); + // Get the listening port from csrsrv.dll + BaseApiPort = CsrQueryApiPort(); + if (BaseApiPort == NULL) return STATUS_UNSUCCESSFUL; + + // Register our message dispatcher Status = CsrAddStaticServerThread(ConsoleStaticServerThread); if (NT_SUCCESS(Status)) { @@ -366,7 +370,7 @@ }
BOOL -NTAPI +WINAPI DllMain(IN HANDLE hDll, IN DWORD dwReason, IN LPVOID lpReserved)
Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -24,9 +24,9 @@
*/
+#include "w32csr.h" + #define NDEBUG - -#include "w32csr.h" #include <debug.h>
/***
Modified: branches/ros-csrss/win32ss/user/win32csr/desktopbg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/desktopbg.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -11,12 +11,6 @@ #include <csr/csrsrv.h> //#include "api.h"
-/* Api functions */ -CSR_API(CsrCreateDesktop); -CSR_API(CsrShowDesktop); -CSR_API(CsrHideDesktop); -CSR_API(CsrRegisterSystemClasses); - BOOL FASTCALL DtbgIsDesktopVisible(VOID);
/* EOF */
Modified: branches/ros-csrss/win32ss/user/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/dllmain.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -7,8 +7,10 @@ */
/* INCLUDES ******************************************************************/ + +#include "w32csr.h" + #define NDEBUG -#include "w32csr.h" #include <debug.h>
@@ -332,17 +334,17 @@ PrivateCsrssManualGuiCheck(0);
/* Setup the DLL Object */ - LoadedServerDll->ApiBase = BASESRV_FIRST_API_NUMBER; - LoadedServerDll->HighestApiSupported = BasepMaxApiNumber; + LoadedServerDll->ApiBase = USERSRV_FIRST_API_NUMBER; + LoadedServerDll->HighestApiSupported = UserpMaxApiNumber; LoadedServerDll->DispatchTable = Win32CsrApiDefinitions; - // LoadedServerDll->ValidTable = BaseServerApiServerValidTable; - // LoadedServerDll->NameTable = BaseServerApiNameTable; + // LoadedServerDll->ValidTable = Win32CsrApiServerValidTable; + // LoadedServerDll->NameTable = Win32CsrApiNameTable; // LoadedServerDll->SizeOfProcessData = 0; // LoadedServerDll->ConnectCallback = NULL; // LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = Win32CsrHardError; - LoadedServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; - LoadedServerDll->DisconnectCallback = Win32CsrReleaseConsole; + LoadedServerDll->NewProcessCallback = NULL; + LoadedServerDll->DisconnectCallback = NULL;
/* Start Raw Input Threads */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId);
Modified: branches/ros-csrss/win32ss/user/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/exitros.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -12,10 +12,11 @@ ***/
/* INCLUDES ******************************************************************/ -#define NDEBUG + #include "w32csr.h" #include <sddl.h> -#include "resource.h" + +#define NDEBUG #include <debug.h>
static HWND LogonNotifyWindow = NULL;
Modified: branches/ros-csrss/win32ss/user/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/harderror.c [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -9,9 +9,11 @@
/* INCLUDES ******************************************************************/
+#include "w32csr.h" + #define NDEBUG -#include "w32csr.h" #include <debug.h> + #include <strsafe.h>
#define IDTRYAGAIN 10
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/bg-BG.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -40,25 +40,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Îáðàáîòêà" - IDS_MARK "Îòáåëÿçâàíå" - IDS_COPY "Çàïîìíÿíå\tEnter" - IDS_PASTE "Ïîñòàâÿíå" - IDS_SELECTALL "Èçáîð íà âñè÷êî" - IDS_SCROLL "Ïðåëèñòâàíå" - IDS_FIND "Òúðñåíå..." - IDS_DEFAULTS "Ïîäðàçáèðàíè" - IDS_PROPERTIES "Ñâîéñòâà" - IDS_SCROLLHERE "Ïðåëèñòâàíå òóê" - IDS_SCROLLTOP "Ïðåëèñòâàíå äî ãîðå" - IDS_SCROLLBOTTOM "Ïðåëèñòâàíå äî äîëó" - IDS_SCROLLPAGE_UP "Ãîðíà ñòðàíèöà" - IDS_SCROLLPAGE_DOWN "Äîëíà ñòðàíèöà" - IDS_SCROLLUP "Ïðåëèñòâàíå íàãîðå" - IDS_SCROLLDOWN "Ïðåëèñòâàíå íàäîëó" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/cs-CZ.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravit" - IDS_MARK "Oznaèit" - IDS_COPY "Kopírovat\tEnter" - IDS_PASTE "Vloit" - IDS_SELECTALL "Oznaèit ve" - IDS_SCROLL "Posunout" - IDS_FIND "Najít..." - IDS_DEFAULTS "Výchozí" - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Posunout sem" - IDS_SCROLLTOP "Posunout na zaèátek" - IDS_SCROLLBOTTOM "Posunout na konec" - IDS_SCROLLPAGE_UP "O stránku výe" - IDS_SCROLLPAGE_DOWN "O stránku níe" - IDS_SCROLLUP "Posunout nahoru" - IDS_SCROLLDOWN "Posunout dolù" - - IDS_COMMAND_PROMPT "Pøíkazový øádek" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/de-DE.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Bearbeiten" - IDS_MARK "Markieren" - IDS_COPY "Kopieren\tEnter" - IDS_PASTE "Einfügen" - IDS_SELECTALL "Alles auswählen" - IDS_SCROLL "Scrollen" - IDS_FIND "Suchen..." - IDS_DEFAULTS "Standardwerte" - IDS_PROPERTIES "Eigenschaften" - IDS_SCROLLHERE "Hier scrollen" - IDS_SCROLLTOP "Ganz nach oben scrollen" - IDS_SCROLLBOTTOM "Ganz nach unten scrollen" - IDS_SCROLLPAGE_UP "Seite nach oben" - IDS_SCROLLPAGE_DOWN "Seite nach unten" - IDS_SCROLLUP "Nach oben scrollen" - IDS_SCROLLDOWN "Nach unten scrollen" - - IDS_COMMAND_PROMPT "Eingabeaufforderung" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/el-GR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Åðåîåñãáóßá" - IDS_MARK "ÌáñêÜñéóìá" - IDS_COPY "ÁíôéãñáöÞ\tEnter" - IDS_PASTE "Åðéêüëëçóç" - IDS_SELECTALL "ÅðéëïãÞ üëùí" - IDS_SCROLL "Êýëéóç" - IDS_FIND "Åýñåóç..." - IDS_DEFAULTS "ÐñïåðéëïãÞ" - IDS_PROPERTIES "Éäéüôçôåò" - IDS_SCROLLHERE "Êýëéóç åäþ" - IDS_SCROLLTOP "Áñ÷Þ" - IDS_SCROLLBOTTOM "ÔÝëïò" - IDS_SCROLLPAGE_UP "Ðñïçãïýìåíç óåëßäá" - IDS_SCROLLPAGE_DOWN "Åðüìåíç óåëßäá" - IDS_SCROLLUP "Êýëéóç ðÜíù" - IDS_SCROLLDOWN "Êýëéóç êÜôù" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/en-US.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edit" - IDS_MARK "Mark" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Select All" - IDS_SCROLL "Scroll" - IDS_FIND "Find..." - IDS_DEFAULTS "Defaults" - IDS_PROPERTIES "Properties" - IDS_SCROLLHERE "Scroll here" - IDS_SCROLLTOP "Scroll top" - IDS_SCROLLBOTTOM "Scroll bottom" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/es-ES.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tIntroducir" - IDS_PASTE "Pegar" - IDS_SELECTALL "Seleccionar Todo" - IDS_SCROLL "Desplazar" - IDS_FIND "Buscar..." - IDS_DEFAULTS "Por defecto" - IDS_PROPERTIES "Propiedades" - IDS_SCROLLHERE "Desplazar aquí" - IDS_SCROLLTOP "Desplazar hasta arriba" - IDS_SCROLLBOTTOM "Desplazar hasta abajo" - IDS_SCROLLPAGE_UP "Subir página" - IDS_SCROLLPAGE_DOWN "Bajar página" - IDS_SCROLLUP "Desplazar arriba" - IDS_SCROLLDOWN "Desplazar abajo" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/fr-FR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,27 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -/* Fixme : Translation could be really improved, with context - La traduction pourrait réellement être améliorée grâce au contexte */ -STRINGTABLE -BEGIN - IDS_EDIT "Éditer" - IDS_MARK "Marquer" - IDS_COPY "Copier\tEntrée" - IDS_PASTE "Coller" - IDS_SELECTALL "Tout sélectionner" - IDS_SCROLL "Défiler" - IDS_FIND "Trouver..." - IDS_DEFAULTS "Défauts" - IDS_PROPERTIES "Propriétés" - IDS_SCROLLHERE "Défiler ici" - IDS_SCROLLTOP "Défiler tout en haut" - IDS_SCROLLBOTTOM "Défiler tout en bas" - IDS_SCROLLPAGE_UP "Page précédente" - IDS_SCROLLPAGE_DOWN "Page suivante" - IDS_SCROLLUP "Défiler en haut" - IDS_SCROLLDOWN "Défiler en bas" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/id-ID.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edit" - IDS_MARK "Tandai" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Pilih Semua" - IDS_SCROLL "Gulung" - IDS_FIND "Cari..." - IDS_DEFAULTS "Standar" - IDS_PROPERTIES "Properti" - IDS_SCROLLHERE "Gulung ke Sini" - IDS_SCROLLTOP "Gulung ke Atas" - IDS_SCROLLBOTTOM "Gulung ke Bawah" - IDS_SCROLLPAGE_UP "Halaman Naik" - IDS_SCROLLPAGE_DOWN "Halaman Turun" - IDS_SCROLLUP "Gulung Naik" - IDS_SCROLLDOWN "Gulung Turun" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/it-IT.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -43,25 +43,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Modifica" - IDS_MARK "Seleziona" - IDS_COPY "Copia\tInvio" - IDS_PASTE "Incolla" - IDS_SELECTALL "Seleziona tutto" - IDS_SCROLL "Scorri" - IDS_FIND "Trova..." - IDS_DEFAULTS "Impostazioni predefinite" - IDS_PROPERTIES "Proprietà" - IDS_SCROLLHERE "Scorri qui" - IDS_SCROLLTOP "Scorri in cima" - IDS_SCROLLBOTTOM "Scorri in fondo" - IDS_SCROLLPAGE_UP "Pagina sù" - IDS_SCROLLPAGE_DOWN "Pagina giù" - IDS_SCROLLUP "Scorri sù" - IDS_SCROLLDOWN "Scorri giù" - - IDS_COMMAND_PROMPT "Prompt dei commandi" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ja-JP.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "ÒW" - IDS_MARK "ÍÍwè" - IDS_COPY "Rs[\tEnter" - IDS_PASTE "\èt¯" - IDS_SELECTALL "·×ÄIð" - IDS_SCROLL "XN[" - IDS_FIND "õ..." - IDS_DEFAULTS "Kèl" - IDS_PROPERTIES "vpeB" - IDS_SCROLLHERE "±±ÉXN[" - IDS_SCROLLTOP "êÔãÉXN[" - IDS_SCROLLBOTTOM "êÔºÉXN[" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "ãÉXN[" - IDS_SCROLLDOWN "ºÉXN[" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/no-NO.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Rediger" - IDS_MARK "Merk" - IDS_COPY "Kopier\tEnter" - IDS_PASTE "Lim inn" - IDS_SELECTALL "Velg alt" - IDS_SCROLL "Rull" - IDS_FIND "Finn..." - IDS_DEFAULTS "Standard" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Rull her" - IDS_SCROLLTOP "Rull til toppen" - IDS_SCROLLBOTTOM "Rull knapp" - IDS_SCROLLPAGE_UP "Side opp" - IDS_SCROLLPAGE_DOWN "Side ned" - IDS_SCROLLUP "Rull opp" - IDS_SCROLLDOWN "Rull ned" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/pl-PL.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -42,25 +42,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Edytuj" - IDS_MARK "Zaznacz" - IDS_COPY "Kopiuj\tWejdź" - IDS_PASTE "Wklej" - IDS_SELECTALL "Zaznacz wszystko" - IDS_SCROLL "PrzewiÅ" - IDS_FIND "Znajdź..." - IDS_DEFAULTS "Ustawienia domyÅlne" - IDS_PROPERTIES "WÅaÅciwoÅci" - IDS_SCROLLHERE "PrzewiÅ tutaj" - IDS_SCROLLTOP "PrzewiÅ na poczÄ tek" - IDS_SCROLLBOTTOM "PrzewiÅ na koniec" - IDS_SCROLLPAGE_UP "Poprzednia strona" - IDS_SCROLLPAGE_DOWN "NastÄpna strona" - IDS_SCROLLUP "PrzewiÅ do góry" - IDS_SCROLLDOWN "PrzewiÅ na dóÅ" - - IDS_COMMAND_PROMPT "Wiersz polecenia" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/pt-BR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -36,25 +36,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editar" - IDS_MARK "Marcar" - IDS_COPY "Copiar\tEnter" - IDS_PASTE "Colar" - IDS_SELECTALL "Selecionar Tudo" - IDS_SCROLL "Rolar" - IDS_FIND "Procurar..." - IDS_DEFAULTS "Padrões" - IDS_PROPERTIES "Propriedades" - IDS_SCROLLHERE "Rolar aqui" - IDS_SCROLLTOP "Rolar até o topo" - IDS_SCROLLBOTTOM "Rolar até o fim" - IDS_SCROLLPAGE_UP "Page up" - IDS_SCROLLPAGE_DOWN "Page down" - IDS_SCROLLUP "Scroll up" - IDS_SCROLLDOWN "Scroll down" - - IDS_COMMAND_PROMPT "Prompt de Comando" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ro-RO.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -41,25 +41,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Editare" - IDS_MARK "MarcheazÄ" - IDS_COPY "CopiazÄ\tEnter" - IDS_PASTE "LipeÈte" - IDS_SELECTALL "SelecteazÄ tot" - IDS_SCROLL "DeruleazÄ" - IDS_FIND "GÄsireâ¦" - IDS_DEFAULTS "Implicite" - IDS_PROPERTIES "ProprietÄÈi" - IDS_SCROLLHERE "DeruleazÄ aici" - IDS_SCROLLTOP "DeruleazÄ la început" - IDS_SCROLLBOTTOM "DeruleazÄ la sfârÈit" - IDS_SCROLLPAGE_UP "Pagina anterioarÄ" - IDS_SCROLLPAGE_DOWN "Pagina urmÄtoare" - IDS_SCROLLUP "DeruleazÄ Ã®n sus" - IDS_SCROLLDOWN "DeruleazÄ Ã®n jos" - - IDS_COMMAND_PROMPT "Linie de comandÄ" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/ru-RU.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "ÐзмениÑÑ" - IDS_MARK "ÐомеÑиÑÑ" - IDS_COPY "ÐопиÑоваÑÑ\tEnter" - IDS_PASTE "ÐÑÑавиÑÑ" - IDS_SELECTALL "ÐÑделиÑÑ Ð²Ñе" - IDS_SCROLL "ÐÑокÑÑÑиÑÑ" - IDS_FIND "ÐÑкаÑÑ..." - IDS_DEFAULTS "УмолÑаниÑ" - IDS_PROPERTIES "СвойÑÑва" - IDS_SCROLLHERE "Scroll Here" - IDS_SCROLLTOP "Scroll Top" - IDS_SCROLLBOTTOM "ÐÑокÑÑÑиÑÑ Ð²Ð½Ð¸Ð·" - IDS_SCROLLPAGE_UP "ÐвеÑÑ ÑÑÑаниÑÑ" - IDS_SCROLLPAGE_DOWN "Ðниз ÑÑÑаниÑÑ" - IDS_SCROLLUP "ÐÑокÑÑÑиÑÑ Ð²Ð²ÐµÑÑ " - IDS_SCROLLDOWN "Scroll Down" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/sk-SK.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -39,25 +39,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Upravi" - IDS_MARK "Oznaèi" - IDS_COPY "Kopírova\tEnter" - IDS_PASTE "Vloi" - IDS_SELECTALL "Vybra vetko" - IDS_SCROLL "Rolova" - IDS_FIND "Nájs..." //Find - IDS_DEFAULTS "Predvolené" //Defaults - IDS_PROPERTIES "Vlastnosti" - IDS_SCROLLHERE "Rolova sem" - IDS_SCROLLTOP "K hornému okraju" - IDS_SCROLLBOTTOM "K dolnému okraju" - IDS_SCROLLPAGE_UP "O stránku vyie" - IDS_SCROLLPAGE_DOWN "O stránku niie" - IDS_SCROLLUP "Rolova nahor" - IDS_SCROLLDOWN "Rolova nadol" - - IDS_COMMAND_PROMPT "Príkazový riadok" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/sv-SE.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -41,25 +41,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Redigera" - IDS_MARK "Markera" - IDS_COPY "Kopiera\tEnter" - IDS_PASTE "Klistra in" - IDS_SELECTALL "Markera Allt" - IDS_SCROLL "Skrolla" - IDS_FIND "Sök..." - IDS_DEFAULTS "Ursprunglig" - IDS_PROPERTIES "Egenskaper" - IDS_SCROLLHERE "Skrolla hit" - IDS_SCROLLTOP "Skrolla till topp" - IDS_SCROLLBOTTOM "Skrolla till botten" - IDS_SCROLLPAGE_UP "Sida upp" - IDS_SCROLLPAGE_DOWN "Sida ner" - IDS_SCROLLUP "Skrolla upp" - IDS_SCROLLDOWN "Skrolla ner" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/tr-TR.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -54,25 +54,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "Düzenle" - IDS_MARK "İÅaretle" - IDS_COPY "Kopyala\tEnter" - IDS_PASTE "YapıÅtır" - IDS_SELECTALL "Tümünü Seç" - IDS_SCROLL "Yuvarla" - IDS_FIND "Bul..." - IDS_DEFAULTS "Varsayılanlar" - IDS_PROPERTIES "Ãzellikler" - IDS_SCROLLHERE "Buraya yuvarla" - IDS_SCROLLTOP "Ãste yuvarla" - IDS_SCROLLBOTTOM "Alta yuvarla" - IDS_SCROLLPAGE_UP "Sayfa yukarı" - IDS_SCROLLPAGE_DOWN "Sayfa aÅaÄı" - IDS_SCROLLUP "Yukarı yuvarla" - IDS_SCROLLDOWN "AÅaÄı yuvarla" - - IDS_COMMAND_PROMPT "Komut İstemi" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/uk-UA.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -42,25 +42,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "РедагÑваÑи" - IDS_MARK "ÐидÑлиÑи" - IDS_COPY "ÐопÑÑваÑи\tEnter" - IDS_PASTE "ÐÑÑавиÑи" - IDS_SELECTALL "ÐидÑлиÑи вÑе" - IDS_SCROLL "ÐÑокÑÑÑиÑи" - IDS_FIND "ÐнайÑи..." - IDS_DEFAULTS "ÐамовÑÑваннÑ" - IDS_PROPERTIES "ÐлаÑÑивоÑÑÑ" - IDS_SCROLLHERE "ÐÑокÑÑÑиÑи ÑÑди" - IDS_SCROLLTOP "ÐÑокÑÑÑиÑи на поÑаÑок" - IDS_SCROLLBOTTOM "ÐÑокÑÑÑиÑи на кÑнеÑÑ" - IDS_SCROLLPAGE_UP "ÐопеÑÐµÐ´Ð½Ñ ÑоÑÑÑнка" - IDS_SCROLLPAGE_DOWN "ÐаÑÑÑпна ÑÑоÑÑнка" - IDS_SCROLLUP "ÐÑокÑÑÑиÑи догоÑи" - IDS_SCROLLDOWN "ÐÑокÑÑÑиÑи донизÑ" - - IDS_COMMAND_PROMPT "Ðомандний ÑÑдок" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/zh-CN.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "±à¼" - IDS_MARK "±ê¼Ç" - IDS_COPY "¸´ÖÆ\tEnter" - IDS_PASTE "ð¤Ìù" - IDS_SELECTALL "È«²¿Ñ¡Ôñ" - IDS_SCROLL "¹ö¶¯" - IDS_FIND "²éÕÒ..." - IDS_DEFAULTS "ĬÈÏ" - IDS_PROPERTIES "ÊôÐÔ" - IDS_SCROLLHERE "¹ö¶¯µ½´Ë" - IDS_SCROLLTOP "¹ö¶¯ÖÁ¶¥¶Ë" - IDS_SCROLLBOTTOM "¹ö¶¯ÖÁÄ©¶Ë" - IDS_SCROLLPAGE_UP "ÉÏÒ»Ò³" - IDS_SCROLLPAGE_DOWN "ÏÂÒ»Ò³" - IDS_SCROLLUP "ÏòÉϹö¶¯" - IDS_SCROLLDOWN "ÏòϹö¶¯" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/lang/zh-TW.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -34,25 +34,3 @@ BEGIN LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE END - -STRINGTABLE -BEGIN - IDS_EDIT "½s¿è" - IDS_MARK "¼Ð°O" - IDS_COPY "½Æ»s\tEnter" - IDS_PASTE "ÂH¶K" - IDS_SELECTALL "¥þ³¡¿ï¾Ü" - IDS_SCROLL "ºu°Ê" - IDS_FIND "´M§ä..." - IDS_DEFAULTS "¹w³]" - IDS_PROPERTIES "ÄÝ©Ê" - IDS_SCROLLHERE "ºu°Ê¨ì¦¹ " - IDS_SCROLLTOP "ºu°Ê¨ì³»¸m" - IDS_SCROLLBOTTOM "ºu°Ê¨ì¥½ºÝ" - IDS_SCROLLPAGE_UP "¤W¤@¶" - IDS_SCROLLPAGE_DOWN "¤U¤@¶" - IDS_SCROLLUP "¦V¤Wºu°Ê" - IDS_SCROLLDOWN "¦V¤Uºu°Ê" - - IDS_COMMAND_PROMPT "Command Prompt" -END
Modified: branches/ros-csrss/win32ss/user/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/rsrc.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/rsrc.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -2,8 +2,6 @@ #include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 ICON DISCARDABLE res/terminal.ico
#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc"
Modified: branches/ros-csrss/win32ss/user/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/w32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/w32csr.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -9,8 +9,9 @@ #include <winlogon.h>
/* Internal CSRSS Headers */ -#include <conio.h> -#include <csrplugin.h> +#include <win/winmsg.h> +//#include <conio.h> +//#include <csrplugin.h> #include <desktopbg.h>
/* Public Win32K Headers */
Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr/... ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -27,6 +27,12 @@ NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context);
+/* desktopbg.c */ +CSR_API(CsrCreateDesktop); +CSR_API(CsrShowDesktop); +CSR_API(CsrHideDesktop); +// CSR_API(CsrRegisterSystemClasses); + /* exitros.c */ /// Must go to winsrv.dll CSR_API(CsrExitReactos);
Removed: branches/ros-csrss/win32ss/user/winsrv/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/dl... ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/dllmain.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/dllmain.c (removed) @@ -1,44 +1,0 @@ -/* $Id$ - * - * dllmain.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- - */ -#include "winsrv.h" - -#define NDEBUG -#include <debug.h> - -HANDLE DllHandle = 0; - -/* FUNCTIONS *****************************************************************/ - -BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) -{ - if (DLL_PROCESS_ATTACH == dwReason) - { - DllHandle = hDll; - } - - return TRUE; -} - -/* EOF */
Removed: branches/ros-csrss/win32ss/user/winsrv/winsrv.def URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/wi... ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.def [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.def (removed) @@ -1,6 +1,0 @@ -; $Id$ -LIBRARY winsrv.dll -EXPORTS -ConServerDllInitialization@8 -UserServerDllInitialization@8 -; EOF
Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/wi... ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.rc [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.rc [iso-8859-1] Wed Oct 24 21:37:22 2012 @@ -1,4 +1,7 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 console+user usermode server\0" +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Server DLL\0" #define REACTOS_STR_INTERNAL_NAME "winsrv\0" -#define REACTOS_STR_ORIGINAL_FILENAME "winsrv.exe\0" +#define REACTOS_STR_ORIGINAL_FILENAME "winsrv.dll\0" #include <reactos/version.rc> + +#include "rsrc.rc"