Changeset 5046 for trunk/src

Timestamp:

Feb 1, 2001, 7:02:49 PM (25 years ago)

Author:

sandervl

Message:

wine merge

File:

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

trunk/src/comdlg32/filedlg95.c

@@ -291 +291 @@
   HINSTANCE hInstance;
   LPCSTR lpstrInitialDir = (LPCSTR)-1;
+  LPSTR lpstrSavDir = NULL;
   DWORD dwFlags = 0;
   
@@ -304 +305 @@
   fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
 
+  /* save current directory */
+  if (ofn->Flags & OFN_NOCHANGEDIR)
+  {
+     lpstrSavDir = MemAlloc(MAX_PATH);
+     GetCurrentDirectoryA(MAX_PATH, lpstrSavDir);
+  }
+
   dwFlags = ofn->Flags;
   ofn->Flags = ofn->Flags|OFN_WINE;
@@ -324 +332 @@
   }
 
+  if (lpstrSavDir)
+  {
+      SetCurrentDirectoryA(lpstrSavDir);
+      MemFree(lpstrSavDir);
+  }
+
   if (lpstrInitialDir != (LPCSTR)-1)
   {
@@ -383 +397 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-  
+#ifdef __WIN32OS2__
+  LPSTR lpstrSavDir = NULL;
+#endif
   /* out arguments */
   LPWSTR lpstrFile = NULL;
@@ -476 +492 @@
   hInstance = ofn->hInstance;
 
+#ifdef __WIN32OS2__
+  /* save current directory */
+  if (ofn->Flags & OFN_NOCHANGEDIR)
+  {
+     lpstrSavDir = MemAlloc(MAX_PATH);
+     GetCurrentDirectoryA(MAX_PATH, lpstrSavDir);
+  }
+#endif
+
   ofn->Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
   ofn->hInstance = MapHModuleLS(ofn->hInstance);
@@ -491 +516 @@
       ret = 0;
   }
+
+#ifdef __WIN32OS2__
+  if (lpstrSavDir)
+  {
+      SetCurrentDirectoryA(lpstrSavDir);
+      MemFree(lpstrSavDir);
+  }
+#endif
       
   /* restore saved IN arguments and convert OUT arguments back */
@@ -856 +889 @@
          SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
          FILEDLG95_FillControls(hwnd, wParam, lParam);
+         SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
          return 0;
        }
@@ -1548 +1582 @@
             /* first old style */
             TRACE("---\n");
-#ifndef __WIN32OS2__
-//-->> crashes Adobe Acrobat 4.0
-            CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook, hwnd,
-                         fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
+            CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,
+                            fodInfos->DlgInfos.hwndCustomDlg,
+                            fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
             if (GetWindowLongA(hwnd, DWL_MSGRESULT))
             {
@@ -1558 +1591 @@
               goto ret;
             }
-#endif
           }