version information

svn path=/trunk/; revision=412

diff --git a/reactos/lib/crtdll/crtdll.rc b/reactos/lib/crtdll/crtdll.rc
new file mode 100644 (file)
index 0000000..3130012
--- /dev/null
+++ b/reactos/lib/crtdll/crtdll.rc
@@ -0,0 +1,37 @@
+#include <windows32/defines.h>
+#include "../../include/reactos/resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
+       PRODUCTVERSION  0,0,13,0
+       FILEFLAGSMASK   0x3fL
+#ifdef _DEBUG
+       FILEFLAGS       0x1L
+#else
+       FILEFLAGS       0x0L
+#endif
+       FILEOS          0x40004L
+       FILETYPE        0x2L
+       FILESUBTYPE     0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",       RES_STR_COMPANY_NAME
+            VALUE "FileDescription",   "C Runtime Library\0"
+            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "InternalName",      "crtdll\0"
+            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",  "crtdll.dll\0"
+            VALUE "ProductName",       RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile
index b4bf250..afd7656 100644 (file)
--- a/reactos/lib/crtdll/makefile
+++ b/reactos/lib/crtdll/makefile
@@ -119,16 +119,21 @@ OLD_OBJECTS = $(MISC_OBJECTS) stdlib/malloc.o stdlib/abort.o \
          stdlib/errno.o stdio/printf.o stdio/vprintf.o\
          $(QUAD_OBJECTS)
 
+RESOURCE_OBJECT = crtdll.coff
+
 OBJECTS = $(MISC_OBJECTS) $(STDLIB_OBJECTS) $(IO_OBJECTS) \
           $(FLOAT_OBJECTS) $(ASSERT_OBJECTS) $(PROCESS_OBJECTS) \
          $(STDIO_OBJECTS) $(CTYPE_OBJECTS) $(MATH_OBJECTS) \
          $(STRING_OBJECTS) $(TIME_OBJECTS) $(WCHAR_OBJECTS) \
          $(SYS_STAT_OBJECTS) misc/dllmain.o $(MALLOC_OBJECTS) \
          $(SEARCH_OBJECTS) $(CONIO_OBJECTS) $(DIRECT_OBJECTS) \
-         $(SIGNAL_OBJECTS)
+         $(SIGNAL_OBJECTS) $(RESOURCE_OBJECT)
+
 
+crtdll.coff: crtdll.rc ../../include/reactos/resource.h
+       windres crtdll.rc crtdll.coff
 
- crtdll.a: $(OBJECTS)
+crtdll.a: $(OBJECTS)
        $(LD)  -r $(OBJECTS) -o crtdll.a
 
 crtdll.dll: $(DLLMAIN) $(OBJECTS) crtdll.def

diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 2c57bac..c345053 100644 (file)
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -28,7 +28,7 @@ STRING_OBJECTS = string/ctype.o string/memcpy.o string/memmove.o \
 OBJECTS = napi.o ldr/startup.o rtl/largeint.o rtl/namespc.o rtl/unicode.o \
           stdio/vsprintf.o $(STDLIB_OBJECTS) $(STRING_OBJECTS) \
           stubs/stubs.o rtl/heap.o rtl/critical.o rtl/mem.o \
-          ldr/utils.o
+          ldr/utils.o ntdll.coff
 
 ifeq ($(DOSCLI),yes)
 CLEAN_FILES = napi.o ldr\*.o rtl\*.o stdio\*.o string\*.o stubs\*.o ntdll.a  \
