April 2013 - Wine-commits - list.winehq.org

Piotr Caban : mshtml: Support IObjectIdentity interface in HTMLWindow object.
by Alexandre Julliard 26 Apr '13

26 Apr '13

Module: wine Branch: master Commit: b3fb1b0408832b7c535cf9e74f6ce3819c4f0ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fb1b0408832b7c535cf9e74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 26 15:47:54 2013 +0200 mshtml: Support IObjectIdentity interface in HTMLWindow object. --- dlls/mshtml/htmlwindow.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 48 ++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 28c071e..5c40f41 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -174,6 +174,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; + }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { + TRACE("(%p)->(IID_IObjectIdentity %p)\n", This, ppv); + *ppv = &This->IObjectIdentity_iface; }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; @@ -2295,6 +2298,57 @@ static const ITravelLogClientVtbl TravelLogClientVtbl = { TravelLogClient_LoadHistoryPosition }; +static inline HTMLWindow *impl_from_IObjectIdentity(IObjectIdentity *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, IObjectIdentity_iface); +} + +static HRESULT WINAPI ObjectIdentity_QueryInterface(IObjectIdentity *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_IObjectIdentity(iface); + + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI ObjectIdentity_AddRef(IObjectIdentity *iface) +{ + HTMLWindow *This = impl_from_IObjectIdentity(iface); + + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI ObjectIdentity_Release(IObjectIdentity *iface) +{ + HTMLWindow *This = impl_from_IObjectIdentity(iface); + + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI ObjectIdentity_IsEqualObject(IObjectIdentity *iface, IUnknown *unk) +{ + HTMLWindow *This = impl_from_IObjectIdentity(iface); + IServiceProvider *sp; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, unk); + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&sp); + if(hres != S_OK) + return hres; + + hres = &This->inner_window->base.IServiceProvider_iface==sp || + &This->outer_window->base.IServiceProvider_iface==sp ? S_OK : S_FALSE; + IServiceProvider_Release(sp); + return hres; +} + +static const IObjectIdentityVtbl ObjectIdentityVtbl = { + ObjectIdentity_QueryInterface, + ObjectIdentity_AddRef, + ObjectIdentity_Release, + ObjectIdentity_IsEqualObject +}; + static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IDispatchEx_iface); @@ -2793,6 +2847,7 @@ static void *alloc_window(size_t size) window->IDispatchEx_iface.lpVtbl = &WindowDispExVtbl; window->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; window->ITravelLogClient_iface.lpVtbl = &TravelLogClientVtbl; + window->IObjectIdentity_iface.lpVtbl = &ObjectIdentityVtbl; window->ref = 1; return window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 08c48ce..421bf8a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -365,6 +365,7 @@ struct HTMLWindow { IDispatchEx IDispatchEx_iface; IServiceProvider IServiceProvider_iface; ITravelLogClient ITravelLogClient_iface; + IObjectIdentity IObjectIdentity_iface; LONG ref; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ffb3614..7228649 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6966,12 +6966,37 @@ static void test_cond_comment(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(IsEqualGUID(riid, &IID_IServiceProvider), "riid = %s\n", dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; +static IUnknown obj_ident_test = { &UnknownVtbl }; + static void test_frame(IDispatch *disp, const char *exp_id) { IHTMLWindow2 *frame2, *parent, *top; IHTMLDocument2 *parent_doc, *top_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; + IObjectIdentity *obj_ident; + ITravelLogClient *tlc; HRESULT hres; hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); @@ -7002,6 +7027,29 @@ static void test_frame(IDispatch *disp, const char *exp_id) return; } + hres = IHTMLWindow2_QueryInterface(frame2, &IID_IObjectIdentity, (void**)&obj_ident); + ok(hres == S_OK, "Could not get IObjectIdentity interface: %08x\n", hres); + hres = IHTMLWindow2_QueryInterface(frame2, &IID_ITravelLogClient, (void**)&tlc); + if(hres == E_NOINTERFACE) { + win_skip("IID_ITravelLogClient not available\n"); + tlc = NULL; + }else { + ok(hres == S_OK, "Could not get ITravelLogClient interface: %08x\n", hres); + + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)tlc); + ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + ITravelLogClient_Release(tlc); + } + + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)obj_ident); + ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)parent); + ok(hres == S_FALSE, "IsEqualObject returned: 0x%08x\n", hres); + hres = IObjectIdentity_IsEqualObject(obj_ident, &obj_ident_test); + ok(hres == E_NOINTERFACE, "IsEqualObject returned: 0x%08x\n", hres); + + IObjectIdentity_Release(obj_ident); + hres = IHTMLWindow2_get_document(parent, &parent_doc); ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); IHTMLWindow2_Release(parent);

