Commit b70b153c authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

setupapi: Make the FDI handle a local variable.

parent 6b248f78
...@@ -40,7 +40,6 @@ OSVERSIONINFOW OsVersionInfo; ...@@ -40,7 +40,6 @@ OSVERSIONINFOW OsVersionInfo;
HINSTANCE SETUPAPI_hInstance = 0; HINSTANCE SETUPAPI_hInstance = 0;
typedef struct { typedef struct {
HFDI hfdi;
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];
...@@ -255,6 +254,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, ...@@ -255,6 +254,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
ERF erf; ERF erf;
CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL;
DWORD fpnsize; DWORD fpnsize;
HFDI hfdi;
BOOL ret; BOOL ret;
TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
...@@ -293,14 +293,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, ...@@ -293,14 +293,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
my_hsc.msghandler = MsgHandler; my_hsc.msghandler = MsgHandler;
my_hsc.context = Context; my_hsc.context = Context;
my_hsc.hfdi = FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, hfdi = FDICreate(sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read,
sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf ); sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf);
if (!my_hsc.hfdi) return FALSE; if (!hfdi) return FALSE;
ret = FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); ret = FDICopy(hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc);
FDIDestroy(my_hsc.hfdi); FDIDestroy(hfdi);
return ret; return ret;
} }
......
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