May 2006 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added stub implementation of IPersistStreamInit.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 78b7286eba563466438ff37975f17d8733ed47e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78b7286eba563466438ff37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 22:16:26 2006 +0200 mshtml: Added stub implementation of IPersistStreamInit. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/persist.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f14eb25..d028d83 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -110,6 +110,9 @@ static HRESULT WINAPI HTMLDocument_Query }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppvObject); *ppvObject = CONPTCONT(This); + }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); + *ppvObject = PERSTRINIT(This); } if(*ppvObject) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aaf2f4f..3d7ed03 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -64,6 +64,7 @@ typedef struct { const IOleControlVtbl *lpOleControlVtbl; const IHlinkTargetVtbl *lpHlinkTargetVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; + const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; LONG ref; @@ -177,6 +178,7 @@ #define CONTROL(x) ((IOleControl*) #define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) +#define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0c0b71f..be12106 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -643,11 +643,90 @@ static const IPersistFileVtbl PersistFil PersistFile_GetCurFile }; +#define PERSTRINIT_THIS(iface) DEFINE_THIS(HTMLDocument, PersistStreamInit, iface); + +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, + REFIID riid, void **ppv) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + return IPersist_GetClassID(PERSIST(This), pClassID); +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pStm); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, + BOOL fClearDirty) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, + ULARGE_INTEGER *pcbSize) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)->(%p)\n", This, pcbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + HTMLDocument *This = PERSTRINIT_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PERSTRINIT_THIS + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + void HTMLDocument_Persist_Init(HTMLDocument *This) { This->lpPersistMonikerVtbl = &PersistMonikerVtbl; This->lpPersistFileVtbl = &PersistFileVtbl; This->lpMonikerPropVtbl = &MonikerPropVtbl; + This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; This->status_callback = NULL; }

1 0

Jacek Caban : shdocvw: Added OLEIVERB_UIACTIVATE implementation.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: 5c932f9634c1b17f350bbd6fcf355654845b4495 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c932f9634c1b17f350bbd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:07:45 2006 +0200 shdocvw: Added OLEIVERB_UIACTIVATE implementation. --- dlls/shdocvw/oleobject.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index d9fec8e..c7cbb74 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -325,6 +325,9 @@ static HRESULT WINAPI OleObject_DoVerb(I case OLEIVERB_SHOW: TRACE("OLEIVERB_SHOW\n"); return activate_ui(This, pActiveSite, hwndParent); + case OLEIVERB_UIACTIVATE: + TRACE("OLEIVERB_UIACTIVATE\n"); + return activate_ui(This, pActiveSite, hwndParent); case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); return activate_inplace(This, pActiveSite, hwndParent);

1 0

Jacek Caban : shdocvw: Don't do verb that is already done.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: 4ee19c81bb267daa377ed8bfe778f7c96a60ec58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ee19c81bb267daa377ed8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:06:55 2006 +0200 shdocvw: Don't do verb that is already done. --- dlls/shdocvw/oleobject.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c6a35aa..d9fec8e 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -103,14 +103,12 @@ static HRESULT activate_inplace(WebBrows { HRESULT hres; + if(This->inplace) + return S_OK; + if(!active_site) return E_INVALIDARG; - if(This->inplace) { - IOleInPlaceSite_Release(This->inplace); - This->inplace = NULL; - } - hres = IOleClientSite_QueryInterface(active_site, &IID_IOleInPlaceSite, (void**)&This->inplace); if(FAILED(hres)) { @@ -158,6 +156,9 @@ static HRESULT activate_ui(WebBrowser *T static const WCHAR wszitem[] = {'i','t','e','m',0}; + if(This->inplace) + return S_OK; + hres = activate_inplace(This, active_site, parent_hwnd); if(FAILED(hres)) return hres;

1 0

Jacek Caban : shdocvw: Move UI activating to the separated function.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: dda3bea568eea9c816022bec8348fdd60e3defb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dda3bea568eea9c816022be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:05:58 2006 +0200 shdocvw: Move UI activating to the separated function. --- dlls/shdocvw/oleobject.c | 50 +++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 074da8d..c6a35aa 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -152,6 +152,30 @@ static HRESULT activate_inplace(WebBrows return S_OK; } +static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) +{ + HRESULT hres; + + static const WCHAR wszitem[] = {'i','t','e','m',0}; + + hres = activate_inplace(This, active_site, parent_hwnd); + if(FAILED(hres)) + return hres; + + IOleInPlaceSite_OnUIActivate(This->inplace); + + if(This->frame) + IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + if(This->uiwindow) + IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem); + + /* TODO: + * IOleInPlaceFrmae_SetMenu + */ + + return S_OK; +} + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -291,38 +315,18 @@ static HRESULT WINAPI OleObject_DoVerb(I LPOLECLIENTSITE pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { WebBrowser *This = OLEOBJ_THIS(iface); - HRESULT hres; - - static const WCHAR wszitem[] = {'i','t','e','m',0}; TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); switch (iVerb) { + case OLEIVERB_SHOW: + TRACE("OLEIVERB_SHOW\n"); + return activate_ui(This, pActiveSite, hwndParent); case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); return activate_inplace(This, pActiveSite, hwndParent); - - case OLEIVERB_SHOW: - TRACE("OLEIVERB_SHOW\n"); - - hres = activate_inplace(This, pActiveSite, hwndParent); - if(FAILED(hres)) - return hres; - - IOleInPlaceSite_OnUIActivate(This->inplace); - - if(This->frame) - IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); - if(This->uiwindow) - IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem); - - /* TODO: - * IOleInPlaceFrmae_SetMenu - */ - - return S_OK; default: FIXME("stub for %ld\n", iVerb); break;

1 0

Jacek Caban : shdocvw: Move inplace activating code to the separated function.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: 864bfd8ead3f1bf005bfa493ce7c1efbf8603fbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=864bfd8ead3f1bf005bfa49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:04:56 2006 +0200 shdocvw: Move inplace activating code to the separated function. --- dlls/shdocvw/oleobject.c | 106 +++++++++++++++++++++++++--------------------- 1 files changed, 58 insertions(+), 48 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index cf9e867..074da8d 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -99,6 +99,59 @@ static void create_shell_embedding_hwnd( NULL, shdocvw_hinstance, This); } +static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd) +{ + HRESULT hres; + + if(!active_site) + return E_INVALIDARG; + + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + + hres = IOleClientSite_QueryInterface(active_site, &IID_IOleInPlaceSite, + (void**)&This->inplace); + if(FAILED(hres)) { + WARN("Could not get IOleInPlaceSite\n"); + return hres; + } + + hres = IOleInPlaceSite_CanInPlaceActivate(This->inplace); + if(hres != S_OK) { + WARN("CanInPlaceActivate returned: %08lx\n", hres); + IOleInPlaceSite_Release(This->inplace); + return E_FAIL; + } + + hres = IOleInPlaceSite_GetWindow(This->inplace, &This->iphwnd); + if(FAILED(hres)) + This->iphwnd = parent_hwnd; + + IOleInPlaceSite_OnInPlaceActivate(This->inplace); + + IOleInPlaceSite_GetWindowContext(This->inplace, &This->frame, &This->uiwindow, + &This->pos_rect, &This->clip_rect, + &This->frameinfo); + + SetWindowPos(This->shell_embedding_hwnd, NULL, + This->pos_rect.left, This->pos_rect.top, + This->pos_rect.right-This->pos_rect.left, + This->pos_rect.bottom-This->pos_rect.top, + SWP_NOZORDER | SWP_SHOWWINDOW); + + if(This->client) { + IOleClientSite_ShowObject(This->client); + IOleClientSite_GetContainer(This->client, &This->container); + } + + if(This->frame) + IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + + return S_OK; +} + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -247,59 +300,16 @@ static HRESULT WINAPI OleObject_DoVerb(I switch (iVerb) { - case OLEIVERB_SHOW: case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); + return activate_inplace(This, pActiveSite, hwndParent); - if(!pActiveSite) - return E_INVALIDARG; - - if(This->inplace) { - IOleInPlaceSite_Release(This->inplace); - This->inplace = NULL; - } - - hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSite, (void**)&This->inplace); - if(FAILED(hres)) { - WARN("Could not get IOleInPlaceSite\n"); - return hres; - } - - hres = IOleInPlaceSite_CanInPlaceActivate(This->inplace); - if(hres != S_OK) { - WARN("CanInPlaceActivate returned: %08lx\n", hres); - IOleInPlaceSite_Release(This->inplace); - return E_FAIL; - } + case OLEIVERB_SHOW: + TRACE("OLEIVERB_SHOW\n"); - hres = IOleInPlaceSite_GetWindow(This->inplace, &This->iphwnd); + hres = activate_inplace(This, pActiveSite, hwndParent); if(FAILED(hres)) - This->iphwnd = hwndParent; - - IOleInPlaceSite_OnInPlaceActivate(This->inplace); - - IOleInPlaceSite_GetWindowContext(This->inplace, &This->frame, &This->uiwindow, - &This->pos_rect, &This->clip_rect, - &This->frameinfo); - - SetWindowPos(This->shell_embedding_hwnd, NULL, - This->pos_rect.left, This->pos_rect.top, - This->pos_rect.right-This->pos_rect.left, - This->pos_rect.bottom-This->pos_rect.top, - SWP_NOZORDER | SWP_SHOWWINDOW); - - if(This->client) { - IOleClientSite_ShowObject(This->client); - IOleClientSite_GetContainer(This->client, &This->container); - } - - if(This->frame) - IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); - - if(iVerb == OLEIVERB_INPLACEACTIVATE) - return S_OK; - - TRACE("OLEIVERB_SHOW\n"); + return hres; IOleInPlaceSite_OnUIActivate(This->inplace);

