Changeset 21875 for branches/gcc-kmk/src

Timestamp:

Dec 9, 2011, 9:23:34 PM (14 years ago)

Author:

dmik

Message:

Port DDRAW to GCC/kBuild.

Location:

branches/gcc-kmk/src

Files:

• Makefile.kmk (modified) (1 diff)
• ddraw/Makefile.kmk (added)
• ddraw/ddmain.cpp (modified) (2 diffs)
• ddraw/ddraw.def (modified) (1 diff)
• ddraw/ddraw2d.cpp (modified) (1 diff)
• ddraw/ddraw2d.h (modified) (1 diff)
• ddraw/initterm.cpp (moved) (moved from branches/gcc-kmk/src/ddraw/initddraw.cpp ) (2 diffs)
• ddraw/os2fsdd.cpp (modified) (2 diffs)
• ddraw/surface.cpp (modified) (1 diff)
• ddraw/surfacehlp.cpp (modified) (8 diffs)
• ddraw/surfblit.cpp (modified) (1 diff)
• ddraw/surfoverlay.cpp (modified) (1 diff)
• ddraw/svgadefs.h (modified) (1 diff)
• ddraw/wndproc.c (modified) (1 diff)

branches/gcc-kmk/src/Makefile.kmk

@@ -36 +36 @@
 include $(PATH_SUB_CURRENT)/winspool/Makefile.kmk
 include $(PATH_SUB_CURRENT)/comdlg32/Makefile.kmk
+include $(PATH_SUB_CURRENT)/ddraw/Makefile.kmk
 include $(PATH_SUB_CURRENT)/crypt32/Makefile.kmk
 include $(PATH_SUB_CURRENT)/ctl3d32/Makefile.kmk

branches/gcc-kmk/src/ddraw/ddmain.cpp

@@ -79 +79 @@
   dprintf(("DDRAW: DirectDrawEnumerateA\n Callback for DIVE"));
   //call it twice for the DirectDraw & Direct3D classes
