Changeset 1054 for trunk/src/kernel32/old

Timestamp:

Sep 25, 1999, 9:07:34 PM (26 years ago)

Author:

sandervl

Message:

Compilation fixes

Location:

trunk/src/kernel32/old

Files:

• lang.cpp (modified) (1 diff)
• makefile (modified) (6 diffs)
• mmap.cpp (modified) (2 diffs)
• virtual.cpp (modified) (2 diffs)
• windll.cpp (modified) (2 diffs)
• winimage.cpp (modified) (2 diffs)
• winres.cpp (modified) (2 diffs)

trunk/src/kernel32/old/lang.cpp

@@ +1 @@
+/* $Id: lang.cpp,v 1.3 1999-09-25 19:07:03 sandervl Exp $ */
 /*
  * Win32 language API functions for OS/2

trunk/src/kernel32/old/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 1999-09-15 23:32:58 sandervl Exp $
+# $Id: makefile,v 1.2 1999-09-25 19:06:17 sandervl Exp $
 
 #
@@ -7 +7 @@
 #
 
-PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_INCLUDE = ..\..\..\include\old
+PDWIN32_LIB = ..\..\..\lib
+PDWIN32_BIN = .
+PDWIN32_TOOLS = ..\..\..\tools\bin
 
 
@@ -16 +16 @@
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) /Tm+
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) /Tm+
+CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\..\win
+CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I$(PDWIN32_INCLUDE)\..\win
 
 
@@ -51 +51 @@
         rc -r console.rc console.res
         rc console.res $@
-        $(CP) $@ $(PDWIN32_BIN)
 
 $(TARGET).lrf: makefile
@@ -67 +66 @@
 $(TARGET).LIB: $(TARGET)exp.def
         $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
 
 $(TARGET)exp.def: $(TARGET).def
@@ -331 +329 @@
         $(PDWIN32_INCLUDE)\unicode.h
 
-virtual.obj:   virtual.cpp $(PDWIN32_INCLUDE)\win\virtual.h $(PDWIN32_INCLUDE)\handlemanager.h mmap.h
+virtual.obj:   virtual.cpp $(PDWIN32_INCLUDE)\handlemanager.h mmap.h
 mmap.obj:      mmap.cpp mmap.h $(PDWIN32_INCLUDE)\vmutex.h oslibdos.h
 
 pefile.OBJ:    pefile.cpp $(PDWIN32_INCLUDE)\pefile.h
-winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h initterm.h $(PDWIN32_INCLUDE)\win\virtual.h oslibmisc.h
+winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h initterm.h  oslibmisc.h
 winimgres.OBJ: winimgres.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winexe.h $(PDWIN32_INCLUDE)\winres.h
 windll.OBJ:    windll.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h oslibmisc.h

trunk/src/kernel32/old/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.1 1999-09-15 23:32:58 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.2 1999-09-25 19:06:17 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <virtual.h>
 #include <vmutex.h>
 #include <handlemanager.h>

trunk/src/kernel32/old/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.1 1999-09-15 23:33:01 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.2 1999-09-25 19:06:17 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <virtual.h>
 #include <heapstring.h>
 #include <handlemanager.h>

trunk/src/kernel32/old/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.1 1999-09-15 23:33:01 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.2 1999-09-25 19:06:17 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
 void _System SetLastError(ULONG ulError);
 
+BOOL WIN32API RegisterLxDll(HINSTANCE hInstance, WIN32DLLENTRY EntryPoint, 
+                            PVOID pResData)
+{
+  return TRUE;
+}
+BOOL WIN32API UnregisterLxDll(HINSTANCE hInstance)
+{
+  return TRUE;
+}
 //******************************************************************************
 //******************************************************************************

trunk/src/kernel32/old/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.1 1999-09-15 23:33:02 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.2 1999-09-25 19:06:17 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 #include "oslibmisc.h"
 #include "initterm.h"
-#include <win\virtual.h>
+#include <virtual.h>
 
 char szErrorTitle[]     = "Win32 for OS/2";

trunk/src/kernel32/old/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.1 1999-09-15 23:33:02 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.2 1999-09-25 19:06:17 sandervl Exp $ */
 
 /*
@@ -447 +447 @@
 //******************************************************************************
 //******************************************************************************
+ULONG Win32Resource::getOS2Size()
+{
+  switch(type) {
+    case NTRT_NEWBITMAP:
+    case NTRT_BITMAP:
+        return QueryConvertedBitmapSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+
+    case NTRT_CURSOR:
+        return QueryConvertedCursorSize((CursorComponent *)winresdata, ressize);
+
+    case NTRT_ICON:
+        return QueryConvertedIconSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+
+    case NTRT_GROUP_ICON:
+    case NTRT_GROUP_CURSOR:
+    case NTRT_ACCELERATORS:
+    case NTRT_NEWMENU:
+    case NTRT_MENU:
+    case NTRT_NEWDIALOG:
+    case NTRT_DIALOG:
+    case NTRT_FONTDIR:
+    case NTRT_FONT:
+    case NTRT_MESSAGETABLE:
+    case NTRT_RCDATA:
+    case NTRT_VERSION:
+    case NTRT_STRING:
+    default:
+        dprintf(("Win32Resource::getOS2Size SHOULDN'T BE CALLED for this resource type (%d) (NOT IMPLEMENTED)!!", type));
+        break;
+  }
+  return 0;
+}
+//******************************************************************************
+//******************************************************************************