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
c3fe4b87
Commit
c3fe4b87
authored
Oct 31, 2017
by
Huw Davies
Committed by
Alexandre Julliard
Oct 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: TYMED_NULL is not valid.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
12718fe0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
datacache.c
dlls/ole32/datacache.c
+1
-1
ole2.c
dlls/ole32/tests/ole2.c
+7
-0
No files found.
dlls/ole32/datacache.c
View file @
c3fe4b87
...
@@ -328,7 +328,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt )
...
@@ -328,7 +328,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt )
if
(
fmt
->
dwAspect
==
DVASPECT_ICON
&&
fmt
->
cfFormat
!=
CF_METAFILEPICT
)
if
(
fmt
->
dwAspect
==
DVASPECT_ICON
&&
fmt
->
cfFormat
!=
CF_METAFILEPICT
)
return
DV_E_FORMATETC
;
return
DV_E_FORMATETC
;
if
(
!
fmt
->
cfFormat
||
!
fmt
->
tymed
||
if
(
!
fmt
->
cfFormat
||
(
fmt
->
cfFormat
==
CF_METAFILEPICT
&&
fmt
->
tymed
==
TYMED_MFPICT
)
||
(
fmt
->
cfFormat
==
CF_METAFILEPICT
&&
fmt
->
tymed
==
TYMED_MFPICT
)
||
(
fmt
->
cfFormat
==
CF_BITMAP
&&
fmt
->
tymed
==
TYMED_GDI
)
||
(
fmt
->
cfFormat
==
CF_BITMAP
&&
fmt
->
tymed
==
TYMED_GDI
)
||
(
fmt
->
cfFormat
==
CF_DIB
&&
fmt
->
tymed
==
TYMED_HGLOBAL
)
||
(
fmt
->
cfFormat
==
CF_DIB
&&
fmt
->
tymed
==
TYMED_HGLOBAL
)
||
...
...
dlls/ole32/tests/ole2.c
View file @
c3fe4b87
...
@@ -2332,6 +2332,13 @@ static void test_data_cache_cache(void)
...
@@ -2332,6 +2332,13 @@ static void test_data_cache_cache(void)
hr
=
IOleCache2_Uncache
(
cache
,
conn
);
hr
=
IOleCache2_Uncache
(
cache
,
conn
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %08x
\n
"
,
hr
);
/* tymed == 0 */
fmt
.
cfFormat
=
CF_ENHMETAFILE
;
fmt
.
dwAspect
=
DVASPECT_CONTENT
;
fmt
.
tymed
=
0
;
hr
=
IOleCache2_Cache
(
cache
,
&
fmt
,
0
,
&
conn
);
ok
(
hr
==
DV_E_TYMED
,
"got %08x
\n
"
,
hr
);
IDataObject_Release
(
data
);
IDataObject_Release
(
data
);
IOleCache2_Release
(
cache
);
IOleCache2_Release
(
cache
);
}
}
...
...
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