From a59d256b75d74edc1e878bf776e394636df0a422 Mon Sep 17 00:00:00 2001
From: ashok <ashok>
Date: Wed, 3 Dec 2014 16:33:49 +0000
Subject: Fix for 4a0451f529. Needed a Tcl_ResetResult after recursive event
 loop otherwise clicking Cancel would return a non-empty result in case a
 script was run in the background as part of the event loop. Also updated test
 suite which did not actually check that a Cancel resulted in an empty event
 string.

---
 tests/winDialog.test | 18 ++++++++++++------
 win/tkWinDialog.c    | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/tests/winDialog.test b/tests/winDialog.test
index cd8d937..b7847a5 100644
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -251,10 +251,14 @@ test winDialog-5.4 {GetFileName: Tcl_GetIndexFromObj() != TCL_OK} -constraints {
 test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} -constraints {
     nt testwinevent
 } -body {
-    start {tk_getOpenFile -title bar}
-    then {
+    start {set x [tk_getOpenFile -title bar]}
+    set y [then {
         Click cancel
-    }
+    }]
+    # Note this also tests fix for 
+    # http://core.tcl.tk/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
+    # $x is expected to be empty
+    append x $y
 } -result {0}
 test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints {
     nt
@@ -533,10 +537,12 @@ test winDialog-8.1 {OFNHookProc} -constraints {emptyTest nt} -body {}
 test winDialog-9.1 {Tk_ChooseDirectoryObjCmd: no arguments} -constraints {
     nt testwinevent
 } -body {
-    start {tk_chooseDirectory}
-    then {
+    start {set x [tk_chooseDirectory]}
+    set y [then {
         Click cancel
-    }
+    }]
+    # $x should be "" on a Cancel
+    append x $y
 } -result {0}
 test winDialog-9.2 {Tk_ChooseDirectoryObjCmd: one argument} -constraints {
     nt
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index adb5e9e..c137111 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1407,6 +1407,21 @@ static int GetFileNameVista(Tcl_Interp *interp, OFNOpts *optsPtr,
     hr = fdlgIf->lpVtbl->Show(fdlgIf, hWnd);
     Tcl_SetServiceMode(oldMode);
 
+    /*
+     * Ensure that hWnd is enabled, because it can happen that we have updated
+     * the wrapper of the parent, which causes us to leave this child disabled
+     * (Windows loses sync).
+     */
+
+    if (hWnd)
+        EnableWindow(hWnd, 1);
+
+    /*
+     * Clear interp result since it might have been set during the modal loop.
+     * http://core.tcl.tk/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
+     */
+    Tcl_ResetResult(interp);
+
     if (SUCCEEDED(hr)) {
         if ((oper == OFN_FILE_OPEN) && optsPtr->multi) {
             IShellItemArray *multiIf;
-- 
cgit v0.12