wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Jacek Caban : mshtml: Added IHTMLWindow2::close tests.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 9f62d217c36763d791efb4d78d2304fdccd18106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f62d217c36763d791efb4d78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:41:04 2013 +0200 mshtml: Added IHTMLWindow2::close tests. --- dlls/mshtml/tests/htmldoc.c | 274 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 274 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1669943..ae8af82 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -43,6 +43,7 @@ #include "shobjidl.h" #include "htiface.h" #include "tlogstg.h" +#include "exdispid.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -194,6 +195,10 @@ DEFINE_EXPECT(ActiveElementChanged); DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(get_LocationURL); DEFINE_EXPECT(CountEntries); +DEFINE_EXPECT(FindConnectionPoint); +DEFINE_EXPECT(EnumConnections); +DEFINE_EXPECT(EnumConnections_Next); +DEFINE_EXPECT(WindowClosing); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -3940,6 +3945,244 @@ static HRESULT browserservice_qi(REFIID riid, void **ppv) return E_NOINTERFACE; } +static HRESULT WINAPI WBE2Sink_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI WBE2Sink_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); + ok(pdp != NULL, "pDispParams == NULL\n"); + ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo); + ok(puArgErr == NULL, "puArgErr != NULL\n"); + ok(pVarResult == NULL, "pVarResult != NULL\n"); + ok(wFlags == DISPATCH_METHOD, "wFlags=%08x, expected DISPATCH_METHOD\n", wFlags); + ok(!pdp->cNamedArgs, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs = %p\n", pdp->rgdispidNamedArgs); + + switch(dispIdMember) { + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pdp->rgvarg+1, *cancel = pdp->rgvarg; + + CHECK_EXPECT(WindowClosing); + + ok(pdp->cArgs == 2, "pdp->cArgs = %d\n", pdp->cArgs); + ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child)); + ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child)); + ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel)); + ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel)); + + *V_BOOLREF(cancel) = VARIANT_TRUE; + return S_OK; + } + default: + ok(0, "unexpected id %d\n", dispIdMember); + } + + return E_NOTIMPL; +} + +static const IDispatchVtbl WBE2SinkVtbl = { + WBE2Sink_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + WBE2Sink_Invoke +}; + +static IDispatch WBE2Sink = { &WBE2SinkVtbl }; + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + return 2; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + return 1; +} + +static BOOL next_called; + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched) +{ + CHECK_EXPECT2(EnumConnections_Next); + + ok(cConnections == 1, "cConnections = %d\n", cConnections); + ok(pcFetched != NULL, "pcFetched == NULL\n"); + + if(next_called) { + *pcFetched = 0; + return S_FALSE; + } + + next_called = TRUE; + rgcd->pUnk = (IUnknown*)&WBE2Sink; + rgcd->dwCookie = 0xdeadbeef; + *pcFetched = 1; + return S_OK; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG ulConnections) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + +static IEnumConnections EnumConnections = { &EnumConnectionsVtbl }; + +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) +{ + CHECK_EXPECT(EnumConnections); + + *ppEnum = &EnumConnections; + next_called = FALSE; + return S_OK; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static IConnectionPoint ConnectionPointWBE2 = { &ConnectionPointVtbl }; + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + CHECK_EXPECT(FindConnectionPoint); + + if(IsEqualGUID(riid, &DIID_DWebBrowserEvents2)) { + *ppCP = &ConnectionPointWBE2; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + +static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; + static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -3953,6 +4196,11 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid if(IsEqualGUID(riid, &IID_IOleObject)) return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) { + *ppv = &ConnectionPointContainer; + return S_OK; + } + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -5580,6 +5828,30 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) IHTMLWindow2_Release(window); } +static void test_window_close(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + SET_EXPECT(FindConnectionPoint); + SET_EXPECT(EnumConnections); + SET_EXPECT(EnumConnections_Next); + SET_EXPECT(WindowClosing); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(FindConnectionPoint); + CHECK_CALLED(EnumConnections); + CHECK_CALLED(EnumConnections_Next); + CHECK_CALLED(WindowClosing); + + IHTMLWindow2_Release(window); +} + static void test_elem_from_point(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -7014,6 +7286,8 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_open_window(doc, TRUE); if(!support_wbapp) /* FIXME */ test_open_window(doc, FALSE); + if(support_wbapp) + test_window_close(doc); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::close partial implementation.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e13cf82e61abcc2d904bfe13ec06bc2993c3e814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13cf82e61abcc2d904bfe13e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:53 2013 +0200 mshtml: Added IHTMLWindow2::close partial implementation. --- dlls/mshtml/htmlwindow.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6cfa76b..113f33a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -28,6 +28,7 @@ #include "mshtmdid.h" #include "shlguid.h" #include "shobjidl.h" +#include "exdispid.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -772,10 +773,79 @@ static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory ** return S_OK; } +static BOOL notify_webbrowser_close(HTMLOuterWindow *window, HTMLDocumentObj *doc) +{ + IConnectionPointContainer *cp_container; + VARIANT_BOOL cancel = VARIANT_FALSE; + IEnumConnections *enum_conn; + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, 2, 0}; + CONNECTDATA conn_data; + IConnectionPoint *cp; + IDispatch *disp; + ULONG fetched; + HRESULT hres; + + if(!doc->webbrowser) + return TRUE; + + hres = IUnknown_QueryInterface(doc->webbrowser, &IID_IConnectionPointContainer, (void**)&cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, &DIID_DWebBrowserEvents2, &cp); + IConnectionPointContainer_Release(cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPoint_EnumConnections(cp, &enum_conn); + IConnectionPoint_Release(cp); + if(FAILED(hres)) + return TRUE; + + while(!cancel) { + conn_data.pUnk = NULL; + conn_data.dwCookie = 0; + fetched = 0; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + if(hres != S_OK) + break; + + hres = IUnknown_QueryInterface(conn_data.pUnk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(conn_data.pUnk); + if(FAILED(hres)) + continue; + + V_VT(args) = VT_BYREF|VT_BOOL; + V_BOOLREF(args) = &cancel; + V_VT(args+1) = VT_BOOL; + V_BOOL(args+1) = window->parent ? VARIANT_TRUE : VARIANT_FALSE; + hres = IDispatch_Invoke(disp, DISPID_WINDOWCLOSING, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + IDispatch_Release(disp); + if(FAILED(hres)) + cancel = VARIANT_FALSE; + } + + IEnumConnections_Release(enum_conn); + return !cancel; +} + static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); + HTMLOuterWindow *window = This->outer_window; + + TRACE("(%p)\n", This); + + if(!window->doc_obj) { + FIXME("No document object\n"); + return E_FAIL; + } + + if(!notify_webbrowser_close(window, window->doc_obj)) + return S_OK; + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Store IWebBrowserApp reference in HTMLDocumentObj.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 8f323e9b91656f73111f549fed83d83f715d1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f323e9b91656f73111f549fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:43 2013 +0200 mshtml: Store IWebBrowserApp reference in HTMLDocumentObj. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/oleobj.c | 13 +++++++------ dlls/mshtml/persist.c | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d0bb68e..f141bdf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -544,6 +544,7 @@ struct HTMLDocumentObj { IOleInPlaceUIWindow *ip_window; IAdviseSink *view_sink; IDocObjectService *doc_object_service; + IUnknown *webbrowser; DOCHOSTUIINFO hostinfo; @@ -557,7 +558,6 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; - BOOL is_webbrowser; BOOL container_locked; BOOL focus; BOOL has_popup; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index b585b68..3bae9f7 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -268,7 +268,7 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_container, 1005); call_explorer_69(doc); - if(doc->is_webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) + if(doc->webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d99d0aa..5661308 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2268,7 +2268,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { if(!(flags & BINDING_REFRESH)) { BOOL cancel = FALSE; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index d62c306..c463ebe 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -246,8 +246,12 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->doc_object_service = NULL; } + if(This->doc_obj->webbrowser) { + IUnknown_Release(This->doc_obj->webbrowser); + This->doc_obj->webbrowser = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); - This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -348,11 +352,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite * embedder supports IWebBrowserApp. */ hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); - if(SUCCEEDED(hres)) { - This->doc_obj->is_webbrowser = TRUE; - IWebBrowser2_Release(wb); - } - + if(SUCCEEDED(hres)) + This->doc_obj->webbrowser = (IUnknown*)wb; IBrowserService_Release(browser_service); } } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b2eefd3..0038942 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -77,7 +77,7 @@ static void notify_travellog_update(HTMLDocumentObj *doc) IOleCommandTarget *cmdtrg; HRESULT hres; - if(!doc->is_webbrowser) + if(!doc->webbrowser) return; hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg);

