Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b70b153c
Commit
b70b153c
authored
Mar 04, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Make the FDI handle a local variable.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6b248f78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
setupcab.c
dlls/setupapi/setupcab.c
+6
-6
No files found.
dlls/setupapi/setupcab.c
View file @
b70b153c
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment