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
98c2c9a9
Commit
98c2c9a9
authored
Oct 21, 2019
by
Vincent Povirk
Committed by
Alexandre Julliard
Oct 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windowscodecs: Implement IWICStream_Commit.
Signed-off-by:
Vincent Povirk
<
vincent@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f704c365
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
20 deletions
+20
-20
stream.c
dlls/windowscodecs/stream.c
+5
-5
stream.c
dlls/windowscodecs/tests/stream.c
+15
-15
No files found.
dlls/windowscodecs/stream.c
View file @
98c2c9a9
...
...
@@ -189,12 +189,11 @@ static HRESULT WINAPI StreamOnMemory_CopyTo(IStream *iface,
return
E_NOTIMPL
;
}
/* Commit isn't implemented in the native windowscodecs DLL either */
static
HRESULT
WINAPI
StreamOnMemory_Commit
(
IStream
*
iface
,
DWORD
grfCommitFlags
)
{
TRACE
(
"(%p, %#x)
\n
"
,
iface
,
grfCommitFlags
);
return
E_NOTIMPL
;
return
S_OK
;
}
/* Revert isn't implemented in the native windowscodecs DLL either */
...
...
@@ -375,7 +374,7 @@ static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface,
DWORD
grfCommitFlags
)
{
TRACE
(
"(%p, %#x)
\n
"
,
iface
,
grfCommitFlags
);
return
E_NOTIMPL
;
return
S_OK
;
}
static
HRESULT
WINAPI
StreamOnFileHandle_Revert
(
IStream
*
iface
)
...
...
@@ -655,8 +654,9 @@ static HRESULT WINAPI StreamOnStreamRange_CopyTo(IStream *iface,
static
HRESULT
WINAPI
StreamOnStreamRange_Commit
(
IStream
*
iface
,
DWORD
grfCommitFlags
)
{
TRACE
(
"(%p, %#x)
\n
"
,
iface
,
grfCommitFlags
);
return
E_NOTIMPL
;
StreamOnStreamRange
*
This
=
StreamOnStreamRange_from_IStream
(
iface
);
TRACE
(
"(%p, %#x)
\n
"
,
This
,
grfCommitFlags
);
return
IStream_Commit
(
This
->
stream
,
grfCommitFlags
);
}
/* Revert isn't implemented in the native windowscodecs DLL either */
...
...
dlls/windowscodecs/tests/stream.c
View file @
98c2c9a9
...
...
@@ -326,19 +326,19 @@ static void test_StreamOnMemory(void)
/* Commit */
hr
=
IWICStream_Commit
(
pStream
,
STGC_DEFAULT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pStream
,
STGC_OVERWRITE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pStream
,
STGC_ONLYIFCURRENT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pStream
,
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pStream
,
STGC_CONSOLIDATE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
/* Revert */
...
...
@@ -643,19 +643,19 @@ static void test_StreamOnStreamRange(void)
/* Commit */
hr
=
IWICStream_Commit
(
pSubStream
,
STGC_DEFAULT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pSubStream
,
STGC_OVERWRITE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pSubStream
,
STGC_ONLYIFCURRENT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pSubStream
,
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
pSubStream
,
STGC_CONSOLIDATE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
/* Revert */
...
...
@@ -953,19 +953,19 @@ static void test_StreamOnIStream(void)
/* Commit */
hr
=
IWICStream_Commit
(
substream
,
STGC_DEFAULT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
substream
,
STGC_OVERWRITE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
substream
,
STGC_ONLYIFCURRENT
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
substream
,
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
hr
=
IWICStream_Commit
(
substream
,
STGC_CONSOLIDATE
);
todo_wine
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
ok
(
broken
(
hr
==
E_NOTIMPL
)
||
hr
==
S_OK
,
"Commit returned %#x
\n
"
,
hr
);
/* Revert */
IWICStream_Write
(
substream
,
buff
+
5
,
6
,
NULL
);
...
...
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