1 0

Scott Ritchie : Remove Mandriva from downloads page
by Jeremy Newman 25 Apr '13

25 Apr '13

Module: website Branch: master Commit: 26b289e239f64904c66a625ee97e4abab0a577c1 URL: http://source.winehq.org/git/website.git/?a=commit;h=26b289e239f64904c66a62… Author: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Wed Apr 24 17:41:26 2013 -0700 Remove Mandriva from downloads page Dead distro, no new packages in a very long time. RIP. --- images/distro/mandriva.png | Bin 1836 -> 0 bytes templates/de/download.template | 11 ----------- templates/en/download.template | 10 ---------- templates/fr/download.template | 11 ----------- templates/he/download.template | 10 ---------- templates/pl/download.template | 10 ---------- templates/pt/download.template | 9 --------- templates/tr/download.template | 10 ---------- templates/zh-cn/download.template | 10 ---------- 9 files changed, 0 insertions(+), 81 deletions(-) diff --git a/images/distro/mandriva.png b/images/distro/mandriva.png deleted file mode 100644 index 718b665..0000000 Binary files a/images/distro/mandriva.png and /dev/null differ diff --git a/templates/de/download.template b/templates/de/download.template index 45d0746..e9c63fa 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -100,17 +100,6 @@ erbeten hat, dass sie die Wine-Website hosten. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Mandriva</a> - binär .rpms für Mandriva Linux 2008, 2009 und 2010. Lade das 2010.2 Package herunter, falls Du eine - 2010.2 Version von Mandriva nutzt, z.B. 2010 Spring. Lade das 2010.0 Package herunter, falls Du die erste - Mandriva Version aus 2010 nutzt.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/en/download.template b/templates/en/download.template index 616dce8..cfdf1bb 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -99,16 +99,6 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Download Mandriva packages</a> - - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.2 package if your Mandriva is a 2010.2 - release, e.g. 2010 Spring. Download the 2010.0 package if your Mandriva is the first 2010 release.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/fr/download.template b/templates/fr/download.template index 4b4741e..3869fd2 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -107,17 +107,6 @@ center;">Voyez la </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Paquets Mandriva</a> - - .rpm binaires pour Mandriva Linux 2008, 2009 et 2010. Téléchargez les - paquets 2010.2 si votre Mandriva est une version 2010.2, p.ex. 2010 -Spring. Téléchargez les paquets 2010.0 si votre Mandriva est la première version 2010.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> </td> diff --git a/templates/he/download.template b/templates/he/download.template index d7cabac..f171e65 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -100,16 +100,6 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">הורדת חבילות ל־Mandriva</a> - - קובצי .rpmבינריים ל־Mandriva Linux 2008, 2009 ו־2010. יש להוריד את החבילה 2010.1 אם גרסת ה־היא Mandriva שלך היא - 2010.1, לדוגמה ל־2010 Spring. יש להוריד את חבילת 2010.0 אם הפצת ה־Mandriva שלך היא ההפצה הראשונה לשנת 2010.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/pl/download.template b/templates/pl/download.template index ae9b32e..0389781 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -99,16 +99,6 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Pobierz paczki dla Mandriva</a> - - binarne paczki .rpm dla Mandriva Linux 2008, 2009, i 2010. Pobierz paczkę 2010.2 jeżeli wersja twojej Mandrivy to 2010.2 - , np. 2010 Spring. Pobierz paczkę 2010.0 jeżeli twoja Mandriva jest pierwszym wydaniem w roku 2010.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/pt/download.template b/templates/pt/download.template index fd1f61f..9eca240 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -97,15 +97,6 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Descarregar pacotes para Mandriva</a> - - .rpms binários para Mandriva Linux 2008, 2009, e 2010. Use o pacote 2010.2 se o seu Mandriva for um lançamento 2010.2, por exemplo para a versão 2010 Spring. Use o pacote 2010.0 se o seu Mandriva for o primeiro lançamento de 2010.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/tr/download.template b/templates/tr/download.template index 52b1c79..ea6b6ca 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -100,16 +100,6 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Mandriva paketleri indirin</a> - - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.2 package if your Mandriva is a 2010.2 - release, eg. 2010 Spring. Download the 2010.0 package if your Mandriva is the first 2010 release.</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 3b207fb..80f46fe 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -97,16 +97,6 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> - <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> - </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">下载 Mandriva 安装包</a> - - Mandriva Linux 2008、2009 和 2010 的二进制 .rpms。下载 2010.2 的安装包，如果你的 Mandriva 是 2010.2 - 发行版，例如：2010 Spring。下载 2010.0 安装包当你的 Mandriva 是 2010 的第一个发行。</td> - <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td>

