Author: fireball
Date: Mon Dec 14 12:14:01 2015
New Revision: 70346
URL: http://svn.reactos.org/svn/reactos?rev=70346&view=rev
Log:
[ARWINSS]
- Reduce patch to trunk by 1Kb by removing unnecessary debug prints and other
misc stuff.
Modified:
branches/arwinss/trunk.diff
Modified: branches/arwinss/trunk.diff
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/trunk.diff?rev=70346&r1=70345&r2=70346&view=diff
==============================================================================
--- branches/arwinss/trunk.diff [iso-8859-1] (original)
+++ branches/arwinss/trunk.diff [iso-8859-1] Mon Dec 14 12:14:01 2015
@@ -1,6 +1,6 @@
Index: base/system/winlogon/winlogon.c
===================================================================
---- base/system/winlogon/winlogon.c (revision 70340)
+--- base/system/winlogon/winlogon.c (revision 70342)
+++ base/system/winlogon/winlogon.c (working copy)
@@ -397,7 +397,7 @@
HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT);
@@ -13,7 +13,7 @@
#if 0
Index: cmake/baseaddress.cmake
===================================================================
---- cmake/baseaddress.cmake (revision 70340)
+--- cmake/baseaddress.cmake (revision 70342)
+++ cmake/baseaddress.cmake (working copy)
@@ -2,9 +2,9 @@
set(baseaddress_kernel32 0x7c750000)
@@ -30,7 +30,7 @@
set(baseaddress_iphlpapi 0x7c2b0000)
Index: cmake/config.cmake
===================================================================
---- cmake/config.cmake (revision 70340)
+--- cmake/config.cmake (revision 70342)
+++ cmake/config.cmake (working copy)
@@ -58,6 +58,9 @@
"Whether to compile support for ELF files.
@@ -44,7 +44,7 @@
If you live in a country where software patents are valid/apply, don't
Index: CMakeLists.txt
===================================================================
---- CMakeLists.txt (revision 70340)
+--- CMakeLists.txt (revision 70342)
+++ CMakeLists.txt (working copy)
@@ -165,6 +165,10 @@
add_definitions(-D_WINKD_=1)
@@ -67,22 +67,9 @@
# Create the registry hives
create_registry_hives()
-Index: dll/win32/kernel32/client/dllmain.c
-===================================================================
---- dll/win32/kernel32/client/dllmain.c (revision 70340)
-+++ dll/win32/kernel32/client/dllmain.c (working copy)
-@@ -131,7 +131,7 @@
- SessionId,
- WIN_OBJ_DIR);
- }
--
-+DPRINT1("About to connect to CSR!\n");
- /* Connect to the Base Server */
- Status = CsrClientConnectToServer(SessionDir,
- BASESRV_SERVERDLL_INDEX,
Index: dll/win32/msgina/gui.c
===================================================================
---- dll/win32/msgina/gui.c (revision 70340)
+--- dll/win32/msgina/gui.c (revision 70342)
+++ dll/win32/msgina/gui.c (working copy)
@@ -73,6 +73,7 @@
@@ -113,7 +100,7 @@
/*
Index: include/asm/syscalls.inc
===================================================================
---- include/asm/syscalls.inc (revision 70340)
+--- include/asm/syscalls.inc (revision 70342)
+++ include/asm/syscalls.inc (working copy)
@@ -1,4 +1,4 @@
-
@@ -325,7 +312,7 @@
-#endif
Index: include/psdk/winddi.h
===================================================================
---- include/psdk/winddi.h (revision 70340)
+--- include/psdk/winddi.h (revision 70342)
+++ include/psdk/winddi.h (working copy)
@@ -2911,7 +2911,7 @@
_In_ ULONG cjSize,
@@ -338,7 +325,7 @@
APIENTRY
Index: include/reactos/wine/config.h
===================================================================
---- include/reactos/wine/config.h (revision 70340)
+--- include/reactos/wine/config.h (revision 70342)
+++ include/reactos/wine/config.h (working copy)
@@ -1,3 +1,5 @@
+#include "reactos/buildno.h"
@@ -348,7 +335,7 @@
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
Index: lib/3rdparty/CMakeLists.txt
===================================================================
---- lib/3rdparty/CMakeLists.txt (revision 70340)
+--- lib/3rdparty/CMakeLists.txt (revision 70342)
+++ lib/3rdparty/CMakeLists.txt (working copy)
@@ -2,7 +2,9 @@
add_subdirectory(adns)
@@ -360,22 +347,9 @@
add_subdirectory(fullfat)
add_subdirectory(libmpg123)
add_subdirectory(libsamplerate)
-Index: subsystems/win32/csrsrv/init.c
-===================================================================
---- subsystems/win32/csrsrv/init.c (revision 70340)
-+++ subsystems/win32/csrsrv/init.c (working copy)
-@@ -20,7 +20,7 @@
- /* DATA
***********************************************************************/
-
- // Debug Flag
--ULONG CsrDebug = 0; // 0xFFFFFFFF;
-+ULONG CsrDebug = 0xFFFFFFFF;
-
- HANDLE CsrHeap = NULL;
- HANDLE CsrObjectDirectory = NULL;
Index: win32ss/CMakeLists.txt
===================================================================
---- win32ss/CMakeLists.txt (revision 70340)
+--- win32ss/CMakeLists.txt (revision 70342)
+++ win32ss/CMakeLists.txt (working copy)
@@ -10,7 +10,10 @@
PROJECT(WIN32SS)
@@ -404,7 +378,7 @@
\ No newline at end of file
Index: win32ss/drivers/CMakeLists.txt
===================================================================
---- win32ss/drivers/CMakeLists.txt (revision 70340)
+--- win32ss/drivers/CMakeLists.txt (revision 70342)
+++ win32ss/drivers/CMakeLists.txt (working copy)
@@ -1,6 +1,8 @@
@@ -417,7 +391,7 @@
add_subdirectory(watchdog)
Index: win32ss/include/ntgdihdl.h
===================================================================
---- win32ss/include/ntgdihdl.h (revision 70340)
+--- win32ss/include/ntgdihdl.h (revision 70342)
+++ win32ss/include/ntgdihdl.h (working copy)
@@ -260,6 +260,7 @@
DWORD dwCFCount;
@@ -449,7 +423,7 @@
FLONG AttrFlags;
Index: win32ss/user/winsrv/consrv/conoutput.c
===================================================================
---- win32ss/user/winsrv/consrv/conoutput.c (revision 70340)
+--- win32ss/user/winsrv/consrv/conoutput.c (revision 70342)
+++ win32ss/user/winsrv/consrv/conoutput.c (working copy)
@@ -99,9 +99,13 @@
* Indeed, the palette handle comes from a console app
@@ -467,7 +441,7 @@
Buffer,
Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
===================================================================
---- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70340)
+--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70342)
+++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy)
@@ -159,7 +159,11 @@
}
@@ -483,7 +457,7 @@
return (WndClassAtom != 0);
Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
===================================================================
---- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70340)
+--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70342)
+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy)
@@ -161,9 +161,14 @@
/* Assign this console input thread to this desktop */
@@ -534,7 +508,7 @@
Index: win32ss/user/winsrv/usersrv/init.c
===================================================================
---- win32ss/user/winsrv/usersrv/init.c (revision 70340)
+--- win32ss/user/winsrv/usersrv/init.c (revision 70342)
+++ win32ss/user/winsrv/usersrv/init.c (working copy)
@@ -199,9 +199,14 @@
@@ -565,7 +539,7 @@
Status = NtUserInitialize(USER_VERSION,
Index: win32ss/user/winsrv/usersrv/shutdown.c
===================================================================
---- win32ss/user/winsrv/usersrv/shutdown.c (revision 70340)
+--- win32ss/user/winsrv/usersrv/shutdown.c (revision 70342)
+++ win32ss/user/winsrv/usersrv/shutdown.c (working copy)
@@ -381,7 +381,12 @@
static BOOLEAN
