Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57607: [libjpeg] - fix build
by jgardou＠svn.reactos.org 24 Oct '12

24 Oct '12

Author: jgardou Date: Wed Oct 24 21:49:09 2012 New Revision: 57607 URL: http://svn.reactos.org/svn/reactos?rev=57607&view=rev Log: [libjpeg] - fix build Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:49:09 2012 @@ -3,7 +3,8 @@ -DWIN32 -D_WINDOWS -D_MBCS - -DJPEG_DLL) + -DJPEG_DLL + -Dmain=mainptr) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg

1 0

[jgardou] 57606: [DLLs] - Don't set entrypoint to 0 for those which don't provide DllMain
by jgardou＠svn.reactos.org 24 Oct '12

24 Oct '12

Author: jgardou Date: Wed Oct 24 21:44:47 2012 New Revision: 57606 URL: http://svn.reactos.org/svn/reactos?rev=57606&view=rev Log: [DLLs] - Don't set entrypoint to 0 for those which don't provide DllMain Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -3,8 +3,7 @@ -DWIN32 -D_WINDOWS -D_MBCS - -DJPEG_DLL - -Dmain=mainptr) + -DJPEG_DLL) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg @@ -58,7 +57,6 @@ jmemmgr.c jmemnobs.c) -set_entrypoint(libjpeg 0) add_importlibs(libjpeg msvcrt kernel32) add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeL… ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -26,7 +26,6 @@ pngwtran.c pngwutil.c) -set_entrypoint(libpng 0) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32 ntdll) add_dependencies(libpng psdk) Modified: trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -50,7 +50,7 @@ tif_write.c tif_zip.c) -set_module_type(libtiff win32dll ENTRYPOINT 0) +set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_dependencies(libtiff psdk) Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Wed Oct 24 21:44:47 2012 @@ -33,7 +33,7 @@ xsltlocale.c xsltutils.c) -set_module_type(libxslt win32dll ENTRYPOINT 0) +set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2) add_importlibs(libxslt msvcrt ws2_32 kernel32)

1 0

[hbelusca] 57605: [CSRSRV/BASESRV/CONSRV/WIN32CSR/WINSRV] - Fix resource files strings, headers, delete unuseful files... Nothing interesting. - Add winsrv to build.
by hbelusca＠svn.reactos.org 24 Oct '12

24 Oct '12

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

1 0

[janderwald] 57604: [USBHUB] - Implement IOCTL_USB_GET_NODE_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME
by janderwald＠svn.reactos.org 24 Oct '12

24 Oct '12

Author: janderwald Date: Wed Oct 24 15:40:46 2012 New Revision: 57604 URL: http://svn.reactos.org/svn/reactos?rev=57604&view=rev Log: [USBHUB] - Implement IOCTL_USB_GET_NODE_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Wed Oct 24 15:40:46 2012 @@ -1133,7 +1133,7 @@ ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; UNICODE_STRING DeviceName; - ULONG ConfigDescSize, DeviceDescSize; + ULONG ConfigDescSize, DeviceDescSize, DeviceInfoSize; PVOID HubInterfaceBusContext; USB_CONFIGURATION_DESCRIPTOR ConfigDesc; @@ -1312,6 +1312,14 @@ DPRINT1("USBHUB: GetUsbDeviceDescriptor failed with status %x\n", Status); goto Cleanup; } + + // query device details + Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext, + UsbChildExtension->UsbDeviceHandle, + &UsbChildExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &DeviceInfoSize); + //DumpFullConfigurationDescriptor(UsbChildExtension->FullConfigDesc); @@ -2047,8 +2055,164 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdoHandleDeviceControl\n"); - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_NODE_INFORMATION NodeInformation; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_NODE_CONNECTION_INFORMATION NodeConnectionInfo; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME NodeKey; + ULONG Index, Length; + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) + { + // is the buffer big enough + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get buffer + NodeInformation = (PUSB_NODE_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity check + ASSERT(NodeInformation); + + // init buffer + NodeInformation->NodeType = UsbHub; + RtlCopyMemory(&NodeInformation->u.HubInformation.HubDescriptor, &HubDeviceExtension->HubDescriptor, sizeof(USB_HUB_DESCRIPTOR)); + + // FIXME is hub powered + NodeInformation->u.HubInformation.HubIsBusPowered = TRUE; + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + + + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_INFORMATION) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeConnectionInfo = (PUSB_NODE_CONNECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeConnectionInfo); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeConnectionInfo->ConnectionIndex) + continue; + + // init node connection info + RtlCopyMemory(&NodeConnectionInfo->DeviceDescriptor, &ChildDeviceExtension->DeviceDesc, sizeof(USB_DEVICE_DESCRIPTOR)); + NodeConnectionInfo->CurrentConfigurationValue = ChildDeviceExtension->FullConfigDesc->bConfigurationValue; + NodeConnectionInfo->DeviceIsHub = FALSE; //FIXME support hubs + NodeConnectionInfo->LowSpeed = ChildDeviceExtension->DeviceInformation.DeviceSpeed == UsbLowSpeed; + NodeConnectionInfo->DeviceAddress = ChildDeviceExtension->DeviceInformation.DeviceAddress; + NodeConnectionInfo->NumberOfOpenPipes = ChildDeviceExtension->DeviceInformation.NumberOfOpenPipes; + NodeConnectionInfo->ConnectionStatus = DeviceConnected; //FIXME + + if (NodeConnectionInfo->NumberOfOpenPipes) + { + DPRINT1("Need to copy pipe information\n"); + } + break; + } + + // done + Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); + Status = STATUS_SUCCESS; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USB_NODE_CONNECTION_INFORMATION)) + { + // buffer too small + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + // get node connection info + NodeKey = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // sanity checks + ASSERT(NodeKey); + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) + continue; + + // get child device extension + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + if (ChildDeviceExtension->PortNumber != NodeKey->ConnectionIndex) + continue; + + // get driver key + Status = IoGetDeviceProperty(HubDeviceExtension->ChildDeviceObject[Index], DevicePropertyDriverKeyName, + IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME), + NodeKey->DriverKeyName, + &Length); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // normalize status + Status = STATUS_SUCCESS; + } + + if (Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + // terminate node key name + NodeKey->DriverKeyName[0] = 0; + Irp->IoStatus.Information = sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + else + { + // result size + Irp->IoStatus.Information = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + } + + // length of driver name + NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); + break; + } + } + } + else + { + DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + } + + // finish irp + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Wed Oct 24 15:40:46 2012 @@ -68,6 +68,7 @@ PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; + USB_DEVICE_INFORMATION_0 DeviceInformation; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION

1 0

[janderwald] 57603: [MOUHID] - Report absolute mouse in Flags MOUSE_INPUT_DATA member [HIDPARSER] - Fix data conversion when extracting unscaled data from reports - Fixes VBOX absolute pointing dev...
by janderwald＠svn.reactos.org 24 Oct '12

24 Oct '12

Author: janderwald Date: Wed Oct 24 09:37:08 2012 New Revision: 57603 URL: http://svn.reactos.org/svn/reactos?rev=57603&view=rev Log: [MOUHID] - Report absolute mouse in Flags MOUSE_INPUT_DATA member [HIDPARSER] - Fix data conversion when extracting unscaled data from reports - Fixes VBOX absolute pointing device - Tested with VBOX 4.1.22 - #Core-6553 #resolve Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Oct 24 09:37:08 2012 @@ -92,7 +92,8 @@ VOID MouHid_GetButtonFlags( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, - OUT PUSHORT ButtonFlags) + OUT PUSHORT ButtonFlags, + OUT PUSHORT Flags) { NTSTATUS Status; USAGE Usage; @@ -102,6 +103,7 @@ /* init flags */ *ButtonFlags = 0; + *Flags = 0; /* get usages */ CurrentUsageListLength = DeviceExtension->UsageListLength; @@ -170,7 +172,7 @@ if (DeviceExtension->MouseAbsolute) { // mouse operates absolute - *ButtonFlags |= MOUSE_MOVE_ABSOLUTE; + *Flags |= MOUSE_MOVE_ABSOLUTE; } } @@ -212,6 +214,7 @@ NTSTATUS Status; LONG LastX, LastY; MOUSE_INPUT_DATA MouseInputData; + USHORT Flags; /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; @@ -239,13 +242,14 @@ MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags, &Flags); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); /* init input data */ MouseInputData.ButtonFlags = ButtonFlags; + MouseInputData.Flags = Flags; MouseInputData.LastX = LastX; MouseInputData.LastY = LastY; Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Wed Oct 24 09:37:08 2012 @@ -630,11 +630,10 @@ ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); // - // one extra shift for skipping the prepended report id - // - Data = 0; - Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset +1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); - //Data = ReportDescriptor[ReportItem->ByteOffset + 1]; + // FIXME: support items with variable bitlength + // + ASSERT(ReportItem->BitCount == 16); + Data = (ReportDescriptor[ReportItem->ByteOffset +1] & 0xFF) | (ReportDescriptor[ReportItem->ByteOffset +2] & 0xFF) << 8; // // shift data

1 0

