[PATCH 5/5] setupapi: Make the FDI handle a local variable.

Zebediah Figura z.figura12 at gmail.com
Thu Mar 4 20:08:17 CST 2021


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/setupapi/setupcab.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 675a1923071..e041dd965e3 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -56,7 +56,6 @@ OSVERSIONINFOW OsVersionInfo;
 HINSTANCE SETUPAPI_hInstance = 0;
 
 typedef struct {
-  HFDI hfdi;
   PSP_FILE_CALLBACK_A msghandler;
   PVOID context;
   CHAR most_recent_cabinet_name[MAX_PATH];
@@ -271,6 +270,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
   ERF erf;
   CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL;
   DWORD fpnsize;
+  HFDI hfdi;
   BOOL ret;
 
   TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n",
@@ -309,14 +309,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
 
   my_hsc.msghandler = MsgHandler;
   my_hsc.context = Context;
-  my_hsc.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 );
+  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);
 
-  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;
 }
 
-- 
2.20.1




More information about the wine-devel mailing list