1 0

Stefan Dösinger : wined3d: Don' t hardcode the ps_1_3 sampler limit in find_ps_compile_args.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 76234750a5dfdcac182f2b77bc71289d8fcd8300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76234750a5dfdcac182f2b77b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:17 2013 +0200 wined3d: Don't hardcode the ps_1_3 sampler limit in find_ps_compile_args. --- dlls/wined3d/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0431c1f..3aec36c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2011,7 +2011,7 @@ void find_ps_compile_args(const struct wined3d_state *state, if (shader->reg_maps.shader_version.major == 1 && shader->reg_maps.shader_version.minor <= 3) { - for (i = 0; i < 4; ++i) + for (i = 0; i < shader->limits.sampler; ++i) { DWORD flags = state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS];

1 0

Stefan Dösinger : wined3d: Store ps 1. 4 texture types in ps_compile_args.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0680b1758df48222f6770d9c3de0def95ff97ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0680b1758df48222f6770d9c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:16 2013 +0200 wined3d: Store ps 1.4 texture types in ps_compile_args. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/shader.c | 61 ++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 17 ++++++++-- 4 files changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c3313ec..6683829 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4354,7 +4354,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - pixelshader_update_samplers(&shader->reg_maps, device->stateBlock->state.textures); + pixelshader_update_samplers(shader, args->super.tex_types); if (!shader_buffer_init(&buffer)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab32abe..c84d73b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4627,7 +4627,6 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { - struct wined3d_state *state = &shader->device->stateBlock->state; struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -4690,7 +4689,7 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, memset(np2fixup, 0, sizeof(*np2fixup)); *np2fixup_info = args->np2_fixup ? np2fixup : NULL; - pixelshader_update_samplers(&shader->reg_maps, state->textures); + pixelshader_update_samplers(shader, args->tex_types); shader_buffer_clear(buffer); ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 692e5b2..0431c1f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2062,6 +2062,39 @@ void find_ps_compile_args(const struct wined3d_state *state, } } } + if (shader->reg_maps.shader_version.major == 1 + && shader->reg_maps.shader_version.minor <= 4) + { + for (i = 0; i < shader->limits.sampler; ++i) + { + const struct wined3d_texture *texture = state->textures[i]; + + if (!shader->reg_maps.sampler_type[i]) + continue; + + /* Treat unbound textures as 2D. The dummy texture will provide + * the proper sample value. The tex_types bitmap defaults to + * 2D because of the memset. */ + if (!texture) + continue; + + switch (texture->target) + { + /* RECT textures are distinguished from 2D textures via np2_fixup */ + case GL_TEXTURE_RECTANGLE_ARB: + case GL_TEXTURE_2D: + break; + + case GL_TEXTURE_3D: + args->tex_types |= WINED3D_SHADER_TEX_3D << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + + case GL_TEXTURE_CUBE_MAP_ARB: + args->tex_types |= WINED3D_SHADER_TEX_CUBE << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + } + } + } for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -2274,46 +2307,32 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de return WINED3D_OK; } -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, struct wined3d_texture * const *textures) +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) { + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; enum wined3d_sampler_texture_type *sampler_type = reg_maps->sampler_type; unsigned int i; if (reg_maps->shader_version.major != 1) return; - for (i = 0; i < max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS); ++i) + for (i = 0; i < shader->limits.sampler; ++i) { /* We don't sample from this sampler. */ if (!sampler_type[i]) continue; - if (!textures[i]) + switch ((tex_types >> i * WINED3D_PSARGS_TEXTYPE_SHIFT) & WINED3D_PSARGS_TEXTYPE_MASK) { - WARN("No texture bound to sampler %u, using 2D.\n", i); - sampler_type[i] = WINED3DSTT_2D; - continue; - } - - switch (textures[i]->target) - { - case GL_TEXTURE_RECTANGLE_ARB: - case GL_TEXTURE_2D: - /* We have to select between texture rectangles and 2D - * textures later because 2.0 and 3.0 shaders only have - * WINED3DSTT_2D as well. */ + case WINED3D_SHADER_TEX_2D: sampler_type[i] = WINED3DSTT_2D; break; - case GL_TEXTURE_3D: + case WINED3D_SHADER_TEX_3D: sampler_type[i] = WINED3DSTT_VOLUME; break; - case GL_TEXTURE_CUBE_MAP_ARB: + case WINED3D_SHADER_TEX_CUBE: sampler_type[i] = WINED3DSTT_CUBE; break; - - default: - FIXME("Unrecognized texture type %#x, using 2D.\n", textures[i]->target); - sampler_type[i] = WINED3DSTT_2D; } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ca2b10..2137585 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -746,13 +746,25 @@ enum fogmode { #define WINED3D_PSARGS_PROJECTED (1 << 3) #define WINED3D_PSARGS_TEXTRANSFORM_SHIFT 4 #define WINED3D_PSARGS_TEXTRANSFORM_MASK 0xf +#define WINED3D_PSARGS_TEXTYPE_SHIFT 2 +#define WINED3D_PSARGS_TEXTYPE_MASK 0x3 + +/* Similar to tex_types, except that it doesn't have 1d textures + * (can't be bound), rect textures (handled via np2_fixup) and + * none / unknown (treated as 2d and handled via dummy textures). */ +enum wined3d_shader_tex_types +{ + WINED3D_SHADER_TEX_2D = 0, + WINED3D_SHADER_TEX_3D = 1, + WINED3D_SHADER_TEX_CUBE = 2, +}; struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; enum vertexprocessing_mode vp_mode; enum fogmode fog; WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - /* Texture types(2D, Cube, 3D) in ps 1.x */ + WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; WORD np2_fixup; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). @@ -2635,8 +2647,7 @@ struct wined3d_shader } u; }; -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, - struct wined3d_texture * const *textures) DECLSPEC_HIDDEN; +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Use the np2_fixup to find out if a RECT texture is used.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 547be26d90575a5013ea67025e940cb6f32119f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547be26d90575a5013ea67025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:15 2013 +0200 wined3d: Use the np2_fixup to find out if a RECT texture is used. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- dlls/wined3d/glsl_shader.c | 9 +++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e695fd..c3313ec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1368,14 +1368,14 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; - const struct wined3d_shader *shader = ins->ctx->shader; - const struct wined3d_texture *texture; const char *tex_type; BOOL np2_fixup = FALSE; - struct wined3d_device *device = shader->device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader *shader; + const struct wined3d_device *device; + const struct wined3d_gl_info *gl_info; /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; @@ -1386,13 +1386,15 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD break; case WINED3DSTT_2D: - texture = device->stateBlock->state.textures[sampler_idx]; - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - { + shader = ins->ctx->shader; + device = shader->device; + gl_info = &device->adapter->gl_info; + + if (pshader && priv->cur_ps_args->super.np2_fixup & (1 << sampler_idx) + && gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; - } else { + else tex_type = "2D"; - } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { if (priv->cur_np2fixup_info->super.active & (1 << sampler_idx)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a840a5d..ab32abe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1058,7 +1058,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (reg_maps->sampler_type[i]) { BOOL shadow_sampler = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->shadow & (1 << i)); - const struct wined3d_texture *texture; + BOOL tex_rect; switch (reg_maps->sampler_type[i]) { @@ -1069,17 +1069,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform sampler1D %s_sampler%u;\n", prefix, i); break; case WINED3DSTT_2D: - texture = state->textures[i]; + tex_rect = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->np2_fixup & (1 << i)); + tex_rect = tex_rect && gl_info->supported[ARB_TEXTURE_RECTANGLE]; if (shadow_sampler) { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRectShadow %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2DShadow %s_sampler%u;\n", prefix, i); } else { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRect %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2D %s_sampler%u;\n", prefix, i);

1 0

Stefan Dösinger : wined3d: 1x1 texures have a power of two size.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 196c88cfc4ad4d14a8e6091aa59111aa511ee31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=196c88cfc4ad4d14a8e6091aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 12 14:12:40 2013 +0200 wined3d: 1x1 texures have a power of two size. --- dlls/wined3d/texture.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9bf4c2e..5b83d4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -965,15 +965,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE] && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { - if (width != 1 || height != 1) - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; - texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip;

1 0

Rico Schüller : d3d8: Don' t assert on invalid IDirect3DBaseTexture8 interfaces.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 1486bdd99ff0d0d7fa39042517736d645ce02675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1486bdd99ff0d0d7fa3904251… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 14 16:53:37 2013 +0200 d3d8: Don't assert on invalid IDirect3DBaseTexture8 interfaces. --- dlls/d3d8/texture.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f139d4e..07695f9 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,9 +1155,20 @@ struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture { if (!iface) return NULL; - assert(iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl - || iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl); + + /* SetTexture() in particular doesn't do a lot of validation on the pointer + * that gets passed in, and passing an invalid pointer works as long as the + * application doesn't try to actually render anything with it, so we print + * a WARN and return NULL instead of having the usual assert() here. + * One application affected by this is Fishdom 2. */ + if (iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl + && iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl) + { + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); + return NULL; + } + return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface); }

1 0

André Hentschel : ntdll: Respect the 8-bit part in the ARM relocation.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e187c4aec2f8c5d3720fcfa5d2d7c52f8c7a417f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e187c4aec2f8c5d3720fcfa5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 12 23:19:46 2013 +0200 ntdll: Respect the 8-bit part in the ARM relocation. --- dlls/ntdll/loader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 271907f..9642f62 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2180,7 +2180,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count { DWORD inst = *(INT_PTR *)((char *)page + offset); DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f240) ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); @@ -2191,13 +2191,13 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); if (delta > 0xffff) { inst = *(INT_PTR *)((char *)page + offset + 4); imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f2c0) ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); @@ -2209,7 +2209,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); } } break;

1 0

Daniel Lehman : msvcr100: Implement _get_daylight.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 3f39f377c82b04c3074098b6f61518ebc6ad6bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f39f377c82b04c3074098b6f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 12 12:57:49 2013 -0700 msvcr100: Implement _get_daylight. --- dlls/msvcr100/msvcr100.c | 11 +++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 2735d17..d43cbbf 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -473,6 +473,17 @@ int CDECL _get_timezone(LONG *timezone) return 0; } +/********************************************************************* + * _get_daylight (MSVCR100.@) + */ +int CDECL _get_daylight(int *hours) +{ + if(!CHECK_PMT(hours != NULL)) return EINVAL; + + *hours = *(int*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_daylight"); + return 0; +} + /* copied from dlls/msvcrt/heap.c */ #define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ ~(sizeof(void *) - 1))) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1982668..de346c4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -866,7 +866,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 62631f7..29c7186 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1218,7 +1218,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fb76449..30e3fa5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -520,7 +520,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index aec46f7..2db3042 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -515,7 +515,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
58
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 2013