Changeset 141 for trunk/classes/c/c_image/cwimage.c

Timestamp:

Jan 21, 2024, 10:15:49 PM (19 months ago)

Author:

gyoung

Message:

Merged changes from Lar's branch

File:

• trunk/classes/c/c_image/cwimage.c (modified) (102 diffs)

trunk/classes/c/c_image/cwimage.c

@@ -25 +25 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */          
+ */
 /*
  * If you need another license for your project/product (commercial,
  * noncommercial, whatever) contact me at
- * 
+ *
  * http://www.os2world.com/cdwriting
  * http://www.geocities.com/SiliconValley/Sector/5785/
@@ -36 +36 @@
 /*
  *  This file was generated by the SOM Compiler and Emitter Framework.
- *  Generated using: 
+ *  Generated using:
  *      SOM Emitter emitctm: 2.42
  */
@@ -120 +120 @@
 HBITMAP createNewBitmap ( HBITMAP hbm,
                           PBITMAPINFOHEADER2 pBmpInfoHeader2,
-                          ULONG ulWidth, 
-                          ULONG ulHeight, 
+                          ULONG ulWidth,
+                          ULONG ulHeight,
                           BOOL* pbQuitEarly);
 
@@ -129 +129 @@
 BOOL getStringFromRexxScript(PSZ rexxFile, char* chrResult, ULONG ulSize);
 
-BOOL mmclsCreateTheDefaultTemplate(M_WPObject *somSelf, 
+BOOL mmclsCreateTheDefaultTemplate(M_WPObject *somSelf,
                                    WPObject* Folder);
 
 MRESULT menuInsertMenuSeparator(HWND hwndMenu, HWND hwndSubMenu, SHORT sPosition );
 
-/* 
+/*
    This Proc creates the small bitmaps for display on a separate thread.
    It's used indirectly used by the lighttable folder when an attempt to
@@ -160 +160 @@
               if(!pCreateBMP)
                 return (MRESULT) FALSE;
+
 #ifdef DEBUG
               SysWriteToTrapLog("In %s, line %d\n", __FUNCTION__, __LINE__);
@@ -167 +168 @@
                 return (MRESULT) FALSE;
 
-              /* 
-                 V0.2.8, CW 2004/11/01 
-                 
+              /*
+                 V0.2.8, CW 2004/11/01
+
                  It's possible that a lot of requests are issued to this thread while opening a folder.
                  These are qeued and in the meanwhile the user may have closed the folder.
@@ -181 +182 @@
                 pmrcToRefresh=pCreateBMP->pmrcToRefresh;
                 for(;;) {
-                  RECTL rectl, rectl2;
+                  RECTL rectl2;
                   if(WinSendMsg(pCreateBMP->hwndCnr, CM_QUERYVIEWPORTRECT, MPFROMP(&rectl2), MPFROM2SHORT(CMA_WORKSPACE, FALSE))) {
 
@@ -197 +198 @@
 
                   _wpLockObject(pCreateBMP->wpObject);
-                  
+
                   /* Check if in the meantime the bitmap was created */
                   if(!_hBitmapSmall) {
-                    /* 
+                    /*
                        FIXME:
-                       
+
                        Not threadsafe!!!
-                       
+
                        Use a private work alike for wpQueryBitmapHandle instead???
                        
@@ -214 +215 @@
                       bLoaded=TRUE;
                     
-                    if(_wpQueryBitmapHandle(pCreateBMP->wpObject, 
-                                            &hbm, 
+                    if(_wpQueryBitmapHandle(pCreateBMP->wpObject,
+                                            &hbm,
                                             NULLHANDLE,
-                                            pCreateBMP->ulWidth, 
-                                            pCreateBMP->ulHeight, 
-                                            0, /* ulFlags*/ 
-                                            0, 
+                                            pCreateBMP->ulWidth,
+                                            pCreateBMP->ulHeight,
+                                            0, /* ulFlags*/
+                                            0,
                                             NULLHANDLE)) {
                       _hBitmapSmall=hbm;
                       _ulSizeSmallBitmap=pCreateBMP->ulHeight;
                       if(!bLoaded) {
-                        /* The bitmap wasn't loaded so discard it now, we don't need it any more as we have
-                           the small one. */
-                        GpiDeleteBitmap(_hBitmap);
-                        _hBitmap=NULLHANDLE;
+                      /* Discard the large bitmap now, we don't need it any more as we have
+                         the small one. */
+                      GpiDeleteBitmap(_hBitmap);
+                      _hBitmap=NULLHANDLE;
                       }
                     }/* _wpQueryBitmapHandle() */
@@ -235 +236 @@
                     //    WinPostMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
                     WinSendMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
-                  
-                  _wpUnlockObject(pCreateBMP->wpObject);
                   break;
                 }/* for */
               }/* Try */
-              CATCH(BITMAP_OBJECT)
-                {
+              CATCH(BITMAP_OBJECT) {
                   SysWriteToTrapLog("\nTrap occured in %s, file %s, around line %d.\n",
                                     __FUNCTION__, __FILE__, __LINE__);
-                  _wpUnlockObject(pCreateBMP->wpObject); /* If we trapped in wpUnlockObject(), we will have a problem here... */
-                } END_CATCH;
-                //        WinSendMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
-                //   _wp_FreeMem(wpObject, (PBYTE)pCreateBMP);
-                free((PBYTE)pCreateBMP);
-
-                return (MRESULT) FALSE;
+              } END_CATCH;
+              _wpUnlockObject(pCreateBMP->wpObject);
+              //        WinSendMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
+              //   _wp_FreeMem(wpObject, (PBYTE)pCreateBMP);
+              free((PBYTE)pCreateBMP);
+
+              return (MRESULT) FALSE;
             }/* case ACKEY_CREATE_SMALLBITMAP */
           case ACKEY_QUERY_BITMAPINFO:
@@ -262 +260 @@
                 return (MRESULT) FALSE;
 
-              TRY_LOUD(BITMAPIH_OBJECT) {          
+              TRY_LOUD(BITMAPIH_OBJECT) {
                 somThis  = MMImageGetData(pCreateBMP->wpObject);
-                                
+
                 /* Check if in the meantime the bitmap was created */
                 if(!_pBmpInfoHeader2) {
@@ -303 +301 @@
   HMQ  hmq;
   QMSG qmsg;
-  
+
   hab=WinInitialize(0);
   if(hab) {
@@ -348 +346 @@
         }
         return FALSE;
-        
+
       }
     default:
@@ -430 +428 @@
                 //ulPostCount++;
                 //SysWriteToTrapLog("  Have msg %d\n", ulPostCount);
-                
+
                 /*
                   Check for system msgs and dispatch them.
@@ -476 +474 @@
                 /*
                   queue is almost full. The semaphore was posted by the function so
-                  dispatch messages faster. 
+                  dispatch messages faster.
                  */
                 int a=0;
                 //                SysWriteToTrapLog(" --Semaphore posted\n");
-                while((bQuit=!WinGetMsg(hab,&qmsg,(HWND)NULL,0,0))==FALSE 
+                while((bQuit=!WinGetMsg(hab,&qmsg,(HWND)NULL,0,0))==FALSE
                       && a < BMP_DEL_UPPER-BMP_DEL_LOWER) {
                   //     SysWriteToTrapLog(" -- Got message, dispatching it...\n");
@@ -560 +558 @@
 
           if(pbmpih2->cbFix==sizeof(BITMAPINFOHEADER2)) {
-            if(!getMessage(chrTemplate, IDSTR_SPRINTFPIXEL, sizeof(chrTemplate), 
+            if(!getMessage(chrTemplate, IDSTR_SPRINTFPIXEL, sizeof(chrTemplate),
                        queryResModuleHandle(), hwnd))
               strcpy(chrTemplate, "%d Pixel");
             sprintf(fName, chrTemplate, pbmpih2->cx);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_IMAGEWIDTH),fName);
-            
+
             sprintf(fName, chrTemplate, pbmpih2->cy);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_IMAGEHEIGHT),fName);
 
-            if(!getMessage(chrTemplate, IDSTR_SPRINTFBIT, sizeof(chrTemplate), 
+            if(!getMessage(chrTemplate, IDSTR_SPRINTFBIT, sizeof(chrTemplate),
                            queryResModuleHandle(), hwnd))
-              strcpy(chrTemplate, "%d Bit");            
+              strcpy(chrTemplate, "%d Bit");
             sprintf(fName, chrTemplate, pbmpih2->cBitCount);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_COLORDEPTH),fName);
@@ -578 +576 @@
             /* We shouldn't get a BITMAPINFOHEADER here but who knows...*/
             PBITMAPINFOHEADER pbmpih=(PBITMAPINFOHEADER)pbmpih2;
-            if(!getMessage(chrTemplate, IDSTR_SPRINTFPIXEL, sizeof(chrTemplate), 
+            if(!getMessage(chrTemplate, IDSTR_SPRINTFPIXEL, sizeof(chrTemplate),
                            queryResModuleHandle(), hwnd))
               strcpy(chrTemplate, "%d Pixel");
             sprintf(fName, chrTemplate,pbmpih->cx);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_IMAGEWIDTH),fName);
-            
+
             sprintf(fName, chrTemplate, pbmpih->cy);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_IMAGEHEIGHT),fName);
 
-            if(!getMessage(chrTemplate, IDSTR_SPRINTFBIT, sizeof(chrTemplate), 
-                           queryResModuleHandle(), hwnd))                        
+            if(!getMessage(chrTemplate, IDSTR_SPRINTFBIT, sizeof(chrTemplate),
+                           queryResModuleHandle(), hwnd))
               strcpy(chrTemplate, "%d Bit");
             sprintf(fName, chrTemplate, pbmpih->cBitCount);
             WinSetWindowText(WinWindowFromID(hwnd, IDST_COLORDEPTH),fName);
           }
-          
+
           WinSetWindowText(WinWindowFromID(hwnd, IDST_IMAGEFORMAT),_chrIOProcName);
         }
@@ -607 +605 @@
           mp2=MPFROMLONG(LONGFROMMP(mp2)|0x80000);/*AWP_ACTIVATE 0x00080000L*/
           mr=WinDefDlgProc(hwnd, msg, mp1, mp2);
-          return mr;  
+          return mr;
         }
         break;
@@ -618 +616 @@
 
             mr=WinDefDlgProc(hwnd, msg, mp1, mp2);
-            WinSendMsg(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT), QW_PARENT), 
+            WinSendMsg(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT), QW_PARENT),
                        WM_SETFOCUS, MPFROMHWND(hwnd), (MPARAM)TRUE);
             return mr;
@@ -688 +686 @@
 /*                                                       */
 /*!!******************************************************/
-SOM_Scope ULONG  SOMLINK cwimg_cwmmAddImageInformationPage(MMImage *somSelf, 
+SOM_Scope ULONG  SOMLINK cwimg_cwmmAddImageInformationPage(MMImage *somSelf,
                                                            HWND hwndNotebook)
 {
@@ -797 +795 @@
 /*                                                       */
 /*!!******************************************************/
-SOM_Scope HBITMAP  SOMLINK cwimg_cwmmQuerySmallBitmapHandle(MMImage *somSelf, 
-                                                            ULONG ulSize, 
-                                                            PMINIRECORDCORE pmrcToRefresh, 
+SOM_Scope HBITMAP  SOMLINK cwimg_cwmmQuerySmallBitmapHandle(MMImage *somSelf,
+                                                            ULONG ulSize,
+                                                            PMINIRECORDCORE pmrcToRefresh,
                                                             HWND hwndCnr)
 {
@@ -818 +816 @@
 
       if(_bNoIOProcAvailable)
-        return NULLHANDLE; /* No IO-proc for this image format. Don't try again in the future. 
+        return NULLHANDLE; /* No IO-proc for this image format. Don't try again in the future.
                             This var is set if we trapped during reading. */
 
@@ -842 +840 @@
       }
 
-    /* 
-       FIXME: use WinIsWindow() here?? 
+    /*
+       FIXME: use WinIsWindow() here??
      */
     if(!_hBitmapSmall && hwndCreateBMP) {
@@ -866 +864 @@
 
       WinPostMsg(hwndCreateBMP, WM_APPTERMINATENOTIFY,MPFROMP(pCreateBMP), MPFROM2SHORT(0, ACKEY_CREATE_SMALLBITMAP));
-      free(pCreateBMP);
       return NULLHANDLE;
     }
@@ -924 +921 @@
 
 /*
- * SOM_Scope ULONG  SOMLINK cwimg_cwmmQueryImageInfo(MMImage *somSelf, 
- *                                                   char** chrString, 
- *                                                   ULONG ulSize, 
+ * SOM_Scope ULONG  SOMLINK cwimg_cwmmQueryImageInfo(MMImage *somSelf,
+ *                                                   char** chrString,
+ *                                                   ULONG ulSize,
  *                                                   int iWhich)
  */
@@ -933 +930 @@
  * The prototype for cwimg_cwmmQueryImageInfo was replaced by the following prototype:
  */
-SOM_Scope ULONG  SOMLINK cwimg_cwmmQueryImageInfo(MMImage *somSelf, 
-                                                  char** chrString, 
-                                                  ULONG ulSize, 
+SOM_Scope ULONG  SOMLINK cwimg_cwmmQueryImageInfo(MMImage *somSelf,
+                                                  char** chrString,
+                                                  ULONG ulSize,
                                                   long iWhich)
 {
-  PBITMAPINFOHEADER2 pBmpInfoHdr2=NULLHANDLE;       
+  PBITMAPINFOHEADER2 pBmpInfoHdr2=NULLHANDLE;
   ULONG ulWidth, ulHeight, ulDepth;
     MMImageData *somThis = MMImageGetData(somSelf);
@@ -987 +984 @@
 }
 
-SOM_Scope void  SOMLINK cwimg_cwmmRequestBmpDeletion(MMImage *somSelf, 
+SOM_Scope void  SOMLINK cwimg_cwmmRequestBmpDeletion(MMImage *somSelf,
                                                      ULONG ulFlags)
 {
@@ -1013 +1010 @@
         RECTL rectl2;
         PRECORDITEM pri=(PRECORDITEM)(++pui);
-        
+
         /*
           V0.2.9 CW 2004/11/12
-          
+
           Check if small bitmaps for icons are currently visible in any container. This is useful if the
           user scrolls a folder with a lot of pictures.
@@ -1026 +1023 @@
           pui--;
           if(WinSendMsg(pri->hwndCnr, CM_QUERYVIEWPORTRECT, MPFROMP(&rectl2), MPFROM2SHORT(CMA_WORKSPACE, FALSE))) {
-            
+
             if(pri->pRecord->ptlIcon.y >= rectl2.yBottom  && pri->pRecord->ptlIcon.y <= rectl2.yTop &&
                pri->pRecord->ptlIcon.x >= rectl2.xLeft && pri->pRecord->ptlIcon.x < rectl2.xRight)
               bDeleteBmp=FALSE;
-            
-          }/* WinSendMsg() */   
+
+          }/* WinSendMsg() */
         }
       }/* else */
@@ -1061 +1058 @@
  * The prototype for cwimg_wpQueryBitmapHandle was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpQueryBitmapHandle(MMImage *somSelf, 
-                                                  HBITMAP* phBitmap, 
-                                                  HPAL* phPalette, 
-                                                  ULONG ulWidth, 
-                                                  ULONG ulHeight, 
-                                                  ULONG ulFlags, 
-                                                  long lBackgroundColor, 
+SOM_Scope BOOL  SOMLINK cwimg_wpQueryBitmapHandle(MMImage *somSelf,
+                                                  HBITMAP* phBitmap,
+                                                  HPAL* phPalette,
+                                                  ULONG ulWidth,
+                                                  ULONG ulHeight,
+                                                  ULONG ulFlags,
+                                                  long lBackgroundColor,
                                                   BOOL* pbQuitEarly)
 {
@@ -1073 +1070 @@
   char chrName[CCHMAXPATH];
 
-    MMImageData *somThis = MMImageGetData(somSelf); 
+    MMImageData *somThis = MMImageGetData(somSelf);
     MMImageMethodDebug("MMImage","cwimg_wpQueryBitmapHandle");
 
@@ -1091 +1088 @@
       return FALSE;
 
-    
+
     TRY_LOUD(QRY_HBM) {
       /* Create a new (maybe smaller) bitmap from the normal size bitmap */
-      *phBitmap=createNewBitmap ( _hBitmap, (PBITMAPINFOHEADER2) _pBmpInfoHeader2, 
+      *phBitmap=createNewBitmap ( _hBitmap, (PBITMAPINFOHEADER2) _pBmpInfoHeader2,
                                   ulWidth, ulHeight , pbQuitEarly);
     }
@@ -1106 +1103 @@
                           chrName);
       } END_CATCH;
-      
+
       if(!*phBitmap)
         return FALSE;
@@ -1124 +1121 @@
   BOOL bSem;
 
-  MMImageData *somThis = MMImageGetData(somSelf); 
+  MMImageData *somThis = MMImageGetData(somSelf);
     MMImageMethodDebug("MMImage","cwimg_wpQueryBitmapInfoHeader");
 
@@ -1193 +1190 @@
             break;
 
-          bGotHeader=getBmpInfoHeader( (PBITMAPINFOHEADER2) pByte, chrName, _chrIOProcName, 
+          bGotHeader=getBmpInfoHeader( (PBITMAPINFOHEADER2) pByte, chrName, _chrIOProcName,
                                        sizeof(_chrIOProcName), &_bNoIOProcAvailable);
           break;
@@ -1253 +1250 @@
  * The prototype for cwimg_wpQueryBitmapData was replaced by the following prototype:
  */
-SOM_Scope PBYTE  SOMLINK cwimg_wpQueryBitmapData(MMImage *somSelf, 
+SOM_Scope PBYTE  SOMLINK cwimg_wpQueryBitmapData(MMImage *somSelf,
                                                  ULONG* pulSize)
 {
@@ -1261 +1258 @@
     NOT_IMPLEMENTED
 
-    return (MMImage_parent_WPImageFile_wpQueryBitmapData(somSelf, 
+    return (MMImage_parent_WPImageFile_wpQueryBitmapData(somSelf,
                                                          pulSize));
 }
@@ -1268 +1265 @@
  * The prototype for cwimg_wpSetBitmapData was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpSetBitmapData(MMImage *somSelf, 
-                                              PBYTE pBitmapData, 
+SOM_Scope BOOL  SOMLINK cwimg_wpSetBitmapData(MMImage *somSelf,
+                                              PBYTE pBitmapData,
                                               ULONG ulSize)
 {
@@ -1284 +1281 @@
 #endif
 
-    return (MMImage_parent_WPImageFile_wpSetBitmapData(somSelf, 
-                                                       pBitmapData, 
+    return (MMImage_parent_WPImageFile_wpSetBitmapData(somSelf,
+                                                       pBitmapData,
                                                        ulSize));
 }
@@ -1298 +1295 @@
   BOOL bGotHeader=FALSE;
 
-  MMImageData *somThis = MMImageGetData(somSelf); 
+  MMImageData *somThis = MMImageGetData(somSelf);
     MMImageMethodDebug("MMImage","cwimg_wpReadImageFile");
 
@@ -1327 +1324 @@
                           chrName);
       }END_CATCH;
-      
+
       if(!bGotHeader)
         return FALSE;
@@ -1347 +1344 @@
           _bNoIOProcAvailable=TRUE;
         } END_CATCH;
-        
+
         if(!_hBitmap) {
           return FALSE;
         }
-        
+
         return TRUE;
 }
@@ -1413 +1410 @@
     HWND hwndSubMenu;
     MENUITEM mi;
-    
+
     if(g_pmmFormatInfoArray)
       free(g_pmmFormatInfoArray);
@@ -1421 +1418 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_IMAGE;
-    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;    
+    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -1444 +1441 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -1463 +1460 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -1479 +1476 @@
     hwndSubMenu=WinCreateWindow(hwndMenu,WC_MENU,"",0,
                                 0,0,0,0,
-                                hwndMenu,//Owner. If set, this window 
+                                hwndMenu,//Owner. If set, this window
                                 //is destroyed if owner is destroyed
                                 HWND_TOP,
@@ -1488 +1485 @@
     mi.afStyle=MIS_TEXT;//|MIS_SUBMENU;
     mi.id=ID_MENU_CONVERT;
-    mi.afAttribute=NULLHANDLE;    
+    mi.afAttribute=NULLHANDLE;
     mi.hwndSubMenu=NULLHANDLE;//hwndSubMenu;
     mi.hItem=NULLHANDLE;
@@ -1502 +1499 @@
       {
         mmioGetFormatName(pmmFormatInfoArray, szBuffer, &lBytesRead, 0L, 0L);
-        
+
         /* Insert NULL string terminator */
         *( szBuffer + lBytesRead ) = (CHAR)NULL;
@@ -1520 +1517 @@
             mi.afStyle=MIS_TEXT|MIS_SUBMENU;
             mi.id=ID_ITEM_FIRSTCONVERT+index;/* Create menu id */
-            mi.afAttribute=NULLHANDLE;    
+            mi.afAttribute=NULLHANDLE;
             mi.hwndSubMenu=NULLHANDLE;//hwndSubMenu;
             mi.hItem=NULLHANDLE;
@@ -1528 +1525 @@
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -1564 +1561 @@
  * The prototype for cwimg_wpModifyPopupMenu was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpModifyPopupMenu(MMImage *somSelf, 
-                                                HWND hwndMenu, 
-                                                HWND hwndCnr, 
+SOM_Scope BOOL  SOMLINK cwimg_wpModifyPopupMenu(MMImage *somSelf,
+                                                HWND hwndMenu,
+                                                HWND hwndCnr,
                                                 ULONG iPosition)
 {
@@ -1583 +1580 @@
           if(!getMessage(text, IDSTR_MENU_IMAGEINFO, sizeof(text), queryResModuleHandle(), hwndMenu))
             strcpy(text, "Image information: %d x %d x %d");
-          
+
           sprintf(menuText, text, _ulWidth, _ulHeight, _ulDepth);//create menuitem
-          
+
           //insert size menuitem in popupmenu
 
@@ -1599 +1596 @@
       insertIOProcMenuItems( hwndMenu );
       menuInsertMenuSeparator(hwndMenu, NULLHANDLE, MIT_END );
-      
+
     }/* TRY_LOUD */
     CATCH(IMAGE_INSERTPOPUPMENU)
@@ -1607 +1604 @@
       } END_CATCH;
 
-    return (MMImage_parent_WPImageFile_wpModifyPopupMenu(somSelf, 
-                                                         hwndMenu, 
-                                                         hwndCnr, 
+    return (MMImage_parent_WPImageFile_wpModifyPopupMenu(somSelf,
+                                                         hwndMenu,
+                                                         hwndCnr,
                                                          iPosition));
 }
@@ -1617 +1614 @@
  * The prototype for cwimg_wpMenuItemSelected was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpMenuItemSelected(MMImage *somSelf, 
-                                                 HWND hwndFrame, 
+SOM_Scope BOOL  SOMLINK cwimg_wpMenuItemSelected(MMImage *somSelf,
+                                                 HWND hwndFrame,
                                                  ULONG ulMenuId)
 {
@@ -1631 +1628 @@
         ULONG ulSize;
         ULONG ulRc;
-        
+
         PrfQueryProfileString(HINI_USERPROFILE, "CWMM", "imageconverter", "", chrEditor,
                               sizeof(chrEditor));
@@ -1659 +1656 @@
       }
 
-    return (MMImage_parent_WPImageFile_wpMenuItemSelected(somSelf, 
-                                                          hwndFrame, 
+    return (MMImage_parent_WPImageFile_wpMenuItemSelected(somSelf,
+                                                          hwndFrame,
                                                           ulMenuId));
 }
@@ -1667 +1664 @@
  * The prototype for cwimg_wpOpen was replaced by the following prototype:
  */
-SOM_Scope HWND  SOMLINK cwimg_wpOpen(MMImage *somSelf, HWND hwndCnr, 
+SOM_Scope HWND  SOMLINK cwimg_wpOpen(MMImage *somSelf, HWND hwndCnr,
                                      ULONG ulView, ULONG param)
 {
@@ -1711 +1708 @@
      }
 
-    return (MMImage_parent_WPImageFile_wpOpen(somSelf, hwndCnr, 
+    return (MMImage_parent_WPImageFile_wpOpen(somSelf, hwndCnr,
                                               ulView, param));
 }
@@ -1719 +1716 @@
  * The prototype for cwimg_wpAddSettingsPages was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpAddSettingsPages(MMImage *somSelf, 
+SOM_Scope BOOL  SOMLINK cwimg_wpAddSettingsPages(MMImage *somSelf,
                                                  HWND hwndNotebook)
 {
@@ -1726 +1723 @@
     MMImageMethodDebug("MMImage","cwimg_wpAddSettingsPages");
 
-    rc=(MMImage_parent_WPImageFile_wpAddSettingsPages(somSelf, 
+    rc=(MMImage_parent_WPImageFile_wpAddSettingsPages(somSelf,
                                                           hwndNotebook));
     return rc | (_cwmmAddImageInformationPage(somSelf, hwndNotebook));
@@ -1735 +1732 @@
  * The prototype for cwimg_wpQueryDetailsData was replaced by the following prototype:
  */
-SOM_Scope ULONG  SOMLINK cwimg_wpQueryDetailsData(MMImage *somSelf, 
-                                                  PVOID* ppDetailsData, 
+SOM_Scope ULONG  SOMLINK cwimg_wpQueryDetailsData(MMImage *somSelf,
+                                                  PVOID* ppDetailsData,
                                                   PULONG pcp)
 {
@@ -1746 +1743 @@
 
     /* Fill parent info */
-    rcParent=(MMImage_parent_WPImageFile_wpQueryDetailsData(somSelf, 
-                                                          ppDetailsData, 
+    rcParent=(MMImage_parent_WPImageFile_wpQueryDetailsData(somSelf,
+                                                          ppDetailsData,
                                                           pcp));
 
@@ -1754 +1751 @@
       {
         ULONG ulWidth, ulHeight, ulDepth;
-      
-        PBITMAPINFOHEADER2 pBmpInfoHeader2=NULLHANDLE;       
+
+        PBITMAPINFOHEADER2 pBmpInfoHeader2=NULLHANDLE;
 
 #if 0
@@ -1761 +1758 @@
                                    is on CD is done in wpRestore() */
           pBmpInfoHeader2=(PBITMAPINFOHEADER2) _wpQueryBitmapInfoHeader(somSelf);
-#endif   
+#endif
 
         pBmpInfoHeader2=(PBITMAPINFOHEADER2)_pBmpInfoHeader2;
@@ -1785 +1782 @@
             ulDepth=_ulDepth;
           }
-        /* Fill the structure with the info to be displayed */      
-        pImageDetails=(PIMAGEDETAILS)*ppDetailsData;  
+        /* Fill the structure with the info to be displayed */
+        pImageDetails=(PIMAGEDETAILS)*ppDetailsData;
         pImageDetails->ulWidth=ulWidth;
         pImageDetails->ulHeight=ulHeight;
         pImageDetails->ulDepth=ulDepth;
         pImageDetails->pszFormat=_chrIOProcName;
-        
-        *ppDetailsData=((PBYTE) (*ppDetailsData))+sizeof(*pImageDetails);          
+
+        *ppDetailsData=((PBYTE) (*ppDetailsData))+sizeof(*pImageDetails);
       }
     else
@@ -1806 +1803 @@
  * The prototype for cwimg_wpRestoreState was replaced by the following prototype:
  */
-SOM_Scope BOOL  SOMLINK cwimg_wpRestoreState(MMImage *somSelf, 
+SOM_Scope BOOL  SOMLINK cwimg_wpRestoreState(MMImage *somSelf,
                                              ULONG ulReserved)
 {
@@ -1813 +1810 @@
     MMImageData *somThis = MMImageGetData(somSelf);
     MMImageMethodDebug("MMImage","cwimg_wpRestoreState");
-    
+
     _bUseNewClsFeatures=TRUE;
-    
+
     if(cwObjectIsOnCD(somSelf)) {
       /* The object is on CD. Check if we should use the new class features */
@@ -1827 +1824 @@
        the filename is unknown). Querying the image data in wpObjectReady() is to late because that method is called after
        wpQueryDetailsData(). In wpObjectReady the image header will be read in. */
-    
+
     /* Query the image info */
     if(!_wpRestoreLong(somSelf, "CWImage", KEY_FILESIZE, &_ulFileSize))
@@ -1843 +1840 @@
     //      _wpQueryBitmapInfoHeader(somSelf);
 
-    return (MMImage_parent_WPImageFile_wpRestoreState(somSelf, 
+    return (MMImage_parent_WPImageFile_wpRestoreState(somSelf,
                                                       ulReserved));
 }
@@ -1870 +1867 @@
 
     /* Refresh */
-    bufferSize=sizeof(buffer); 
+    bufferSize=sizeof(buffer);
     if(_wpScanSetupString(somSelf, pszSetupString, SETUP_MMREFRESH, buffer,&bufferSize))
       {
         _cwmmFreeBitmaps(somSelf);
 #if 0
-        _cwmmQuerySmallBitmapHandle(somSelf, 
-                                    0, 
-                                    NULLHANDLE, 
+        _cwmmQuerySmallBitmapHandle(somSelf,
+                                    0,
+                                    NULLHANDLE,
                                     0);
 #endif
@@ -1883 +1880 @@
         //        _wpCnrRefreshDetails(somSelf);
       }
-    
+
     return (MMImage_parent_WPImageFile_wpSetup(somSelf, pszSetupString));
 }
 
 
-SOM_Scope void  SOMLINK cwimg_wpObjectReady(MMImage *somSelf, 
+SOM_Scope void  SOMLINK cwimg_wpObjectReady(MMImage *somSelf,
                                             ULONG ulCode, WPObject* refObject)
-{  
+{
   PCREATEBMPINFO pCreateBMP;
   ULONG ulError;
   MMImageData *somThis = MMImageGetData(somSelf);
   MMImageMethodDebug("MMImage","cwimg_wpObjectReady");
-  
-  MMImage_parent_WPImageFile_wpObjectReady(somSelf, ulCode, 
+
+  MMImage_parent_WPImageFile_wpObjectReady(somSelf, ulCode,
                                            refObject);
   /* Get image info asynchronous to replace cached image size read in from EA  which
@@ -1906 +1903 @@
       /* Only the object pointer is used */
       pCreateBMP->wpObject=somSelf;
-      
-      //      WinPostMsg(hwndCreateBMP, WM_APPTERMINATENOTIFY,MPFROMP(pCreateBMP), MPFROM2SHORT(0, ACKEY_QUERY_BITMAPINFO));      
+
+      //      WinPostMsg(hwndCreateBMP, WM_APPTERMINATENOTIFY,MPFROMP(pCreateBMP), MPFROM2SHORT(0, ACKEY_QUERY_BITMAPINFO));
     }
 #endif
@@ -1927 +1924 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_IMAGE;
-    mmFormatInfo.ulFlags|=MMIO_CANREADTRANSLATED;/* Read !!!*/    
+    mmFormatInfo.ulFlags|=MMIO_CANREADTRANSLATED;/* Read !!!*/
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -1955 +1952 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -1973 +1970 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -2005 +2002 @@
           //          HlpWriteToTrapLog("Known Extension: %s\n", chrMMImageKnownExt);
           //          HlpWriteToTrapLog("Extension: %s\n", chrMMImageExt);
-        }  
+        }
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -2036 +2033 @@
     if(_pBmpInfoHeader2) {
       if(((PBITMAPINFOHEADER2)_pBmpInfoHeader2)->cbFix==sizeof(BITMAPINFOHEADER2)) {
-        _wpSaveLong(somSelf, "CWImage", KEY_WIDTH, ((PBITMAPINFOHEADER2)_pBmpInfoHeader2)->cx);    
+        _wpSaveLong(somSelf, "CWImage", KEY_WIDTH, ((PBITMAPINFOHEADER2)_pBmpInfoHeader2)->cx);
         _wpSaveLong(somSelf, "CWImage", KEY_HEIGHT, ((PBITMAPINFOHEADER2)_pBmpInfoHeader2)->cy);
         _wpSaveLong(somSelf, "CWImage", KEY_DEPTH, ((PBITMAPINFOHEADER2)_pBmpInfoHeader2)->cBitCount);
@@ -2043 +2040 @@
         PBITMAPINFOHEADER pBmpInfoHeader=(PBITMAPINFOHEADER)_pBmpInfoHeader2;
 
-        _wpSaveLong(somSelf, "CWImage", KEY_WIDTH, pBmpInfoHeader->cx);    
+        _wpSaveLong(somSelf, "CWImage", KEY_WIDTH, pBmpInfoHeader->cx);
         _wpSaveLong(somSelf, "CWImage", KEY_HEIGHT, pBmpInfoHeader->cy);
         _wpSaveLong(somSelf, "CWImage", KEY_DEPTH, pBmpInfoHeader->cBitCount);
@@ -2052 +2049 @@
 
 #if 0
-SOM_Scope BOOL  SOMLINK cwimg_wpFormatDragItem(MMImage *somSelf, 
+SOM_Scope BOOL  SOMLINK cwimg_wpFormatDragItem(MMImage *somSelf,
                                                PDRAGITEM pdrgItem)
 {
@@ -2060 +2057 @@
     MMImageMethodDebug("MMImage","cwimg_wpFormatDragItem");
 
-    rc= (MMImage_parent_WPImageFile_wpFormatDragItem(somSelf, 
+    rc= (MMImage_parent_WPImageFile_wpFormatDragItem(somSelf,
                                                         pdrgItem));
 DosBeep(500,10);
@@ -2080 +2077 @@
       If the folder is closed it's likely the bitmaps may be obsolete. A check for USAGE_RECORD items
       will be done on another thread.
- 
+
       wpDeleteFromObjUseList() seems to be the more natural place to do this but the method is not called
       when an object is removed from a container. Also wpCnrRemoveObject() doesn't work because the WPS seems
@@ -2089 +2086 @@
 
      */
-    if(_hBitmap || _hBitmapSmall) 
+    if(_hBitmap || _hBitmapSmall)
       sendDeleteBMPMsg(somSelf);
 
@@ -2126 +2123 @@
         /* Now check installed IO procs for other exts and add them to the filter list */
         _getMissingExtFromImageIOProc();
-        bGotImgExt=TRUE; 
+        bGotImgExt=TRUE;
       }
 
@@ -2134 +2131 @@
       globalHab=WinQueryAnchorBlock(HWND_DESKTOP);
 
-    if(!getMessage(chrHelpLibrary, IDSTR_HELPLIBRARY, sizeof(chrHelpLibrary), 
+    if(!getMessage(chrHelpLibrary, IDSTR_HELPLIBRARY, sizeof(chrHelpLibrary),
                    queryModuleHandle(), HWND_DESKTOP))
       strcpy(chrHelpLibrary,"MMPARTS.HLP");
@@ -2152 +2149 @@
       {
         memset((PCH)pCfi,0,sizeof(CLASSFIELDINFO));
-        
+
         pCfi->cb=sizeof(CLASSFIELDINFO);
         pCfi->flData=CFA_LEFT|CFA_SEPARATOR|CFA_FIREADONLY;
@@ -2159 +2156 @@
         pCfi->pTitleData=(PVOID)pszImageColTitles[i];
         pCfi->flCompare=COMPARE_SUPPORTED|SORTBY_SUPPORTED;
-        
+
         switch(i)
           {
@@ -2191 +2188 @@
           }/* switch(i) */
       }/* for() */
-    cfiImageFieldInfo[NUM_IMAGE_DETAILS_FIELDS].pNextFieldInfo=NULL;    
+    cfiImageFieldInfo[NUM_IMAGE_DETAILS_FIELDS].pNextFieldInfo=NULL;
     if(!hwndCreateBMP)
       _beginthread(createBMPThreadFunc,NULL,8192*20, NULLHANDLE); //Fehlerbehandlung fehlt
@@ -2223 +2220 @@
       {
         ULONG ulHowMatched=1;
-        
+
         DosBeep(5000, 1000);
         /* Template found. Now query associated program */
@@ -2230 +2227 @@
           DosBeep(500, 1000);
       }
-#endif        
+#endif
     /* Create default templates. We do it here because we need an object to query the associated
        program (if any) when the system asks for the default view. */
@@ -2252 +2249 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_IMAGE;
-    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;    
+    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -2280 +2277 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -2298 +2295 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -2314 +2311 @@
       {
         mmioGetFormatName(pmmFormatInfoArray, szBuffer, &lBytesRead, 0L, 0L);
-        
+
         /* Insert NULL string terminator */
         *( szBuffer + lBytesRead ) = (CHAR)NULL;
@@ -2320 +2317 @@
         /* Compressed TIF is not supported because the Warp 4 IO-Procs are
            broken. */
-        //HlpWriteToTrapLog("---------  Ext: %s, IO-Proc: %s, Name: %s\n", 
+        //HlpWriteToTrapLog("---------  Ext: %s, IO-Proc: %s, Name: %s\n",
         //chrExt,  pmmFormatInfoArray->szDefaultFormatExt,
         //                szBuffer);
@@ -2336 +2333 @@
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -2344 +2341 @@
 }
 
-SOM_Scope BOOL  SOMLINK cwimgM_wpclsCreateDefaultTemplates(M_MMImage *somSelf, 
+SOM_Scope BOOL  SOMLINK cwimgM_wpclsCreateDefaultTemplates(M_MMImage *somSelf,
                                                            WPObject* Folder)
 {
@@ -2354 +2351 @@
     /* The FOURCC of the JPEG-IO proc is JPEG so we have to create that template
        in the JPG class. */
-    
+
     if(checkImageIOProc( _wpclsQueryInstanceFilter(somSelf))) {
       //   WPFolder* wpFolder;
@@ -2400 +2397 @@
  */
 
-SOM_Scope ULONG  SOMLINK cwimgM_wpclsQueryIconData(M_MMImage *somSelf, 
+SOM_Scope ULONG  SOMLINK cwimgM_wpclsQueryIconData(M_MMImage *somSelf,
                                                    PICONINFO pIconInfo)
 {
@@ -2424 +2421 @@
  * The prototype for cwimgM_wpclsQueryDetailsInfo was replaced by the following prototype:
  */
-SOM_Scope ULONG  SOMLINK cwimgM_wpclsQueryDetailsInfo(M_MMImage *somSelf, 
-                                                      PCLASSFIELDINFO* ppClassFieldInfo, 
+SOM_Scope ULONG  SOMLINK cwimgM_wpclsQueryDetailsInfo(M_MMImage *somSelf,
+                                                      PCLASSFIELDINFO* ppClassFieldInfo,
                                                       PULONG pSize)
 {
@@ -2435 +2432 @@
     M_MMImageMethodDebug("M_MMImage","cwimgM_wpclsQueryDetailsInfo");
 
-    cParentColumns= (M_MMImage_parent_M_WPImageFile_wpclsQueryDetailsInfo(somSelf, 
-                                                                 ppClassFieldInfo, 
+    cParentColumns= (M_MMImage_parent_M_WPImageFile_wpclsQueryDetailsInfo(somSelf,
+                                                                 ppClassFieldInfo,
                                                                  pSize));
   if(pSize)