1 0

Stefan Dösinger : wined3d: Add a new structure for d3d limits and other info.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 16e862ba9d82326a9ce8549584aec863b2e5286f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e862ba9d82326a9ce854958… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:24 2013 +0200 wined3d: Add a new structure for d3d limits and other info. --- dlls/wined3d/arb_program_shader.c | 12 ++++++++---- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 1 - dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 12 +++++++----- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_private.h | 8 +++++++- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 967a057..5054b7c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4293,6 +4293,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh { struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4315,7 +4316,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); - if (!device->vs_clipping) + if (!d3d_info->vs_clipping) shader_data->clipplane_emulation = shader_find_free_input_register(&shader->reg_maps, gl_info->limits.texture_stages - 1); else @@ -4475,6 +4476,7 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, { struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; int i; WORD int_skip; @@ -4493,7 +4495,7 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, * is quite expensive because it forces the driver to disable early Z discards. It is cheaper to * duplicate the shader than have a no-op KIL instruction in every shader */ - if (!device->vs_clipping && use_vs(state) + if (!d3d_info->vs_clipping && use_vs(state) && state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]) args->clip = 1; @@ -4529,7 +4531,9 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_adapter *adapter = device->adapter; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; int i; WORD int_skip; @@ -4547,7 +4551,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, else { args->ps_signature = ~0; - if (!device->vs_clipping && device->adapter->fragment_pipe == &arbfp_fragment_pipeline) + if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) { args->clip.boolclip.clip_texcoord = ffp_clip_emul(state) ? gl_info->limits.texture_stages : 0; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4ee5bd4..6a4f766 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1449,6 +1449,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } ret->gl_info = gl_info; + ret->d3d_info = &device->adapter->d3d_info; ret->state_table = device->StateTable; /* Mark all states dirty to force a proper initialization of the states diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3eb7852..b15d4c2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5435,7 +5435,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ps_version = shader_caps.ps_version; device->d3d_vshader_constantF = shader_caps.vs_uniform_count; device->d3d_pshader_constantF = shader_caps.ps_uniform_count; - device->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; vertex_pipeline = adapter->vertex_pipe; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3743968..cd96ac7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2625,6 +2625,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) struct wined3d_gl_info *gl_info = &adapter->gl_info; enum wined3d_pci_vendor card_vendor; struct fragment_caps fragment_caps; + struct shader_caps shader_caps; const char *WGL_Extensions = NULL; const char *GL_Extensions = NULL; enum wined3d_gl_vendor gl_vendor; @@ -2843,6 +2844,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); adapter->blitter = select_blit_implementation(gl_info, adapter->shader_backend); + adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + adapter->d3d_info.vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 84e8b72..5de7f43 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -610,9 +610,7 @@ static void state_clipping(struct wined3d_context *context, const struct wined3d if (use_vs(state)) { - const struct wined3d_device *device = context->swapchain->device; - - if (!device->vs_clipping) + if (!context->d3d_info->vs_clipping) { /* The spec says that opengl clipping planes are disabled when using shaders. Direct3D planes aren't, * so that is an issue. The MacOS ATI driver keeps clipping planes activated with shaders in some @@ -4603,8 +4601,11 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine { updateFog = TRUE; - if (!device->vs_clipping && !isStateDirty(context, STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE))) + if (!context->d3d_info->vs_clipping + && !isStateDirty(context, STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE))) + { state_clipping(context, state, STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE)); + } for (i = 0; i < gl_info->limits.clipplanes; ++i) { @@ -4618,7 +4619,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine { if(!context->last_was_vshader) { static BOOL warned = FALSE; - if(!device->vs_clipping) { + if (!context->d3d_info->vs_clipping) + { /* Disable all clip planes to get defined results on all drivers. See comment in the * state_clipping state handler */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4a4289c..0e5ff2b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3131,6 +3131,7 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; const struct wined3d_surface *rt = state->fb->render_targets[0]; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; for (i = 0; i < gl_info->limits.texture_stages; ++i) { @@ -3350,7 +3351,7 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s } else { settings->sRGB_write = 0; } - if (device->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] + if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { /* No need to emulate clipplanes if GL supports native vertex shader clipping or if diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f836485..b3d1eb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1059,6 +1059,7 @@ BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSP struct wined3d_context { const struct wined3d_gl_info *gl_info; + const struct wined3d_d3d_info *d3d_info; const struct StateEntry *state_table; /* State dirtification * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices @@ -1586,6 +1587,11 @@ struct wined3d_driver_info DWORD version_low; }; +struct wined3d_d3d_info +{ + BOOL vs_clipping; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -1594,6 +1600,7 @@ struct wined3d_adapter enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info; + struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; @@ -1724,7 +1731,6 @@ struct wined3d_device unsigned int max_ffp_textures; UINT vs_version, gs_version, ps_version; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ - DWORD vs_clipping; UINT instance_count; WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */

1 0

Stefan Dösinger : wined3d: Access gl_info and d3d_info from the context in find_arb_*_compile_args.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 820c12c98f3a18a1e2829a64930cf93a6e3bd1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=820c12c98f3a18a1e2829a649… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:25 2013 +0200 wined3d: Access gl_info and d3d_info from the context in find_arb_*_compile_args. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5054b7c..70c796d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4472,11 +4472,11 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } static void find_arb_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct arb_ps_compile_args *args) + const struct wined3d_context *context, const struct wined3d_shader *shader, + struct arb_ps_compile_args *args) { - struct wined3d_device *device = shader->device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; @@ -4528,12 +4528,13 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } static void find_arb_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_shader *shader, struct arb_vs_compile_args *args) + const struct wined3d_context *context, const struct wined3d_shader *shader, + struct arb_vs_compile_args *args) { struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; @@ -4623,7 +4624,7 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(state, ps, &compile_args); + find_arb_ps_compile_args(state, context, ps, &compile_args); compiled = find_arb_pshader(ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; @@ -4688,7 +4689,7 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 struct arb_vs_compiled_shader *compiled; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(state, vs, &compile_args); + find_arb_vs_compile_args(state, context, vs, &compile_args); compiled = find_arb_vshader(vs, &compile_args); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled;

1 0

Stefan Dösinger : wined3d: Don' t pass the device to gen_ffp_frag_op.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: f7580726b0697cb3f873daba8468dafe60141d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7580726b0697cb3f873daba8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:26 2013 +0200 wined3d: Don't pass the device to gen_ffp_frag_op. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 70c796d..5d6bd1a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6410,7 +6410,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi { /* Find or create a shader implementing the fixed function pipeline * settings, then activate it. */ - gen_ffp_frag_op(device, state, &settings, FALSE); + gen_ffp_frag_op(context, state, &settings, FALSE); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if(!desc) { struct arbfp_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 34330c2..4832abe 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -844,7 +844,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined DWORD mapped_stage; unsigned int i; - gen_ffp_frag_op(device, state, &settings, TRUE); + gen_ffp_frag_op(context, state, &settings, TRUE); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); if(!desc) { struct atifs_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7750eab..16054ed 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5532,7 +5532,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struc struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - gen_ffp_frag_op(device, state, &settings, FALSE); + gen_ffp_frag_op(context, state, &settings, FALSE); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, gl_info, &settings); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0e5ff2b..cc615bc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3090,7 +3090,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { return size; } -void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_state *state, +void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { #define ARG1 0x01 @@ -3130,8 +3130,8 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; const struct wined3d_surface *rt = state->fb->render_targets[0]; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; for (i = 0; i < gl_info->limits.texture_stages; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3d1eb7..6863116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1674,7 +1674,7 @@ struct ffp_frag_desc extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; -void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_state *state, +void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Move shader limits to wined3d_d3d_info.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 768e8c098cf5358f235b66473281a1492ed790ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=768e8c098cf5358f235b66473… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:27 2013 +0200 wined3d: Move shader limits to wined3d_d3d_info. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- dlls/wined3d/device.c | 23 ++++++++++------------- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/shader.c | 22 +++++++++++++--------- dlls/wined3d/stateblock.c | 36 ++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 10 ++++++++-- 6 files changed, 66 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=768e8c098cf5358f235b6…

1 0

Stefan Dösinger : wined3d: Move max_ffp_textures to wined3d_d3d_info.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: cb01fb27b1095e3cd2657e25b13bf3017d829ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb01fb27b1095e3cd2657e25b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:28 2013 +0200 wined3d: Move max_ffp_textures to wined3d_d3d_info. --- dlls/wined3d/device.c | 13 ++++++------- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c999f65..2dae6ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2714,7 +2714,8 @@ static void device_update_fixed_function_usage_map(struct wined3d_device *device } } -static void device_map_fixed_function_samplers(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) +static void device_map_fixed_function_samplers(struct wined3d_device *device, const struct wined3d_gl_info *gl_info, + const struct wined3d_d3d_info *d3d_info) { unsigned int i, tex; WORD ffu_map; @@ -2722,8 +2723,8 @@ static void device_map_fixed_function_samplers(struct wined3d_device *device, co device_update_fixed_function_usage_map(device); ffu_map = device->fixed_function_usage_map; - if (device->max_ffp_textures == gl_info->limits.texture_stages - || device->stateBlock->state.lowest_disabled_stage <= device->max_ffp_textures) + if (d3d_info->limits.ffp_textures == gl_info->limits.texture_stages + || device->stateBlock->state.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { @@ -2844,6 +2845,7 @@ static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const s void device_update_tex_unit_map(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_state *state = &device->stateBlock->state; BOOL vs = use_vs(state); BOOL ps = use_ps(state); @@ -2857,7 +2859,7 @@ void device_update_tex_unit_map(struct wined3d_device *device) if (ps) device_map_psamplers(device, gl_info); else - device_map_fixed_function_samplers(device, gl_info); + device_map_fixed_function_samplers(device, gl_info, d3d_info); if (vs) device_map_vsamplers(device, ps, gl_info); @@ -5412,7 +5414,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct fragment_pipeline *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; - struct fragment_caps ffp_caps; unsigned int i; HRESULT hr; @@ -5436,8 +5437,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, vertex_pipeline = adapter->vertex_pipe; fragment_pipeline = adapter->fragment_pipe; - fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); - device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 52afdee..e462680 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2854,6 +2854,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; + adapter->d3d_info.limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages); if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 991fab7..d5f479b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1592,6 +1592,7 @@ struct wined3d_d3d_limits UINT vs_version, gs_version, ps_version; DWORD vs_uniform_count; DWORD ps_uniform_count; + UINT ffp_textures; }; struct wined3d_d3d_info @@ -1736,7 +1737,6 @@ struct wined3d_device APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; const struct blit_shader *blitter; - unsigned int max_ffp_textures; UINT instance_count; WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */

1 0

Stefan Dösinger : wined3d: Move valid_rt_mask to wined3d_d3d_info.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: ac99d539912ddc28324c03b7a296016389a9a9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac99d539912ddc28324c03b7a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:29 2013 +0200 wined3d: Move valid_rt_mask to wined3d_d3d_info. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 4 ---- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a4f766..54e9e80 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2282,7 +2282,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const else if (!context->render_offscreen) return context_generate_rt_mask_from_surface(rts[0]); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= device->valid_rt_mask; + rt_mask &= context->d3d_info->valid_rt_mask; rt_mask_bits = rt_mask; i = 0; while (rt_mask_bits) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2dae6ab..61b2f2a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1111,7 +1111,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_context *context; HRESULT hr; DWORD state; - unsigned int i; TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); @@ -1120,9 +1119,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; - device->valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - device->valid_rt_mask |= (1 << i); device->fb.render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device->fb.render_targets) * gl_info->limits.buffers); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e462680..dd3b9a3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2632,6 +2632,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) enum wined3d_pci_device device; DWORD gl_version; HDC hdc; + unsigned int i; TRACE("adapter %p.\n", adapter); @@ -2935,6 +2936,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + adapter->d3d_info.valid_rt_mask = 0; + for (i = 0; i < gl_info->limits.buffers; ++i) + adapter->d3d_info.valid_rt_mask |= (1 << i); + fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device); add_gl_compat_wrappers(gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d5f479b..550dc63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1599,6 +1599,7 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; BOOL vs_clipping; + DWORD valid_rt_mask; }; /* The adapter structure */ @@ -1771,7 +1772,6 @@ struct wined3d_device struct list shaders; /* a linked list to track shaders (pixel and vertex) */ /* Render Target Support */ - DWORD valid_rt_mask; struct wined3d_fb_state fb; struct wined3d_surface *onscreen_depth_stencil; struct wined3d_surface *auto_depth_stencil;

