Changeset 413 for trunk

Timestamp:

Jan 29, 2013, 12:43:05 AM (13 years ago)

Author:

dmik

Message:

jdk: Fix broken file open dialog in AWT apps.

It couldn't be dismissed and would not let navigate through dirs.

Location:

trunk/openjdk/jdk/src/windows/native/sun/windows

Files:

• awt_FileDialog.cpp (modified) (2 diffs)
• awt_Window.h (modified) (1 diff)

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp

@@ -103 +103 @@
     }
 
-    return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
+    WNDPROC oldProc = ComCtl32Util::GetInstance().IsNewSubclassing() ? NULL :
+                      reinterpret_cast<WNDPROC>(::GetProp(hWnd, ModalDialogProcProp));
+
+    return ComCtl32Util::GetInstance().DefWindowProc(oldProc, hWnd, message, wParam, lParam);
 }
 
@@ -137 +140 @@
 
             // subclass dialog's parent to receive additional messages
-            ComCtl32Util::GetInstance().SubclassHWND(parent,
-                                                     FileDialogWndProc);
+            WNDPROC oldProc = ComCtl32Util::GetInstance().SubclassHWND(parent,
+                                                                       FileDialogWndProc);
+            if (!ComCtl32Util::GetInstance().IsNewSubclassing())
+                ::SetProp(parent, ModalDialogProcProp, reinterpret_cast<HANDLE>(oldProc));
 
             break;
         }
         case WM_DESTROY: {
+            WNDPROC oldProc = ComCtl32Util::GetInstance().IsNewSubclassing() ? NULL :
+                              reinterpret_cast<WNDPROC>(::GetProp(parent, ModalDialogProcProp));
+
             ComCtl32Util::GetInstance().UnsubclassHWND(parent,
                                                        FileDialogWndProc,
-                                                       NULL);
+                                                       oldProc);
+            if (!ComCtl32Util::GetInstance().IsNewSubclassing())
+                ::RemoveProp(parent, ModalDialogProcProp);
             ::RemoveProp(parent, ModalDialogPeerProp);
             break;

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Window.h

@@ -35 +35 @@
 static LPCTSTR ModalBlockerProp = TEXT("SunAwtModalBlockerProp");
 static LPCTSTR ModalDialogPeerProp = TEXT("SunAwtModalDialogPeerProp");
+static LPCTSTR ModalDialogProcProp = TEXT("SunAwtModalDialogProcProp");
 
 #ifndef WH_MOUSE_LL