- if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
-                "DirectDraw/2 v0.4", lpContext) == DDENUMRET_CANCEL)
+ if(lpCallback(NULL, (LPSTR)"DIVE DirectDraw for OS/2",
+                (LPSTR)"DirectDraw/2 v0.4", lpContext) == DDENUMRET_CANCEL)
   {
     dprintf(("DDRAW: Cancel Callback"));
@@ -91 +91 @@
   {
     dprintf(("DDRAW: Callback for 3Dfx Voodoo"));
-    if(lpCallback((GUID *)&IID_IDirect3D, "3Dfx Voodoo Direct3D/2",
-      "Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
+    if(lpCallback((GUID *)&IID_IDirect3D, (LPSTR)"3Dfx Voodoo Direct3D/2",
+      (LPSTR)"Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
     {
       dprintf(("DDRAW: Cancel Callback"));

branches/gcc-kmk/src/ddraw/ddraw.def

@@ -17 +17 @@
 ; D3DParseUnknownCommand    @2
 ; DDGetAttachedSurfaceLcl   @3
- DDHAL32_VidMemFree  = _DDHAL32_VidMemFree@4                    @4
- DDHAL32_VidMemAlloc = _DDHAL32_VidMemAlloc@4                   @5
+ DDHAL32_VidMemFree  = "_DDHAL32_VidMemFree@4"                  @4
+ DDHAL32_VidMemAlloc = "_DDHAL32_VidMemAlloc@4"                 @5
 ; DDInternalLock            @6
 ; DDInternalUnlock          @7
 ; DSoundHelp                @8
- DirectDrawCreate         = _OS2DirectDrawCreate@12             @9
- DirectDrawCreateClipper  = _OS2DirectDrawCreateClipper@12      @10
- DirectDrawCreateEx       = _DirectDrawCreateEx@16              @11
- DirectDrawEnumerateA     = _OS2DirectDrawEnumerateA@8          @12
- DirectDrawEnumerateExA   = _OS2DirectDrawEnumerateExA@12       @13
+ DirectDrawCreate         = "_OS2DirectDrawCreate@12"           @9
+ DirectDrawCreateClipper  = "_OS2DirectDrawCreateClipper@12"    @10
+ DirectDrawCreateEx       = "_DirectDrawCreateEx@16"            @11
+ DirectDrawEnumerateA     = "_OS2DirectDrawEnumerateA@8"        @12
+ DirectDrawEnumerateExA   = "_OS2DirectDrawEnumerateExA@12"     @13
 ; DirectDrawEnumerateExW          @14
 ; DirectDrawEnumerateW            @15
-DllCanUnloadNow   = _DDrawDllCanUnloadNow@0                     @16
-DllGetClassObject = _DDrawDllGetClassObject@12                  @17
+DllCanUnloadNow   = "_DDrawDllCanUnloadNow@0"                   @16
+DllGetClassObject = "_DDrawDllGetClassObject@12"                @17
 ; GetAliasedVidMem          @18
 ; GetDDSurfaceLocal         @19

branches/gcc-kmk/src/ddraw/ddraw2d.cpp

@@ -130 +130 @@
 
   pdwUnknownData = (DWORD*) malloc (255*sizeof(DWORD));
-  for(int i= 0 ;i<255;i++)
+  int i;
+  for(i= 0 ;i<255;i++)
     pdwUnknownData[i] = 0;
 

branches/gcc-kmk/src/ddraw/ddraw2d.h

@@ -163 +163 @@
 };
 
+#ifdef __GNUC__
+// abuse the real address instead of NULL to supress GCC warnings
+// (note that it will not work right if OS2IDirectDraw gets virtual methods etc.)
+#define OFFSET_D3DVTABLE        (LONG)(&((OS2IDirectDraw *)1)->lpVtbl3D-1)
+#else
 #define OFFSET_D3DVTABLE        (LONG)(&((OS2IDirectDraw *)NULL)->lpVtbl3D)
+#endif
 #define DDraw3D_GetThisPtr(a)   (OS2IDirectDraw *)((ULONG)a-OFFSET_D3DVTABLE)
 

branches/gcc-kmk/src/ddraw/initterm.cpp

@@ -1 @@
-/* $Id: initddraw.cpp,v 1.2 2003-02-07 13:58:17 sandervl Exp $
+/* $Id: initterm.cpp,v 1.20 2003-01-21 11:20:35 sandervl Exp $
  *
- * DLL entry point
+ * DDRAW DLL entry point
  *
  * Copyright 1998 Sander van Leeuwen
  * Copyright 1998 Peter Fitzsimmons
  *
- *
  * Project Odin Software License can be found in LICENSE.TXT
- *
  */
 
-/*-------------------------------------------------------------*/
-/* INITERM.C -- Source for a custom dynamic link library       */
-/*              initialization and termination (_DLL_InitTerm) */
-/*              function.                                      */
-/*                                                             */
-/* When called to perform initialization, this sample function */
-/* gets storage for an array of integers, and initializes its  */
-/* elements with random integers.  At termination time, it     */
-/* frees the array.  Substitute your own special processing.   */
-/*-------------------------------------------------------------*/
-
-
-/* Include files */
 #define  INCL_DOSMODULEMGR
 #define  INCL_DOSPROCESS
@@ -35 +20 @@
 #include <odinlx.h>
 #include <dbglog.h>
+#include <exitlist.h>
+#include <misc.h>       /*PLF Wed  98-03-18 23:18:15*/
+#include <initdll.h>
+
+#ifdef FULLSCREEN_DDRAW
+#include "os2fsdd.h"    // For RestorePM()
+#endif
 #include "divewrap.h"
 
-extern "C" {
- //Win32 resource table (produced by wrc)
- extern DWORD ddraw_PEResTab;
-}
+// Win32 resource table (produced by wrc)
+extern DWORD ddraw_PEResTab;
 
 char ddrawPath[CCHMAXPATH] = "";
 static HMODULE dllHandle = 0;
 
-static void APIENTRY cleanup(ULONG ulReason);
+#if 0 // not currently needed
+BOOL WINAPI LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+{
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        return TRUE;
 
-/****************************************************************************/
-/* _DLL_InitTerm is the function that gets called by the operating system   */
-/* loader when it loads and frees this DLL for each process that accesses   */
-/* this DLL.  However, it only gets called the first time the DLL is loaded */
-/* and the last time it is freed for a particular process.  The system      */
-/* linkage convention MUST be used because the operating system loader is   */
-/* calling this function.                                                   */
-/****************************************************************************/
-ULONG APIENTRY inittermDDraw(ULONG hModule, ULONG ulFlag)
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        return TRUE;
+
+    case DLL_PROCESS_DETACH:
+        return TRUE;
+    }
+    return FALSE;
+}
+#endif
+
+ULONG SYSTEM DLL_InitDDraw(ULONG hModule)
 {
-   /*-------------------------------------------------------------------------*/
-   /* If ulFlag is zero then the DLL is being loaded so initialization should */
-   /* be performed.  If ulFlag is 1 then the DLL is being freed so            */
-   /* termination should be performed.                                        */
-   /*-------------------------------------------------------------------------*/
+    APIRET rc;
 
-   switch (ulFlag) {
-      case 0 :
-      {
-         APIRET rc;
+    DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
+    char *endofpath = strrchr(ddrawPath, '\\');
+    if (endofpath)
+       *(endofpath+1) = '\0';
 
-         DosQueryModuleName(hModule, CCHMAXPATH, ddrawPath);
-         char *endofpath = strrchr(ddrawPath, '\\');
-         if (endofpath)
-            *(endofpath+1) = '\0';
+    CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
 
-         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
+    dllHandle = RegisterLxDll(hModule, NULL, (PVOID)&ddraw_PEResTab,
+                              DDRAW_MAJORIMAGE_VERSION, DDRAW_MINORIMAGE_VERSION,
+                              IMAGE_SUBSYSTEM_WINDOWS_GUI);
+    if (dllHandle == 0)
+       return -1;
 
-         dllHandle = RegisterLxDll(hModule, NULL, (PVOID)&ddraw_PEResTab,
-                                   DDRAW_MAJORIMAGE_VERSION, DDRAW_MINORIMAGE_VERSION,
-                                   IMAGE_SUBSYSTEM_WINDOWS_GUI);
-         if (dllHandle == 0)
-            return 0UL;
+    DiveLoad();
 
-         DiveLoad();
-         break;
-      }
-      case 1 :
-         DiveUnload();
-         if(dllHandle) {
-            UnregisterLxDll(dllHandle);
-         }
-         break;
-      default  :
-         return 0UL;
-   }
+#ifdef FULLSCREEN_DDRAW
+    return EXITLIST_NONCOREDLL;
+#else
+    return 0;
+#endif
+}
 
-   /***********************************************************/
-   /* A non-zero value must be returned to indicate success.  */
-   /***********************************************************/
-   return 1UL;
+void SYSTEM DLL_TermDDraw(ULONG hModule)
+{
+#ifdef FULLSCREEN_DDRAW
+    dprintf(("DDRAW processing exitlist"));
+    RestorePM();
+    dprintf(("DDRAW exitlist done"));
+#endif
+
+    DiveUnload();
+
+    if (dllHandle)
+       UnregisterLxDll(dllHandle);
 }
-//******************************************************************************
-//******************************************************************************
+
+ULONG SYSTEM DLL_Init(ULONG hModule)
+{
+    if (DLL_InitDefault(hModule) == -1)
+        return -1;
+    return DLL_InitDDraw(hModule);
+}
+
+void SYSTEM DLL_Term(ULONG hModule)
+{
+    DLL_TermDDraw(hModule);
+    DLL_TermDefault(hModule);
+}

branches/gcc-kmk/src/ddraw/os2fsdd.cpp

@@ -15 +15 @@
 #include <misc.h>
 
-#include <svgadefs.h>
+#include "svgadefs.h"
 
 #include "os2fsdd.h"
@@ -53 +53 @@
 static ULONG ulTotalModes;
 
-static bIsInFS = FALSE;
+static BOOL bIsInFS = FALSE;
 
 /*

branches/gcc-kmk/src/ddraw/surface.cpp

@@ -44 +44 @@
 #include "wndproc.h"
 
-#ifndef __WATCOMC__
+#ifdef __IBMC__
   #include <builtin.h>
 #endif

branches/gcc-kmk/src/ddraw/surfacehlp.cpp

@@ -314 +314 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -339 +339 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -357 +357 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -397 +397 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -441 +441 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -462 +462 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
     FE(DDSD_CAPS)
@@ -492 +492 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},
@@ -511 +511 @@
   const struct {
     DWORD  mask;
-    char  *name;
+    const char  *name;
   } flags[] = {
 #define FE(x) { x, #x},

branches/gcc-kmk/src/ddraw/surfblit.cpp

@@ -46 +46 @@
 #include "divewrap.h"
 
-#ifndef __WATCOMC__
+#ifdef __IBMC__
   #include <builtin.h>
 #endif

branches/gcc-kmk/src/ddraw/surfoverlay.cpp

@@ -45 +45 @@
 #include "wndproc.h"
 
-#ifndef __WATCOMC__
+#ifdef __IBMC__
   #include <builtin.h>
 #endif

branches/gcc-kmk/src/ddraw/svgadefs.h

@@ -82 +82 @@
 /* NOINC */
 
-#include <svgapmi.h>
+#include "svgapmi.h"
 
 /* INC */

branches/gcc-kmk/src/ddraw/wndproc.c

@@ -107 +107 @@
                            "WINE_DDRAW", "DirectDraw",
                            WS_POPUP, 0, 0, dwWidth, dwHeight,
-                           GetDesktopWindow(), 0, 0, hwndOwner);
+                           GetDesktopWindow(), 0, 0, (LPVOID)hwndOwner);
 
     SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0,