Changeset 1356 for trunk/src/kernel32/winres.cpp

Timestamp:

Oct 19, 1999, 2:51:25 PM (26 years ago)

Author:

sandervl

Message:

Resource support for DIB type (DISABLED)

File:

• trunk/src/kernel32/winres.cpp (modified) (16 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.19 1999-09-15 23:38:02 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.20 1999-10-19 12:51:25 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #define INCL_BITMAPFILEFORMAT
 #define INCL_DOSMODULEMGR
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdarg.h>
 #ifdef __IBMCPP__
@@ -107 +107 @@
   //resources are in Unicode format by default; indirectly created resources
   //can also be in ascii format
-  isUnicode  = TRUE; 
+  isUnicode  = TRUE;
 }
 //******************************************************************************
@@ -129 +129 @@
     case NTRT_NEWBITMAP:
     case NTRT_BITMAP:
-        orgos2type = RT_BITMAP;
+        orgos2type = RT_BITMAP;
         break;
     case NTRT_CURSOR:
@@ -135 +135 @@
     case NTRT_GROUP_ICON:
     case NTRT_ICON:
-        orgos2type = RT_POINTER;
-        break;
+        orgos2type = RT_POINTER;
+        break;
     case NTRT_ACCELERATORS:
-        orgos2type = RT_ACCELTABLE;
-        break;
+        orgos2type = RT_ACCELTABLE;
+    break;
     case NTRT_NEWMENU:
     case NTRT_MENU:
-        orgos2type = RT_MENU;
-        break;
+        orgos2type = RT_MENU;
+        break;
     case NTRT_NEWDIALOG:
     case NTRT_DIALOG:
-        orgos2type = RT_DIALOG;
-        break;
+        orgos2type = RT_DIALOG;
+        break;
     case NTRT_FONTDIR:
     case NTRT_FONT:
@@ -166 +166 @@
   }
   //resources are in Unicode format by default
-  isUnicode  = TRUE; 
+  isUnicode  = TRUE;
 }
 //******************************************************************************
@@ -192 +192 @@
 
   if(type == NTRT_STRING) {
-        memcpy(winresdata, resdata, size-sizeof(WCHAR));
-        ((USHORT *)winresdata)[size/sizeof(WCHAR)-1] = 0;
-  }
-  else  memcpy(winresdata, resdata, size);
+    memcpy(winresdata, resdata, size-sizeof(WCHAR));
+    ((USHORT *)winresdata)[size/sizeof(WCHAR)-1] = 0;
+  }
+  else  memcpy(winresdata, resdata, size);
 
   //resources are in Unicode format by default
-  isUnicode  = TRUE; 
+  isUnicode  = TRUE;
 }
 //******************************************************************************
@@ -208 +208 @@
   //returned by DosGetResource, so we don't (and mustn't) free it
   if(os2resdata && (resType == RSRC_PELOADER || resType == RSRC_CUSTOMINDIRECT))
-        free(os2resdata);
+    free(os2resdata);
 
   if(winresdata)    free(winresdata);
@@ -235 +235 @@
 
   dprintf(("Win32Resource::lockResource %d\n", id));
+
   if(winresdata)
     return(winresdata);
@@ -290 +291 @@
         winresdata = malloc(ressize+sizeof(WCHAR));
         memcpy(winresdata, resdata, ressize);
-        *(USHORT *)(&((char *)winresdata)[ressize]) = 0;
+    *(USHORT *)(&((char *)winresdata)[ressize]) = 0;
         DosFreeResource(resdata);
         return((PVOID)((ULONG)winresdata+2));   //skip length word
@@ -303 +304 @@
 
   if(winresdata == NULL) {
-        rc = DosGetResource((HMODULE)module->hinstance, os2type, id, (PPVOID)&resdata);
-        if(rc) {
-                dprintf(("Can't find original resource!!!\n"));
-                return(NULL);
-        }
-        winresdata = (char *)malloc(ressize);
-        memcpy(winresdata, resdata, ressize);
+        rc = DosGetResource((HMODULE)module->hinstance, os2type, id, (PPVOID)&resdata);
+        if(rc) {
+            dprintf(("Can't find original resource!!!\n"));
+            return(NULL);
+        }
+        winresdata = (char *)malloc(ressize);
+        memcpy(winresdata, resdata, ressize);
   }
   if(resdata)
-        DosFreeResource(resdata);
+        DosFreeResource(resdata);
 
   return winresdata;
@@ -325 +326 @@
    dprintf(("Win32Resource::lockOS2Resource %d\n", id));
    if(os2resdata == NULL) {
-        if(resType == RSRC_PELOADER || resType == RSRC_CUSTOMINDIRECT) {
-                os2resdata = convertResource(winresdata);
-        }
-        else {
-                rc = DosGetResource((HMODULE)module->hinstance, orgos2type, id, (PPVOID)&resdata);
-                if(rc)  return(NULL);
-                os2resdata = resdata;
-        }
+    if(resType == RSRC_PELOADER || resType == RSRC_CUSTOMINDIRECT) {
+        os2resdata = convertResource(winresdata);
+    }
+    else {
+        rc = DosGetResource((HMODULE)module->hinstance, orgos2type, id, (PPVOID)&resdata);
+        if(rc)  return(NULL);
+        os2resdata = resdata;
+    }
    }
    return os2resdata;
@@ -344 +345 @@
     case NTRT_NEWBITMAP:
     case NTRT_BITMAP:
-        return QueryConvertedBitmapSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+    return QueryConvertedBitmapSize((WINBITMAPINFOHEADER *)winresdata, ressize);
 
     case NTRT_CURSOR:
-        return QueryConvertedCursorSize((CursorComponent *)winresdata, ressize);
+    return QueryConvertedCursorSize((CursorComponent *)winresdata, ressize);
 
     case NTRT_ICON:
-        return QueryConvertedIconSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+    return QueryConvertedIconSize((WINBITMAPINFOHEADER *)winresdata, ressize);
 
     case NTRT_GROUP_ICON:
@@ -366 +367 @@
     case NTRT_STRING:
     default:
-        dprintf(("Win32Resource::getOS2Size SHOULDN'T BE CALLED for this resource type (%d) (NOT IMPLEMENTED)!!", type));
-        break;
+    dprintf(("Win32Resource::getOS2Size SHOULDN'T BE CALLED for this resource type (%d) (NOT IMPLEMENTED)!!", type));
+    break;
   }
   return 0;
@@ -380 +381 @@
     case NTRT_NEWBITMAP:
     case NTRT_BITMAP:
-        return ConvertBitmap((WINBITMAPINFOHEADER *)win32res, ressize, &ressize);
+    return ConvertBitmap((WINBITMAPINFOHEADER *)win32res, ressize, &ressize);
 
     case NTRT_CURSOR:
-        return ConvertCursor((CursorComponent *)win32res, ressize, &cvtressize);
+    return ConvertCursor((CursorComponent *)win32res, ressize, &cvtressize);
 
     case NTRT_GROUP_CURSOR:
-        return ConvertCursorGroup((CursorHeader *)win32res, ressize, module);
+    return ConvertCursorGroup((CursorHeader *)win32res, ressize, module);
 
     case NTRT_GROUP_ICON:
-        return ConvertIconGroup((IconHeader *)win32res, ressize, module);
+    return ConvertIconGroup((IconHeader *)win32res, ressize, module);
 
     case NTRT_ICON:
-        return ConvertIcon((WINBITMAPINFOHEADER *)win32res, ressize, &cvtressize);
+    return ConvertIcon((WINBITMAPINFOHEADER *)win32res, ressize, &cvtressize);
 
     case NTRT_ACCELERATORS:
-        return ConvertAccelerator((WINACCEL *)win32res, ressize);
+    return ConvertAccelerator((WINACCEL *)win32res, ressize);
 
     case NTRT_NEWMENU:
     case NTRT_MENU:
-        return ConvertMenu((MenuHeader *)win32res, ressize, isUnicode);
+    return ConvertMenu((MenuHeader *)win32res, ressize, isUnicode);
 
     case NTRT_NEWDIALOG:
     case NTRT_DIALOG:
-        break;
+    break;
     case NTRT_FONTDIR:
     case NTRT_FONT:
@@ -410 +411 @@
     case NTRT_VERSION:
     case NTRT_STRING:
-        break;
+    break;
 
     default: