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
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
Alexey Alyaev
wine
Commits
eae4e45c
Commit
eae4e45c
authored
19 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
- Added more tests.
- Make tests pass under Wine.
parent
737978a8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/mshtml/oleobj.c
+29
-4
29 additions, 4 deletions
dlls/mshtml/oleobj.c
dlls/mshtml/tests/Makefile.in
+1
-1
1 addition, 1 deletion
dlls/mshtml/tests/Makefile.in
dlls/mshtml/tests/htmldoc.c
+629
-52
629 additions, 52 deletions
dlls/mshtml/tests/htmldoc.c
with
659 additions
and
57 deletions
dlls/mshtml/oleobj.c
+
29
−
4
View file @
eae4e45c
...
...
@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
* IOleObject implementation
*/
#define OLEOBJ_THIS(iface)
(HTMLDocument*)((char*)(iface)-offsetof
(HTMLDocument,
lp
OleObject
Vtbl)
)
#define OLEOBJ_THIS(iface)
DEFINE_THIS
(HTMLDocument,
OleObject
, iface
)
static
HRESULT
WINAPI
OleObject_QueryInterface
(
IOleObject
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
...
...
@@ -111,6 +111,19 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
}
}
/* Native calls here GetWindow. What is it for?
* We don't have anything to do with it here (yet). */
if
(
pClientSite
)
{
IOleWindow
*
pOleWindow
=
NULL
;
HWND
hwnd
;
hres
=
IOleClientSite_QueryInterface
(
pClientSite
,
&
IID_IOleWindow
,
(
void
**
)
&
pOleWindow
);
if
(
SUCCEEDED
(
hres
))
{
IOleWindow_GetWindow
(
pOleWindow
,
&
hwnd
);
IOleWindow_Release
(
pOleWindow
);
}
}
IOleClientSite_AddRef
(
pClientSite
);
This
->
client
=
pClientSite
;
This
->
hostui
=
pDocHostUIHandler
;
...
...
@@ -144,8 +157,20 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont
static
HRESULT
WINAPI
OleObject_Close
(
IOleObject
*
iface
,
DWORD
dwSaveOption
)
{
HTMLDocument
*
This
=
OLEOBJ_THIS
(
iface
);
HRESULT
hres
;
FIXME
(
"(%p)->(%08lx)
\n
"
,
This
,
dwSaveOption
);
return
E_NOTIMPL
;
if
(
This
->
client
)
{
IOleContainer
*
container
;
hres
=
IOleClientSite_GetContainer
(
This
->
client
,
&
container
);
if
(
SUCCEEDED
(
hres
))
{
IOleContainer_LockContainer
(
container
,
FALSE
);
IOleContainer_Release
(
container
);
}
}
return
S_OK
;
}
static
HRESULT
WINAPI
OleObject_SetMoniker
(
IOleObject
*
iface
,
DWORD
dwWhichMoniker
,
IMoniker
*
pmk
)
...
...
@@ -343,7 +368,7 @@ static const IOleObjectVtbl OleObjectVtbl = {
* IOleDocument implementation
*/
#define OLEDOC_THIS(iface)
(HTMLDocument*)((char*)(iface)-offsetof
(HTMLDocument,
lp
OleDocument
Vtbl)
)
#define OLEDOC_THIS(iface)
DEFINE_THIS
(HTMLDocument,
OleDocument
, iface
)
static
HRESULT
WINAPI
OleDocument_QueryInterface
(
IOleDocument
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
...
...
@@ -425,7 +450,7 @@ static const IOleDocumentVtbl OleDocumentVtbl = {
* IOleCommandTarget implementation
*/
#define CMDTARGET_THIS(iface)
(HTMLDocument*)((char*)(iface)-offsetof
(HTMLDocument,
lp
OleCommandTarget
Vtbl)
)
#define CMDTARGET_THIS(iface)
DEFINE_THIS
(HTMLDocument,
OleCommandTarget
, iface
)
static
HRESULT
WINAPI
OleCommandTarget_QueryInterface
(
IOleCommandTarget
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/tests/Makefile.in
+
1
−
1
View file @
eae4e45c
...
...
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
TESTDLL
=
mshtml.dll
IMPORTS
=
ole32
IMPORTS
=
ole32
user32
EXTRALIBS
=
-luuid
CTESTS
=
\
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/tests/htmldoc.c
+
629
−
52
View file @
eae4e45c
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