wine-commits April 2006

wine-commits@winehq.org

4 participants
512 discussions

Mikołaj Zalewski : comctl32: header: Avoid freeing invalid pointers.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: b82156586e0462a6c4d0ba9239a4931347b390a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b82156586e0462a6c4d0ba9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 19 21:30:29 2006 +0200 comctl32: header: Avoid freeing invalid pointers. --- dlls/comctl32/header.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 5cfb811..cddf740 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -99,7 +99,16 @@ #define HDN_FIRST_UNICODE (HDN_FIRST-HDN #define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static WCHAR emptyString[] = {0}; +static void HEADER_DisposeItem(HEADER_ITEM *lpItem) +{ + if (lpItem->pszText && lpItem->pszText != emptyString && + lpItem->pszText != LPSTR_TEXTCALLBACKW) /* covers LPSTR_TEXTCALLBACKA too */ + { + Free(lpItem->pszText); + } +} inline static LRESULT HEADER_IndexToOrder (HWND hwnd, INT iItem) @@ -796,8 +805,7 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa if (infoPtr->uNumItem == 1) { TRACE("Simple delete!\n"); - if (infoPtr->items[0].pszText) - Free (infoPtr->items[0].pszText); + HEADER_DisposeItem(&infoPtr->items[0]); Free (infoPtr->items); Free(infoPtr->order); infoPtr->items = 0; @@ -812,8 +820,7 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa for (i = 0; i < infoPtr->uNumItem; i++) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - if (infoPtr->items[iItem].pszText) - Free (infoPtr->items[iItem].pszText); + HEADER_DisposeItem(&infoPtr->items[iItem]); iOrder = infoPtr->items[iItem].iOrder; infoPtr->uNumItem--; @@ -1111,7 +1118,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem if (phdi->mask & HDI_TEXT) { - if (!phdi->pszText) phdi->pszText = '\0'; /* null pointer check */ + if (!phdi->pszText) phdi->pszText = emptyString; /* null pointer check */ if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { if (bUnicode) @@ -1255,7 +1262,8 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L { if (lpItem->pszText) { - Free(lpItem->pszText); + if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) + Free(lpItem->pszText); lpItem->pszText = NULL; } if (phdi->pszText) @@ -1374,8 +1382,7 @@ HEADER_Destroy (HWND hwnd, WPARAM wParam if (infoPtr->items) { lpItem = infoPtr->items; for (nItem = 0; nItem < infoPtr->uNumItem; nItem++, lpItem++) { - if ((lpItem->pszText) && (lpItem->pszText != LPSTR_TEXTCALLBACKW)) - Free (lpItem->pszText); + HEADER_DisposeItem(lpItem); } Free (infoPtr->items); }

1 0

Michael Kaufmann : user: Add SS_NOPREFIX to the text style in message boxes .
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: a1c98ea8bbbeb0fdf19c5adcbf7c70a44a088156 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1c98ea8bbbeb0fdf19c5ad… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Wed Apr 19 21:29:31 2006 +0200 user: Add SS_NOPREFIX to the text style in message boxes. --- dlls/user/resources/user32_Bg.rc | 2 +- dlls/user/resources/user32_Ca.rc | 2 +- dlls/user/resources/user32_Cs.rc | 2 +- dlls/user/resources/user32_Da.rc | 2 +- dlls/user/resources/user32_De.rc | 2 +- dlls/user/resources/user32_En.rc | 2 +- dlls/user/resources/user32_Eo.rc | 2 +- dlls/user/resources/user32_Es.rc | 2 +- dlls/user/resources/user32_Fi.rc | 2 +- dlls/user/resources/user32_Fr.rc | 2 +- dlls/user/resources/user32_Hu.rc | 2 +- dlls/user/resources/user32_It.rc | 2 +- dlls/user/resources/user32_Ja.rc | 2 +- dlls/user/resources/user32_Ko.rc | 2 +- dlls/user/resources/user32_Nl.rc | 2 +- dlls/user/resources/user32_No.rc | 2 +- dlls/user/resources/user32_Pl.rc | 2 +- dlls/user/resources/user32_Pt.rc | 2 +- dlls/user/resources/user32_Ru.rc | 2 +- dlls/user/resources/user32_Si.rc | 2 +- dlls/user/resources/user32_Sk.rc | 2 +- dlls/user/resources/user32_Sv.rc | 2 +- dlls/user/resources/user32_Tr.rc | 2 +- dlls/user/resources/user32_Uk.rc | 2 +- dlls/user/resources/user32_Wa.rc | 2 +- dlls/user/resources/user32_Zh.rc | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a1c98ea8bbbeb0fdf19…

1 0

