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
c192885d
Commit
c192885d
authored
Aug 27, 2013
by
Nikolay Sivov
Committed by
Alexandre Julliard
Aug 27, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Missing MiscStatus key is not a failure for OleRegGetMiscStatus().
parent
1b9fac3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
7 deletions
+29
-7
ole2.c
dlls/ole32/ole2.c
+5
-6
compobj.c
dlls/ole32/tests/compobj.c
+24
-1
No files found.
dlls/ole32/ole2.c
View file @
c192885d
...
...
@@ -882,11 +882,6 @@ HRESULT WINAPI OleRegGetMiscStatus(
LONG
result
;
/*
* Initialize the out parameter.
*/
*
pdwStatus
=
0
;
/*
* Build the key name we're looking for
*/
sprintfW
(
keyName
,
clsidfmtW
,
...
...
@@ -896,6 +891,10 @@ HRESULT WINAPI OleRegGetMiscStatus(
TRACE
(
"(%s, %d, %p)
\n
"
,
debugstr_w
(
keyName
),
dwAspect
,
pdwStatus
);
if
(
!
pdwStatus
)
return
E_INVALIDARG
;
*
pdwStatus
=
0
;
/*
* Open the class id Key
*/
...
...
@@ -910,7 +909,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
if
(
result
!=
ERROR_SUCCESS
)
{
RegCloseKey
(
clsidKey
);
return
REGDB_E_READREGDB
;
return
S_OK
;
}
/*
...
...
dlls/ole32/tests/compobj.c
View file @
c192885d
...
...
@@ -1732,18 +1732,41 @@ static void test_OleRegGetMiscStatus(void)
DWORD
status
;
HRESULT
hr
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_Testclass
,
DVASPECT_ICON
,
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
status
=
0xdeadbeef
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_Testclass
,
DVASPECT_ICON
,
&
status
);
ok
(
hr
==
REGDB_E_CLASSNOTREG
,
"got 0x%08x
\n
"
,
hr
);
ok
(
status
==
0
,
"got 0x%08x
\n
"
,
status
);
status
=
-
1
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_StdFont
,
DVASPECT_ICON
,
&
status
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
status
==
0
,
"got 0x%08x
\n
"
,
status
);
if
((
handle
=
activate_context
(
actctx_manifest
,
&
cookie
)))
{
status
=
0
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_Testclass
,
DVASPECT_ICON
,
&
status
);
todo_wine
{
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
status
==
OLEMISC_RECOMPOSEONRESIZE
,
"got 0x%08x
\n
"
,
status
);
}
/* context data takes precedence over registration info */
status
=
0
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_StdFont
,
DVASPECT_ICON
,
&
status
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
todo_wine
ok
(
status
==
OLEMISC_RECOMPOSEONRESIZE
,
"got 0x%08x
\n
"
,
status
);
/* there's no such attribute in context */
status
=
-
1
;
hr
=
OleRegGetMiscStatus
(
&
CLSID_Testclass
,
DVASPECT_DOCPRINT
,
&
status
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
status
==
0
,
"got 0x%08x
\n
"
,
status
);
pDeactivateActCtx
(
0
,
cookie
);
pReleaseActCtx
(
handle
);
}
...
...
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