1 0

Stefan Dösinger : wined3d: Move gl_info->limits. max_texture_stages to d3d_info.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 76941eff009bebf5b1d1a101564035240ff75387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76941eff009bebf5b1d1a1015… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 25 15:20:30 2013 +0200 wined3d: Move gl_info->limits.max_texture_stages to d3d_info. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/device.c | 30 +++++++++++++++--------------- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/state.c | 20 +++++++++++--------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++++--- 8 files changed, 39 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76941eff009bebf5b1d1a…

1 0

Ken Thomases : winemac: If an app opens a window shortly after its systray icon is clicked, activate it.
by Alexandre Julliard 25 Apr '13

25 Apr '13

Module: wine Branch: master Commit: 1c7a2ba33b8601ee2758a55f97f40d10bbc35a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7a2ba33b8601ee2758a55f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 24 16:10:10 2013 -0500 winemac: If an app opens a window shortly after its systray icon is clicked, activate it. The Mac driver doesn't normally steal focus, but a click on the systray icon counts as the user giving permission. --- dlls/winemac.drv/cocoa_window.m | 8 +++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/systray.c | 8 ++++++++ dlls/winemac.drv/window.c | 10 +++++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e89dee5..65d7bc5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -856,7 +856,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) macdrv_release_event(event); } - - (void) makeFocused + - (void) makeFocused:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; NSArray* screens; @@ -889,6 +889,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (front && [front levelWhenActive] > [self levelWhenActive]) [self setLevelWhenActive:[front levelWhenActive]]; } + if (activate) + [NSApp activateIgnoringOtherApps:YES]; [self orderFront:nil]; [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; @@ -1804,12 +1806,12 @@ void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) * orders it front and, if its frame was not within the desktop bounds, * Cocoa will typically move it on-screen. */ -void macdrv_give_cocoa_window_focus(macdrv_window w) +void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) { WineWindow* window = (WineWindow*)w; OnMainThread(^{ - [window makeFocused]; + [window makeFocused:activate]; }); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bdbe8d1..aec7a02 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -88,6 +88,7 @@ enum macdrv_window_messages WM_MACDRV_UPDATE_DESKTOP_RECT, WM_MACDRV_RESET_DEVICE_METRICS, WM_MACDRV_DISPLAYCHANGE, + WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, }; struct macdrv_thread_data diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c0ee9d..39f229d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -353,7 +353,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat CGFloat keyBlue) DECLSPEC_HIDDEN; extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; -extern void macdrv_give_cocoa_window_focus(macdrv_window w) DECLSPEC_HIDDEN; +extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate) DECLSPEC_HIDDEN; extern macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index b45e311..dc0f99b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -325,6 +325,14 @@ void macdrv_status_item_clicked(const macdrv_event *event) { UINT down; + if (!SendMessageW(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && + GetLastError() == ERROR_INVALID_WINDOW_HANDLE) + { + WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); + delete_icon(icon); + return; + } + if (event->status_item_clicked.count == 1) { down = WM_LBUTTONDOWN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 987aa34..3353749 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -42,6 +42,8 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; +DWORD activate_on_focus_time; + void CDECL macdrv_SetFocus(HWND hwnd); @@ -855,8 +857,9 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (data->cocoa_window && data->on_screen) { + BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); /* Set Mac focus */ - macdrv_give_cocoa_window_focus(data->cocoa_window); + macdrv_give_cocoa_window_focus(data->cocoa_window, activate); } release_win_data(data); @@ -1226,6 +1229,11 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) } SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); return 0; + case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: + activate_on_focus_time = GetTickCount(); + if (!activate_on_focus_time) activate_on_focus_time = 1; + TRACE("WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS time %u\n", activate_on_focus_time); + break; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0