Changeset 2253 for trunk/src

Timestamp:

Dec 29, 1999, 7:49:50 PM (26 years ago)

Author:

sandervl

Message:

fixed version resource

Location:

trunk/src

Files:

• kernel32/Fileio.cpp (modified) (2 diffs)
• kernel32/initterm.cpp (modified) (3 diffs)
• kernel32/makefile (modified) (5 diffs)
• user32/user32.rc (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.19 1999-12-06 20:39:37 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.20 1999-12-29 18:49:49 sandervl Exp $ */
 
 /*
@@ -547 +547 @@
               LPCSTR, arg2)
 {
-    dprintf(("KERNEL32:  MoveFileA\n"));
+    dprintf(("KERNEL32: MoveFileA %s %s", arg1, arg2));
     return O32_MoveFile(arg1, arg2);
 }

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.31 1999-12-12 14:32:38 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.32 1999-12-29 18:49:50 sandervl Exp $ */
 
 /*
@@ -61 +61 @@
 void CDECL _ctordtorInit( void );
 void CDECL _ctordtorTerm( void );
+
+ //Win32 resource table (produced by wrc)
+ extern DWORD _Resource_PEResTab;
 }
 
@@ -118 +121 @@
 
             PROFILE_LoadOdinIni();
-            if(RegisterLxDll(hModule, 0, 0) == FALSE)
+//            if(RegisterLxDll(hModule, 0, 0) == FALSE)
+            if(RegisterLxDll(hModule, 0, (PVOID)&_Resource_PEResTab) == FALSE)
                 return 0UL;
 

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.74 1999-12-28 19:16:34 sandervl Exp $
+# $Id: makefile,v 1.75 1999-12-29 18:49:50 sandervl Exp $
 
 #
@@ -28 +28 @@
 CXXFLAGS = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
 !endif
+
+RC = $(PDWIN32_TOOLS)\wrc
+RCFLAGS = -s -I. -I$(CPPMAIN)\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
 
 OBJS = KERNEL32.OBJ KOBJECTS.OBJ CONSOLE.OBJ CONIN.OBJ \
@@ -41 +44 @@
 winimagepe2lx.obj winimagepeldr.obj windllpe2lx.obj windlllx.obj windllpeldr.obj \
 winexepe2lx.obj winexelx.obj winexepeldr.obj WINRES.OBJ critsection.obj \
-pefile.OBJ winimgres.OBJ wintls.obj async.OBJ fileio.obj hmtoken.obj \
+pefile.OBJ winimgres.OBJ wintls.obj async.OBJ fileio.obj hmtoken.obj kernelrsrc.obj \
 atom.obj disk.obj directory.obj cvtbitmap.obj hmmmap.obj winfakepeldr.obj \
 cvtaccel.obj cvticon.obj cvticongrp.obj oslibexcept.obj cpu.obj process.obj \
@@ -88 +91 @@
 $(PDWIN32_LIB)\pmwinx.lib:
         $(IMPLIB) $(IMPLIBFLAGS) $@ $(PDWIN32_LIB)\pmwinx.def
+
+kernelrsrc.asm: kernel32.rc
+    $(RC) $(RCFLAGS) -o kernelrsrc.asm kernel32.rc
+
+kernelrsrc.obj: kernelrsrc.asm
 
 kernel32.OBJ: kernel32.cpp \
@@ -406 +414 @@
 
 clean:
-        $(RM) *.OBJ *.LIB *.dll *.lrf *.res *.map *.pch
+        $(RM) *.OBJ *.LIB *.dll *.lrf *.res *.map *.pch kernelrsrc.asm
         $(RM) $(PDWIN32_LIB)\$(TARGET).LIB
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll

trunk/src/user32/user32.rc

@@ -1 @@
-/* $Id: user32.rc,v 1.3 1999-10-24 22:56:09 sandervl Exp $ */
+/* $Id: user32.rc,v 1.4 1999-12-29 18:49:29 sandervl Exp $ */
 /* converted from WINE */
 
@@ -395 +395 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// Version
+// Version (based on NT 4 SP3 user32.dll)
 //
 
@@ -413 +413 @@
             VALUE "Comments", "Odin32 System Dll\0"
             VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "Generic Example Application\0"
-            VALUE "FileVersion", "0.0\0"
-            VALUE "InternalName", "Odin32 - USER32\0"
+            VALUE "FileDescription", "USER32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "USER32\0"
             VALUE "LegalCopyright", "Copyright (C) 1999\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
+            VALUE "OriginalFilename", "USER32.DLL\0"
             VALUE "ProductName", "Odin32 - USER32\0"
-            VALUE "ProductVersion", "1.0\0"
+            VALUE "ProductVersion", "4.00\0"
         END
     END