Erich Hoover : setupapi: Close the target file before issuing SPFILENOTIFY_FILEEXTRACTED.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f036f462174d047e960bded01bef48dd7e0c19c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f036f462174d047e960bded01b...

Author: Erich Hoover 
Date:   Thu Oct  4 12:49:52 2012 -0600

setupapi: Close the target file before issuing SPFILENOTIFY_FILEEXTRACTED.

---

dlls/setupapi/setupcab.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index d92ca6a..8fcd989 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -356,9 +356,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
     fp.Flags = 0;
     /* the following should be a fixme -- but it occurs too many times */
     WARN("Should set file date/time/attribs (and execute files?)\n");
-    err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0);
     if (sc_cb_close(pfdin->hf))
       WARN("_close failed.\n");
+    err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0);
     if (err) {
       SetLastError(err);
       return FALSE;
@@ -497,9 +497,9 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
     fp.Flags = 0;
     /* a valid fixme -- but occurs too many times */
     /* FIXME("Should set file date/time/attribs (and execute files?)\n"); */
-    err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0);
     if (sc_cb_close(pfdin->hf))
       WARN("_close failed.\n");
+    err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0);
     if (err) {
       SetLastError(err);
       return FALSE;