[hbelusca] 57602: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and temporary acti...
by hbelusca＠svn.reactos.org 23 Oct '12

23 Oct '12

Author: hbelusca Date: Tue Oct 23 22:31:36 2012 New Revision: 57602 URL: http://svn.reactos.org/svn/reactos?rev=57602&view=rev Log: [CONSRV] - Add consrv to compilation. It compiles now \o/ - Convert the used console-csrss structures to the new ones. [CSR] - Continue to move some structures, and temporary activate a symbol. [WIN32CSR] - Clean a header. Added: branches/ros-csrss/win32ss/user/consrv/resource.h - copied unchanged from r57599, branches/ros-csrss/win32ss/user/win32csr/resource.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/subsystems/win32/csrsrv/srv.h branches/ros-csrss/win32ss/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/CMakeLists.tx… Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…

1 0

[ekohl] 57601: [ADVAPI32] - Use LookupAccountNameW to retrieve the account SID when a user tries to log-on to a computer. - Little clean-up of LogonUserW. This is the first step to get rid of hard-...
by ekohl＠svn.reactos.org 23 Oct '12

23 Oct '12

Author: ekohl Date: Tue Oct 23 21:59:43 2012 New Revision: 57601 URL: http://svn.reactos.org/svn/reactos?rev=57601&view=rev Log: [ADVAPI32] - Use LookupAccountNameW to retrieve the account SID when a user tries to log-on to a computer. - Little clean-up of LogonUserW. This is the first step to get rid of hard-coded logon stuff. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Tue Oct 23 21:59:43 2012 @@ -310,53 +310,72 @@ GetUserSid(LPCWSTR UserName, PSID *Sid) { - PSID AccountDomainSid = NULL; - ULONG ulUserRid; - DWORD dwLength; - HKEY hNamesKey = NULL; - BOOL bResult = TRUE; - - if (!GetAccountDomainSid(&AccountDomainSid)) - { - return FALSE; - } - - /* Open the Users\Names key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account\\Users\\Names", - 0, - KEY_READ, - &hNamesKey)) - { - ERR("Failed to open Users\\Names key! (Error %lu)\n", GetLastError()); - bResult = FALSE; + PSID SidBuffer = NULL; + PWSTR DomainBuffer = NULL; + DWORD cbSidSize = 0; + DWORD cchDomSize = 0; + SID_NAME_USE Use; + BOOL res = TRUE; + + *Sid = NULL; + + LookupAccountNameW(NULL, + UserName, + NULL, + &cbSidSize, + NULL, + &cchDomSize, + &Use); + + if (cbSidSize == 0 || cchDomSize == 0) + return FALSE; + + SidBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cbSidSize); + if (SidBuffer == NULL) + return FALSE; + + DomainBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cchDomSize * sizeof(WCHAR)); + if (DomainBuffer == NULL) + { + res = FALSE; goto done; } - /* Read the user RID */ - dwLength = sizeof(ULONG); - if (RegQueryValueExW(hNamesKey, - UserName, - NULL, - NULL, - (LPBYTE)&ulUserRid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %ld)\n", GetLastError()); - bResult = FALSE; + if (!LookupAccountNameW(NULL, + UserName, + SidBuffer, + &cbSidSize, + DomainBuffer, + &cchDomSize, + &Use)) + { + res = FALSE; goto done; } - *Sid = AppendRidToSid(AccountDomainSid, ulUserRid); + if (Use != SidTypeUser) + { + res = FALSE; + goto done; + } + + *Sid = SidBuffer; done: - if (hNamesKey != NULL) - RegCloseKey(hNamesKey); - - if (AccountDomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); - - return bResult; + if (DomainBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainBuffer); + + if (res == FALSE) + { + if (SidBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, SidBuffer); + } + + return res; } @@ -593,8 +612,8 @@ TOKEN_USER TokenUser; TOKEN_OWNER TokenOwner; TOKEN_PRIMARY_GROUP TokenPrimaryGroup; - PTOKEN_GROUPS TokenGroups; - PTOKEN_PRIVILEGES TokenPrivileges; + PTOKEN_GROUPS TokenGroups = NULL; + PTOKEN_PRIVILEGES TokenPrivileges = NULL; TOKEN_DEFAULT_DACL TokenDefaultDacl; LARGE_INTEGER ExpirationTime; LUID AuthenticationId; @@ -603,10 +622,10 @@ PSID PrimaryGroupSid = NULL; PSID OwnerSid = NULL; PSID LocalSystemSid; - PACL Dacl; - NTSTATUS Status; + PACL Dacl = NULL; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; unsigned i; + NTSTATUS Status = STATUS_SUCCESS; Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Qos.ImpersonationLevel = SecurityAnonymous; @@ -641,11 +660,10 @@ /* Allocate and initialize token groups */ TokenGroups = AllocateGroupSids(&PrimaryGroupSid, &OwnerSid); - if (NULL == TokenGroups) - { - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenGroups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } /* Allocate and initialize token privileges */ @@ -653,12 +671,10 @@ sizeof(TOKEN_PRIVILEGES) + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0]) * sizeof(LUID_AND_ATTRIBUTES)); - if (NULL == TokenPrivileges) - { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + if (TokenPrivileges == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } TokenPrivileges->PrivilegeCount = 0; @@ -683,21 +699,13 @@ Dacl = RtlAllocateHeap(GetProcessHeap(), 0, 1024); if (Dacl == NULL) { - FreeGroupSids(TokenGroups); - RtlFreeSid(UserSid); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; } Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION); if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); - return FALSE; - } + goto done; RtlAddAccessAllowedAce(Dacl, ACL_REVISION, @@ -754,10 +762,18 @@ &TokenDefaultDacl, &TokenSource); - RtlFreeHeap(GetProcessHeap(), 0, Dacl); - FreeGroupSids(TokenGroups); - RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); - RtlFreeSid(UserSid); +done: + if (Dacl != NULL) + RtlFreeHeap(GetProcessHeap(), 0, Dacl); + + if (TokenGroups != NULL) + FreeGroupSids(TokenGroups); + + if (TokenPrivileges != NULL) + RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges); + + if (UserSid != NULL) + RtlFreeHeap(GetProcessHeap(), 0, UserSid); return NT_SUCCESS(Status); }