@@ -38,18 +38,23 @@ CLEAN_FILES = napi.o ldr/*.o rtl/*.o stdio/*.o string/*.o stubs/*.o ntall.a  \
               main/dllmain.o ntdll.o ntdll.dll junk.tmp base.tmp temp.exp ntdll.sym
 endif
 
+ntdll.coff: ntdll.rc ../../include/reactos/resource.h
+       windres ntdll.rc ntdll.coff
+
 ntdll.a: $(OBJECTS)
        $(AR) csr ntdll.a $(OBJECTS)
 
 ntdll.dll: $(DLLMAIN) $(OBJECTS) 
        $(LD) -r $(DLLMAIN) $(OBJECTS) -o ntdll.o
        $(DLLTOOL) --dllname ntdll.dll --def def/ntdll.def \
-                  --output-lib ntdll.a
+                  --output-lib ntdll.a --add-stdcall-alias \
+                  --kill-at
        $(CC) -specs=ntdll_specs -mdll -o junk.tmp \
              -Wl,--base-file,base.tmp ntdll.o
        - $(RM) junk.tmp
        $(DLLTOOL) --dllname ntdll.dll --base-file base.tmp \
-                  --output-exp temp.exp --def def/ntdll.def
+                  --output-exp temp.exp --def def/ntdll.def \
+                  --add-stdcall-alias --kill-at
        - $(RM) base.tmp
        $(CC) -specs=ntdll_specs -mdll -o ntdll.dll ntdll.o \
              -Wl,--entry=_LdrStartup \

diff --git a/reactos/lib/ntdll/ntdll.rc b/reactos/lib/ntdll/ntdll.rc
new file mode 100644 (file)
index 0000000..4da21fb
--- /dev/null
+++ b/reactos/lib/ntdll/ntdll.rc
@@ -0,0 +1,37 @@
+#include <windows32/defines.h>
+#include "../../include/reactos/resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
+       PRODUCTVERSION  0,0,13,0
+       FILEFLAGSMASK   0x3fL
+#ifdef _DEBUG
+       FILEFLAGS       0x1L
+#else
+       FILEFLAGS       0x0L
+#endif
+       FILEOS          0x40004L
+       FILETYPE        0x2L
+       FILESUBTYPE     0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",       RES_STR_COMPANY_NAME
+            VALUE "FileDescription",   "ReactOS Layer DLL\0"
+            VALUE "FileVersion",       "post 0.0.13\0"
+            VALUE "InternalName",      "ntdll\0"
+            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",  "ntdll.dll\0"
+            VALUE "ProductName",       RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

diff --git a/reactos/ntoskrnl/makefile_rex b/reactos/ntoskrnl/makefile_rex
index b76878f..b187d7b 100644 (file)
--- a/reactos/ntoskrnl/makefile_rex
+++ b/reactos/ntoskrnl/makefile_rex
@@ -52,6 +52,8 @@ LDR_OBJECTS = ldr/loader.o ldr/init.o
 
 CC_OBJECTS = cc/cacheman.o cc/block.o cc/view.o
 
+RESOURCE_OBJECT = ntoskrnl.coff
+
 objects: 
        mkdir objects
 
@@ -97,10 +99,15 @@ objects/nt.o: $(NT_OBJECTS)
 objects/cc.o: $(CC_OBJECTS)
        $(LD) -r $(CC_OBJECTS) -o objects/cc.o
 
+objects/ntoskrnl.coff: ntoskrnl.rc ../include/reactos/resource.h
+       windres ntoskrnl.rc objects/ntoskrnl.coff
+
+
 OBJECTS = objects/hal.o objects/ke.o objects/rtl.o objects/mm.o \
           objects/io.o objects/ob.o objects/ps.o objects/ex.o \
-         objects/se.o objects/cm.o objects/dbg.o\
-         objects/nt.o objects/cc.o objects/ldr.o
+         objects/se.o objects/cm.o objects/dbg.o \
+         objects/nt.o objects/cc.o objects/ldr.o \
+         objects/ntoskrnl.coff
          
 ifeq ($(DOSCLI),yes)
 CLEAN_FILES = objects\*.o cc\*.o cm\*.o dbg\*.o ex\*.o hal\x86\*.o io\*.o  \

diff --git a/reactos/ntoskrnl/ntoskrnl.rc b/reactos/ntoskrnl/ntoskrnl.rc
new file mode 100644 (file)
index 0000000..1e85647
--- /dev/null
+++ b/reactos/ntoskrnl/ntoskrnl.rc
@@ -0,0 +1,37 @@
+#include <windows32/defines.h>
+#include "../include/reactos/resource.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+       FILEVERSION     0,0,13,RES_UINT_FILE_VERSION
+       PRODUCTVERSION  0,0,13,0
+       FILEFLAGSMASK   0x3fL
+#ifdef _DEBUG
+       FILEFLAGS       0x1L
+#else
+       FILEFLAGS       0x0L
+#endif
+       FILEOS          0x40004L
+       FILETYPE        0x2L
+       FILESUBTYPE     0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        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 "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",  "ntoskrnl.exe\0"
+            VALUE "ProductName",       RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END