Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3987dec9
Commit
3987dec9
authored
Aug 31, 2018
by
Nikolay Sivov
Committed by
Alexandre Julliard
Aug 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shlwapi: Use wrappers to call stream methods internally.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
16f83eb4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
istream.c
dlls/shlwapi/istream.c
+5
-8
No files found.
dlls/shlwapi/istream.c
View file @
3987dec9
...
...
@@ -55,9 +55,6 @@ static inline ISHFileStream *impl_from_IStream(IStream *iface)
return
CONTAINING_RECORD
(
iface
,
ISHFileStream
,
IStream_iface
);
}
static
HRESULT
WINAPI
IStream_fnCommit
(
IStream
*
,
DWORD
);
/**************************************************************************
* IStream_fnQueryInterface
*/
...
...
@@ -104,7 +101,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
if
(
!
refCount
)
{
IStream_
fn
Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
IStream_Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
LocalFree
(
This
->
lpszPath
);
CloseHandle
(
This
->
hFile
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
...
...
@@ -171,7 +168,7 @@ static HRESULT WINAPI IStream_fnSeek(IStream *iface, LARGE_INTEGER dlibMove,
TRACE
(
"(%p,%d,%d,%p)
\n
"
,
This
,
dlibMove
.
u
.
LowPart
,
dwOrigin
,
pNewPos
);
IStream_
fn
Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
IStream_Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
dwPos
=
SetFilePointer
(
This
->
hFile
,
dlibMove
.
u
.
LowPart
,
NULL
,
dwOrigin
);
if
(
dwPos
==
INVALID_SET_FILE_POINTER
)
return
HRESULT_FROM_WIN32
(
GetLastError
());
...
...
@@ -193,7 +190,7 @@ static HRESULT WINAPI IStream_fnSetSize(IStream *iface, ULARGE_INTEGER libNewSiz
TRACE
(
"(%p,%d)
\n
"
,
This
,
libNewSize
.
u
.
LowPart
);
IStream_
fn
Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
IStream_Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
if
(
!
SetFilePointer
(
This
->
hFile
,
libNewSize
.
QuadPart
,
NULL
,
FILE_BEGIN
)
)
return
E_FAIL
;
...
...
@@ -224,7 +221,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT
if
(
!
pstm
)
return
S_OK
;
IStream_
fn
Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
IStream_Commit
(
iface
,
0
);
/* If ever buffered, this will be needed */
/* Copy data */
ulSize
=
cb
.
QuadPart
;
...
...
@@ -235,7 +232,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT
ulLeft
=
ulSize
>
sizeof
(
copyBuff
)
?
sizeof
(
copyBuff
)
:
ulSize
;
/* Read */
hRet
=
IStream_
fn
Read
(
iface
,
copyBuff
,
ulLeft
,
&
ulRead
);
hRet
=
IStream_Read
(
iface
,
copyBuff
,
ulLeft
,
&
ulRead
);
if
(
FAILED
(
hRet
)
||
ulRead
==
0
)
break
;
if
(
pcbRead
)
...
...
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