Jacek Caban : shdocvw: Added InternetExplorer::Navigate2 implementation.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 4d5cf7e6f961855a447b6c281c825cc014375585 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d5cf7e6f961855a447b6c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:40:56 2006 +0200 shdocvw: Added InternetExplorer::Navigate2 implementation. --- dlls/shdocvw/ie.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index e3771ca..857241f 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -439,8 +439,48 @@ static HRESULT WINAPI InternetExplorer_N VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); - return E_NOTIMPL; + PBYTE post_data = NULL; + ULONG post_data_len = 0; + LPWSTR headers = NULL; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); + + if((Flags && V_VT(Flags) != VT_EMPTY) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) + FIXME("Unsupported arguments\n"); + + if(!URL) + return S_OK; + + if(V_VT(URL) != VT_BSTR) + return E_INVALIDARG; + + if(PostData && V_VT(PostData) != VT_EMPTY) { + if(V_VT(PostData) != (VT_ARRAY | VT_UI1) + || V_ARRAY(PostData)->cDims != 1) { + WARN("Invalid PostData\n"); + return E_INVALIDARG; + } + + SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); + post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + } + + if(Headers && V_VT(Headers) != VT_EMPTY) { + if(V_VT(Headers) != VT_BSTR) + return E_INVALIDARG; + + headers = V_BSTR(Headers); + TRACE("Headers: %s\n", debugstr_w(headers)); + } + + hres = navigate_url(&This->doc_host, V_BSTR(URL), post_data, post_data_len, headers); + + if(post_data) + SafeArrayUnaccessData(V_ARRAY(PostData)); + + return hres; } static HRESULT WINAPI InternetExplorer_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf)

1 0

Jacek Caban : shdocvw: Move create_doc_view_hwnd call to navigate_url.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 7b09cca96361b169213bc746656b2eb1ff93eff1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b09cca96361b169213bc74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:39:39 2006 +0200 shdocvw: Move create_doc_view_hwnd call to navigate_url. --- dlls/shdocvw/navigate.c | 3 +++ dlls/shdocvw/webbrowser.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 1b6ba87..865195f 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -450,6 +450,9 @@ HRESULT navigate_url(DocHost *This, LPCW VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; + if(!This->hwnd) + create_doc_view_hwnd(This); + hres = CreateURLMoniker(NULL, url, &mon); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08lx\n", hres); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 0dd1e32..74ad74e 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -611,9 +611,6 @@ static HRESULT WINAPI WebBrowser_Navigat TRACE("Headers: %s\n", debugstr_w(headers)); } - if(!This->doc_host.hwnd) - create_doc_view_hwnd(&This->doc_host); - hres = navigate_url(&This->doc_host, V_BSTR(URL), post_data, post_data_len, headers); if(post_data)

1 0

Jacek Caban : shdocvw: Register InternetExplorer class factory in IEWinMain .
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 4a8397a5933b5a09cbda45aa8c8a76b93760bc05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a8397a5933b5a09cbda45a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:37:57 2006 +0200 shdocvw: Register InternetExplorer class factory in IEWinMain. Based on a patch by Mike McCormack. --- dlls/shdocvw/factory.c | 25 +++++++++++++++++++++++++ dlls/shdocvw/iexplore.c | 11 ++++++++++- dlls/shdocvw/shdocvw.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 2fa096e..b42c7d6 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -138,3 +138,28 @@ HRESULT WINAPI DllGetClassObject(REFCLSI /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } + +HRESULT register_class_object(BOOL do_reg) +{ + HRESULT hres; + + static DWORD cookie; + static IClassFactoryImpl IEClassFactory = {&WBCF_Vtbl, InternetExplorer_Create}; + + if(do_reg) { + hres = CoRegisterClassObject(&CLSID_InternetExplorer, (IUnknown*)FACTORY(&IEClassFactory), + CLSCTX_SERVER, REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); + if (FAILED(hres)) { + ERR("failed to register object %08lx\n", hres); + return hres; + } + + hres = CoResumeClassObjects(); + if(SUCCEEDED(hres)) + return hres; + + ERR("failed to resume object %08lx\n", hres); + } + + return CoRevokeClassObject(cookie); +} diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 62bc81c..20ef796 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -590,11 +590,18 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi { LPWSTR url; DWORD len; + HRESULT hres; FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow); CoInitialize(NULL); + hres = register_class_object(TRUE); + if(FAILED(hres)) { + CoUninitialize(); + ExitProcess(1); + } + /* FIXME: parse the command line properly, handle -Embedding */ len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); @@ -605,7 +612,9 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi HeapFree(GetProcessHeap(), 0, url); - CoUninitialize(); + register_class_object(FALSE); + + CoUninitialize(); ExitProcess(0); return 0; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 3e6900c..585cb1b 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -200,4 +200,6 @@ extern void register_iewindow_class(void extern void unregister_iewindow_class(void); extern BOOL create_ie_window(LPCWSTR url); +HRESULT register_class_object(BOOL); + #endif /* __WINE_SHDOCVW_H */

1 0

Jacek Caban : shdocvw: Added InternetExplorer::put_Visible implementation.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: c51aefdb580d13334b97e68800a0fe5978191875 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c51aefdb580d13334b97e68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:36:32 2006 +0200 shdocvw: Added InternetExplorer::put_Visible implementation. --- dlls/shdocvw/ie.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 4019f8a..e3771ca 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -358,8 +358,11 @@ static HRESULT WINAPI InternetExplorer_g static HRESULT WINAPI InternetExplorer_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, Value); + + ShowWindow(This->frame_hwnd, Value ? SW_SHOW : SW_HIDE); + + return S_OK; } static HRESULT WINAPI InternetExplorer_get_StatusBar(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Jacek Caban : shdocvw: Move IEWinMain to iexplore.c.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: 4027a1149c6a273a09abe99cdf291a7296ecf076 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4027a1149c6a273a09abe99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:34:53 2006 +0200 shdocvw: Move IEWinMain to iexplore.c. --- dlls/shdocvw/iexplore.c | 30 ++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw_main.c | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index b39e293..62bc81c 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -580,3 +580,33 @@ HRESULT InternetExplorer_Create(IUnknown return hres; } + +/****************************************************************** + * IEWinMain (SHDOCVW.101) + * + * Only returns on error. + */ +DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) +{ + LPWSTR url; + DWORD len; + + FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow); + + CoInitialize(NULL); + + /* FIXME: parse the command line properly, handle -Embedding */ + + len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); + url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); + + create_ie_window(url); + + HeapFree(GetProcessHeap(), 0, url); + + CoUninitialize(); + + ExitProcess(0); + return 0; +} diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index e936095..0093243 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -637,33 +637,3 @@ DWORD WINAPI StopWatchAFORWARD(DWORD dwC return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); return ERROR_CALL_NOT_IMPLEMENTED; } - -/****************************************************************** - * IEWinMain (SHDOCVW.101) - * - * Only returns on error. - */ -DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) -{ - LPWSTR url; - DWORD len; - - FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - - CoInitialize(NULL); - - /* FIXME: parse the command line properly, handle -Embedding */ - - len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); - url = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, url, len); - - create_ie_window(url); - - HeapFree(GetProcessHeap(), 0, url); - - CoUninitialize(); - - ExitProcess(0); - return 0; -}

