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
Felix Münchhalfen
wine
Commits
91369e20
Commit
91369e20
authored
19 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Added nsIInterfaceRequestor implementation.
parent
a611b20c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/mshtml/mshtml_private.h
+2
-0
2 additions, 0 deletions
dlls/mshtml/mshtml_private.h
dlls/mshtml/nsembed.c
+48
-1
48 additions, 1 deletion
dlls/mshtml/nsembed.c
dlls/mshtml/nsiface.idl
+28
-1
28 additions, 1 deletion
dlls/mshtml/nsiface.idl
with
78 additions
and
2 deletions
dlls/mshtml/mshtml_private.h
+
2
−
0
View file @
91369e20
...
...
@@ -84,6 +84,7 @@ struct NSContainer {
const
nsIContextMenuListenerVtbl
*
lpContextMenuListenerVtbl
;
const
nsIURIContentListenerVtbl
*
lpURIContentListenerVtbl
;
const
nsIEmbeddingSiteWindowVtbl
*
lpEmbeddingSiteWindowVtbl
;
const
nsIInterfaceRequestorVtbl
*
lpInterfaceRequestorVtbl
;
nsIWebBrowser
*
webbrowser
;
nsIWebNavigation
*
navigation
;
...
...
@@ -125,6 +126,7 @@ struct NSContainer {
#define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl)
#define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl)
#define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl)
#define NSIFACEREQ(x) ((nsIInterfaceRequestor*) &(x)->lpInterfaceRequestorVtbl)
#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/nsembed.c
+
48
−
1
View file @
91369e20
/*
* Copyright 2005 Jacek Caban
* Copyright 2005
-2006
Jacek Caban
for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
...
...
@@ -457,6 +457,9 @@ static nsresult NSAPI nsWebBrowserChrome_QueryInterface(nsIWebBrowserChrome *ifa
}
else
if
(
IsEqualGUID
(
&
IID_nsIEmbeddingSiteWindow
,
riid
))
{
TRACE
(
"(%p)->(IID_nsIEmbeddingSiteWindow %p)
\n
"
,
This
,
result
);
*
result
=
NSEMBWNDS
(
This
);
}
else
if
(
IsEqualGUID
(
&
IID_nsIInterfaceRequestor
,
riid
))
{
TRACE
(
"(%p)->(IID_nsIInterfaceRequestor %p)
\n
"
,
This
,
result
);
*
result
=
NSIFACEREQ
(
This
);
}
if
(
*
result
)
{
...
...
@@ -916,6 +919,49 @@ static const nsIEmbeddingSiteWindowVtbl nsEmbeddingSiteWindowVtbl = {
nsEmbeddingSiteWindow_GetSiteWindow
};
#define NSIFACEREQ_THIS(iface) DEFINE_THIS(NSContainer, InterfaceRequestor, iface)
static
nsresult
NSAPI
nsInterfaceRequestor_QueryInterface
(
nsIInterfaceRequestor
*
iface
,
nsIIDRef
riid
,
nsQIResult
result
)
{
NSContainer
*
This
=
NSIFACEREQ_THIS
(
iface
);
return
nsIWebBrowserChrome_QueryInterface
(
NSWBCHROME
(
This
),
riid
,
result
);
}
static
nsrefcnt
NSAPI
nsInterfaceRequestor_AddRef
(
nsIInterfaceRequestor
*
iface
)
{
NSContainer
*
This
=
NSIFACEREQ_THIS
(
iface
);
return
nsIWebBrowserChrome_AddRef
(
NSWBCHROME
(
This
));
}
static
nsrefcnt
NSAPI
nsInterfaceRequestor_Release
(
nsIInterfaceRequestor
*
iface
)
{
NSContainer
*
This
=
NSIFACEREQ_THIS
(
iface
);
return
nsIWebBrowserChrome_Release
(
NSWBCHROME
(
This
));
}
static
nsresult
NSAPI
nsInterfaceRequestor_GetInterface
(
nsIInterfaceRequestor
*
iface
,
nsIIDRef
riid
,
nsQIResult
result
)
{
NSContainer
*
This
=
NSIFACEREQ_THIS
(
iface
);
if
(
IsEqualGUID
(
&
IID_nsIDOMWindow
,
riid
))
{
FIXME
(
"(%p)->(IID_nsIDOMWindow %p)
\n
"
,
This
,
result
);
return
NS_NOINTERFACE
;
}
return
nsIWebBrowserChrome_QueryInterface
(
NSWBCHROME
(
This
),
riid
,
result
);
}
#undef NSIFACEREQ_THIS
static
const
nsIInterfaceRequestorVtbl
nsInterfaceRequestorVtbl
=
{
nsInterfaceRequestor_QueryInterface
,
nsInterfaceRequestor_AddRef
,
nsInterfaceRequestor_Release
,
nsInterfaceRequestor_GetInterface
};
void
NSContainer_Create
(
HTMLDocument
*
doc
)
{
nsIWebBrowserSetup
*
wbsetup
;
...
...
@@ -931,6 +977,7 @@ void NSContainer_Create(HTMLDocument *doc)
ret
->
lpContextMenuListenerVtbl
=
&
nsContextMenuListenerVtbl
;
ret
->
lpURIContentListenerVtbl
=
&
nsURIContentListenerVtbl
;
ret
->
lpEmbeddingSiteWindowVtbl
=
&
nsEmbeddingSiteWindowVtbl
;
ret
->
lpInterfaceRequestorVtbl
=
&
nsInterfaceRequestorVtbl
;
ret
->
doc
=
doc
;
ret
->
ref
=
1
;
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/nsiface.idl
+
28
−
1
View file @
91369e20
...
...
@@ -68,7 +68,6 @@ interface nsISupports
/*
Currently
we
don
't need a full declaration of these interfaces */
typedef nsISupports nsIWeakReference;
typedef nsISupports nsIDOMWindow;
typedef nsISupports nsIDOMDocument;
typedef nsISupports nsISHistory;
typedef nsISupports nsISimpleEnumerator;
...
...
@@ -81,6 +80,9 @@ typedef nsISupports nsIDOMAbstractView;
typedef nsISupports nsIStreamListener;
typedef nsISupports nsIHttpHeaderVisitor;
typedef nsISupports nsIRequestObserver;
typedef nsISupports nsIDOMBarProp;
typedef nsISupports nsIDOMWindowCollection;
typedef nsISupports nsISelection;
[
object,
...
...
@@ -295,6 +297,31 @@ interface nsIUploadChannel : nsISupports
nsresult GetUploadStream(nsIInputStream **aUploadStream);
}
[
object,
uuid(a6cf906b-15b3-11d2-932e-00805f8add32)
]
interface nsIDOMWindow : nsISupports
{
nsresult GetDocument(nsIDOMDocument **aDocument);
nsresult GetParent(nsIDOMWindow **aParent);
nsresult GetTop(nsIDOMWindow **aTop);
nsresult GetScrollbars(nsIDOMBarProp **aScrollbars);
nsresult GetFrames(nsIDOMWindowCollection **aFrames);
nsresult GetName(nsAString *aName);
nsresult SetName(const nsAString *aName);
nsresult GetTextZoom(float *aTextZoom);
nsresult SetTextZoom(float aTextZoom);
nsresult GetScrollX(PRInt32 *aScrollX);
nsresult GetScrollY(PRInt32 *aScrollY);
nsresult ScrollTo(PRInt32 xScroll, PRInt32 yScroll);
nsresult ScrollBy(PRInt32 xScrollDif, PRInt32 yScrollDif);
nsresult GetSelection(nsISelection **_retval);
nsresult ScrollByLines(PRInt32 numLines);
nsresult ScrollByPages(PRInt32 numPages);
nsresult SizeToContent();
}
[
object,
uuid(94928ab3-8b63-11d3-989d-001083010e9b)
...
...
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