From 4c669fff49713ad0310dd077944f953a022f1a4e Mon Sep 17 00:00:00 2001
From: "law%netscape.com"
 <law%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 17 Oct 2001 00:42:12 +0000
Subject: [PATCH] Fixes for bugs: 74445  - Add call to DdeUnaccessData
 (r=pchen, sr=blake) 103849 - Use ::IsIconic to check if window is minimized
 before restoring (r=matt, sr=blake)

git-svn-id: svn://10.0.0.236/trunk@105576 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index db0ef0576e8..68d598441a8 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -142,8 +142,10 @@ activateWindow( nsIDOMWindowInternal *win ) {
     // Try to get native window handle.
     HWND hwnd = hwndForDOMWindow( win );
     if ( hwnd ) {
-        // Restore the window in case it is minimized.
-        ::ShowWindow( hwnd, SW_RESTORE );
+        // Restore the window if it is minimized.
+        if ( ::IsIconic( hwnd ) ) {
+            ::ShowWindow( hwnd, SW_RESTORE );
+        }
         // Use the OS call, if possible.
         ::SetForegroundWindow( hwnd );
     } else {
@@ -1262,6 +1264,8 @@ nsNativeAppSupportWin::HandleDDENotification( UINT uType,       // transaction t
             printf( "Handling dde request: [%s]...\n", (char*)request );
 #endif
             HandleRequest( request );
+            // Release the data.
+            DdeUnaccessData( hdata );
             result = (HDDEDATA)DDE_FACK;
         } else {
             result = (HDDEDATA)DDE_FNOTPROCESSED;