1
1
Index: base/system/winlogon/winlogon.c
2
2
===================================================================
3
- --- base/system/winlogon/winlogon.c (revision 70340 )
3
+ --- base/system/winlogon/winlogon.c (revision 70342 )
4
4
+++ base/system/winlogon/winlogon.c (working copy)
5
5
@@ -397,7 +397,7 @@
6
6
HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT);
@@ -13,7 +13,7 @@ Index: base/system/winlogon/winlogon.c
13
13
#if 0
14
14
Index: cmake/baseaddress.cmake
15
15
===================================================================
16
- --- cmake/baseaddress.cmake (revision 70340 )
16
+ --- cmake/baseaddress.cmake (revision 70342 )
17
17
+++ cmake/baseaddress.cmake (working copy)
18
18
@@ -2,9 +2,9 @@
19
19
set(baseaddress_kernel32 0x7c750000)
@@ -30,7 +30,7 @@ Index: cmake/baseaddress.cmake
30
30
set(baseaddress_iphlpapi 0x7c2b0000)
31
31
Index: cmake/config.cmake
32
32
===================================================================
33
- --- cmake/config.cmake (revision 70340 )
33
+ --- cmake/config.cmake (revision 70342 )
34
34
+++ cmake/config.cmake (working copy)
35
35
@@ -58,6 +58,9 @@
36
36
"Whether to compile support for ELF files.
@@ -44,7 +44,7 @@ Index: cmake/config.cmake
44
44
If you live in a country where software patents are valid/apply, don't
45
45
Index: CMakeLists.txt
46
46
===================================================================
47
- --- CMakeLists.txt (revision 70340 )
47
+ --- CMakeLists.txt (revision 70342 )
48
48
+++ CMakeLists.txt (working copy)
49
49
@@ -165,6 +165,10 @@
50
50
add_definitions(-D_WINKD_=1)
@@ -67,22 +67,9 @@ Index: CMakeLists.txt
67
67
68
68
# Create the registry hives
69
69
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,
83
70
Index: dll/win32/msgina/gui.c
84
71
===================================================================
85
- --- dll/win32/msgina/gui.c (revision 70340 )
72
+ --- dll/win32/msgina/gui.c (revision 70342 )
86
73
+++ dll/win32/msgina/gui.c (working copy)
87
74
@@ -73,6 +73,7 @@
88
75
@@ -113,7 +100,7 @@ Index: dll/win32/msgina/gui.c
113
100
/*
114
101
Index: include/asm/syscalls.inc
115
102
===================================================================
116
- --- include/asm/syscalls.inc (revision 70340 )
103
+ --- include/asm/syscalls.inc (revision 70342 )
117
104
+++ include/asm/syscalls.inc (working copy)
118
105
@@ -1,4 +1,4 @@
119
106
-
@@ -325,7 +312,7 @@ Index: include/asm/syscalls.inc
325
312
- #endif
326
313
Index: include/psdk/winddi.h
327
314
===================================================================
328
- --- include/psdk/winddi.h (revision 70340 )
315
+ --- include/psdk/winddi.h (revision 70342 )
329
316
+++ include/psdk/winddi.h (working copy)
330
317
@@ -2911,7 +2911,7 @@
331
318
_In_ ULONG cjSize,
@@ -338,7 +325,7 @@ Index: include/psdk/winddi.h
338
325
APIENTRY
339
326
Index: include/reactos/wine/config.h
340
327
===================================================================
341
- --- include/reactos/wine/config.h (revision 70340 )
328
+ --- include/reactos/wine/config.h (revision 70342 )
342
329
+++ include/reactos/wine/config.h (working copy)
343
330
@@ -1,3 +1,5 @@
344
331
+ #include "reactos/buildno.h"
@@ -348,7 +335,7 @@ Index: include/reactos/wine/config.h
348
335
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
349
336
Index: lib/3rdparty/CMakeLists.txt
350
337
===================================================================
351
- --- lib/3rdparty/CMakeLists.txt (revision 70340 )
338
+ --- lib/3rdparty/CMakeLists.txt (revision 70342 )
352
339
+++ lib/3rdparty/CMakeLists.txt (working copy)
353
340
@@ -2,7 +2,9 @@
354
341
add_subdirectory(adns)
@@ -360,22 +347,9 @@ Index: lib/3rdparty/CMakeLists.txt
360
347
add_subdirectory(fullfat)
361
348
add_subdirectory(libmpg123)
362
349
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;
376
350
Index: win32ss/CMakeLists.txt
377
351
===================================================================
378
- --- win32ss/CMakeLists.txt (revision 70340 )
352
+ --- win32ss/CMakeLists.txt (revision 70342 )
379
353
+++ win32ss/CMakeLists.txt (working copy)
380
354
@@ -10,7 +10,10 @@
381
355
PROJECT(WIN32SS)
@@ -404,7 +378,7 @@ Index: win32ss/CMakeLists.txt
404
378
\ No newline at end of file
405
379
Index: win32ss/drivers/CMakeLists.txt
406
380
===================================================================
407
- --- win32ss/drivers/CMakeLists.txt (revision 70340 )
381
+ --- win32ss/drivers/CMakeLists.txt (revision 70342 )
408
382
+++ win32ss/drivers/CMakeLists.txt (working copy)
409
383
@@ -1,6 +1,8 @@
410
384
@@ -417,7 +391,7 @@ Index: win32ss/drivers/CMakeLists.txt
417
391
add_subdirectory(watchdog)
418
392
Index: win32ss/include/ntgdihdl.h
419
393
===================================================================
420
- --- win32ss/include/ntgdihdl.h (revision 70340 )
394
+ --- win32ss/include/ntgdihdl.h (revision 70342 )
421
395
+++ win32ss/include/ntgdihdl.h (working copy)
422
396
@@ -260,6 +260,7 @@
423
397
DWORD dwCFCount;
@@ -449,7 +423,7 @@ Index: win32ss/include/ntgdihdl.h
449
423
FLONG AttrFlags;
450
424
Index: win32ss/user/winsrv/consrv/conoutput.c
451
425
===================================================================
452
- --- win32ss/user/winsrv/consrv/conoutput.c (revision 70340 )
426
+ --- win32ss/user/winsrv/consrv/conoutput.c (revision 70342 )
453
427
+++ win32ss/user/winsrv/consrv/conoutput.c (working copy)
454
428
@@ -99,9 +99,13 @@
455
429
* Indeed, the palette handle comes from a console app
@@ -467,7 +441,7 @@ Index: win32ss/user/winsrv/consrv/conoutput.c
467
441
Buffer,
468
442
Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
469
443
===================================================================
470
- --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70340 )
444
+ --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (revision 70342 )
471
445
+++ win32ss/user/winsrv/consrv/frontends/gui/conwnd.c (working copy)
472
446
@@ -159,7 +159,11 @@
473
447
}
@@ -483,7 +457,7 @@ Index: win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
483
457
return (WndClassAtom != 0);
484
458
Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
485
459
===================================================================
486
- --- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70340 )
460
+ --- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (revision 70342 )
487
461
+++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c (working copy)
488
462
@@ -161,9 +161,14 @@
489
463
/* Assign this console input thread to this desktop */
@@ -534,7 +508,7 @@ Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
534
508
535
509
Index: win32ss/user/winsrv/usersrv/init.c
536
510
===================================================================
537
- --- win32ss/user/winsrv/usersrv/init.c (revision 70340 )
511
+ --- win32ss/user/winsrv/usersrv/init.c (revision 70342 )
538
512
+++ win32ss/user/winsrv/usersrv/init.c (working copy)
539
513
@@ -199,9 +199,14 @@
540
514
@@ -565,7 +539,7 @@ Index: win32ss/user/winsrv/usersrv/init.c
565
539
Status = NtUserInitialize(USER_VERSION,
566
540
Index: win32ss/user/winsrv/usersrv/shutdown.c
567
541
===================================================================
568
- --- win32ss/user/winsrv/usersrv/shutdown.c (revision 70340 )
542
+ --- win32ss/user/winsrv/usersrv/shutdown.c (revision 70342 )
569
543
+++ win32ss/user/winsrv/usersrv/shutdown.c (working copy)
570
544
@@ -381,7 +381,12 @@
571
545
static BOOLEAN
0 commit comments