Changeset 1252 for trunk/src

Timestamp:

Oct 11, 1999, 10:17:11 PM (26 years ago)

Author:

sandervl

Message:

Added version info, compile resource with wrc (shell about fixed), call Wine dll entrypoint

Location:

trunk/src/shell32

Files:

• initterm.cpp (modified) (3 diffs)
• makefile (modified) (4 diffs)
• resource.asm (added)
• shell32_En.rc (modified) (2 diffs)
• shell32_main.cpp (modified) (2 diffs)
• shres.rc (modified) (4 diffs)

trunk/src/shell32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.8 1999-10-09 11:13:19 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.9 1999-10-11 20:17:10 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 }
 
+extern "C" {
+ //Win32 resource table (produced by wrc)
+ extern DWORD _Resource_PEResTab;
+}
+
+BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad);
+
 /*-------------------------------------------------------------------*/
 /* A clean up routine registered with DosExitList must be used if    */
@@ -81 +88 @@
          /*******************************************************************/
 
-         if(RegisterLxDll(hModule, 0, 0) == FALSE) 
+         if(RegisterLxDll(hModule, Shell32LibMain, (PVOID)&_Resource_PEResTab) == FALSE) 
                 return 0UL;
 

trunk/src/shell32/makefile

@@ -1 @@
-# $Id: makefile,v 1.12 1999-10-09 11:13:19 sandervl Exp $
+# $Id: makefile,v 1.13 1999-10-11 20:17:10 sandervl Exp $
 
 #
@@ -20 +20 @@
 
 
+RC = wrc
+RCFLAGS = -s -I. -If:\ibmcpp\include -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\win
+
 TARGET = shell32
 
@@ -29 +32 @@
         shellord.obj shellpath.obj shv_bg_cmenu.obj \
         shlfolder.obj shlview.obj shell.obj unknown.obj misc.obj \
-        she.obj sh.obj
+        she.obj sh.obj resource.obj
 
 all: $(TARGET).dll $(TARGET).lib
@@ -51 +54 @@
         $(IMPDEF) $** $@
 
+resource.asm: shres.rc 
+    $(RC) $(RCFLAGS) -o resource.asm shres.rc
+
+resource.obj: resource.asm
 
 

trunk/src/shell32/shell32_En.rc

@@ -1 @@
-/* $Id: shell32_En.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
+/* $Id: shell32_En.rc,v 1.3 1999-10-11 20:17:11 sandervl Exp $ */
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
@@ -11 +11 @@
  ICON "", 1088, 189, 10, 14, 16
  LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+ LTEXT "Odin was brought to you by:", 98, 8, 55, 137, 10
 }
 

trunk/src/shell32/shell32_main.cpp

@@ -1 @@
-/* $Id: shell32_main.cpp,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
+/* $Id: shell32_main.cpp,v 1.3 1999-10-11 20:17:11 sandervl Exp $ */
 /*
  *                              Shell basics
@@ -837 +837 @@
 
 INT             shell32_ObjCount = 0;
-HINSTANCE       shell32_hInstance;
+HINSTANCE       shell32_hInstance = 0;
 HIMAGELIST      ShellSmallIconList = 0;
 HIMAGELIST      ShellBigIconList = 0;

trunk/src/shell32/shres.rc

@@ -1 @@
-/* $Id: shres.rc,v 1.2 1999-10-09 11:17:07 sandervl Exp $ */
+/* $Id: shres.rc,v 1.3 1999-10-11 20:17:11 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -9 +9 @@
 #include "shlobj.h"
 #include "shresdef.h"
+#include "odinrsrc.h"
 
 /*--------------------- FIXME --------------------------
@@ -126 +127 @@
         IDS_OPEN                "Open"
 }
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            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 - SHELL32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "\0"
+            VALUE "ProductName", "Odin32 - SHELL32\0"
+            VALUE "ProductVersion", "1.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x04E4
+    END
+END
 
 /* document */
@@ -1190 +1227 @@
  * get localized bitmaps for example.
  */
-#include "shell32_Ca.rc"
-#include "shell32_Cs.rc"
-#include "shell32_Da.rc"
-#include "shell32_De.rc"
 #include "shell32_En.rc"
-#include "shell32_Eo.rc"
-#include "shell32_Es.rc"
-#include "shell32_Fi.rc"
-#include "shell32_Fr.rc"
-#include "shell32_Hu.rc"
-#include "shell32_It.rc"
-#include "shell32_Ko.rc"
-#include "shell32_Nl.rc"
-#include "shell32_No.rc"
-#include "shell32_Pl.rc"
-#include "shell32_Pt.rc"
-#include "shell32_Ru.rc"
-#include "shell32_Sv.rc"
-#include "shell32_Wa.rc"
+//#include "shell32_Ca.rc"
+//#include "shell32_Cs.rc"
+//#include "shell32_Da.rc"
+//#include "shell32_De.rc"
+//#include "shell32_Eo.rc"
+//#include "shell32_Es.rc"
+//#include "shell32_Fi.rc"
+//#include "shell32_Fr.rc"
+//#include "shell32_Hu.rc"
+//#include "shell32_It.rc"
+//#include "shell32_Ko.rc"
+//#include "shell32_Nl.rc"
+//#include "shell32_No.rc"
+//#include "shell32_Pl.rc"
+//#include "shell32_Pt.rc"
+//#include "shell32_Ru.rc"
+//#include "shell32_Sv.rc"
+//#include "shell32_Wa.rc"