1 0

[hbelusca] 57600: Synchronize with trunk's revision r57599.
by hbelusca＠svn.reactos.org 23 Oct '12

23 Oct '12

Author: hbelusca Date: Tue Oct 23 19:54:03 2012 New Revision: 57600 URL: http://svn.reactos.org/svn/reactos?rev=57600&view=rev Log: Synchronize with trunk's revision r57599. Added: branches/ros-csrss/dll/win32/lsasrv/lookup.c - copied unchanged from r57599, trunk/reactos/dll/win32/lsasrv/lookup.c Removed: branches/ros-csrss/dll/win32/lsasrv/sids.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/boot/bootdata/hivesys_amd64.inf branches/ros-csrss/boot/bootdata/hivesys_arm.inf branches/ros-csrss/boot/bootdata/hivesys_i386.inf branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/samlib/samlib.c branches/ros-csrss/dll/win32/samlib/samlib.spec branches/ros-csrss/dll/win32/shell32/iconcache.cpp branches/ros-csrss/drivers/hid/hidparse/ (props changed) branches/ros-csrss/drivers/hid/hidparse/hidparse.c branches/ros-csrss/drivers/hid/mouhid/mouhid.c branches/ros-csrss/drivers/hid/mouhid/mouhid.h branches/ros-csrss/drivers/usb/usbd/usbd.c branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbhub/pdo.c branches/ros-csrss/drivers/usb/usbhub/usbhub.h branches/ros-csrss/drivers/usb/usbstor/fdo.c branches/ros-csrss/drivers/usb/usbstor/pdo.c branches/ros-csrss/drivers/usb/usbstor/usbstor.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/include/reactos/wine/unicode.h branches/ros-csrss/lib/drivers/hidparser/api.c branches/ros-csrss/lib/drivers/hidparser/hidparser.c branches/ros-csrss/lib/drivers/hidparser/hidparser.h branches/ros-csrss/lib/drivers/hidparser/parser.h branches/ros-csrss/ntoskrnl/include/internal/po.h branches/ros-csrss/ntoskrnl/io/iomgr/device.c branches/ros-csrss/ntoskrnl/po/povolume.c branches/ros-csrss/tools/widl/header.c branches/ros-csrss/win32ss/gdi/eng/engbrush.c branches/ros-csrss/win32ss/gdi/eng/xlateobj.c branches/ros-csrss/win32ss/gdi/ntgdi/bitblt.c branches/ros-csrss/win32ss/gdi/ntgdi/brush.h branches/ros-csrss/win32ss/gdi/ntgdi/dclife.c branches/ros-csrss/win32ss/gdi/ntgdi/dcobjs.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… Modified: branches/ros-csrss/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… Modified: branches/ros-csrss/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesys… Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMak… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Removed: branches/ros-csrss/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/sids… Modified: branches/ros-csrss/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samlib/saml… Modified: branches/ros-csrss/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samlib/saml… Modified: branches/ros-csrss/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/ico… Modified: branches/ros-csrss/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidparse/… Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mo… Modified: branches/ros-csrss/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/mouhid/mo… Modified: branches/ros-csrss/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbd/usbd… Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… Modified: branches/ros-csrss/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/pd… Modified: branches/ros-csrss/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/us… Modified: branches/ros-csrss/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/f… Modified: branches/ros-csrss/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/p… Modified: branches/ros-csrss/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbstor/u… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/wine/… Modified: branches/ros-csrss/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… Modified: branches/ros-csrss/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… Modified: branches/ros-csrss/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… Modified: branches/ros-csrss/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/hidparser… Modified: branches/ros-csrss/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/include/inte… Modified: branches/ros-csrss/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/iomgr/dev… Modified: branches/ros-csrss/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/po/povolume.… Modified: branches/ros-csrss/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/header.c?r… Modified: branches/ros-csrss/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/engbr… Modified: branches/ros-csrss/win32ss/gdi/eng/xlateobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/xlate… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/bit… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/bru… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dcl… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dco… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c…

1 0

[janderwald] 57599: [NTOSKRNL] - Unregister dope (device object power extension) from volume list when device object is deleted - Core-6691 #resolve
by janderwald＠svn.reactos.org 23 Oct '12

23 Oct '12

Author: janderwald Date: Tue Oct 23 05:42:17 2012 New Revision: 57599 URL: http://svn.reactos.org/svn/reactos?rev=57599&view=rev Log: [NTOSKRNL] - Unregister dope (device object power extension) from volume list when device object is deleted - Core-6691 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/po/povolume.c Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Tue Oct 23 05:42:17 2012 @@ -285,6 +285,11 @@ IN PDEVICE_OBJECT DeviceObject ); +VOID +NTAPI +PoRemoveVolumeDevice( + IN PDEVICE_OBJECT DeviceObject); + // // Power State routines // Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Oct 23 05:42:17 2012 @@ -1035,6 +1035,9 @@ /* Set the pending delete flag */ IoGetDevObjExtension(DeviceObject)->ExtensionFlags |= DOE_DELETE_PENDING; + /* Unlink with the power manager */ + if (DeviceObject->Vpb) PoRemoveVolumeDevice(DeviceObject); + /* Check if the device object can be unloaded */ if (!DeviceObject->ReferenceCount) IopUnloadDevice(DeviceObject); } Modified: trunk/reactos/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Tue Oct 23 05:42:17 2012 @@ -97,7 +97,52 @@ KeReleaseGuardedMutex(&PopVolumeLock); } } - + +VOID +NTAPI +PoRemoveVolumeDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT_POWER_EXTENSION Dope; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + KIRQL OldIrql; + PAGED_CODE(); + + /* If the device already has the dope, return it */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + if (!DeviceExtension->Dope) + { + /* no dope */ + return; + } + + /* Make sure we can flush safely */ + KeAcquireGuardedMutex(&PopVolumeLock); + + /* Get dope from device */ + Dope = (PDEVICE_OBJECT_POWER_EXTENSION)DeviceExtension->Dope; + + if (Dope->Volume.Flink) + { + /* Remove from volume from list */ + RemoveEntryList(&Dope->Volume); + } + + /* Allow flushes to go through */ + KeReleaseGuardedMutex(&PopVolumeLock); + + /* Now remove dope from device object */ + KeAcquireSpinLock(&PopDopeGlobalLock, &OldIrql); + + /* remove from dev obj */ + DeviceExtension->Dope = NULL; + + /* Release lock */ + KeReleaseSpinLock(&PopDopeGlobalLock, OldIrql); + + /* Free dope */ + ExFreePoolWithTag(Dope, 'Dope'); +} + VOID NTAPI PopFlushVolumeWorker(IN PVOID Context)

1 0

[janderwald] 57598: [USBD] - Don't assert on invalid usb descriptor - Core-6574
by janderwald＠svn.reactos.org 23 Oct '12

23 Oct '12

Author: janderwald Date: Tue Oct 23 04:54:37 2012 New Revision: 57598 URL: http://svn.reactos.org/svn/reactos?rev=57598&view=rev Log: [USBD] - Don't assert on invalid usb descriptor - Core-6574 Modified: trunk/reactos/drivers/usb/usbd/usbd.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Tue Oct 23 04:54:37 2012 @@ -474,8 +474,11 @@ return CommonDescriptor; } - /* sanity check */ - ASSERT(CommonDescriptor->bLength); + if (CommonDescriptor->bLength == 0) + { + /* invalid usb descriptor */ + return NULL; + } /* move to next descriptor */ CommonDescriptor = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)CommonDescriptor + CommonDescriptor->bLength);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs