Skip to content

Commit 8d09a00

Browse files
committed
[ARWINSS]
- Reduce patch to trunk by 1Kb by removing unnecessary debug prints and other misc stuff. svn path=/branches/arwinss/; revision=70346
1 parent d5b0085 commit 8d09a00

File tree

1 file changed

+17
-43
lines changed

1 file changed

+17
-43
lines changed

trunk.diff

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Index: base/system/winlogon/winlogon.c
22
===================================================================
3-
--- base/system/winlogon/winlogon.c (revision 70340)
3+
--- base/system/winlogon/winlogon.c (revision 70342)
44
+++ base/system/winlogon/winlogon.c (working copy)
55
@@ -397,7 +397,7 @@
66
HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT);
@@ -13,7 +13,7 @@ Index: base/system/winlogon/winlogon.c
1313
#if 0
1414
Index: cmake/baseaddress.cmake
1515
===================================================================
16-
--- cmake/baseaddress.cmake (revision 70340)
16+
--- cmake/baseaddress.cmake (revision 70342)
1717
+++ cmake/baseaddress.cmake (working copy)
1818
@@ -2,9 +2,9 @@
1919
set(baseaddress_kernel32 0x7c750000)
@@ -30,7 +30,7 @@ Index: cmake/baseaddress.cmake
3030
set(baseaddress_iphlpapi 0x7c2b0000)
3131
Index: cmake/config.cmake
3232
===================================================================
33-
--- cmake/config.cmake (revision 70340)
33+
--- cmake/config.cmake (revision 70342)
3434
+++ cmake/config.cmake (working copy)
3535
@@ -58,6 +58,9 @@
3636
"Whether to compile support for ELF files.
@@ -44,7 +44,7 @@ Index: cmake/config.cmake
4444
If you live in a country where software patents are valid/apply, don't
4545
Index: CMakeLists.txt
4646
===================================================================
47-
--- CMakeLists.txt (revision 70340)
47+
--- CMakeLists.txt (revision 70342)
4848
+++ CMakeLists.txt (working copy)
4949
@@ -165,6 +165,10 @@
5050
add_definitions(-D_WINKD_=1)
@@ -67,22 +67,9 @@ Index: CMakeLists.txt
6767

