Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57566: [WIDL] - Forward-declare coclasses as 'class' in C++ to fix MSVC warnings. Already applied upstream. CORE-6587 #resolve
by tfaber＠svn.reactos.org 16 Oct '12

16 Oct '12

Author: tfaber Date: Tue Oct 16 06:43:32 2012 New Revision: 57566 URL: http://svn.reactos.org/svn/reactos?rev=57566&view=rev Log: [WIDL] - Forward-declare coclasses as 'class' in C++ to fix MSVC warnings. Already applied upstream. CORE-6587 #resolve Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=57… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Tue Oct 16 06:43:32 2012 @@ -1300,7 +1300,11 @@ { fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", cocl->name); fprintf(header, "#define __%s_FWD_DEFINED__\n", cocl->name); + fprintf(header, "#ifdef __cplusplus\n"); + fprintf(header, "typedef class %s %s;\n", cocl->name, cocl->name); + fprintf(header, "#else\n"); fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); + fprintf(header, "#endif /* defined __cplusplus */\n"); fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); }

1 0

[fireball] 57565: - Update diff to trunk. - Now it all builds with consistent version (and that, in fact, fixed at least a couple of bugs).
by fireball＠svn.reactos.org 15 Oct '12

15 Oct '12

Author: fireball Date: Mon Oct 15 14:30:55 2012 New Revision: 57565 URL: http://svn.reactos.org/svn/reactos?rev=57565&view=rev Log: - Update diff to trunk. - Now it all builds with consistent version (and that, in fact, fixed at least a couple of bugs). Modified: branches/arwinss/trunk.diff Modified: branches/arwinss/trunk.diff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=57565&r1… ============================================================================== --- branches/arwinss/trunk.diff [iso-8859-1] (original) +++ branches/arwinss/trunk.diff [iso-8859-1] Mon Oct 15 14:30:55 2012 @@ -1,6 +1,6 @@ Index: base/shell/explorer/desktop/desktop.cpp =================================================================== ---- base/shell/explorer/desktop/desktop.cpp (revision 57368) +--- base/shell/explorer/desktop/desktop.cpp (revision 57501) +++ base/shell/explorer/desktop/desktop.cpp (working copy) @@ -327,8 +327,8 @@ HWND DesktopWindow::Create() @@ -15,7 +15,7 @@ int height = GetSystemMetrics(SM_CYSCREEN); Index: cmake/baseaddress.cmake =================================================================== ---- cmake/baseaddress.cmake (revision 57368) +--- cmake/baseaddress.cmake (revision 57501) +++ cmake/baseaddress.cmake (working copy) @@ -1,7 +1,7 @@ set(baseaddress_ntdll 0x77f20000) @@ -33,7 +33,7 @@ +set(baseaddress_freetypd 0x709b0000) Index: cmake/config.cmake =================================================================== ---- cmake/config.cmake (revision 57368) +--- cmake/config.cmake (revision 57501) +++ cmake/config.cmake (working copy) @@ -26,7 +26,7 @@ @@ -54,33 +54,11 @@ set(NSWPAT FALSE CACHE BOOL "Whether to compile apps/libs with features covered software patents or not. If you live in a country where software patents are valid/apply, don't -Index: cmake/gcc.cmake -=================================================================== ---- cmake/gcc.cmake (revision 57368) -+++ cmake/gcc.cmake (working copy) -@@ -171,7 +171,7 @@ - - SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") - SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") --set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I\"${REACTOS_SOURCE_DIR}/include/asm\" -I\"${REACTOS_BINARY_DIR}/include/asm\" <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") - - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") - set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ") -@@ -353,7 +353,7 @@ - - add_custom_command( - OUTPUT ${_object_file} -- COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ${_asm_file} -+ COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I\"${REACTOS_SOURCE_DIR}/include/asm\" -I\"${REACTOS_BINARY_DIR}/include/asm\" -D__ASM__ -c ${_asm_file} - DEPENDS ${_asm_file}) - - add_custom_command( Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 57368) +--- CMakeLists.txt (revision 57501) +++ CMakeLists.txt (working copy) -@@ -126,16 +126,20 @@ +@@ -126,6 +126,10 @@ add_definitions(-D_WINKD_=1) endif() @@ -91,20 +69,6 @@ if(USE_PSEH3) add_definitions(-D_USE_PSEH3=1) endif() - - # Version Options -- add_definitions(-DWINVER=0x502 -+ add_definitions(-DWINVER=0x600 - -D_WIN32_IE=0x600 -- -D_WIN32_WINNT=0x502 -- -D_WIN32_WINDOWS=0x502 -- -D_SETUPAPI_VER=0x502) -+ -D_WIN32_WINNT=0x600 -+ -D_WIN32_WINDOWS=0x600 -+ -D_SETUPAPI_VER=0x600) - - # Arch Options - if(ARCH STREQUAL "i386") @@ -245,6 +249,9 @@ add_subdirectory(ntoskrnl) add_subdirectory(subsystems) @@ -117,9 +81,9 @@ Index: drivers/filesystems/npfs/create.c =================================================================== ---- drivers/filesystems/npfs/create.c (revision 57368) +--- drivers/filesystems/npfs/create.c (revision 57501) +++ drivers/filesystems/npfs/create.c (working copy) -@@ -226,6 +226,9 @@ +@@ -227,6 +227,9 @@ } Ccb->FileObject = FileObject; @@ -131,7 +95,7 @@ FileObject->FsContext2 = Ccb; Index: include/asm/syscalls.inc =================================================================== ---- include/asm/syscalls.inc (revision 57368) +--- include/asm/syscalls.inc (revision 57501) +++ include/asm/syscalls.inc (working copy) @@ -95,6 +95,7 @@ @@ -151,9 +115,9 @@ .ENDP Index: include/psdk/winddi.h =================================================================== ---- include/psdk/winddi.h (revision 57368) +--- include/psdk/winddi.h (revision 57501) +++ include/psdk/winddi.h (working copy) -@@ -2665,7 +2665,7 @@ +@@ -2666,7 +2666,7 @@ _In_ ULONG cjSize, _Out_bytecap_(cjSize) FONTINFO *pfi); @@ -164,7 +128,7 @@ FONTOBJ_pGetGammaTables( Index: include/psdk/winuser.h =================================================================== ---- include/psdk/winuser.h (revision 57368) +--- include/psdk/winuser.h (revision 57501) +++ include/psdk/winuser.h (working copy) @@ -2818,8 +2818,8 @@ typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM); @@ -179,7 +143,7 @@ typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM); Index: include/reactos/wine/config.h =================================================================== ---- include/reactos/wine/config.h (revision 57368) +--- include/reactos/wine/config.h (revision 57501) +++ include/reactos/wine/config.h (working copy) @@ -1,3 +1,5 @@ +#include "reactos/buildno.h" @@ -189,7 +153,7 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ Index: lib/3rdparty/CMakeLists.txt =================================================================== ---- lib/3rdparty/CMakeLists.txt (revision 57368) +--- lib/3rdparty/CMakeLists.txt (revision 57501) +++ lib/3rdparty/CMakeLists.txt (working copy) @@ -3,7 +3,9 @@ add_subdirectory(bzip2) @@ -203,7 +167,7 @@ add_subdirectory(libsamplerate) Index: lib/3rdparty/freetype/CMakeLists.txt =================================================================== ---- lib/3rdparty/freetype/CMakeLists.txt (revision 57368) +--- lib/3rdparty/freetype/CMakeLists.txt (revision 57501) +++ lib/3rdparty/freetype/CMakeLists.txt (working copy) @@ -11,7 +11,9 @@ src/base/ftbbox.c @@ -217,7 +181,7 @@ src/base/ftgxval.c Index: win32ss/CMakeLists.txt =================================================================== ---- win32ss/CMakeLists.txt (revision 57368) +--- win32ss/CMakeLists.txt (revision 57501) +++ win32ss/CMakeLists.txt (working copy) @@ -10,10 +10,12 @@ add_subdirectory(gdi/diblib) @@ -242,7 +206,7 @@ \ No newline at end of file Index: win32ss/drivers/CMakeLists.txt =================================================================== ---- win32ss/drivers/CMakeLists.txt (revision 57368) +--- win32ss/drivers/CMakeLists.txt (revision 57501) +++ win32ss/drivers/CMakeLists.txt (working copy) @@ -1,5 +1,7 @@ @@ -254,7 +218,7 @@ add_subdirectory(videoprt) Index: win32ss/include/ntgdihdl.h =================================================================== ---- win32ss/include/ntgdihdl.h (revision 57368) +--- win32ss/include/ntgdihdl.h (revision 57501) +++ win32ss/include/ntgdihdl.h (working copy) @@ -270,6 +270,7 @@ DWORD dwCFCount; @@ -286,7 +250,7 @@ FLONG AttrFlags; Index: win32ss/user/win32csr/CMakeLists.txt =================================================================== ---- win32ss/user/win32csr/CMakeLists.txt (revision 57368) +--- win32ss/user/win32csr/CMakeLists.txt (revision 57501) +++ win32ss/user/win32csr/CMakeLists.txt (working copy) @@ -22,6 +22,7 @@ file.c @@ -298,7 +262,7 @@ tuiconsole.c Index: win32ss/user/win32csr/desktopbg.c =================================================================== ---- win32ss/user/win32csr/desktopbg.c (revision 57368) +--- win32ss/user/win32csr/desktopbg.c (revision 57501) +++ win32ss/user/win32csr/desktopbg.c (working copy) @@ -53,7 +53,9 @@ @@ -423,7 +387,7 @@ Index: win32ss/user/win32csr/dllmain.c =================================================================== ---- win32ss/user/win32csr/dllmain.c (revision 57368) +--- win32ss/user/win32csr/dllmain.c (revision 57501) +++ win32ss/user/win32csr/dllmain.c (working copy) @@ -16,6 +16,9 @@ extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);

1 0

[fireball] 57564: - Get rid of version redefines. It turned out the 6.0+ stuff could be easily isolated.
by fireball＠svn.reactos.org 15 Oct '12

15 Oct '12

Author: fireball Date: Mon Oct 15 14:14:28 2012 New Revision: 57564 URL: http://svn.reactos.org/svn/reactos?rev=57564&view=rev Log: - Get rid of version redefines. It turned out the 6.0+ stuff could be easily isolated. Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt branches/arwinss/arwinss/client/user32/sysparams.c Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/C… ============================================================================== --- branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] Mon Oct 15 14:14:28 2012 @@ -1,15 +1,5 @@ add_definitions(-D__WINESRC__ -D_WINE) - -remove_definitions(-DWINVER=0x502 - -D_WIN32_WINNT=0x502 - -D_WIN32_WINDOWS=0x502 - -D_SETUPAPI_VER=0x502) - -add_definitions(-DWINVER=0x0600 - -D_WIN32_WINNT=0x0600 - -D_WIN32_WINDOWS=0x600 - -D_SETUPAPI_VER=0x600) spec2def(user32.dll user32.spec ADD_IMPORTLIB) Modified: branches/arwinss/arwinss/client/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/s… ============================================================================== --- branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] Mon Oct 15 14:14:28 2012 @@ -316,7 +316,9 @@ static UINT mouse_hover_width = 4; static UINT mouse_hover_height = 4; static UINT mouse_hover_time = 400; +#if (_WIN32_WINNT >= 0x0600) static UINT mouse_scroll_chars = 3; +#endif static UINT mouse_scroll_lines = 3; static UINT menu_show_delay = 400; static UINT menu_drop_alignment = 0; @@ -2141,7 +2143,7 @@ SPI_SETMENUSHOWDELAY_VALNAME, &menu_show_delay, uiParam, fWinIni ); break; - +#if (_WIN32_WINNT >= 0x0600) case SPI_GETWHEELSCROLLCHARS: /* 108 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETMOUSESCROLLCHARS_IDX, SPI_SETMOUSESCROLLCHARS_REGKEY, @@ -2155,7 +2157,7 @@ SPI_SETMOUSESCROLLCHARS_VALNAME, &mouse_scroll_chars, uiParam, fWinIni ); break; - +#endif WINE_SPI_FIXME(SPI_GETSHOWIMEUI); /* 110 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ @@ -2331,6 +2333,7 @@ ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni ); break; +#if (_WIN32_WINNT >= 0x0600) /* _WIN32_WINNT >= 0x600 */ WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); @@ -2340,7 +2343,7 @@ WINE_SPI_FIXME(SPI_SETCLEARTYPE); WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); - +#endif case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY,

1 0

[hbelusca] 57563: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosbuild)
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 14:03:51 2012 New Revision: 57563 URL: http://svn.reactos.org/svn/reactos?rev=57563&view=rev Log: Enable widl to read .idl files when they are in another disk drive. (This enable the ReactOS' source code to be placed e.g. in C:\ros_src, and to be compiled into G:\rosbuild) Modified: branches/ros-csrss/tools/wpp/preproc.c Modified: branches/ros-csrss/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/wpp/preproc.c?r… ============================================================================== --- branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] (original) +++ branches/ros-csrss/tools/wpp/preproc.c [iso-8859-1] Sun Oct 14 14:03:51 2012 @@ -447,7 +447,12 @@ * Include management *------------------------------------------------------------------------- */ -#if defined(_Windows) || defined(__MSDOS__) +#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) || \ + defined(_WIN32) || defined(__WIN32__) || defined(__MSDOS__) ) +/* + * Windows system uses ':' as part of its path. + * Therefore use another separator character. + */ #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"

1 0

[hbelusca] 57562: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 13:53:59 2012 New Revision: 57562 URL: http://svn.reactos.org/svn/reactos?rev=57562&view=rev Log: - Use only the cmd.exe as a shell. - Deactivate compilation of the (optional) applications and of explorer(_new).exe Modified: branches/ros-csrss/base/CMakeLists.txt branches/ros-csrss/base/shell/CMakeLists.txt branches/ros-csrss/boot/bootdata/hivedef_amd64.inf branches/ros-csrss/boot/bootdata/hivedef_arm.inf branches/ros-csrss/boot/bootdata/hivedef_i386.inf branches/ros-csrss/boot/bootdata/hivesft_amd64.inf branches/ros-csrss/boot/bootdata/hivesft_arm.inf branches/ros-csrss/boot/bootdata/hivesft_i386.inf Modified: branches/ros-csrss/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/CMakeLists.txt?r… ============================================================================== --- branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,5 +1,5 @@ -add_subdirectory(applications) +#add_subdirectory(applications) add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) Modified: branches/ros-csrss/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/CMakeLists… ============================================================================== --- branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/base/shell/CMakeLists.txt [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1,7 +1,7 @@ add_subdirectory(cmd) -if(NOT MSVC) -add_subdirectory(explorer) -endif() -add_subdirectory(explorer-new) +#if(NOT MSVC) +#add_subdirectory(explorer) +#endif() +#add_subdirectory(explorer-new) Modified: branches/ros-csrss/boot/bootdata/hivedef_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_amd64.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_arm.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1453,7 +1453,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivedef… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1649,7 +1649,7 @@ ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 Modified: branches/ros-csrss/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1023,7 +1023,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -948,7 +948,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" Modified: branches/ros-csrss/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/hivesft… ============================================================================== --- branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ branches/ros-csrss/boot/bootdata/hivesft_i386.inf [iso-8859-1] Sun Oct 14 13:53:59 2012 @@ -1059,7 +1059,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"

1 0

[hbelusca] 57561: Create a branch for working on csrss and co.
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 13:04:31 2012 New Revision: 57561 URL: http://svn.reactos.org/svn/reactos?rev=57561&view=rev Log: Create a branch for working on csrss and co. Added: branches/ros-csrss/ (props changed) - copied from r57560, trunk/reactos/ Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 14 13:04:31 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 14 13:04:31 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 14 13:04:31 2012 @@ -1,0 +1,15 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/ros-csrss/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[hbelusca] 57560: This was not the good thing to copy.
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 13:02:55 2012 New Revision: 57560 URL: http://svn.reactos.org/svn/reactos?rev=57560&view=rev Log: This was not the good thing to copy. Removed: branches/ros-csrss/

1 0

[hbelusca] 57559: Create a branch for working on csrss and Co.
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 12:46:30 2012 New Revision: 57559 URL: http://svn.reactos.org/svn/reactos?rev=57559&view=rev Log: Create a branch for working on csrss and Co. Added: branches/ros-csrss/ - copied from r57558, trunk/

1 0

[hbelusca] 57558: [CSRSS] Code formatting only.
by hbelusca＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: hbelusca Date: Sun Oct 14 11:46:22 2012 New Revision: 57558 URL: http://svn.reactos.org/svn/reactos?rev=57558&view=rev Log: [CSRSS] Code formatting only. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/csrplugin.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -92,35 +92,35 @@ typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - ULONG NrCharactersToWrite; - ULONG NrCharactersWritten; - HANDLE UnpauseEvent; - BYTE Buffer[0]; + HANDLE ConsoleHandle; + BOOL Unicode; + ULONG NrCharactersToWrite; + ULONG NrCharactersWritten; + HANDLE UnpauseEvent; + BYTE Buffer[0]; } CSRSS_WRITE_CONSOLE, *PCSRSS_WRITE_CONSOLE; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - WORD NrCharactersToRead; - WORD NrCharactersRead; - HANDLE EventHandle; - PVOID Buffer; - UNICODE_STRING ExeName; - DWORD CtrlWakeupMask; - DWORD ControlKeyState; + HANDLE ConsoleHandle; + BOOL Unicode; + WORD NrCharactersToRead; + WORD NrCharactersRead; + HANDLE EventHandle; + PVOID Buffer; + UNICODE_STRING ExeName; + DWORD CtrlWakeupMask; + DWORD ControlKeyState; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct { - PCONTROLDISPATCHER CtrlDispatcher; - BOOLEAN ConsoleNeeded; - INT ShowCmd; - HANDLE Console; - HANDLE InputHandle; - HANDLE OutputHandle; + PCONTROLDISPATCHER CtrlDispatcher; + BOOLEAN ConsoleNeeded; + INT ShowCmd; + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; } CSRSS_ALLOC_CONSOLE, *PCSRSS_ALLOC_CONSOLE; typedef struct @@ -130,254 +130,254 @@ typedef struct { - HANDLE ConsoleHandle; - CONSOLE_SCREEN_BUFFER_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_SCREEN_BUFFER_INFO Info; } CSRSS_SCREEN_BUFFER_INFO, *PCSRSS_SCREEN_BUFFER_INFO; typedef struct { - HANDLE ConsoleHandle; - COORD Position; + HANDLE ConsoleHandle; + COORD Position; } CSRSS_SET_CURSOR, *PCSRSS_SET_CURSOR; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - union - { - CHAR AsciiChar; - WCHAR UnicodeChar; - } Char; - COORD Position; - WORD Length; - ULONG NrCharactersWritten; + HANDLE ConsoleHandle; + BOOL Unicode; + union + { + CHAR AsciiChar; + WCHAR UnicodeChar; + } Char; + COORD Position; + WORD Length; + ULONG NrCharactersWritten; } CSRSS_FILL_OUTPUT, *PCSRSS_FILL_OUTPUT; typedef struct { - HANDLE ConsoleHandle; - CHAR Attribute; - COORD Coord; - WORD Length; + HANDLE ConsoleHandle; + CHAR Attribute; + COORD Coord; + WORD Length; } CSRSS_FILL_OUTPUT_ATTRIB, *PCSRSS_FILL_OUTPUT_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - INPUT_RECORD Input; - BOOL MoreEvents; - HANDLE Event; + HANDLE ConsoleHandle; + BOOL Unicode; + INPUT_RECORD Input; + BOOL MoreEvents; + HANDLE Event; } CSRSS_READ_INPUT, *PCSRSS_READ_INPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - WORD Length; - COORD Coord; - COORD EndCoord; - ULONG NrCharactersWritten; - CHAR String[0]; + HANDLE ConsoleHandle; + BOOL Unicode; + WORD Length; + COORD Coord; + COORD EndCoord; + ULONG NrCharactersWritten; + CHAR String[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_CHAR, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR; typedef struct { - HANDLE ConsoleHandle; - WORD Length; - COORD Coord; - COORD EndCoord; - WORD Attribute[0]; + HANDLE ConsoleHandle; + WORD Length; + COORD Coord; + COORD EndCoord; + WORD Attribute[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - CONSOLE_CURSOR_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; } CSRSS_GET_CURSOR_INFO, *PCSRSS_GET_CURSOR_INFO; typedef struct { - HANDLE ConsoleHandle; - CONSOLE_CURSOR_INFO Info; + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; } CSRSS_SET_CURSOR_INFO, *PCSRSS_SET_CURSOR_INFO; typedef struct { - HANDLE ConsoleHandle; - WORD Attrib; + HANDLE ConsoleHandle; + WORD Attrib; } CSRSS_SET_ATTRIB, *PCSRSS_SET_ATTRIB; typedef struct { - HANDLE ConsoleHandle; - DWORD Mode; + HANDLE ConsoleHandle; + DWORD Mode; } CSRSS_SET_CONSOLE_MODE, *PCSRSS_SET_CONSOLE_MODE; typedef struct { - HANDLE ConsoleHandle; - DWORD ConsoleMode; + HANDLE ConsoleHandle; + DWORD ConsoleMode; } CSRSS_GET_CONSOLE_MODE, *PCSRSS_GET_CONSOLE_MODE; typedef struct { - DWORD Access; - DWORD ShareMode; - BOOL Inheritable; - HANDLE OutputHandle; /* handle to newly created screen buffer */ + DWORD Access; + DWORD ShareMode; + BOOL Inheritable; + HANDLE OutputHandle; /* handle to newly created screen buffer */ } CSRSS_CREATE_SCREEN_BUFFER, *PCSRSS_CREATE_SCREEN_BUFFER; typedef struct { - HANDLE OutputHandle; /* handle to screen buffer to switch to */ + HANDLE OutputHandle; /* handle to screen buffer to switch to */ } CSRSS_SET_SCREEN_BUFFER, *PCSRSS_SET_SCREEN_BUFFER; typedef struct { - HANDLE UniqueThread; - CLIENT_ID Cid; + HANDLE UniqueThread; + CLIENT_ID Cid; } CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; typedef struct { - DWORD Length; - PWCHAR Title; + DWORD Length; + PWCHAR Title; } CSRSS_SET_TITLE, *PCSRSS_SET_TITLE; typedef struct { - DWORD Length; - PWCHAR Title; + DWORD Length; + PWCHAR Title; } CSRSS_GET_TITLE, *PCSRSS_GET_TITLE; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - COORD BufferSize; - COORD BufferCoord; - SMALL_RECT WriteRegion; - CHAR_INFO* CharInfo; + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT WriteRegion; + CHAR_INFO* CharInfo; } CSRSS_WRITE_CONSOLE_OUTPUT, *PCSRSS_WRITE_CONSOLE_OUTPUT; typedef struct { - HANDLE ConsoleInput; + HANDLE ConsoleInput; } CSRSS_FLUSH_INPUT_BUFFER, *PCSRSS_FLUSH_INPUT_BUFFER; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - SMALL_RECT ScrollRectangle; - BOOLEAN UseClipRectangle; - SMALL_RECT ClipRectangle; - COORD DestinationOrigin; - CHAR_INFO Fill; + HANDLE ConsoleHandle; + BOOL Unicode; + SMALL_RECT ScrollRectangle; + BOOLEAN UseClipRectangle; + SMALL_RECT ClipRectangle; + COORD DestinationOrigin; + CHAR_INFO Fill; } CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD NumCharsToRead; - COORD ReadCoord; - COORD EndCoord; - DWORD CharsRead; - CHAR String[0]; -}CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; - -typedef struct -{ - HANDLE ConsoleHandle; - DWORD NumAttrsToRead; - COORD ReadCoord; - COORD EndCoord; - WORD Attribute[0]; -}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; - -typedef struct -{ - HANDLE ConsoleHandle; - DWORD NumInputEvents; -}CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; - -typedef struct -{ - HANDLE ProcessId; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD NumCharsToRead; + COORD ReadCoord; + COORD EndCoord; + DWORD CharsRead; + CHAR String[0]; +} CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumAttrsToRead; + COORD ReadCoord; + COORD EndCoord; + WORD Attribute[0]; +} CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumInputEvents; +} CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; + +typedef struct +{ + HANDLE ProcessId; } CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; typedef struct { - UINT Flags; - DWORD Reserved; + UINT Flags; + DWORD Reserved; } CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; typedef struct { - DWORD Level; - DWORD Flags; + DWORD Level; + DWORD Flags; } CSRSS_SET_SHUTDOWN_PARAMETERS, *PCSRSS_SET_SHUTDOWN_PARAMETERS; typedef struct { - DWORD Level; - DWORD Flags; + DWORD Level; + DWORD Flags; } CSRSS_GET_SHUTDOWN_PARAMETERS, *PCSRSS_GET_SHUTDOWN_PARAMETERS; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD Length; - INPUT_RECORD* InputRecord; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; } CSRSS_PEEK_CONSOLE_INPUT, *PCSRSS_PEEK_CONSOLE_INPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - COORD BufferSize; - COORD BufferCoord; - SMALL_RECT ReadRegion; - CHAR_INFO* CharInfo; + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT ReadRegion; + CHAR_INFO* CharInfo; } CSRSS_READ_CONSOLE_OUTPUT, *PCSRSS_READ_CONSOLE_OUTPUT; typedef struct { - HANDLE ConsoleHandle; - BOOL Unicode; - DWORD Length; - INPUT_RECORD* InputRecord; + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; } CSRSS_WRITE_CONSOLE_INPUT, *PCSRSS_WRITE_CONSOLE_INPUT; typedef struct { - DWORD Access; - BOOL Inheritable; - HANDLE Handle; - DWORD ShareMode; + DWORD Access; + BOOL Inheritable; + HANDLE Handle; + DWORD ShareMode; } CSRSS_GET_INPUT_HANDLE, *PCSRSS_GET_INPUT_HANDLE, CSRSS_GET_OUTPUT_HANDLE, *PCSRSS_GET_OUTPUT_HANDLE; typedef struct { - HANDLE Handle; + HANDLE Handle; } CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE; typedef struct { - HANDLE Handle; + HANDLE Handle; } CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE; typedef struct { - HANDLE Handle; - DWORD Access; - BOOL Inheritable; - DWORD Options; + HANDLE Handle; + DWORD Access; + BOOL Inheritable; + DWORD Options; } CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE; #define CONSOLE_HARDWARE_STATE_GET 0 @@ -388,72 +388,72 @@ typedef struct { - HANDLE ConsoleHandle; - DWORD SetGet; /* 0=get; 1=set */ - DWORD State; + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; } CSRSS_SETGET_CONSOLE_HW_STATE, *PCSRSS_SETGET_CONSOLE_HW_STATE; typedef struct { - HWND WindowHandle; + HWND WindowHandle; } CSRSS_GET_CONSOLE_WINDOW, *PCSRSS_GET_CONSOLE_WINDOW; typedef struct { - HICON WindowIcon; + HICON WindowIcon; } CSRSS_SET_CONSOLE_ICON, *PCSRSS_SET_CONSOLE_ICON; typedef struct { - HDESK DesktopHandle; + HDESK DesktopHandle; } CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP; typedef struct { - HWND DesktopWindow; - ULONG Width; - ULONG Height; + HWND DesktopWindow; + ULONG Width; + ULONG Height; } CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP; typedef struct { - HWND DesktopWindow; + HWND DesktopWindow; } CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP; typedef struct { - HWND LogonNotifyWindow; + HWND LogonNotifyWindow; } CSRSS_SET_LOGON_NOTIFY_WINDOW, *PCSRSS_SET_LOGON_NOTIFY_WINDOW; typedef struct { - HANDLE ProcessId; - BOOL Register; + HANDLE ProcessId; + BOOL Register; } CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_GET_CONSOLE_CP, *PCSRSS_GET_CONSOLE_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_SET_CONSOLE_CP, *PCSRSS_SET_CONSOLE_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_GET_CONSOLE_OUTPUT_CP, *PCSRSS_GET_CONSOLE_OUTPUT_CP; typedef struct { - UINT CodePage; + UINT CodePage; } CSRSS_SET_CONSOLE_OUTPUT_CP, *PCSRSS_SET_CONSOLE_OUTPUT_CP; typedef struct { - HANDLE InputWaitHandle; + HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; typedef struct @@ -474,58 +474,58 @@ typedef struct { - LPWSTR lpExeName; - DWORD BytesWritten; - DWORD AliasBufferLength; - LPWSTR AliasBuffer; + LPWSTR lpExeName; + DWORD BytesWritten; + DWORD AliasBufferLength; + LPWSTR AliasBuffer; } CSRSS_GET_ALL_CONSOLE_ALIASES, *PCSRSS_GET_ALL_CONSOLE_ALIAS; typedef struct { - LPWSTR lpExeName; - DWORD Length; + LPWSTR lpExeName; + DWORD Length; } CSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH, *PCSRSS_GET_ALL_CONSOLE_ALIASES_LENGTH; typedef struct { - DWORD BytesWritten; - DWORD Length; - LPWSTR ExeNames; -} CSRSS_GET_CONSOLE_ALIASES_EXES, *PCSRSS_GET_CONSOLE_ALIASES_EXES; - -typedef struct -{ - DWORD Length; + DWORD BytesWritten; + DWORD Length; + LPWSTR ExeNames; +} CSRSS_GET_CONSOLE_ALIASES_EXES, *PCSRSS_GET_CONSOLE_ALIASES_EXES; + +typedef struct +{ + DWORD Length; } CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH; typedef struct { - DWORD Event; - DWORD ProcessGroup; + DWORD Event; + DWORD ProcessGroup; } CSRSS_GENERATE_CTRL_EVENT, *PCSRSS_GENERATE_CTRL_EVENT; typedef struct { - HANDLE OutputHandle; - COORD Size; + HANDLE OutputHandle; + COORD Size; } CSRSS_SET_SCREEN_BUFFER_SIZE, *PCSRSS_SET_SCREEN_BUFFER_SIZE; typedef struct { - CONSOLE_SELECTION_INFO Info; + CONSOLE_SELECTION_INFO Info; } CSRSS_GET_CONSOLE_SELECTION_INFO, *PCSRSS_GET_CONSOLE_SELECTION_INFO; typedef struct { - UNICODE_STRING ExeName; - DWORD Length; + UNICODE_STRING ExeName; + DWORD Length; } CSRSS_GET_COMMAND_HISTORY_LENGTH, *PCSRSS_GET_COMMAND_HISTORY_LENGTH; typedef struct { - UNICODE_STRING ExeName; - PWCHAR History; - DWORD Length; + UNICODE_STRING ExeName; + PWCHAR History; + DWORD Length; } CSRSS_GET_COMMAND_HISTORY, *PCSRSS_GET_COMMAND_HISTORY; typedef struct @@ -535,21 +535,21 @@ typedef struct { - UNICODE_STRING ExeName; - DWORD NumCommands; + UNICODE_STRING ExeName; + DWORD NumCommands; } CSRSS_SET_HISTORY_NUMBER_COMMANDS, *PCSRSS_SET_HISTORY_NUMBER_COMMANDS; typedef struct { - DWORD HistoryBufferSize; - DWORD NumberOfHistoryBuffers; - DWORD dwFlags; + DWORD HistoryBufferSize; + DWORD NumberOfHistoryBuffers; + DWORD dwFlags; } CSRSS_GET_HISTORY_INFO, *PCSRSS_GET_HISTORY_INFO, CSRSS_SET_HISTORY_INFO, *PCSRSS_SET_HISTORY_INFO;; typedef struct { - UINT UniqueID; + UINT UniqueID; } CSRSS_GET_TEMP_FILE, *PCSRSS_GET_TEMP_FILE; typedef struct Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -36,9 +36,9 @@ typedef enum _CSR_THREAD_FLAGS { - CsrThreadAltertable = 0x1, - CsrThreadInTermination = 0x2, - CsrThreadTerminated = 0x4, + CsrThreadAltertable = 0x1, + CsrThreadInTermination = 0x2, + CsrThreadTerminated = 0x4, CsrThreadIsServerThread = 0x10 } CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; @@ -52,7 +52,7 @@ typedef enum _CSR_SHUTDOWN_FLAGS { CsrShutdownSystem = 4, - CsrShutdownOther = 8 + CsrShutdownOther = 8 } CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; typedef enum _CSR_DEBUG_FLAGS @@ -63,21 +63,21 @@ typedef enum _CSR_PROCESS_FLAGS { - CsrProcessTerminating = 0x1, - CsrProcessSkipShutdown = 0x2, - CsrProcessNormalPriority = 0x10, - CsrProcessIdlePriority = 0x20, - CsrProcessHighPriority = 0x40, - CsrProcessRealtimePriority = 0x80, - CsrProcessCreateNewGroup = 0x100, - CsrProcessTerminated = 0x200, + CsrProcessTerminating = 0x1, + CsrProcessSkipShutdown = 0x2, + CsrProcessNormalPriority = 0x10, + CsrProcessIdlePriority = 0x20, + CsrProcessHighPriority = 0x40, + CsrProcessRealtimePriority = 0x80, + CsrProcessCreateNewGroup = 0x100, + CsrProcessTerminated = 0x200, CsrProcessLastThreadTerminated = 0x400, - CsrProcessIsConsoleApp = 0x800 + CsrProcessIsConsoleApp = 0x800 } CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; #define CsrProcessPriorityFlags (CsrProcessNormalPriority | \ - CsrProcessIdlePriority | \ - CsrProcessHighPriority | \ + CsrProcessIdlePriority | \ + CsrProcessHighPriority | \ CsrProcessRealtimePriority) typedef struct _CSRSS_CON_PROCESS_DATA @@ -240,9 +240,9 @@ typedef struct _CSRSS_API_DEFINITION { - ULONG Type; - ULONG MinRequestSize; - CSRSS_API_PROC Handler; + ULONG Type; + ULONG MinRequestSize; + CSRSS_API_PROC Handler; } CSRSS_API_DEFINITION, *PCSRSS_API_DEFINITION; #define CSRSS_DEFINE_API(Func, Handler) \ @@ -255,9 +255,9 @@ PCSRSS_API_DEFINITION *ApiDefinitions; } CSRSS_LISTEN_DATA, *PCSRSS_LISTEN_DATA; -#define CSR_API(n) NTSTATUS WINAPI n (\ -PCSR_PROCESS ProcessData,\ -PCSR_API_MESSAGE Request) +#define CSR_API(n) NTSTATUS WINAPI n ( \ + PCSR_PROCESS ProcessData, \ + PCSR_API_MESSAGE Request) /* init.c */ extern HANDLE hBootstrapOk; Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Sun Oct 14 11:46:22 2012 @@ -21,17 +21,17 @@ #include "api.h" typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context); + PVOID Context); typedef struct tagCSRSS_EXPORTED_FUNCS { - CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; + CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS; typedef BOOL (WINAPI *CSRPLUGIN_INIT_COMPLETE_PROC)(void); typedef VOID (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG HardErrorMessage); + IN PHARDERROR_MSG HardErrorMessage); typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_INHERIT_PROC)(IN PCSR_PROCESS SourceProcessData, IN PCSR_PROCESS TargetProcessData); @@ -40,13 +40,13 @@ typedef struct tagCSRSS_SERVER_PROCS { - CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; - CSRPLUGIN_HARDERROR_PROC HardErrorProc; - CSRPLUGIN_PROCESS_INHERIT_PROC ProcessInheritProc; - CSRPLUGIN_PROCESS_DELETED_PROC ProcessDeletedProc; + CSRPLUGIN_INIT_COMPLETE_PROC InitCompleteProc; + CSRPLUGIN_HARDERROR_PROC HardErrorProc; + CSRPLUGIN_PROCESS_INHERIT_PROC ProcessInheritProc; + CSRPLUGIN_PROCESS_DELETED_PROC ProcessDeletedProc; } CSRPLUGIN_SERVER_PROCS, *PCSRPLUGIN_SERVER_PROCS; typedef BOOL (WINAPI *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions, - PCSRPLUGIN_SERVER_PROCS ServerProcs); + PCSRPLUGIN_SERVER_PROCS ServerProcs); /* EOF */

1 0

[ekohl] 57557: [LSASRV] LsapLookupIsolatedNames: Add a domain entry to the referenced domain list for an unknown/unidentified domain. Its SID is the SID of the account minus the last sub-authority ...
by ekohl＠svn.reactos.org 14 Oct '12

14 Oct '12

Author: ekohl Date: Sun Oct 14 10:20:59 2012 New Revision: 57557 URL: http://svn.reactos.org/svn/reactos?rev=57557&view=rev Log: [LSASRV] LsapLookupIsolatedNames: Add a domain entry to the referenced domain list for an unknown/unidentified domain. Its SID is the SID of the account minus the last sub-authority and its name is an empty string. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sun Oct 14 10:20:59 2012 @@ -921,7 +921,7 @@ DstSid = MIDL_user_allocate(DstSidSize); if (DstSid == NULL) - return FALSE; + return NULL; RtlInitializeSid(DstSid, RtlIdentifierAuthoritySid(SrcSid), @@ -938,6 +938,40 @@ *q = RelativeId; return DstSid; +} + + +static PSID +CreateDomainSidFromAccountSid(PSID AccountSid) +{ + UCHAR RidCount; + PSID DomainSid; + ULONG i; + ULONG DstSidSize; + PULONG p, q; + + RidCount = *RtlSubAuthorityCountSid(AccountSid); + if (RidCount > 0) + RidCount--; + + DstSidSize = RtlLengthRequiredSid(RidCount); + + DomainSid = MIDL_user_allocate(DstSidSize); + if (DomainSid == NULL) + return NULL; + + RtlInitializeSid(DomainSid, + RtlIdentifierAuthoritySid(AccountSid), + RidCount); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(AccountSid, i); + q = RtlSubAuthoritySid(DomainSid, i); + *q = *p; + } + + return DomainSid; } @@ -950,7 +984,9 @@ PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, PULONG Mapped) { + UNICODE_STRING EmptyDomainName = RTL_CONSTANT_STRING(L""); PWELL_KNOWN_SID ptr, ptr2; + PSID DomainSid; ULONG DomainIndex; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -964,6 +1000,8 @@ /* Ignore fully qualified account names */ if (DomainNames[i].Length != 0) continue; + + TRACE("Mapping name: %wZ\n", &AccountNames[i]); /* Look-up all well-known names */ ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); @@ -999,6 +1037,31 @@ SidsBuffer[i].DomainIndex = DomainIndex; } + else + { + DomainSid = CreateDomainSidFromAccountSid(ptr->Sid); + if (DomainSid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &EmptyDomainName, + DomainSid, + &DomainIndex); + + if (DomainSid != NULL) + { + MIDL_user_free(DomainSid); + DomainSid = NULL; + } + + if (!NT_SUCCESS(Status)) + goto done; + + SidsBuffer[i].DomainIndex = DomainIndex; + } } (*Mapped)++; @@ -1054,6 +1117,7 @@ } done: + return Status; } @@ -1428,7 +1492,6 @@ return Status; } - NTSTATUS @@ -1514,7 +1577,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1529,7 +1595,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedBuiltinNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1544,7 +1613,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupIsolatedAccountNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1560,7 +1632,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupBuiltinNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done; @@ -1575,7 +1650,10 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED && Status != STATUS_SOME_NOT_MAPPED) - goto done; + { + TRACE("LsapLookupAccountNames failed! (Status %lx)\n", Status); + goto done; + } if (Mapped == Count) goto done;

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