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
3b8f4a28
Commit
3b8f4a28
authored
Dec 25, 2013
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Dec 31, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cabinet: Remove a no longer valid comment about seeking and restoring CAB position.
parent
4ddb9f69
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
30 deletions
+0
-30
fdi.c
dlls/cabinet/fdi.c
+0
-30
No files found.
dlls/cabinet/fdi.c
View file @
3b8f4a28
...
@@ -543,36 +543,6 @@ static BOOL FDI_read_entries(
...
@@ -543,36 +543,6 @@ static BOOL FDI_read_entries(
TRACE
(
"(fdi == ^%p, hf == %ld, pfdici == ^%p)
\n
"
,
fdi
,
hf
,
pfdici
);
TRACE
(
"(fdi == ^%p, hf == %ld, pfdici == ^%p)
\n
"
,
fdi
,
hf
,
pfdici
);
/*
* FIXME: I just noticed that I am memorizing the initial file pointer
* offset and restoring it before reading in the rest of the header
* information in the cabinet. Perhaps that's correct -- that is, perhaps
* this API is supposed to support "streaming" cabinets which are embedded
* in other files, or cabinets which begin at file offsets other than zero.
* Otherwise, I should instead go to the absolute beginning of the file.
* (Either way, the semantics of wine's FDICopy require me to leave the
* file pointer where it is afterwards -- If Windows does not do so, we
* ought to duplicate the native behavior in the FDIIsCabinet API, not here.
*
* So, the answer lies in Windows; will native cabinet.dll recognize a
* cabinet "file" embedded in another file? Note that cabextract.c does
* support this, which implies that Microsoft's might. I haven't tried it
* yet so I don't know. ATM, most of wine's FDI cabinet routines (except
* this one) would not work in this way. To fix it, we could just make the
* various references to absolute file positions in the code relative to an
* initial "beginning" offset. Because the FDICopy API doesn't take a
* file-handle like this one, we would therein need to search through the
* file for the beginning of the cabinet (as we also do in cabextract.c).
* Note that this limits us to a maximum of one cabinet per. file: the first.
*
* So, in summary: either the code below is wrong, or the rest of fdi.c is
* wrong... I cannot imagine that both are correct ;) One of these flaws
* should be fixed after determining the behavior on Windows. We ought
* to check both FDIIsCabinet and FDICopy for the right behavior.
*
* -gmt
*/
/* read in the CFHEADER */
/* read in the CFHEADER */
if
(
fdi
->
read
(
hf
,
buf
,
cfhead_SIZEOF
)
!=
cfhead_SIZEOF
)
{
if
(
fdi
->
read
(
hf
,
buf
,
cfhead_SIZEOF
)
!=
cfhead_SIZEOF
)
{
if
(
pmii
)
set_error
(
fdi
,
FDIERROR_NOT_A_CABINET
,
0
);
if
(
pmii
)
set_error
(
fdi
,
FDIERROR_NOT_A_CABINET
,
0
);
...
...
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