6868
# Create the registry hives
6969
create_registry_hives()
70-
Index: dll/win32/kernel32/client/dllmain.c
71-
===================================================================
72-
--- dll/win32/kernel32/client/dllmain.c (revision 70340)
73-
+++ dll/win32/kernel32/client/dllmain.c (working copy)
74-
@@ -131,7 +131,7 @@
75-
SessionId,
76-
WIN_OBJ_DIR);
77-
}
78-
-
79-
+DPRINT1("About to connect to CSR!\n");
80-
/* Connect to the Base Server */
81-
Status = CsrClientConnectToServer(SessionDir,
82-
BASESRV_SERVERDLL_INDEX,
8370
Index: dll/win32/msgina/gui.c
8471
===================================================================
85-
--- dll/win32/msgina/gui.c (revision 70340)
72+
--- dll/win32/msgina/gui.c (revision 70342)
8673
+++ dll/win32/msgina/gui.c (working copy)
8774
@@ -73,6 +73,7 @@
8875

@@ -113,7 +100,7 @@ Index: dll/win32/msgina/gui.c
113100
/*
114101
Index: include/asm/syscalls.inc
115102
===================================================================
116-
--- include/asm/syscalls.inc (revision 70340)
103+
--- include/asm/syscalls.inc (revision 70342)
117104
+++ include/asm/syscalls.inc (working copy)
118105
@@ -1,4 +1,4 @@
119106
-
@@ -325,7 +312,7 @@ Index: include/asm/syscalls.inc
325312
-#endif
326313
Index: include/psdk/winddi.h
327314
===================================================================
328-
--- include/psdk/winddi.h (revision 70340)
315+
--- include/psdk/winddi.h (revision 70342)
329316
+++ include/psdk/winddi.h (working copy)
330317
@@ -2911,7 +2911,7 @@
331318
_In_ ULONG cjSize,
@@ -338,7 +325,7 @@ Index: include/psdk/winddi.h
338325
APIENTRY
339326
Index: include/reactos/wine/config.h
340327
===================================================================
341-
--- include/reactos/wine/config.h (revision 70340)
328+
--- include/reactos/wine/config.h (revision 70342)
342329
+++ include/reactos/wine/config.h (working copy)
343330
@@ -1,3 +1,5 @@
344331
+#include "reactos/buildno.h"
@@ -348,7 +335,7 @@ Index: include/reactos/wine/config.h
348335
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
349336
Index: lib/3rdparty/CMakeLists.txt
350337
===================================================================
351-
--- lib/3rdparty/CMakeLists.txt (revision 70340)
338+
--- lib/3rdparty/CMakeLists.txt (revision 70342)
352339
+++ lib/3rdparty/CMakeLists.txt (working copy)
353340
@@ -2,7 +2,9 @@
354341
add_subdirectory(adns)
@@ -360,22 +347,9 @@ Index: lib/3rdparty/CMakeLists.txt
360347
add_subdirectory(fullfat)
361348
add_subdirectory(libmpg123)
362349
add_subdirectory(libsamplerate)
363-
Index: subsystems/win32/csrsrv/init.c
364-
===================================================================
365-
--- subsystems/win32/csrsrv/init.c (revision 70340)
366-
+++ subsystems/win32/csrsrv/init.c (working copy)
367-
@@ -20,7 +20,7 @@
368-
/* DATA ***********************************************************************/
369-
370-
// Debug Flag
371-
-ULONG CsrDebug = 0; // 0xFFFFFFFF;
372-
+ULONG CsrDebug = 0xFFFFFFFF;
373-
374-
HANDLE CsrHeap = NULL;
375-
HANDLE CsrObjectDirectory = NULL;
376350
Index: win32ss/CMakeLists.txt
377351
===================================================================
378-
--- win32ss/CMakeLists.txt (revision 70340)
352+
--- win32ss/CMakeLists.txt (revision 70342)
379353
+++ win32ss/CMakeLists.txt (working copy)
380354
@@ -10,7 +10,10 @@
381355
PROJECT(WIN32SS)
@@ -404,7 +378,7 @@ Index: win32ss/CMakeLists.txt
404378
\ No newline at end of file
405379
Index: win32ss/drivers/CMakeLists.txt
406380
===================================================================
407-
--- win32ss/drivers/CMakeLists.txt (revision 70340)
381+
--- win32ss/drivers/CMakeLists.txt (revision 70342)
408382
+++ win32ss/drivers/CMakeLists.txt (working copy)
409383
@@ -1,6 +1,8 @@
410384

@@ -417,7 +391,7 @@ Index: win32ss/drivers/CMakeLists.txt
417391
add_subdirectory(watchdog)
418392
Index: win32ss/include/ntgdihdl.h
419393
===================================================================
420-
--- win32ss/include/ntgdihdl.h (revision 70340)
394+
--- win32ss/include/ntgdihdl.h (revision 70342)
421395
+++ win32ss/include/ntgdihdl.h (working copy)
422396
@@ -260,6 +260,7 @@
423397
DWORD dwCFCount;
@@ -449,7 +423,7 @@ Index: win32ss/include/ntgdihdl.h
449423
FLONG AttrFlags;
450424
Index: win32ss/user/winsrv/consrv/conoutput.c
451425
===================================================================
452-
--- win32ss/user/winsrv/consrv/conoutput.c (revision 70340)
426+
--- win32ss/user/winsrv/consrv/conoutput.c (revision 70342)
453427
+++ win32ss/user/winsrv/consrv/conoutput.c (working copy)
454428
@@ -99,9 +99,13 @@
455429
* Indeed, the palette handle comes from a console app
@@ -467,7 +441,7 @@ Index: win32ss/user/winsrv/consrv/conoutput.c
467441
Buffer,
468442
Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
469443
===================================================================
470-
--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70340)
444+
--- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70342)
471445
+++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy)
472446
@@ -159,7 +159,11 @@
473447
}
@@ -483,7 +457,7 @@ Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
483457
return (WndClassAtom != 0);
484458
Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
485459
===================================================================
486-
--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70340)
460+
--- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70342)
487461
+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy)
488462
@@ -161,9 +161,14 @@
489463
/* Assign this console input thread to this desktop */
@@ -534,7 +508,7 @@ Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
534508

535509
Index: win32ss/user/winsrv/usersrv/init.c
536510
===================================================================
537-
--- win32ss/user/winsrv/usersrv/init.c (revision 70340)
511+
--- win32ss/user/winsrv/usersrv/init.c (revision 70342)
538512
+++ win32ss/user/winsrv/usersrv/init.c (working copy)
539513
@@ -199,9 +199,14 @@
540514

@@ -565,7 +539,7 @@ Index: win32ss/user/winsrv/usersrv/init.c
565539
Status = NtUserInitialize(USER_VERSION,
566540
Index: win32ss/user/winsrv/usersrv/shutdown.c
567541
===================================================================
568-
--- win32ss/user/winsrv/usersrv/shutdown.c (revision 70340)
542+
--- win32ss/user/winsrv/usersrv/shutdown.c (revision 70342)
569543
+++ win32ss/user/winsrv/usersrv/shutdown.c (working copy)
570544
@@ -381,7 +381,12 @@
571545
static BOOLEAN

0 commit comments

Comments
 (0)