Skip to content

W
wine-cw
Commit 2ee8cd5a authored by Erich Hoover's avatar Erich Hoover Committed by Alexandre Julliard
Browse files
Options

setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED.

parent f5375256
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
dlls/setupapi/setupcab.c
View file @ 2ee8cd5a
...@@ -82,6 +82,7 @@ typedef struct { ...@@ -82,6 +82,7 @@ typedef struct {
PSP_FILE_CALLBACK_A msghandler; PSP_FILE_CALLBACK_A msghandler;
PVOID context; PVOID context;
CHAR most_recent_cabinet_name[MAX_PATH]; CHAR most_recent_cabinet_name[MAX_PATH];
CHAR most_recent_target[MAX_PATH];
} SC_HSC_A, *PSC_HSC_A; } SC_HSC_A, *PSC_HSC_A;
#define SC_HSC_W_MAGIC 0x0CABFEED #define SC_HSC_W_MAGIC 0x0CABFEED
...@@ -91,6 +92,7 @@ typedef struct { ...@@ -91,6 +92,7 @@ typedef struct {
PSP_FILE_CALLBACK_W msghandler; PSP_FILE_CALLBACK_W msghandler;
PVOID context; PVOID context;
WCHAR most_recent_cabinet_name[MAX_PATH]; WCHAR most_recent_cabinet_name[MAX_PATH];
WCHAR most_recent_target[MAX_PATH];
} SC_HSC_W, *PSC_HSC_W; } SC_HSC_W, *PSC_HSC_W;
WINE_DEFAULT_DEBUG_CHANNEL(setupapi); WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
...@@ -337,6 +339,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ...@@ -337,6 +339,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
SetLastError(ERROR_PATH_NOT_FOUND); SetLastError(ERROR_PATH_NOT_FOUND);
return -1; return -1;
} }
strcpy( phsc->most_recent_target, fici.FullTargetName );
return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE);
} else { } else {
TRACE(" Callback skipped file.\n"); TRACE(" Callback skipped file.\n");
...@@ -348,7 +351,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ...@@ -348,7 +351,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No");
TRACE(" File hndl: %d\n", pfdin->hf); */ TRACE(" File hndl: %d\n", pfdin->hf); */
fp.Source = phsc->most_recent_cabinet_name; fp.Source = phsc->most_recent_cabinet_name;
fp.Target = pfdin->psz1; fp.Target = phsc->most_recent_target;
fp.Win32Error = 0; fp.Win32Error = 0;
fp.Flags = 0; fp.Flags = 0;
/* the following should be a fixme -- but it occurs too many times */ /* the following should be a fixme -- but it occurs too many times */
...@@ -477,6 +480,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ...@@ -477,6 +480,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
SetLastError(ERROR_PATH_NOT_FOUND); SetLastError(ERROR_PATH_NOT_FOUND);
return -1; return -1;
} }
strcpyW( phsc->most_recent_target, fici.FullTargetName );
return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE);
} else { } else {
TRACE(" Callback skipped file.\n"); TRACE(" Callback skipped file.\n");
...@@ -488,10 +492,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ...@@ -488,10 +492,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No");
TRACE(" File hndl: %d\n", pfdin->hf); */ TRACE(" File hndl: %d\n", pfdin->hf); */
fp.Source = phsc->most_recent_cabinet_name; fp.Source = phsc->most_recent_cabinet_name;
len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, buf, MAX_PATH); fp.Target = phsc->most_recent_target;
if ((len > MAX_PATH) || (len <= 1))
buf[0] = '\0';
fp.Target = buf;
fp.Win32Error = 0; fp.Win32Error = 0;
fp.Flags = 0; fp.Flags = 0;
/* a valid fixme -- but occurs too many times */ /* a valid fixme -- but occurs too many times */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment