[WIN32CSR] Make CsrFreeConsole close the process's console handles.

[reactos.git] / reactos / subsystems / win32 / csrss / csrsrv / init.c

diff --git a/reactos/subsystems/win32/csrss/csrsrv/init.c b/reactos/subsystems/win32/csrss/csrsrv/init.c
index 59b69c5..a507628 100644 (file)
--- a/reactos/subsystems/win32/csrss/csrsrv/init.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/init.c
@@ -335,6 +335,7 @@ CsrpInitWin32Csr (int argc, char ** argv, char ** envp)
   Exports.CsrGetObjectProc = CsrGetObject;
   Exports.CsrReleaseObjectByPointerProc = CsrReleaseObjectByPointer;
   Exports.CsrReleaseObjectProc = CsrReleaseObject;
+  Exports.CsrReleaseConsoleProc = CsrReleaseConsole;
   Exports.CsrEnumProcessesProc = CsrEnumProcesses;
   if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc,
                     &HardErrorProc, &Exports, CsrssApiHeap))
@@ -364,7 +365,7 @@ CsrpInitWin32Csr (int argc, char ** argv, char ** envp)
 CSRSS_API_DEFINITION NativeDefinitions[] =
   {
     CSRSS_DEFINE_API(CREATE_PROCESS,               CsrCreateProcess),
-    CSRSS_DEFINE_API(CREATE_THREAD,                CsrCreateThread),
+    CSRSS_DEFINE_API(CREATE_THREAD,                CsrSrvCreateThread),
     CSRSS_DEFINE_API(TERMINATE_PROCESS,            CsrTerminateProcess),
     CSRSS_DEFINE_API(CONNECT_PROCESS,              CsrConnectProcess),
     CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS,    CsrRegisterServicesProcess),
@@ -622,7 +623,7 @@ CsrpLoadKernelModeDriver (int argc, char ** argv, char ** envp)
                WCHAR                      ImagePath [MAX_PATH + 1] = {0};
                UNICODE_STRING             ModuleName;
 
-               wcscpy (ImagePath, L"\\??\\c:\\reactos\\system32\\win32k.sys");
+               wcscpy (ImagePath, L"\\SYSTEMROOT\\system32\\win32k.sys");
 //             wcscat (ImagePath, Data);
                RtlInitUnicodeString (& ModuleName, ImagePath);
                Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */