Changeset 687 for trunk/dll/misc.c

Timestamp:

Jun 10, 2007, 10:41:52 PM (18 years ago)

Author:

Gregg Young

Message:

Add CheckPmDrgLimit function to fix crash when dragging to FM/2 for other apps

File:

• trunk/dll/misc.c (modified) (5 diffs)

trunk/dll/misc.c

@@ -47 +47 @@
 
 #pragma alloc_text(MAINWND5,SetSysMenu)
-#pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow)
+#pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow,IsFm2Window)
 #pragma alloc_text(MISC1,FixSwitchList,FindDirCnr,CurrentRecord,SetShiftState,AddToListboxBottom)
 #pragma alloc_text(CNR_MISC1,AdjustCnrColVis,AdjustCnrColsForFSType)
@@ -74 +74 @@
 #define ORD_DOS32QUERYEXTLIBPATH 874
 #endif
+
+BOOL IsFm2Window(HWND hwnd, BOOL chkTid)
+{
+    PIB *ppib;
+    TIB *ptib;
+    APIRET rc;
+
+    rc = DosGetInfoBlocks(&ptib, &ppib);
+    if (rc)
+      Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                "DosGetInfoBlocks");
+    else {
+      PID pid;
+      TID tid;
+
+      if (WinQueryWindowProcess(hwnd, &pid, &tid))
+        if (chkTid) {
+          // If window owned by FM2 process on same thread?
+          if (pid == ppib->pib_ulpid && tid == ptib->tib_ptib2->tib2_ultid)
+            return TRUE;
+        }
+      //Window is owned by FM2
+        else if (pid == ppib->pib_ulpid)
+          return TRUE;
+    }
+    return FALSE;
+}
 
 VOID SetShiftState(VOID)
@@ -1364 +1391 @@
 
   if (!rc) {
-    PIB *ppib;
+   /* PIB *ppib;
     TIB *ptib;
 
@@ -1374 +1401 @@
       if (WinQueryWindowProcess(h, &pid, &tid)) {
         // If window owned by some other process or some other thread?
-        if (pid != ppib->pib_ulpid || tid != ptib->tib_ptib2->tib2_ultid) {
+        if (pid != ppib->pib_ulpid || tid != ptib->tib_ptib2->tib2_ultid)*/
+      if(!IsFm2Window(h, 1)){
+          QMSG qmsg;
           for (;;) {
             DosSleep(1L);
@@ -1386 +1415 @@
           }                             // for
         }
-      }
-    }
-  }
+    }
   return rc;
 }