1 0

Jacek Caban : shdocvw: Added WebBrowser v1 implementation.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: 86163e7a789cfdd75fc9318bc4a234aef4d19e9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86163e7a789cfdd75fc9318… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:03:30 2006 +0200 shdocvw: Added WebBrowser v1 implementation. --- dlls/shdocvw/factory.c | 9 +++++++-- dlls/shdocvw/shdocvw.h | 5 ++++- dlls/shdocvw/webbrowser.c | 13 ++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 9f4dc33..519c5df 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -124,7 +124,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI { 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"); @@ -132,9 +133,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSI hres = create_mozctl(riid, ppv); if(SUCCEEDED(hres)) return hres; - return IClassFactory_QueryInterface(FACTORY(&WBClassFactory), riid, ppv); + return IClassFactory_QueryInterface(FACTORY(&WB2ClassFactory), 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' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index b1ea6ea..146035a 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -104,6 +104,8 @@ typedef struct { LONG ref; + INT version; + IOleClientSite *client; IOleContainer *container; IOleInPlaceSite *inplace; @@ -182,7 +184,8 @@ void DocHost_ClientSite_Release(DocHost* void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*); 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 deactivate_document(DocHost*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index b4a93b4..7ab2ffc 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -918,7 +918,7 @@ static const IWebBrowser2Vtbl WebBrowser 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; HRESULT hres; @@ -929,6 +929,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; + ret->version = version; DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); @@ -954,3 +955,13 @@ HRESULT WebBrowser_Create(IUnknown *pOut 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); +}

1 0

Jacek Caban : shdocvw: Added WebBrowser v1 registration.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: c0d1f91a7cb7904da3764b93a4a4c3f257c24d31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0d1f91a7cb7904da3764b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 20:02:31 2006 +0200 shdocvw: Added WebBrowser v1 registration. --- dlls/shdocvw/regsvr.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 8f5e084..e7fb595 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -506,6 +506,14 @@ static LONG recursive_delete_keyW(HKEY b * coclass list */ static struct regsvr_coclass const coclass_list[] = { + { &CLSID_WebBrowser_V1, + "Microsoft Web Browser Version 1", + NULL, + "shdocvw.dll", + "Apartment", + "Shell.Explorer.1", + "Shell.Explorer" + }, { &CLSID_WebBrowser, "Microsoft Web Browser", NULL,

1 0

Robert Shearman : comctl32: Fix the loading of strings for the property sheet page by
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: f5660c23ae76d5192d17b1a69d76991f03ffe717 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5660c23ae76d5192d17b1a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue May 23 16:53:55 2006 +0100 comctl32: Fix the loading of strings for the property sheet page by caching the ID of the string to load before overwriting it with an Alloc call. --- dlls/comctl32/propsheet.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ea67e1b..2dad74f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2907,9 +2907,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); } } else @@ -2924,9 +2925,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszHeaderTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszHeaderTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); } } else @@ -2938,9 +2940,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszHeaderSubTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszHeaderSubTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); } } else @@ -2992,9 +2995,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee } else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszTitle), (LPWSTR)ppsp->pszTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); } } else @@ -3013,9 +3017,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee } else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszHeaderTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszHeaderTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderTitle), (LPWSTR)ppsp->pszHeaderTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); } } else @@ -3031,9 +3036,10 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee } else { - int len = LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), NULL, 0 ) + 1; + UINT id = LOWORD(ppsp->pszHeaderSubTitle); + int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR); ppsp->pszHeaderSubTitle = Alloc( len ); - LoadStringW( ppsp->hInstance, LOWORD(ppsp->pszHeaderSubTitle), (LPWSTR)ppsp->pszHeaderSubTitle, len ); + LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); } } else

