Updated to 0.0.14

svn path=/trunk/; revision=546

diff --git a/reactos/lib/advapi32/advapi32.rc b/reactos/lib/advapi32/advapi32.rc
index 699e5b4..7381d92 100644 (file)
--- a/reactos/lib/advapi32/advapi32.rc
+++ b/reactos/lib/advapi32/advapi32.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "Advanced W32 Base API\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "advapi32\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "advapi32.dll\0"

diff --git a/reactos/lib/crtdll/crtdll.rc b/reactos/lib/crtdll/crtdll.rc
index b960fbb..040a8ad 100644 (file)
--- a/reactos/lib/crtdll/crtdll.rc
+++ b/reactos/lib/crtdll/crtdll.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "C Runtime Library\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "crtdll\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "crtdll.dll\0"

diff --git a/reactos/lib/fmifs/fmifs.rc b/reactos/lib/fmifs/fmifs.rc
index b35ba43..70550cb 100644 (file)
--- a/reactos/lib/fmifs/fmifs.rc
+++ b/reactos/lib/fmifs/fmifs.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L

diff --git a/reactos/lib/gdi32/gdi32.rc b/reactos/lib/gdi32/gdi32.rc
index 0b12099..b4ab45d 100644 (file)
--- a/reactos/lib/gdi32/gdi32.rc
+++ b/reactos/lib/gdi32/gdi32.rc
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "GDI Client DLL\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "gdi32\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "gdi32.dll\0"

diff --git a/reactos/lib/kernel32/kernel32.rc b/reactos/lib/kernel32/kernel32.rc
index 0edd9c0..e76d449 100644 (file)
--- a/reactos/lib/kernel32/kernel32.rc
+++ b/reactos/lib/kernel32/kernel32.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD      
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "W32 subsystem kernel\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "kernel32\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "kernel32.dll\0"

diff --git a/reactos/lib/ntdll/ntdll.rc b/reactos/lib/ntdll/ntdll.rc
index a70a18c..f8d5386 100644 (file)
--- a/reactos/lib/ntdll/ntdll.rc
+++ b/reactos/lib/ntdll/ntdll.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "ReactOS Layer DLL\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "ntdll\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "ntdll.dll\0"

diff --git a/reactos/lib/user32/user32.rc b/reactos/lib/user32/user32.rc
index 7582813..35761f3 100644 (file)
--- a/reactos/lib/user32/user32.rc
+++ b/reactos/lib/user32/user32.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,7 +22,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "ReactOS User API Client Dll\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
             VALUE "InternalName",      "user32\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "user32.dll\0"

diff --git a/reactos/ntoskrnl/ntoskrnl.rc b/reactos/ntoskrnl/ntoskrnl.rc
index ad28116..65fb559 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.rc
+++ b/reactos/ntoskrnl/ntoskrnl.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,13,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -22,8 +22,8 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "ReactOS Kernel & System\0"
-            VALUE "FileVersion",       "post 0.0.13\0"
-            VALUE "InternalName",      "ntoskrnl\0"
+            VALUE "FileVersion",       RES_STR_FILE_VERSION
+           VALUE "InternalName",       "ntoskrnl\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "ntoskrnl.exe\0"
             VALUE "ProductName",       RES_STR_PRODUCT_NAME

diff --git a/reactos/services/smss/init.c b/reactos/services/smss/init.c
index 0867f9f..bb678bb 100644 (file)
--- a/reactos/services/smss/init.c
+++ b/reactos/services/smss/init.c
@@ -1,20 +1,20 @@
-/* $Id: init.c,v 1.1 1999/05/30 20:40:18 ea Exp $
+/* $Id: init.c,v 1.2 1999/06/08 22:44:19 ea Exp $
  *
- * smss.c - Session Manager
+ * init.c - Session Manager initialization
  * 
  * ReactOS Operating System
  * 
  * --------------------------------------------------------------------
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.LIB. If not, write
@@ -41,13 +41,30 @@ InitSessionManager(
        /* FIXME: Create pagination files (if any) other than the first one */
        /* FIXME: Load the well known DLLs */
        /* FIXME: Load the kernel mode driver win32k.sys */
-       /* FIXME: Start the Win32 subsystem (csrss.exe) */
-       Children[0] = INVALID_HANDLE_VALUE;
-       /* FIXME: Start winlogon.exe */
-       Children[1] = INVALID_HANDLE_VALUE;
+       /* Start the Win32 subsystem (csrss.exe) */
+       Status = NtCreateProcess(
+                       L"\\??\\C:\\reactos\\system\\csrss.exe",
+                       & Children[CHILD_CSRSS]
+                       );
+       if (!NT_SUCCESS(Status))
+       {
+               return FALSE;
+       }
+       /* Start winlogon.exe */
+       Status = NtCreateProcess(
+                       L"\\??\\C:\\reactos\\system\\winlogon.exe",
+                       & Children[CHILD_WINLOGON]
+                       );
+       if (!NT_SUCCESS(Status))
+       {
+               Status = NtTerminateProcess(
+                               Children[CHILD_CSRSS]
+                               );
+               return FALSE;
+       }
        /* FIXME: Create the \DbgSsApiPort object (LPC) */
        /* FIXME: Create the \DbgUiApiPort object (LPC) */
-       return FALSE;
+       return TRUE;
 }
 
 

diff --git a/reactos/services/smss/smss.c b/reactos/services/smss/smss.c
index 2438988..e671e7b 100644 (file)
--- a/reactos/services/smss/smss.c
+++ b/reactos/services/smss/smss.c
@@ -1,4 +1,4 @@
-/* $Id: smss.c,v 1.1 1999/05/30 20:40:18 ea Exp $
+/* $Id: smss.c,v 1.2 1999/06/08 22:44:19 ea Exp $
  *
  * smss.c - Session Manager
  * 
@@ -7,14 +7,14 @@
  * --------------------------------------------------------------------
  *
  * This software is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.LIB. If not, write

diff --git a/reactos/subsys/win32k/win32k.rc b/reactos/subsys/win32k/win32k.rc
index 1659de9..20e669a 100644 (file)
--- a/reactos/subsys/win32k/win32k.rc
+++ b/reactos/subsys/win32k/win32k.rc
@@ -5,8 +5,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO VERSIONINFO
-       FILEVERSION     0,0,1,RES_UINT_FILE_VERSION
-       PRODUCTVERSION  0,0,1,0
+       FILEVERSION     RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+       PRODUCTVERSION  RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
        FILEFLAGSMASK   0x3fL
 #ifdef _DEBUG
        FILEFLAGS       0x1L
@@ -23,7 +23,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",       RES_STR_COMPANY_NAME
             VALUE "FileDescription",   "W32 GDI KM subsystem\0"
-            VALUE "FileVersion",       "post 0.0.1\0"
+            VALUE "FileVersion",       "0.0.1\0"
             VALUE "InternalName",      "win32k\0"
             VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
             VALUE "OriginalFilename",  "win32k.sys\0"