.

jmalak · Jan 3, 2025 · 28bba0b · 28bba0b
1 parent 4cf86ba
commit 28bba0b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/source/3_image.cpp b/source/3_image.cpp
@@ -19,7 +19,7 @@
 
 
 #include "ui_win.hpp"
-#include <windowsx.h>
+//#include <windowsx.h>
 
 // --------------------------------------------------------------------------
 // ----- UIW_IMAGE ----------------------------------------------------------
@@ -203,6 +203,8 @@ int UIW_IMAGE::LoadImageFromFile(void)
 	// Load the bitmap.
 	ZIL_UINT32 dibSize = bitmapFileHeader.bfSize - sizeof(BITMAPFILEHEADER);
 	ZIL_UINT32 tdibSize = dibSize;
+#define     GlobalAllocPtr(flags, cb)   \
+                (GlobalLock(GlobalAlloc((flags), (cb))))
 	ZIL_UINT8 *dib = (ZIL_UINT8 *)GlobalAllocPtr(GMEM_MOVEABLE, dibSize);
 	ZIL_UINT8 *tdib = dib;
 	for ( ; dibSize; dibSize -= tdibSize, tdib += tdibSize)
@@ -222,6 +224,8 @@ int UIW_IMAGE::LoadImageFromFile(void)
 	ReleaseDC(NULL, hDC);
 
 	// Clean up.
+#define     GlobalFreePtr(lp)           \
+                (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp)))
 	GlobalFreePtr(dib);
    	delete bitmapInfo;
 	woStatus &= ~WOS_READ_ERROR;

diff --git a/source/9_image.cpp b/source/9_image.cpp
@@ -19,7 +19,7 @@
 
 
 #include "ui_win.hpp"
-#include <windowsx.h>
+//#include <windowsx.h>
 
 // --------------------------------------------------------------------------
 // ----- UIW_IMAGE ----------------------------------------------------------
@@ -202,6 +202,8 @@ int UIW_IMAGE::LoadImageFromFile(void)
 	// Load the bitmap.
 	ZIL_UINT32 dibSize = bitmapFileHeader.bfSize - sizeof(BITMAPFILEHEADER);
 	ZIL_UINT32 tdibSize = dibSize;
+#define     GlobalAllocPtr(flags, cb)   \
+                (GlobalLock(GlobalAlloc((flags), (cb))))
 	ZIL_UINT8 *dib = (ZIL_UINT8 *)GlobalAllocPtr(GMEM_MOVEABLE, dibSize);
 	ZIL_UINT8 *tdib = dib;
 	for ( ; dibSize; dibSize -= tdibSize, tdib += tdibSize)
@@ -221,6 +223,8 @@ int UIW_IMAGE::LoadImageFromFile(void)
 	ReleaseDC(NULL, hDC);
 
 	// Clean up.
+#define     GlobalFreePtr(lp)           \
+                (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp)))
 	GlobalFreePtr(dib);
    	delete bitmapInfo;
 	woStatus &= ~WOS_READ_ERROR;

diff --git a/source/w_image.cpp b/source/w_image.cpp
@@ -3,10 +3,14 @@
 //      Zinc Software Incorporated.  Pleasant Grove, Utah  USA
 
 #include "ui_win.hpp"
-#include <windowsx.h>
+//#include <windowsx.h>
 
 #if defined(__WATCOMC__)
     #undef  GlobalFreePtr
+#define     GlobalPtrHandle(lp)         \
+                ((HGLOBAL)LOWORD(GlobalHandle(SELECTOROF(lp))))
+#define     GlobalUnlockPtr(lp)         \
+                GlobalUnlock(GlobalPtrHandle(lp))
     #define     GlobalFreePtr(lp) (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp)))
 #endif
 
@@ -195,6 +199,8 @@ int UIW_IMAGE::LoadImageFromFile(void)
         // Load the bitmap.
         ZIL_UINT32 dibSize = bitmapFileHeader.bfSize - sizeof(BITMAPFILEHEADER);
         ZIL_UINT32 tdibSize = dibSize;
+#define     GlobalAllocPtr(flags, cb)   \
+                (GlobalLock(GlobalAlloc((flags), (cb))))
         ZIL_UINT8 huge *dib = (ZIL_UINT8 huge *)GlobalAllocPtr(GMEM_MOVEABLE, dibSize);
         ZIL_UINT8 huge *tdib = dib;
         for ( ; dibSize; dibSize -= tdibSize, tdib += tdibSize)