Changeset 7137 for trunk/src

Timestamp:

Oct 19, 2001, 6:14:19 PM (24 years ago)

Author:

phaller

Message:

fix crash in CDN_FILEOK

File:

• trunk/src/comdlg32/filedlg95.c (modified) (3 diffs)

trunk/src/comdlg32/filedlg95.c

@@ -1142 +1142 @@
     /* OK button */
   case IDOK:
+#ifndef __WIN32OS2__
       if(FILEDLG95_OnOpen(hwnd))
         SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK);
     break;
+#else
+    {
+      // 20011017 PH
+      // some apps require the resources to be still there
+      // for the CDN_ processing.
+      BOOL fResult = FILEDLG95_OnOpen(hwnd);
+      if(fResult)
+        SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK);
+
+      FILEDLG95_Clean(hwnd);
+      EndDialog(hwnd, fResult);
+      break;
+    }
+#endif
     /* Cancel button */
   case IDCANCEL:
@@ -1273 +1288 @@
 
   /* clean and exit */
+#ifndef __WIN32OS2__
+  // 20011017 PH
+  // some apps require the resources to be still there
+  // for the CDN_ processing.
   FILEDLG95_Clean(hwnd);
   return EndDialog(hwnd,TRUE);
+#else
+  return TRUE;
+#endif
 }
 
@@ -1621 +1643 @@
             }
           }
-
+          
+#ifndef __WIN32OS2__
+  // 20011017 PH
+  // some apps require the resources to be still there
+  // for the CDN_ processing.
+          
           TRACE("close\n");
           FILEDLG95_Clean(hwnd);
           ret = EndDialog(hwnd, TRUE);
+#else
+          ret = TRUE;
+#endif
         }
         else
         {
           /* FIXME set error FNERR_BUFFERTOSMALL */
+#ifndef __WIN32OS2__
+  // 20011017 PH
+  // some apps require the resources to be still there
+  // for the CDN_ processing.
+          
           FILEDLG95_Clean(hwnd);
           ret = EndDialog(hwnd, FALSE);
+#else
+          ret = FALSE;
+#endif
         }
         goto ret;