Skip to content

Commit 3ec8512

Browse files
committed
Update trunk's patch wrt recent commit. It starts to get smaller in size, finally.
svn path=/branches/arwinss/; revision=69875
1 parent cc1122b commit 3ec8512

File tree

1 file changed

+14
-46
lines changed

1 file changed

+14
-46
lines changed

trunk.diff

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
Index: base/system/smss/smsubsys.c
2-
===================================================================
3-
--- base/system/smss/smsubsys.c (revision 69795)
4-
+++ base/system/smss/smsubsys.c (working copy)
5-
@@ -10,7 +10,7 @@
6-
7-
#include "smss.h"
8-
9-
-#define NDEBUG
10-
+//#define NDEBUG
11-
#include <debug.h>
12-
13-
/* GLOBALS ********************************************************************/
141
Index: base/system/winlogon/winlogon.c
152
===================================================================
163
--- base/system/winlogon/winlogon.c (revision 69795)
@@ -113,6 +100,15 @@ Index: dll/win32/msgina/gui.c
113100

114101
if(!SetThreadDesktop(hDesk))
115102
{
103+
@@ -118,6 +122,8 @@
104+
105+
TRACE("GUIDisplayStatusMessage(%ws)\n", pMessage);
106+
107+
+ ERR("ARWINSS BIG BUG #1\n");
108+
+return TRUE; // ARWINSS 1st bug
109+
if (!pgContext->hStatusWindow)
110+
{
111+
/*
116112
Index: include/asm/syscalls.inc
117113
===================================================================
118114
--- include/asm/syscalls.inc (revision 69795)
@@ -502,12 +498,7 @@ Index: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
502498
if (!NT_SUCCESS(Status)) goto Quit;
503499

504500
/* Connect this CSR thread to the USER subsystem */
505-
@@ -295,13 +300,17 @@
506-
507-
Quit:
508-
DPRINT("CONSRV: Quit the Input Thread 0x%p, Status = 0x%08lx\n", InputThreadId, Status);
509-
-
510-
+
501+
@@ -299,9 +304,13 @@
511502
/* Remove this console input thread from this desktop */
512503
// DesktopConsoleThreadInfo.DesktopHandle;
513504
DesktopConsoleThreadInfo.ThreadId = 0;
@@ -543,38 +534,15 @@ Index: win32ss/user/winsrv/usersrv/init.c
543534
===================================================================
544535
--- win32ss/user/winsrv/usersrv/init.c (revision 69795)
545536
+++ win32ss/user/winsrv/usersrv/init.c (working copy)
546-
@@ -101,8 +101,22 @@
547-
NTAPI
548-
CreateSystemThreads(PVOID pParam)
549-
{
550-
+#ifndef _ARWINSS_
551-
NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS);
552-
RtlExitUserThread(0);
553-
+#else
554-
+ DWORD WaitRes;
555-
+ HANDLE hDummyEvent;
556-
+
557-
+ hDummyEvent = CreateEventW(0, FALSE, FALSE, L"");
558-
+
559-
+ while (TRUE)
560-
+ {
561-
+ WaitRes = WaitForSingleObject(hDummyEvent, INFINITE);
562-
+ }
563-
+ DPRINT1("WaitRes: 0x%x\n", WaitRes);
564-
+#endif
565-
+ DPRINT1("This thread should not terminate!\n");
566-
return 0;
567-
}
568-
569-
@@ -173,6 +187,7 @@
537+
@@ -173,6 +173,7 @@
570538
CsrApiPort = CsrQueryApiPort();
571539

572540
/* Inform win32k about the API port */
573541
+#ifndef _ARWINSS_
574542
Status = NtUserSetInformationThread(NtCurrentThread(),
575543
UserThreadCsrApiPort,
576544
&CsrApiPort,
577-
@@ -181,6 +196,9 @@
545+
@@ -181,6 +182,9 @@
578546
{
579547
return Status;
580548
}
@@ -584,7 +552,7 @@ Index: win32ss/user/winsrv/usersrv/init.c
584552
}
585553

586554
/* Check connection info validity */
587-
@@ -199,9 +217,14 @@
555+
@@ -199,9 +203,14 @@
588556

589557
/* Pass the request to win32k */
590558
ConnectInfo->dwDispatchCount = 0; // gDispatchTableValues;
@@ -599,7 +567,7 @@ Index: win32ss/user/winsrv/usersrv/init.c
599567

600568
return Status;
601569
}
602-
@@ -254,7 +277,11 @@
570+
@@ -254,7 +263,11 @@
603571
}
604572

605573
/* Set the process creation notify routine for BASE */

0 commit comments

Comments
 (0)