1 0

Jacek Caban : shdocvw: Added beginning InternetExplorer implementation.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: c0e42d5597c52bb8a51103ced2b130a5d15716ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0e42d5597c52bb8a51103c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:33:32 2006 +0200 shdocvw: Added beginning InternetExplorer implementation. --- dlls/shdocvw/Makefile.in | 1 dlls/shdocvw/ie.c | 655 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/iexplore.c | 29 ++ dlls/shdocvw/shdocvw.h | 13 + 4 files changed, 697 insertions(+), 1 deletions(-) create mode 100644 dlls/shdocvw/ie.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c0e42d5597c52bb8a51…

1 0

Jacek Caban : shdocvw: Move DllGetClassObject implementation to factory.c.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: c48c50f5756bb4a5bd179f903880b1694f9d9c3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c48c50f5756bb4a5bd179f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:31:59 2006 +0200 shdocvw: Move DllGetClassObject implementation to factory.c. --- dlls/shdocvw/factory.c | 27 ++++++++++++++++++++++---- dlls/shdocvw/shdocvw.h | 3 ++- dlls/shdocvw/shdocvw_main.c | 44 +++++++++++-------------------------------- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 264539a..2fa096e 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -30,10 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); * (Based on implementation in ddraw/main.c) */ +#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) + typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; + const IClassFactoryVtbl *lpClassFactoryVtbl; HRESULT (*cf)(LPUNKNOWN, REFIID, LPVOID *); LONG ref; } IClassFactoryImpl; @@ -115,9 +117,24 @@ static const IClassFactoryVtbl WBCF_Vtbl WBCF_LockServer }; -static IClassFactoryImpl SHDOCVW_WBClassFactory = {&WBCF_Vtbl, WebBrowser_Create}; - -IClassFactory *get_class_factory(void) +/************************************************************************* + * DllGetClassObject (SHDOCVW.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - return (IClassFactory*) &SHDOCVW_WBClassFactory; + HRESULT hres; + + static IClassFactoryImpl WBClassFactory = {&WBCF_Vtbl, WebBrowser_Create}; + + TRACE("\n"); + + if(IsEqualGUID(&CLSID_WebBrowser, rclsid)) { + hres = create_mozctl(riid, ppv); + if(SUCCEEDED(hres)) + return hres; + return IClassFactory_QueryInterface(FACTORY(&WBClassFactory), riid, ppv); + } + + /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ + return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 66730cf..a86a595 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -169,6 +169,8 @@ void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,PBYTE,ULONG,LPWSTR); +HRESULT create_mozctl(REFIID,void**); + #define WB_WM_NAVIGATE2 (WM_USER+100) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) @@ -184,6 +186,5 @@ extern HINSTANCE shdocvw_hinstance; extern void register_iewindow_class(void); extern void unregister_iewindow_class(void); extern BOOL create_ie_window(LPCWSTR url); -extern IClassFactory *get_class_factory(void); #endif /* __WINE_SHDOCVW_H */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index f192db7..e936095 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -444,46 +444,24 @@ static BOOL SHDOCVW_TryLoadMozillaContro } } -/************************************************************************* - * DllGetClassObject (SHDOCVW.@) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT create_mozctl(REFIID riid, void **ppv) { - TRACE("\n"); - - if( IsEqualGUID( &CLSID_WebBrowser, rclsid ) && - SHDOCVW_TryLoadMozillaControl() ) - { - HRESULT r; - fnGetClassObject pGetClassObject; - - TRACE("WebBrowser class %s\n", debugstr_guid(rclsid) ); + fnGetClassObject pGetClassObject; + HRESULT hres; - pGetClassObject = (fnGetClassObject) - GetProcAddress( hMozCtl, "DllGetClassObject" ); + if(!SHDOCVW_TryLoadMozillaControl()) + return CLASS_E_CLASSNOTAVAILABLE; - if( !pGetClassObject ) - return CLASS_E_CLASSNOTAVAILABLE; - r = pGetClassObject( &CLSID_MozillaBrowser, riid, ppv ); + pGetClassObject = (fnGetClassObject)GetProcAddress( hMozCtl, "DllGetClassObject" ); - TRACE("r = %08lx *ppv = %p\n", r, *ppv ); + if( !pGetClassObject ) + return CLASS_E_CLASSNOTAVAILABLE; - return r; - } - - if (IsEqualCLSID(&CLSID_WebBrowser, rclsid) && - IsEqualIID(&IID_IClassFactory, riid)) - { - /* Pass back our shdocvw class factory */ - IClassFactory *cf = get_class_factory(); - IClassFactory_AddRef(cf); - *ppv = cf; + hres = pGetClassObject( &CLSID_MozillaBrowser, riid, ppv ); - return S_OK; - } + TRACE("hres = %08lx *ppv = %p\n", hres, *ppv ); - /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ - return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); + return hres; } /***********************************************************************

1 0

Jacek Caban : shdocvw: Move more initialization code to DocHost_Init.
by Alexandre Julliard 20 Apr '06

20 Apr '06

Module: wine Branch: refs/heads/master Commit: b26ed16633daa57a1d669ef86d60d0e09bc9522e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b26ed16633daa57a1d669ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 19 20:31:11 2006 +0200 shdocvw: Move more initialization code to DocHost_Init. --- dlls/shdocvw/dochost.c | 7 ++++++- dlls/shdocvw/shdocvw.h | 2 +- dlls/shdocvw/webbrowser.c | 6 +----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index dbebc77..7335f53 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -478,16 +478,19 @@ static const IDocHostUIHandler2Vtbl DocH DocHostUIHandler_GetOverrideKeyPath }; -void DocHost_Init(DocHost *This) +void DocHost_Init(DocHost *This, IDispatch *disp) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->disp = disp; + This->document = NULL; This->hostui = NULL; This->hwnd = NULL; This->frame_hwnd = NULL; + This->url = NULL; DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); @@ -498,4 +501,6 @@ void DocHost_Release(DocHost *This) { DocHost_ClientSite_Release(This); DocHost_Events_Release(This); + + SysFreeString(This->url); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 9228478..66730cf 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -153,7 +153,7 @@ void WebBrowser_HlinkFrame_Init(WebBrows void WebBrowser_OleObject_Destroy(WebBrowser*); -void DocHost_Init(DocHost*); +void DocHost_Init(DocHost*,IDispatch*); void DocHost_ClientSite_Init(DocHost*); void DocHost_Events_Init(DocHost*); void DocHost_Frame_Init(DocHost*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index cb2d284..0dd1e32 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -132,7 +132,6 @@ static ULONG WINAPI WebBrowser_Release(I WebBrowser_OleObject_Destroy(This); - SysFreeString(This->doc_host.url); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } @@ -844,10 +843,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; - ret->doc_host.url = NULL; - - ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); - DocHost_Init(&ret->doc_host); + DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2006