Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Herman Semenov
wine
Commits
a74c56a3
Commit
a74c56a3
authored
9 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
explorer: Added stub IWebBrowser2 support for desktop shell window.
parent
06b60cc4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/shell32/tests/shelldispatch.c
+17
-14
17 additions, 14 deletions
dlls/shell32/tests/shelldispatch.c
programs/explorer/desktop.c
+654
-4
654 additions, 4 deletions
programs/explorer/desktop.c
with
671 additions
and
18 deletions
dlls/shell32/tests/shelldispatch.c
+
17
−
14
View file @
a74c56a3
...
...
@@ -499,7 +499,6 @@ todo_wine {
ret
=
0xdead
;
VariantInit
(
&
v
);
hr
=
IShellWindows_FindWindowSW
(
shellwindows
,
&
v
,
&
v
,
SWC_DESKTOP
,
&
ret
,
SWFO_NEEDDISPATCH
,
&
disp
);
todo_wine
ok
(
hr
==
S_OK
||
broken
(
hr
==
S_FALSE
),
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_FALSE
)
/* winxp and earlier */
{
win_skip
(
"SWC_DESKTOP is not supported, some tests will be skipped.
\n
"
);
...
...
@@ -519,41 +518,46 @@ todo_wine
IUnknown
*
unk
;
UINT
count
;
todo_wine
ok
(
disp
!=
NULL
,
"got %p
\n
"
,
disp
);
if
(
disp
)
{
ok
(
ret
!=
HandleToUlong
(
hwnd
),
"got %d
\n
"
,
ret
);
/* IDispatch-related tests */
count
=
10
;
hr
=
IDispatch_GetTypeInfoCount
(
disp
,
&
count
);
todo_wine
{
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
count
==
1
,
"got %u
\n
"
,
count
);
}
hr
=
IDispatch_GetTypeInfo
(
disp
,
0
,
LOCALE_SYSTEM_DEFAULT
,
&
typeinfo
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
{
hr
=
ITypeInfo_GetTypeAttr
(
typeinfo
,
&
typeattr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
IsEqualGUID
(
&
typeattr
->
guid
,
&
IID_IWebBrowser2
),
"type guid %s
\n
"
,
wine_dbgstr_guid
(
&
typeattr
->
guid
));
ITypeInfo_ReleaseTypeAttr
(
typeinfo
,
typeattr
);
ITypeInfo_Release
(
typeinfo
);
}
/* IWebBrowser2 */
hr
=
IDispatch_QueryInterface
(
disp
,
&
IID_IWebBrowser2
,
(
void
**
)
&
wb
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IWebBrowser2_Refresh
(
wb
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IWebBrowser2_get_Application
(
wb
,
&
app
);
todo_wine
{
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
disp
==
app
,
"got %p, %p
\n
"
,
app
,
disp
);
IDispatch_Release
(
app
);
}
if
(
hr
==
S_OK
)
IDispatch_Release
(
app
);
hr
=
IWebBrowser2_get_Document
(
wb
,
&
doc
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
{
hr
=
IDispatch_GetTypeInfo
(
doc
,
0
,
LOCALE_SYSTEM_DEFAULT
,
&
typeinfo
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
...
...
@@ -564,7 +568,7 @@ todo_wine
ITypeInfo_ReleaseTypeAttr
(
typeinfo
,
typeattr
);
ITypeInfo_Release
(
typeinfo
);
}
IWebBrowser2_Release
(
wb
);
/* IServiceProvider */
...
...
@@ -572,8 +576,9 @@ todo_wine
ok
(
hr
==
E_NOINTERFACE
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDispatch_QueryInterface
(
disp
,
&
IID_IServiceProvider
,
(
void
**
)
&
sp
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
{
hr
=
IServiceProvider_QueryService
(
sp
,
&
SID_STopLevelBrowser
,
&
IID_IShellBrowser
,
(
void
**
)
&
sb
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
...
...
@@ -595,16 +600,14 @@ todo_wine
ok
(
hr
==
E_NOINTERFACE
,
"got 0x%08x
\n
"
,
hr
);
IServiceProvider_Release
(
sp
);
}
ok
(
ret
!=
HandleToUlong
(
hwnd
),
"got %d
\n
"
,
ret
);
if
(
disp
)
IDispatch_Release
(
disp
);
}
IDispatch_Release
(
disp
);
}
disp
=
(
void
*
)
0xdeadbeef
;
ret
=
0xdead
;
VariantInit
(
&
v
);
hr
=
IShellWindows_FindWindowSW
(
shellwindows
,
&
v
,
&
v
,
SWC_DESKTOP
,
&
ret
,
0
,
&
disp
);
todo_wine
ok
(
hr
==
S_OK
||
broken
(
hr
==
S_FALSE
)
/* winxp */
,
"got 0x%08x
\n
"
,
hr
);
ok
(
disp
==
NULL
,
"got %p
\n
"
,
disp
);
ok
(
ret
!=
HandleToUlong
(
hwnd
),
"got %d
\n
"
,
ret
);
...
...
This diff is collapsed.
Click to expand it.
programs/explorer/desktop.c
+
654
−
4
View file @
a74c56a3
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment