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

Jacek Caban : shdocvw: Get rid of WebBrowser dependency in DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 6470c5ca0a6c76fbeb1db263f5166da4d333ba67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6470c5ca0a6c76fbeb1db26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:38:06 2006 +0200 shdocvw: Get rid of WebBrowser dependency in DocHost object. --- dlls/shdocvw/client.c | 16 +++++++--------- dlls/shdocvw/dochost.c | 17 ++++++++++------- dlls/shdocvw/frame.c | 4 ++-- dlls/shdocvw/shdocvw.h | 8 +++----- dlls/shdocvw/webbrowser.c | 4 +--- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 7e1cb89..d6cd7ed 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -464,17 +464,15 @@ static const IServiceProviderVtbl Servic ClServiceProvider_QueryService }; -void WebBrowser_ClientSite_Init(WebBrowser *This) +void DocHost_ClientSite_Init(DocHost *This) { - This->doc_host.lpOleClientSiteVtbl = &OleClientSiteVtbl; - This->doc_host.lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; - This->doc_host.lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; - This->doc_host.lpDispatchVtbl = &DispatchVtbl; - This->doc_host.lpServiceProviderVtbl = &ServiceProviderVtbl; + This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; + This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + This->lpDispatchVtbl = &DispatchVtbl; + This->lpServiceProviderVtbl = &ServiceProviderVtbl; - This->doc_host.view = NULL; - - This->doc_host.wb = This; + This->view = NULL; } void WebBrowser_ClientSite_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 58d21fe..fd3ca2c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -478,14 +478,17 @@ static const IDocHostUIHandler2Vtbl DocH DocHostUIHandler_GetOverrideKeyPath }; -void WebBrowser_DocHost_Init(WebBrowser *This) +void DocHost_Init(DocHost *This) { - This->doc_host.lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; - This->doc_host.lpOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; - This->doc_host.document = NULL; - This->doc_host.hostui = NULL; + This->document = NULL; + This->hostui = NULL; - This->doc_host.hwnd = NULL; - This->doc_host.frame_hwnd = NULL; + This->hwnd = NULL; + This->frame_hwnd = NULL; + + DocHost_ClientSite_Init(This); + DocHost_Frame_Init(This); } diff --git a/dlls/shdocvw/frame.c b/dlls/shdocvw/frame.c index e1439d9..ad48b8f 100644 --- a/dlls/shdocvw/frame.c +++ b/dlls/shdocvw/frame.c @@ -174,7 +174,7 @@ static const IOleInPlaceFrameVtbl OleInP InPlaceFrame_TranslateAccelerator }; -void WebBrowser_Frame_Init(WebBrowser *This) +void DocHost_Frame_Init(DocHost *This) { - This->doc_host.lpOleInPlaceFrameVtbl = &OleInPlaceFrameVtbl; + This->lpOleInPlaceFrameVtbl = &OleInPlaceFrameVtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d0579e4..09724aa 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -73,8 +73,6 @@ typedef struct { HWND hwnd; HWND frame_hwnd; - - struct WebBrowser *wb; /* FIXME */ } DocHost; typedef struct WebBrowser { @@ -155,10 +153,10 @@ void WebBrowser_ClassInfo_Init(WebBrowse void WebBrowser_Events_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); -void WebBrowser_ClientSite_Init(WebBrowser*); -void WebBrowser_DocHost_Init(WebBrowser*); +void DocHost_Init(DocHost*); +void DocHost_ClientSite_Init(DocHost*); -void WebBrowser_Frame_Init(WebBrowser*); +void DocHost_Frame_Init(DocHost*); void WebBrowser_OleObject_Destroy(WebBrowser*); void WebBrowser_Events_Destroy(WebBrowser*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 01e0a28..f1862dd 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -847,15 +847,13 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->url = NULL; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); + DocHost_Init(&ret->doc_host); WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); WebBrowser_Events_Init(ret); - WebBrowser_ClientSite_Init(ret); - WebBrowser_DocHost_Init(ret); - WebBrowser_Frame_Init(ret); WebBrowser_HlinkFrame_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv);

1 0

Jacek Caban : shdocvw: Move IOleCommandTarget to DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 62aa916b28872e0aed8c3edab93f9c8348d7df9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62aa916b28872e0aed8c3ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:32:43 2006 +0200 shdocvw: Move IOleCommandTarget to DocHost object. --- dlls/shdocvw/client.c | 2 +- dlls/shdocvw/dochost.c | 20 ++++++++++---------- dlls/shdocvw/shdocvw.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 3e143cb..3694c17 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -52,7 +52,7 @@ static HRESULT WINAPI ClientSite_QueryIn *ppv = DOCSITE(This); }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); - *ppv = CLOLECMD(This->wb); + *ppv = CLOLECMD(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = CLDISP(This->wb); diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 481c123..58d21fe 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -206,31 +206,31 @@ void deactivate_document(WebBrowser *Thi This->doc_host.document = NULL; } -#define OLECMD_THIS(iface) DEFINE_THIS(WebBrowser, ClOleCommandTarget, iface) +#define OLECMD_THIS(iface) DEFINE_THIS(DocHost, OleCommandTarget, iface) static HRESULT WINAPI ClOleCommandTarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) { - WebBrowser *This = OLECMD_THIS(iface); - return IOleClientSite_QueryInterface(CLIENTSITE(&This->doc_host), riid, ppv); + DocHost *This = OLECMD_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); } static ULONG WINAPI ClOleCommandTarget_AddRef(IOleCommandTarget *iface) { - WebBrowser *This = OLECMD_THIS(iface); - return IWebBrowser2_AddRef(WEBBROWSER(This)); + DocHost *This = OLECMD_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG WINAPI ClOleCommandTarget_Release(IOleCommandTarget *iface) { - WebBrowser *This = OLECMD_THIS(iface); - return IWebBrowser2_Release(WEBBROWSER(This)); + DocHost *This = OLECMD_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { - WebBrowser *This = OLECMD_THIS(iface); + DocHost *This = OLECMD_THIS(iface); FIXME("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); return E_NOTIMPL; @@ -240,7 +240,7 @@ static HRESULT WINAPI ClOleCommandTarget const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - WebBrowser *This = OLECMD_THIS(iface); + DocHost *This = OLECMD_THIS(iface); FIXME("(%p)->(%s %ld %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); return E_NOTIMPL; @@ -481,7 +481,7 @@ static const IDocHostUIHandler2Vtbl DocH void WebBrowser_DocHost_Init(WebBrowser *This) { This->doc_host.lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; - This->lpClOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->doc_host.lpOleCommandTargetVtbl = &OleCommandTargetVtbl; This->doc_host.document = NULL; This->doc_host.hostui = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index b0bf8d3..089c26b 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -58,6 +58,7 @@ typedef struct { const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; + const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; IDispatch *disp; @@ -89,7 +90,6 @@ typedef struct WebBrowser { /* Interfaces available for embeded document */ - const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl; const IDispatchVtbl *lpDispatchVtbl; const IServiceProviderVtbl *lpClServiceProviderVtbl; @@ -146,7 +146,7 @@ typedef struct WebBrowser { #define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) -#define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpClOleCommandTargetVtbl) +#define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) #define CLSERVPROV(x) ((IServiceProvider*) &(x)->lpClServiceProviderVtbl)

1 0

Jacek Caban : shdocvw: Move IDispatch to DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 9b0c2bf595a2dca82f17f1d03c104861e064f1d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b0c2bf595a2dca82f17f1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:34:21 2006 +0200 shdocvw: Move IDispatch to DocHost object. --- dlls/shdocvw/client.c | 26 +++++++++++++------------- dlls/shdocvw/shdocvw.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 3694c17..1e7fc7c 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -55,7 +55,7 @@ static HRESULT WINAPI ClientSite_QueryIn *ppv = CLOLECMD(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = CLDISP(This->wb); + *ppv = CLDISP(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = CLSERVPROV(This->wb); @@ -347,29 +347,29 @@ static const IOleDocumentSiteVtbl OleDoc OleDocumentSite_ActivateMe }; -#define DISP_THIS(iface) DEFINE_THIS(WebBrowser, Dispatch, iface) +#define DISP_THIS(iface) DEFINE_THIS(DocHost, Dispatch, iface) static HRESULT WINAPI ClDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { - WebBrowser *This = DISP_THIS(iface); - return IOleClientSite_QueryInterface(CLIENTSITE(&This->doc_host), riid, ppv); + DocHost *This = DISP_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); } static ULONG WINAPI ClDispatch_AddRef(IDispatch *iface) { - WebBrowser *This = DISP_THIS(iface); - return IOleClientSite_AddRef(CLIENTSITE(&This->doc_host)); + DocHost *This = DISP_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG WINAPI ClDispatch_Release(IDispatch *iface) { - WebBrowser *This = DISP_THIS(iface); - return IOleClientSite_Release(CLIENTSITE(&This->doc_host)); + DocHost *This = DISP_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT WINAPI ClDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) { - WebBrowser *This = DISP_THIS(iface); + DocHost *This = DISP_THIS(iface); TRACE("(%p)->(%p)\n", This, pctinfo); @@ -379,7 +379,7 @@ static HRESULT WINAPI ClDispatch_GetType static HRESULT WINAPI ClDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WebBrowser *This = DISP_THIS(iface); + DocHost *This = DISP_THIS(iface); TRACE("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); @@ -389,7 +389,7 @@ static HRESULT WINAPI ClDispatch_GetType static HRESULT WINAPI ClDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WebBrowser *This = DISP_THIS(iface); + DocHost *This = DISP_THIS(iface); TRACE("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); @@ -401,7 +401,7 @@ static HRESULT WINAPI ClDispatch_Invoke( LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WebBrowser *This = DISP_THIS(iface); + DocHost *This = DISP_THIS(iface); FIXME("(%p)->(%ld %s %ld %04x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; @@ -469,7 +469,7 @@ void WebBrowser_ClientSite_Init(WebBrows This->doc_host.lpOleClientSiteVtbl = &OleClientSiteVtbl; This->doc_host.lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; This->doc_host.lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; - This->lpDispatchVtbl = &DispatchVtbl; + This->doc_host.lpDispatchVtbl = &DispatchVtbl; This->lpClServiceProviderVtbl = &ServiceProviderVtbl; This->doc_host.view = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 089c26b..64a31f1 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -59,6 +59,7 @@ typedef struct { const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; + const IDispatchVtbl *lpDispatchVtbl; IDispatch *disp; @@ -90,7 +91,6 @@ typedef struct WebBrowser { /* Interfaces available for embeded document */ - const IDispatchVtbl *lpDispatchVtbl; const IServiceProviderVtbl *lpClServiceProviderVtbl; /* Interfaces of InPlaceFrame object */

1 0

Jacek Caban : shdocvw: Move IOleDocumentSite to DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 72c53293360f7570d7f72696f40e799f5c3e8b72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72c53293360f7570d7f7269… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:31:22 2006 +0200 shdocvw: Move IOleDocumentSite to DocHost object. --- dlls/shdocvw/client.c | 30 +++++++++++++++--------------- dlls/shdocvw/dochost.c | 37 +++++++++++++++++++------------------ dlls/shdocvw/navigate.c | 8 ++++---- dlls/shdocvw/oleobject.c | 2 +- dlls/shdocvw/shdocvw.h | 7 +++---- dlls/shdocvw/webbrowser.c | 9 ++++----- 6 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=72c53293360f7570d7f…

1 0

Jacek Caban : shdocvw: Move IDocHostUIHandler to DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: ff7a8abb8556f337b4c7b91119998681e3b1ac5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff7a8abb8556f337b4c7b91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:28:37 2006 +0200 shdocvw: Move IDocHostUIHandler to DocHost object. --- dlls/shdocvw/client.c | 4 ++- dlls/shdocvw/dochost.c | 56 +++++++++++++++++++++++----------------------- dlls/shdocvw/oleobject.c | 8 +++---- dlls/shdocvw/shdocvw.h | 5 ++-- 4 files changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ff7a8abb8556f337b4c…

1 0

Jacek Caban : shdocvw: Move IOleClientSite to new DocHost object to allow sharing
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 2dab3d4c1bbcfe0ee0194e25fd1b3b52d2942583 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dab3d4c1bbcfe0ee0194e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:24:59 2006 +0200 shdocvw: Move IOleClientSite to new DocHost object to allow sharing code between WebBrowser and InternetExplorer. --- dlls/shdocvw/client.c | 74 +++++++++++++++++++++++---------------------- dlls/shdocvw/dochost.c | 10 +++--- dlls/shdocvw/navigate.c | 4 +- dlls/shdocvw/shdocvw.h | 13 +++++++- dlls/shdocvw/webbrowser.c | 2 + 5 files changed, 59 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2dab3d4c1bbcfe0ee01…

1 0

Jacek Caban : shdocvw: Move IOleInPlaceSite to DocHost object.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 89da131352ff03d9467f1f6b7d3698ab11d33186 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89da131352ff03d9467f1f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:26:47 2006 +0200 shdocvw: Move IOleInPlaceSite to DocHost object. --- dlls/shdocvw/client.c | 58 +++++++++++++++++++++++---------------------- dlls/shdocvw/dochost.c | 5 ++-- dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/oleobject.c | 12 +++++---- dlls/shdocvw/shdocvw.h | 6 +++-- dlls/shdocvw/webbrowser.c | 2 +- 6 files changed, 44 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=89da131352ff03d9467…

1 0

Ivan Gyurdiev : wined3d: Use correct register number mask.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: e3c8e650845ca4c607bd5429d7bc7311863ff34b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3c8e650845ca4c607bd542… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Apr 15 14:35:54 2006 -0400 wined3d: Use correct register number mask. The regmask currently being used is wrong - 0x1FFF includes the high two bits of the register type. --- dlls/wined3d/pixelshader.c | 42 ++++++++++++++++++++---------------------- dlls/wined3d/vertexshader.c | 19 ++++++++++--------- 2 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e3c8e650845ca4c607b…

1 0

Alexandre Julliard : winebuild: Fixed index in module table for delayed imports.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 02a9bc00948f5449e425aa136867efa98e60a048 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02a9bc00948f5449e425aa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 11:23:49 2006 +0200 winebuild: Fixed index in module table for delayed imports. --- tools/winebuild/import.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 43956e8..7eafe47 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -793,7 +793,7 @@ static void output_immediate_import_thun /* output the delayed import table of a Win32 module */ static void output_delayed_imports( FILE *outfile, const DLLSPEC *spec ) { - int i, j; + int i, j, mod; if (!nb_delayed) return; @@ -804,14 +804,14 @@ static void output_delayed_imports( FILE /* list of dlls */ - for (i = j = 0; i < nb_imports; i++) + for (i = j = mod = 0; i < nb_imports; i++) { if (!dll_imports[i]->delay) continue; fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); /* grAttrs */ fprintf( outfile, "\t%s .L__wine_delay_name_%d\n", /* szName */ get_asm_ptr_keyword(), i ); fprintf( outfile, "\t%s .L__wine_delay_modules+%d\n", /* phmod */ - get_asm_ptr_keyword(), i * get_ptr_size() ); + get_asm_ptr_keyword(), mod * get_ptr_size() ); fprintf( outfile, "\t%s .L__wine_delay_IAT+%d\n", /* pIAT */ get_asm_ptr_keyword(), j * get_ptr_size() ); fprintf( outfile, "\t%s .L__wine_delay_INT+%d\n", /* pINT */ @@ -820,6 +820,7 @@ static void output_delayed_imports( FILE fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); /* pUnloadIAT */ fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); /* dwTimeStamp */ j += dll_imports[i]->nb_imports; + mod++; } fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); /* grAttrs */ fprintf( outfile, "\t%s 0\n", get_asm_ptr_keyword() ); /* szName */

1 0

Ivan Gyurdiev : wined3d: Use ARB[f|v]p1.0 for ps2/ps3/vs3.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 3dddaae795336f4c4bf1a0fe26315f31f45cb145 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dddaae795336f4c4bf1a0f… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Sat Apr 15 13:31:21 2006 -0400 wined3d: Use ARB[f|v]p1.0 for ps2/ps3/vs3. --- dlls/wined3d/pixelshader.c | 7 +++---- dlls/wined3d/vertexshader.c | 15 +++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index ef6aa35..c7c9884 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1019,24 +1019,23 @@ inline static VOID IWineD3DPixelShaderIm case 13: case 14: numTemps=12; numConstants=8; - strcpy(tmpLine, "!!ARBfp1.0\n"); break; case 20: numTemps=12; numConstants=8; - strcpy(tmpLine, "!!ARBfp2.0\n"); FIXME("No work done yet to support ps2.0 in hw\n"); break; case 30: numTemps=32; numConstants=8; - strcpy(tmpLine, "!!ARBfp3.0\n"); FIXME("No work done yet to support ps3.0 in hw\n"); break; default: numTemps=12; numConstants=8; - strcpy(tmpLine, "!!ARBfp1.0\n"); FIXME("Unrecognized pixel shader version!\n"); } + + /* FIXME: if jumps are used, use GLSL, else use ARB_fragment_program */ + strcpy(tmpLine, "!!ARBfp1.0\n"); addline(&lineNum, pgmStr, &pgmLength, tmpLine); /* TODO: find out how many registers are really needed */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0a8f97f..0912077 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1411,38 +1411,33 @@ inline static VOID IWineD3DVertexShaderI case 10: case 11: numTemps=12; numConstants=96;/* min(GL_LIMITS(constants),96) */ - strcpy(tmpLine, "!!ARBvp1.0\n"); - TRACE("GL HW (%u) : %s", pgmLength, tmpLine); /* Don't add \n to this line as already in tmpLine */ break; /* FIXME: if there are no calls or loops then use ARBvp1 otherwise use GLSL instead TODO: see if there are any operations in vs2/3 that aren't supported by ARBvp TODO: only map the maximum possible number of constants supported by openGL and not the maximum required by d3d (even better only map the used constants)*/ case 20: numTemps=12; /* min(GL_LIMITS(temps),12) */ numConstants=96; /* min(GL_LIMITS(constants),256) */ - strcpy(tmpLine, "!!ARBvp1.0\n"); FIXME("No work done yet to support vs2.0 in hw\n"); - TRACE("GL HW (%u) : %s", pgmLength, tmpLine); /* Don't add \n to this line as already in tmpLine */ break; case 21: numTemps=12; /* min(GL_LIMITS(temps),12) */ numConstants=96; /* min(GL_LIMITS(constants),256) */ - strcpy(tmpLine, "!!ARBvp1.0\n"); FIXME("No work done yet to support vs2.1 in hw\n"); - TRACE("GL HW (%u) : %s", pgmLength, tmpLine); /* Don't add \n to this line as already in tmpLine */ break; case 30: numTemps=32; /* min(GL_LIMITS(temps),32) */ numConstants=96;/* min(GL_LIMITS(constants),256) */ - strcpy(tmpLine, "!!ARBvp3.0\n"); FIXME("No work done yet to support vs3.0 in hw\n"); - TRACE("GL HW (%u) : %s", pgmLength, tmpLine); /* Don't add \n to this line as already in tmpLine */ break; default: numTemps=12;/* min(GL_LIMITS(temps),12) */ numConstants=96;/* min(GL_LIMITS(constants),96) */ - strcpy(tmpLine, "!!ARBvp1.0\n"); FIXME("Unrecognized vertex shader version %d!\n", version); } - PNSTRCAT(pgmStr, tmpLine); + + /* FIXME: if jumps are used, use GLSL, else use ARB_vertex_program */ + strcpy(tmpLine, "!!ARBvp1.0\n"); + TRACE("GL HW (%u) : %s", pgmLength, tmpLine); /* Don't add \n to this line as already in tmpLine */ + PNSTRCAT(pgmStr, tmpLine); ++lineNum; /* This should be a bitmap so that only temp registers that are used are declared. */

1 0