Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
86163e7a
Commit
86163e7a
authored
May 23, 2006
by
Jacek Caban
Committed by
Alexandre Julliard
May 23, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shdocvw: Added WebBrowser v1 implementation.
parent
c0d1f91a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
4 deletions
+23
-4
factory.c
dlls/shdocvw/factory.c
+7
-2
shdocvw.h
dlls/shdocvw/shdocvw.h
+4
-1
webbrowser.c
dlls/shdocvw/webbrowser.c
+12
-1
No files found.
dlls/shdocvw/factory.c
View file @
86163e7a
...
@@ -124,7 +124,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
...
@@ -124,7 +124,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
{
{
HRESULT
hres
;
HRESULT
hres
;
static
IClassFactoryImpl
WBClassFactory
=
{
&
WBCF_Vtbl
,
WebBrowser_Create
};
static
IClassFactoryImpl
WB1ClassFactory
=
{
&
WBCF_Vtbl
,
WebBrowserV1_Create
};
static
IClassFactoryImpl
WB2ClassFactory
=
{
&
WBCF_Vtbl
,
WebBrowserV2_Create
};
TRACE
(
"
\n
"
);
TRACE
(
"
\n
"
);
...
@@ -132,9 +133,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
...
@@ -132,9 +133,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
hres
=
create_mozctl
(
riid
,
ppv
);
hres
=
create_mozctl
(
riid
,
ppv
);
if
(
SUCCEEDED
(
hres
))
if
(
SUCCEEDED
(
hres
))
return
hres
;
return
hres
;
return
IClassFactory_QueryInterface
(
FACTORY
(
&
WBClassFactory
),
riid
,
ppv
);
return
IClassFactory_QueryInterface
(
FACTORY
(
&
WB
2
ClassFactory
),
riid
,
ppv
);
}
}
if
(
IsEqualGUID
(
&
CLSID_WebBrowser_V1
,
rclsid
))
return
IClassFactory_QueryInterface
(
FACTORY
(
&
WB1ClassFactory
),
riid
,
ppv
);
/* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */
/* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */
return
SHDOCVW_GetShellInstanceObjectClassObject
(
rclsid
,
riid
,
ppv
);
return
SHDOCVW_GetShellInstanceObjectClassObject
(
rclsid
,
riid
,
ppv
);
}
}
...
...
dlls/shdocvw/shdocvw.h
View file @
86163e7a
...
@@ -104,6 +104,8 @@ typedef struct {
...
@@ -104,6 +104,8 @@ typedef struct {
LONG
ref
;
LONG
ref
;
INT
version
;
IOleClientSite
*
client
;
IOleClientSite
*
client
;
IOleContainer
*
container
;
IOleContainer
*
container
;
IOleInPlaceSite
*
inplace
;
IOleInPlaceSite
*
inplace
;
...
@@ -182,7 +184,8 @@ void DocHost_ClientSite_Release(DocHost*);
...
@@ -182,7 +184,8 @@ void DocHost_ClientSite_Release(DocHost*);
void
ConnectionPointContainer_Init
(
ConnectionPointContainer
*
,
IUnknown
*
);
void
ConnectionPointContainer_Init
(
ConnectionPointContainer
*
,
IUnknown
*
);
void
ConnectionPointContainer_Destroy
(
ConnectionPointContainer
*
);
void
ConnectionPointContainer_Destroy
(
ConnectionPointContainer
*
);
HRESULT
WebBrowser_Create
(
IUnknown
*
,
REFIID
,
void
**
);
HRESULT
WebBrowserV1_Create
(
IUnknown
*
,
REFIID
,
void
**
);
HRESULT
WebBrowserV2_Create
(
IUnknown
*
,
REFIID
,
void
**
);
void
create_doc_view_hwnd
(
DocHost
*
);
void
create_doc_view_hwnd
(
DocHost
*
);
void
deactivate_document
(
DocHost
*
);
void
deactivate_document
(
DocHost
*
);
...
...
dlls/shdocvw/webbrowser.c
View file @
86163e7a
...
@@ -918,7 +918,7 @@ static const IWebBrowser2Vtbl WebBrowser2Vtbl =
...
@@ -918,7 +918,7 @@ static const IWebBrowser2Vtbl WebBrowser2Vtbl =
WebBrowser_put_Resizable
WebBrowser_put_Resizable
};
};
HRESULT
WebBrowser_Create
(
IUnknown
*
pOuter
,
REFIID
riid
,
void
**
ppv
)
static
HRESULT
WebBrowser_Create
(
INT
version
,
IUnknown
*
pOuter
,
REFIID
riid
,
void
**
ppv
)
{
{
WebBrowser
*
ret
;
WebBrowser
*
ret
;
HRESULT
hres
;
HRESULT
hres
;
...
@@ -929,6 +929,7 @@ HRESULT WebBrowser_Create(IUnknown *pOuter, REFIID riid, void **ppv)
...
@@ -929,6 +929,7 @@ HRESULT WebBrowser_Create(IUnknown *pOuter, REFIID riid, void **ppv)
ret
->
lpWebBrowser2Vtbl
=
&
WebBrowser2Vtbl
;
ret
->
lpWebBrowser2Vtbl
=
&
WebBrowser2Vtbl
;
ret
->
ref
=
0
;
ret
->
ref
=
0
;
ret
->
version
=
version
;
DocHost_Init
(
&
ret
->
doc_host
,
(
IDispatch
*
)
WEBBROWSER2
(
ret
));
DocHost_Init
(
&
ret
->
doc_host
,
(
IDispatch
*
)
WEBBROWSER2
(
ret
));
...
@@ -954,3 +955,13 @@ HRESULT WebBrowser_Create(IUnknown *pOuter, REFIID riid, void **ppv)
...
@@ -954,3 +955,13 @@ HRESULT WebBrowser_Create(IUnknown *pOuter, REFIID riid, void **ppv)
return
hres
;
return
hres
;
}
}
HRESULT
WebBrowserV1_Create
(
IUnknown
*
pOuter
,
REFIID
riid
,
void
**
ppv
)
{
return
WebBrowser_Create
(
1
,
pOuter
,
riid
,
ppv
);
}
HRESULT
WebBrowserV2_Create
(
IUnknown
*
pOuter
,
REFIID
riid
,
void
**
ppv
)
{
return
WebBrowser_Create
(
2
,
pOuter
,
riid
,
ppv
);
}
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