Changeset 6208 for trunk/src

Timestamp:

Jul 7, 2001, 9:08:39 PM (24 years ago)

Author:

sandervl

Message:

PrintDlg: open32 <-> kernel32 global memory handle conversion added

Location:

trunk/src/comdlg32

Files:

• comdlg32.cpp (modified) (4 diffs)
• makefile (modified) (3 diffs)

trunk/src/comdlg32/comdlg32.cpp

@@ -1 @@
-/* $Id: comdlg32.cpp,v 1.29 2001-04-05 05:55:07 sandervl Exp $ */
+/* $Id: comdlg32.cpp,v 1.30 2001-07-07 19:08:39 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
   a->hwndOwner = Win32ToOS2Handle(a->hwndOwner);
 
-
+#ifdef USING_OPEN32
+
+#define FLAG_TO_OPEN32       0
+#define FLAG_FROM_OPEN32     1
+
+//******************************************************************************
+//******************************************************************************
+HGLOBAL GlobalCopy(HGLOBAL hDest, HGLOBAL hSource, BOOL fToOpen32)
+{
+ LPVOID src;
+ LPVOID dest;
+ ULONG  size;
+
+      if(fToOpen32 == FLAG_TO_OPEN32) {
+          src = GlobalLock(hSource);
+          if(src) {
+              size = GlobalSize(hSource);
+              if(hDest == NULL) {
+                  hDest = O32_GlobalAlloc(GHND, size);
+              }
+              dest  = O32_GlobalLock(hDest);
+              memcpy(dest, src, size);
+              O32_GlobalUnlock(hDest);
+          }
+          GlobalUnlock(hSource);
+      }
+      else {
+          src = O32_GlobalLock(hSource);
+          if(src) {
+              size = O32_GlobalSize(hSource);
+              if(hDest == NULL) {
+                  hDest = GlobalAlloc(GHND, size);
+              }
+              dest  = GlobalLock(hDest);
+              memcpy(dest, src, size);
+              GlobalUnlock(hDest);
+          }
+          O32_GlobalUnlock(hSource);
+      }
+      return hDest;
+}
+#endif
 /*****************************************************************************
  * Name      :
@@ -58 +99 @@
               LPPRINTDLGA, lppd)
 {
+  BOOL      ret;
+#ifdef USING_OPEN32
+  HGLOBAL   hDevmode = 0, hDevNames = 0;
+  HGLOBAL   hOrgDevmode = 0, hOrgDevNames = 0;
+  DEVMODEA *devmode, *devmodeorg;
+  DEVNAMES *devnames, *devnamesorg;
+  ULONG     size;
+#endif
 
   COMDLG32_CHECKHOOK2(lppd, PD_ENABLEPRINTHOOK, LPPRINTHOOKPROC,lpfnPrintHook)
   COMDLG32_CHECKHOOK2(lppd, PD_ENABLESETUPHOOK, LPSETUPHOOKPROC,lpfnSetupHook)
 
-  return O32_PrintDlg(lppd);
+#ifdef USING_OPEN32
+  if(lppd->hDevMode) {
+      hOrgDevmode = lppd->hDevMode;
+      lppd->hDevMode = GlobalCopy(NULL, hOrgDevmode, FLAG_TO_OPEN32);
+  }
+  if(lppd->hDevNames) {
+      hOrgDevNames = lppd->hDevNames;
+      lppd->hDevNames = GlobalCopy(NULL, hOrgDevNames, FLAG_TO_OPEN32);
+  }
+#endif
+  HWND hwndOwner = lppd->hwndOwner;
+  if(lppd->hwndOwner) {
+      lppd->hwndOwner = Win32ToOS2Handle(lppd->hwndOwner);
+  }
+  ret = O32_PrintDlg(lppd);
+  lppd->hwndOwner = hwndOwner;
+#ifdef USING_OPEN32
+  if(ret == TRUE) {
+      if(lppd->hDevMode) {
+          hDevmode = lppd->hDevMode;
+          lppd->hDevMode = GlobalCopy(hOrgDevmode, lppd->hDevMode, FLAG_FROM_OPEN32);
+          O32_GlobalFree(hDevmode);
+      }
+      if(lppd->hDevNames) {
+          hDevNames = lppd->hDevNames;
+          lppd->hDevNames = GlobalCopy(hOrgDevNames, lppd->hDevNames, FLAG_FROM_OPEN32);
+          O32_GlobalFree(hDevNames);
+      }
+  }
+#endif
+  return ret;
 }
 
@@ -84 +163 @@
   PRINTDLGA pd;
   BOOL      bResult;
+
+  //SvL: TODO: hDevMode & hDevNames
+  dprintf(("PrintDlgW: ERROR NOT COMPLETE (UNICODE TRANSLATION)!!"));
 
   memcpy(&pd,          // make binary copy first to save all the fields

trunk/src/comdlg32/makefile

@@ -1 @@
-# $Id: makefile,v 1.25 2001-04-24 20:37:25 sandervl Exp $
+# $Id: makefile,v 1.26 2001-07-07 19:08:39 sandervl Exp $
 
 #
@@ -20 +20 @@
 CDEFINES    = $(CDEFINES) -DNONAMELESSUNION
 !endif
+
+CDEFINES = $(CDEFINES) -DUSING_OPEN32
 
 #
@@ -50 +52 @@
 $(ODIN32_LIB)/comctl32.lib \
 $(ODIN32_LIB)/gdi32.lib \
+####$(ODIN32_LIB)/wgss50.lib \
 $(ODIN32_LIB)/pmwinx.lib \
 os2386.lib \