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
Sebastian Mayr
wine
Commits
88f4fb1f
Commit
88f4fb1f
authored
17 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Make connection points container independent.
parent
f09a6f72
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/conpoint.c
+6
-5
6 additions, 5 deletions
dlls/mshtml/conpoint.c
dlls/mshtml/htmldoc.c
+6
-4
6 additions, 4 deletions
dlls/mshtml/htmldoc.c
dlls/mshtml/mshtml_private.h
+2
-2
2 additions, 2 deletions
dlls/mshtml/mshtml_private.h
with
14 additions
and
11 deletions
dlls/mshtml/conpoint.c
+
6
−
5
View file @
88f4fb1f
...
...
@@ -75,13 +75,13 @@ static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface,
static
ULONG
WINAPI
ConnectionPoint_AddRef
(
IConnectionPoint
*
iface
)
{
ConnectionPoint
*
This
=
CONPOINT_THIS
(
iface
);
return
I
HTMLDocument2_AddRef
(
HTMLDOC
(
This
->
doc
)
);
return
I
ConnectionPointContainer_AddRef
(
This
->
container
);
}
static
ULONG
WINAPI
ConnectionPoint_Release
(
IConnectionPoint
*
iface
)
{
ConnectionPoint
*
This
=
CONPOINT_THIS
(
iface
);
return
I
HTMLDocument2_Release
(
HTMLDOC
(
This
->
doc
)
);
return
I
ConnectionPointContainer_Release
(
This
->
container
);
}
static
HRESULT
WINAPI
ConnectionPoint_GetConnectionInterface
(
IConnectionPoint
*
iface
,
IID
*
pIID
)
...
...
@@ -107,7 +107,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi
if
(
!
ppCPC
)
return
E_POINTER
;
*
ppCPC
=
CONPTCONT
(
&
This
->
doc
->
cp_
container
)
;
*
ppCPC
=
This
->
container
;
IConnectionPointContainer_AddRef
(
*
ppCPC
);
return
S_OK
;
}
...
...
@@ -184,10 +184,11 @@ static const IConnectionPointVtbl ConnectionPointVtbl =
ConnectionPoint_EnumConnections
};
void
ConnectionPoint_Init
(
ConnectionPoint
*
cp
,
HTMLDocument
*
doc
,
REFIID
riid
,
ConnectionPoint
*
prev
)
void
ConnectionPoint_Init
(
ConnectionPoint
*
cp
,
IConnectionPointContainer
*
container
,
REFIID
riid
,
ConnectionPoint
*
prev
)
{
cp
->
lpConnectionPointVtbl
=
&
ConnectionPointVtbl
;
cp
->
doc
=
doc
;
cp
->
container
=
container
;
cp
->
sinks
=
NULL
;
cp
->
sinks_size
=
0
;
cp
->
iid
=
*
riid
;
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/htmldoc.c
+
6
−
4
View file @
88f4fb1f
...
...
@@ -1142,10 +1142,12 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject)
HTMLDocument_Service_Init
(
ret
);
HTMLDocument_Hlink_Init
(
ret
);
ConnectionPoint_Init
(
&
ret
->
cp_propnotif
,
ret
,
&
IID_IPropertyNotifySink
,
NULL
);
ConnectionPoint_Init
(
&
ret
->
cp_htmldocevents
,
ret
,
&
DIID_HTMLDocumentEvents
,
&
ret
->
cp_propnotif
);
ConnectionPoint_Init
(
&
ret
->
cp_htmldocevents2
,
ret
,
&
DIID_HTMLDocumentEvents2
,
&
ret
->
cp_htmldocevents
);
ConnectionPoint_Init
(
&
ret
->
cp_propnotif
,
CONPTCONT
(
&
ret
->
cp_container
),
&
IID_IPropertyNotifySink
,
NULL
);
ConnectionPoint_Init
(
&
ret
->
cp_htmldocevents
,
CONPTCONT
(
&
ret
->
cp_container
),
&
DIID_HTMLDocumentEvents
,
&
ret
->
cp_propnotif
);
ConnectionPoint_Init
(
&
ret
->
cp_htmldocevents2
,
CONPTCONT
(
&
ret
->
cp_container
),
&
DIID_HTMLDocumentEvents2
,
&
ret
->
cp_htmldocevents
);
ConnectionPointContainer_Init
(
&
ret
->
cp_container
,
&
ret
->
cp_propnotif
,
(
IUnknown
*
)
HTMLDOC
(
ret
));
ret
->
nscontainer
=
NSContainer_Create
(
ret
,
NULL
);
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/mshtml_private.h
+
2
−
2
View file @
88f4fb1f
...
...
@@ -81,7 +81,7 @@ typedef struct {
struct
ConnectionPoint
{
const
IConnectionPointVtbl
*
lpConnectionPointVtbl
;
HTMLDocument
*
doc
;
IConnectionPointContainer
*
container
;
union
{
IUnknown
*
unk
;
...
...
@@ -346,7 +346,7 @@ void HTMLDocument_Window_Init(HTMLDocument*);
void
HTMLDocument_Service_Init
(
HTMLDocument
*
);
void
HTMLDocument_Hlink_Init
(
HTMLDocument
*
);
void
ConnectionPoint_Init
(
ConnectionPoint
*
,
HTMLDocument
*
,
REFIID
,
ConnectionPoint
*
);
void
ConnectionPoint_Init
(
ConnectionPoint
*
,
IConnectionPointContainer
*
,
REFIID
,
ConnectionPoint
*
);
void
ConnectionPointContainer_Init
(
ConnectionPointContainer
*
,
ConnectionPoint
*
,
IUnknown
*
);
void
ConnectionPointContainer_Destroy
(
ConnectionPointContainer
*
);
...
...
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