1 0

Alexandre Julliard : user: Reuse the fast A-> W function to implement the 16->32W case.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: e6b97ce2bd86c3680704561a500671f48e23780e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6b97ce2bd86c3680704561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 20:38:41 2006 +0200 user: Reuse the fast A->W function to implement the 16->32W case. Get rid of the no longer needed 16->32W mapping functions. --- dlls/user/winproc.c | 243 ++++----------------------------------------------- 1 files changed, 17 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e6b97ce2bd86c368070…

1 0

Alexandre Julliard : user: Use winproc callbacks for the remaining 16-bit messaging functions.
by Alexandre Julliard May 23, 2006

May 23, 2006

Module: wine Branch: refs/heads/master Commit: 22a9d18bff755d283e96ee70d0a1944322df1db8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22a9d18bff755d283e96ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 23 20:15:17 2006 +0200 user: Use winproc callbacks for the remaining 16-bit messaging functions. --- dlls/user/msg16.c | 100 ++++++++++++++++++++++++++------------------------- dlls/user/winproc.c | 9 ++--- dlls/user/winproc.h | 7 ---- 3 files changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index 89d15ca..3193a60 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c @@ -50,6 +50,34 @@ static LRESULT send_message_callback( HW return *result; } +static LRESULT post_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + *result = 0; + return PostMessageA( hwnd, msg, wp, lp ); +} + +static LRESULT post_thread_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + DWORD_PTR tid = (DWORD_PTR)arg; + *result = 0; + return PostThreadMessageA( tid, msg, wp, lp ); +} + +static LRESULT get_message_callback( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + MSG16 *msg16 = arg; + + msg16->hwnd = hwnd; + msg16->message = msg; + msg16->wParam = wp; + msg16->lParam = lp; + *result = 0; + return 0; +} + /*********************************************************************** * SendMessage (USER.111) @@ -85,22 +113,10 @@ LRESULT WINAPI SendMessage16( HWND16 hwn /*********************************************************************** * PostMessage (USER.110) */ -BOOL16 WINAPI PostMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) +BOOL16 WINAPI PostMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) { - WPARAM wparam32; - UINT msg32; - HWND hwnd = WIN_Handle32( hwnd16 ); - - switch (WINPROC_MapMsg16To32A( hwnd, msg, wparam, &msg32, &wparam32, &lparam )) - { - case 0: - return PostMessageA( hwnd, msg32, wparam32, lparam ); - case 1: - ERR( "16-bit message 0x%04x contains pointer, cannot post\n", msg ); - return FALSE; - default: - return FALSE; - } + LRESULT unused; + return WINPROC_CallProc16To32A( post_message_callback, hwnd, msg, wparam, lparam, &unused, NULL ); } @@ -109,21 +125,12 @@ BOOL16 WINAPI PostMessage16( HWND16 hwnd */ BOOL16 WINAPI PostAppMessage16( HTASK16 hTask, UINT16 msg, WPARAM16 wparam, LPARAM lparam ) { - WPARAM wparam32; - UINT msg32; - DWORD tid = HTASK_32( hTask ); - if (!tid) return FALSE; + LRESULT unused; + DWORD_PTR tid = HTASK_32( hTask ); - switch (WINPROC_MapMsg16To32A( 0, msg, wparam, &msg32, &wparam32, &lparam )) - { - case 0: - return PostThreadMessageA( tid, msg32, wparam32, lparam ); - case 1: - ERR( "16-bit message %x contains pointer, cannot post\n", msg ); - return FALSE; - default: - return FALSE; - } + if (!tid) return FALSE; + return WINPROC_CallProc16To32A( post_thread_message_callback, 0, msg, wparam, lparam, + &unused, (void *)tid ); } @@ -153,22 +160,20 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 BOOL16 wHaveParamHigh ) { MSG msg; + LRESULT unused; HWND hwnd = WIN_Handle32( hwnd16 ); if(USER16_AlertableWait) MsgWaitForMultipleObjectsEx( 0, NULL, 1, 0, MWMO_ALERTABLE ); if (!PeekMessageA( &msg, hwnd, first, last, flags )) return FALSE; - msg16->msg.hwnd = HWND_16( msg.hwnd ); - msg16->msg.lParam = msg.lParam; msg16->msg.time = msg.time; msg16->msg.pt.x = (INT16)msg.pt.x; msg16->msg.pt.y = (INT16)msg.pt.y; if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); - - return (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, - &msg16->msg.message, &msg16->msg.wParam, - &msg16->msg.lParam ) != -1); + WINPROC_CallProc32ATo16( get_message_callback, msg.hwnd, msg.message, msg.wParam, msg.lParam, + &unused, &msg16->msg ); + return TRUE; } @@ -282,23 +287,18 @@ BOOL16 WINAPI GetMessage32_16( MSG32_16 UINT16 last, BOOL16 wHaveParamHigh ) { MSG msg; + LRESULT unused; HWND hwnd = WIN_Handle32( hwnd16 ); - do - { - if(USER16_AlertableWait) - MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, 0, MWMO_ALERTABLE ); - GetMessageA( &msg, hwnd, first, last ); - msg16->msg.hwnd = HWND_16( msg.hwnd ); - msg16->msg.lParam = msg.lParam; - msg16->msg.time = msg.time; - msg16->msg.pt.x = (INT16)msg.pt.x; - msg16->msg.pt.y = (INT16)msg.pt.y; - if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); - } - while (WINPROC_MapMsg32ATo16( msg.hwnd, msg.message, msg.wParam, - &msg16->msg.message, &msg16->msg.wParam, - &msg16->msg.lParam ) == -1); + if(USER16_AlertableWait) + MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, 0, MWMO_ALERTABLE ); + GetMessageA( &msg, hwnd, first, last ); + msg16->msg.time = msg.time; + msg16->msg.pt.x = (INT16)msg.pt.x; + msg16->msg.pt.y = (INT16)msg.pt.y; + if (wHaveParamHigh) msg16->wParamHigh = HIWORD(msg.wParam); + WINPROC_CallProc32ATo16( get_message_callback, msg.hwnd, msg.message, msg.wParam, msg.lParam, + &unused, &msg16->msg ); TRACE( "message %04x, hwnd %p, filter(%04x - %04x)\n", msg16->msg.message, hwnd, first, last ); diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index d92fde0..382c0bd 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -728,8 +728,8 @@ static UINT convert_handle_16_to_32(HAND * Map a message from 16- to 32-bit Ansi. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, - WPARAM *pwparam32, LPARAM *plparam ) +static INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, + WPARAM *pwparam32, LPARAM *plparam ) { *pmsg32 = (UINT)msg16; *pwparam32 = (WPARAM)wParam16; @@ -1372,9 +1372,8 @@ static HANDLE16 convert_handle_32_to_16( * Map a message from 32-bit Ansi to 16-bit. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. */ -INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, - UINT16 *pmsg16, WPARAM16 *pwparam16, - LPARAM *plparam ) +static INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, + UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ) { *pmsg16 = (UINT16)msg32; *pwparam16 = (WPARAM16)LOWORD(wParam32); diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 3eefca6..4821140 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -45,13 +45,6 @@ extern LRESULT WINPROC_CallProc16To32A( extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, - UINT *pmsg32, WPARAM *pwparam32, - LPARAM *plparam ); -extern INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, - WPARAM wParam32, UINT16 *pmsg16, - WPARAM16 *pwparam16, LPARAM *plparam ); - extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

1 0