October 2010 - Wine-Commits

Yaron Shahrabani : shdoclc: Added Hebrew translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: f17348a9b9cac413eccb2674c8295f5cd77d8069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17348a9b9cac413eccb2674c… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Oct 24 16:33:46 2010 +0200 shdoclc: Added Hebrew translation. --- dlls/shdoclc/He.rc | 251 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Makefile.in | 1 + 2 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f17348a9b9cac413eccb2…

1 0

Nikolay Sivov : msxml3: Handle passed BSTR argument as a WCHAR string in :: createProcessingInstruction().
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: adfd3058212e4caa71777fae1364fb8dfdd07c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfd3058212e4caa71777fae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 26 02:06:52 2010 +0400 msxml3: Handle passed BSTR argument as a WCHAR string in ::createProcessingInstruction(). --- dlls/msxml3/domdoc.c | 6 +----- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 18 ++++++++++++++---- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 12710a8..78500e6 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1597,15 +1597,11 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( hr = IXMLDOMDocument3_createNode(iface, type, target, NULL, &node); if (hr == S_OK) { - VARIANT v_data; xmlnode *node_obj; /* this is to bypass check in ::put_data() that blocks "<?xml" PIs */ node_obj = get_node_obj(node); - V_VT(&v_data) = VT_BSTR; - V_BSTR(&v_data) = data; - - hr = node_put_value(node_obj, &v_data); + hr = node_set_content(node_obj, data); IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi); IXMLDOMNode_Release(node); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index fcf3dc0..bccce1c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -162,6 +162,7 @@ extern xmlnode *get_node_obj(IXMLDOMNode*); extern HRESULT node_get_nodeName(xmlnode*,BSTR*); extern HRESULT node_get_content(xmlnode*,VARIANT*); +extern HRESULT node_set_content(xmlnode*,LPCWSTR); extern HRESULT node_put_value(xmlnode*,VARIANT*); extern HRESULT node_get_parent(xmlnode*,IXMLDOMNode**); extern HRESULT node_get_child_nodes(xmlnode*,IXMLDOMNodeList**); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 5b7d49d..3e8665f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -138,10 +138,22 @@ HRESULT node_get_content(xmlnode *This, VARIANT *value) return S_OK; } +HRESULT node_set_content(xmlnode *This, LPCWSTR value) +{ + xmlChar *str; + + str = xmlChar_from_wchar(value); + if(!str) + return E_OUTOFMEMORY; + + xmlNodeSetContent(This->node, str); + heap_free(str); + return S_OK; +} + HRESULT node_put_value(xmlnode *This, VARIANT *value) { VARIANT string_value; - xmlChar *str; HRESULT hr; VariantInit(&string_value); @@ -151,11 +163,9 @@ HRESULT node_put_value(xmlnode *This, VARIANT *value) return hr; } - str = xmlChar_from_wchar(V_BSTR(&string_value)); + hr = node_set_content(This, V_BSTR(&string_value)); VariantClear(&string_value); - xmlNodeSetContent(This->node, str); - heap_free(str); return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8821b25..80557f3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7125,6 +7125,28 @@ static void test_events(void) IXMLDOMDocument_Release(doc); } +static void test_createProcessingInstruction(void) +{ + static const WCHAR bodyW[] = {'t','e','s','t',0}; + IXMLDOMProcessingInstruction *pi; + IXMLDOMDocument *doc; + WCHAR buff[10]; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + /* test for BSTR handling, pass broken BSTR */ + memcpy(&buff[2], bodyW, sizeof(bodyW)); + /* just a big length */ + *(DWORD*)buff = 0xf0f0; + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("test"), &buff[2], &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMProcessingInstruction_Release(pi); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7186,6 +7208,7 @@ START_TEST(domdoc) test_default_properties(); test_selectSingleNode(); test_events(); + test_createProcessingInstruction(); CoUninitialize(); }

1 0

Jacek Caban : mshtml.idl: Added IHTMLObjectElement declaration.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 6a30bd59bf12199783d5f8c66cb4a4dc5d63792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a30bd59bf12199783d5f8c66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 26 11:13:59 2010 +0200 mshtml.idl: Added IHTMLObjectElement declaration. --- include/mshtmdid.h | 22 ++++++++++ include/mshtml.idl | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e3683e9..fd7c707 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2495,6 +2495,28 @@ /* IHTMLScriptElement3 */ #define DISPID_IHTMLSCRIPTELEMENT3_IE8_SRC DISPID_IE8_SCRIPT +/* IHTMLObjectElement */ +#define DISPID_IHTMLOBJECTELEMENT_OBJECT DISPID_OBJECT+1 +#define DISPID_IHTMLOBJECTELEMENT_CLASSID DISPID_OBJECT+2 +#define DISPID_IHTMLOBJECTELEMENT_DATA DISPID_OBJECT+3 +#define DISPID_IHTMLOBJECTELEMENT_RECORDSET DISPID_OBJECT+5 +#define DISPID_IHTMLOBJECTELEMENT_ALIGN STDPROPID_XOBJ_CONTROLALIGN +#define DISPID_IHTMLOBJECTELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLOBJECTELEMENT_CODEBASE DISPID_OBJECT+6 +#define DISPID_IHTMLOBJECTELEMENT_CODETYPE DISPID_OBJECT+7 +#define DISPID_IHTMLOBJECTELEMENT_CODE DISPID_OBJECT+8 +#define DISPID_IHTMLOBJECTELEMENT_BASEHREF STDPROPID_XOBJ_BASEHREF +#define DISPID_IHTMLOBJECTELEMENT_TYPE DISPID_OBJECT+9 +#define DISPID_IHTMLOBJECTELEMENT_FORM DISPID_SITE+4 +#define DISPID_IHTMLOBJECTELEMENT_WIDTH STDPROPID_XOBJ_WIDTH +#define DISPID_IHTMLOBJECTELEMENT_HEIGHT STDPROPID_XOBJ_HEIGHT +#define DISPID_IHTMLOBJECTELEMENT_READYSTATE DISPID_OBJECT+10 +#define DISPID_IHTMLOBJECTELEMENT_ONREADYSTATECHANGE DISPID_EVPROP_ONREADYSTATECHANGE +#define DISPID_IHTMLOBJECTELEMENT_ONERROR DISPID_EVPROP_ONERROR +#define DISPID_IHTMLOBJECTELEMENT_ALTHTML DISPID_OBJECT+11 +#define DISPID_IHTMLOBJECTELEMENT_VSPACE DISPID_OBJECT+12 +#define DISPID_IHTMLOBJECTELEMENT_HSPACE DISPID_OBJECT+13 + /* IHTMLFrameBase */ #define DISPID_IHTMLFRAMEBASE_SRC DISPID_FRAMESITE+0 #define DISPID_IHTMLFRAMEBASE_NAME STDPROPID_XOBJ_NAME diff --git a/include/mshtml.idl b/include/mshtml.idl index 1941b92..1c5ef64 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14781,6 +14781,120 @@ methods: } /***************************************************************************** + * IHTMLObjectElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f24f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLObjectElement : IDispatch +{ + [propget, id(DISPID_IHTMLOBJECTELEMENT_OBJECT), hidden] + HRESULT object([retval, out] IDispatch **p); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CLASSID), hidden] + HRESULT classid([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_DATA), hidden] + HRESULT data([retval, out] BSTR *p); + + [propputref, id(DISPID_IHTMLOBJECTELEMENT_RECORDSET), hidden] + HRESULT recordset([in] IDispatch *v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_RECORDSET), hidden] + HRESULT recordset([retval, out] IDispatch **p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ALIGN), displaybind, bindable] + HRESULT align([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ALIGN), displaybind, bindable] + HRESULT align([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODEBASE), displaybind, bindable] + HRESULT codeBase([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODEBASE), displaybind, bindable] + HRESULT codeBase([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODETYPE), displaybind, bindable] + HRESULT codeType([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODETYPE), displaybind, bindable] + HRESULT codeType([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODE), displaybind, bindable] + HRESULT code([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODE), displaybind, bindable] + HRESULT code([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_BASEHREF)] + HRESULT BaseHref([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_TYPE), displaybind, bindable] + HRESULT type([retval, out] BSTR *p); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_FORM)] + HRESULT form([retval, out] IHTMLFormElement **p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_WIDTH)] + HRESULT width([in] VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_WIDTH)] + HRESULT width([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] + HRESULT height([in] VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] + HRESULT height([retval, out] VARIANT *p); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_READYSTATE), hidden] + HRESULT readyState([retval, out] long *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([in] VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ONREADYSTATECHANGE), displaybind, bindable] + HRESULT onreadystatechange([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([in] VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] + HRESULT onerror([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] + HRESULT altHtml([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] + HRESULT altHtml([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_VSPACE)] + HRESULT vspace([in] long v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_VSPACE)] + HRESULT vspace([retval, out] long *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_HSPACE)] + HRESULT hspace([in] long v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_HSPACE)] + HRESULT hspace([retval, out] long *p); +} + +/***************************************************************************** * IHTMLFrameBase interface */ [

1 0

Alexandre Julliard : winedbg: Don' t start another instance of the debugger when it crashes.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 052eb24b03ff0a2b32887518395154d4c7351bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052eb24b03ff0a2b328875183… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 12:55:53 2010 +0200 winedbg: Don't start another instance of the debugger when it crashes. --- programs/winedbg/winedbg.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index a649123..03bff8c 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -603,6 +603,12 @@ void dbg_start_interactive(HANDLE hFile) dbg_save_internal_vars(); } +static LONG CALLBACK top_filter( EXCEPTION_POINTERS *ptr ) +{ + dbg_printf( "winedbg: Internal crash at %p\n", ptr->ExceptionRecord->ExceptionAddress ); + return EXCEPTION_EXECUTE_HANDLER; +} + struct backend_cpu* be_cpu; #ifdef __i386__ extern struct backend_cpu be_i386; @@ -644,6 +650,8 @@ int main(int argc, char** argv) /* Initialize the output */ dbg_houtput = GetStdHandle(STD_OUTPUT_HANDLE); + SetUnhandledExceptionFilter( top_filter ); + /* Initialize internal vars */ if (!dbg_load_internal_vars()) return -1;

1 0

Detlef Riekenberg : faultrep/tests: Add tests for AddERExcludedApplicationA .
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 53fca11fb34c11872480a3eaf0a8e1590022e830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53fca11fb34c11872480a3eaf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 26 10:11:13 2010 +0200 faultrep/tests: Add tests for AddERExcludedApplicationA. --- configure | 3 +- configure.ac | 3 +- dlls/faultrep/Makefile.in | 1 + dlls/faultrep/tests/Makefile.in | 7 +++ dlls/faultrep/tests/faultrep.c | 86 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5de5f5c..dcb9203 100755 --- a/configure +++ b/configure @@ -14694,7 +14694,8 @@ wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll explorerframe enable_explorerframe wine_fn_config_test dlls/explorerframe/tests explorerframe_test -wine_fn_config_dll faultrep enable_faultrep +wine_fn_config_dll faultrep enable_faultrep faultrep +wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test diff --git a/configure.ac b/configure.ac index 9a84cf3..8bae871 100644 --- a/configure.ac +++ b/configure.ac @@ -2440,7 +2440,8 @@ WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(explorerframe) WINE_CONFIG_TEST(dlls/explorerframe/tests) -WINE_CONFIG_DLL(faultrep) +WINE_CONFIG_DLL(faultrep,,[faultrep]) +WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index 96dd2a9..2ad2adb 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -1,4 +1,5 @@ MODULE = faultrep.dll +IMPORTLIB = faultrep IMPORTS = advapi32 C_SRCS = faultrep.c diff --git a/dlls/faultrep/tests/Makefile.in b/dlls/faultrep/tests/Makefile.in new file mode 100644 index 0000000..8a64263 --- /dev/null +++ b/dlls/faultrep/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = faultrep.dll +IMPORTS = faultrep advapi32 + +C_SRCS = \ + faultrep.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c new file mode 100644 index 0000000..dd52928 --- /dev/null +++ b/dlls/faultrep/tests/faultrep.c @@ -0,0 +1,86 @@ +/* + * Unit test suite for fault reporting in XP and above + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "errorrep.h" +#include "wine/test.h" + +static char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; +static char regpath_exclude[] = "ExclusionList"; + +/* ###### */ + +static void test_AddERExcludedApplicationA(void) +{ + BOOL res; + LONG lres; + HKEY hroot; + HKEY hexclude = 0; + + /* clean state */ + lres = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regpath_root, 0, KEY_WRITE, &hroot); + + if (!lres) + lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); + + if (!lres) + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(NULL); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(""); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + /* access rights to HKLM or existence of the path doesn't matter + this function succeeded */ + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* add, when already present */ + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* cleanup */ + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + RegCloseKey(hexclude); + RegCloseKey(hroot); +} + +/* ########################### */ + +START_TEST(faultrep) +{ + test_AddERExcludedApplicationA(); +}

1 0

Henri Verbeet : wined3d: Explicitly pass parameters to shader_arb_ps_local_constants().
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 8c36e4ce1d02701bdcebcfb4553e64197d2e7485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c36e4ce1d02701bdcebcfb45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 26 09:11:07 2010 +0200 wined3d: Explicitly pass parameters to shader_arb_ps_local_constants(). --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f88ef99..9d7c888 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -522,21 +522,18 @@ static void shader_arb_load_np2fixup_constants(void *shader_priv, } /* GL locking is done by the caller. */ -static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) +static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *gl_shader, + const struct wined3d_context *context, const struct wined3d_state *state, float rt_height) { - const struct wined3d_context *context = context_get_current(); - IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned char i; - struct shader_arb_priv *priv = deviceImpl->shader_priv; - const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; for(i = 0; i < gl_shader->numbumpenvmatconsts; i++) { int texunit = gl_shader->bumpenvmatconst[i].texunit; /* The state manager takes care that this function is always called if the bump env matrix changes */ - const float *data = (const float *)&stateBlock->state.texture_states[texunit][WINED3DTSS_BUMPENVMAT00]; + const float *data = (const float *)&state->texture_states[texunit][WINED3DTSS_BUMPENVMAT00]; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->bumpenvmatconst[i].const_num, data)); @@ -547,7 +544,7 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) * don't care about them. The pointers are valid for sure because the stateblock is bigger. * (they're WINED3DTSS_TEXTURETRANSFORMFLAGS and WINED3DTSS_ADDRESSW, so most likely 0 or NaN */ - const float *scale = (const float *)&stateBlock->state.texture_states[texunit][WINED3DTSS_BUMPENVLSCALE]; + const float *scale = (const float *)&state->texture_states[texunit][WINED3DTSS_BUMPENVLSCALE]; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->luminanceconst[i].const_num, scale)); } @@ -562,8 +559,7 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) * ycorrection.w: 0.0 */ float val[4]; - val[0] = context->render_offscreen ? 0.0f - : deviceImpl->render_targets[0]->currentDesc.Height; + val[0] = context->render_offscreen ? 0.0f : rt_height; val[1] = context->render_offscreen ? 1.0f : -1.0f; val[2] = 1.0f; val[3] = 0.0f; @@ -578,9 +574,9 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)stateBlock->state.ps_consts_i[4 * i]; - val[1] = (float)stateBlock->state.ps_consts_i[4 * i + 1]; - val[2] = (float)stateBlock->state.ps_consts_i[4 * i + 2]; + val[0] = (float)state->ps_consts_i[4 * i]; + val[1] = (float)state->ps_consts_i[4 * i + 1]; + val[2] = (float)state->ps_consts_i[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -647,11 +643,13 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha if (usePixelShader) { IWineD3DBaseShaderImpl *pshader = (IWineD3DBaseShaderImpl *)stateBlock->state.pixel_shader; + const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; + float rt_height = device->render_targets[0]->currentDesc.Height; /* Load DirectX 9 float constants for pixel shader */ device->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, device->highest_dirty_ps_const, stateBlock->state.ps_consts_f, context->pshader_const_dirty); - shader_arb_ps_local_constants(device); + shader_arb_ps_local_constants(gl_shader, context, &stateBlock->state, rt_height); } } @@ -4563,7 +4561,8 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, } else { - shader_arb_ps_local_constants(This); + float rt_height = This->render_targets[0]->currentDesc.Height; + shader_arb_ps_local_constants(compiled, context, state, rt_height); } /* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */

1 0

Henri Verbeet : wined3d: Explicitly pass parameters to shader_arb_vs_local_constants().
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 5afb593cb25c2dbcf24e446a4ffe7087e7d25fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afb593cb25c2dbcf24e446a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 26 09:11:06 2010 +0200 wined3d: Explicitly pass parameters to shader_arb_vs_local_constants(). --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a76373b..f88ef99 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -590,14 +590,12 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } /* GL locking is done by the caller. */ -static void shader_arb_vs_local_constants(const struct wined3d_context *context, IWineD3DDeviceImpl *deviceImpl) +static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *gl_shader, + const struct wined3d_context *context, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; - const struct wined3d_state *state = &deviceImpl->stateBlock->state; - unsigned char i; - struct shader_arb_priv *priv = deviceImpl->shader_priv; - const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; + const struct wined3d_gl_info *gl_info = context->gl_info; float position_fixup[4]; + unsigned char i; /* Upload the position fixup */ shader_get_position_fixup(context, state, position_fixup); @@ -633,15 +631,17 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha IWineD3DDeviceImpl *device = context->swapchain->device; IWineD3DStateBlockImpl* stateBlock = device->stateBlock; const struct wined3d_gl_info *gl_info = context->gl_info; + struct shader_arb_priv *priv = device->shader_priv; if (useVertexShader) { IWineD3DBaseShaderImpl *vshader = (IWineD3DBaseShaderImpl *)stateBlock->state.vertex_shader; + const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; /* Load DirectX 9 float constants for vertex shader */ device->highest_dirty_vs_const = shader_arb_load_constantsF(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, device->highest_dirty_vs_const, stateBlock->state.vs_consts_f, context->vshader_const_dirty); - shader_arb_vs_local_constants(context, device); + shader_arb_vs_local_constants(gl_shader, context, &stateBlock->state); } if (usePixelShader) @@ -4601,7 +4601,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); - shader_arb_vs_local_constants(context, This); + shader_arb_vs_local_constants(compiled, context, state); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { priv->last_vs_color_unclamp = compiled->need_color_unclamp;

1 0

Henri Verbeet : wined3d: Read transform flags from the compile args in pshader_hw_texm3x3tex().
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: f624d8f7b6f226d9d54af5b6843640286923a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f624d8f7b6f226d9d54af5b68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 26 09:11:09 2010 +0200 wined3d: Read transform flags from the compile args in pshader_hw_texm3x3tex(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 253da9a..33c18d3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2134,8 +2134,8 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) { + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *)shader->baseShader.device; SHADER_PARSE_STATE *current_state = &shader->baseShader.parse_state; DWORD flags; DWORD reg = ins->dst[0].reg.idx; @@ -2150,7 +2150,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); - flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->state.texture_states[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); current_state->current_row = 0; }

1 0

Henri Verbeet : wined3d: Read transform flags from the compile args in pshader_hw_texm3x2tex().
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: db156977dd22be98eed2fa6c4b8065584b196a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db156977dd22be98eed2fa6c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 26 09:11:08 2010 +0200 wined3d: Read transform flags from the compile args in pshader_hw_texm3x2tex(). Instead of directly from the stateblock. Note that the GLSL backend doesn't take these flags into account at all. That's probably a bug in the GLSL backend, but needs tests. --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d7c888..253da9a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2090,8 +2090,7 @@ static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *)shader->baseShader.device; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; DWORD flags; DWORD reg = ins->dst[0].reg.idx; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -2106,7 +2105,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); - flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->state.texture_states[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); }

1 0

Austin Lund : user32/tests: Fixed WM_SETFONT combo box tests.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: ccd4479ce98f44161f3ccaef278577068376bfd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd4479ce98f44161f3ccaef2… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Oct 26 14:45:12 2010 +1000 user32/tests: Fixed WM_SETFONT combo box tests. --- dlls/user32/tests/combo.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index f63b941..fd852d1 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -117,6 +117,10 @@ static void test_setfont(DWORD style) MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); + /* The size of the dropped control is initially equal to the size + of the window when it was created. The size of the calculated + dropped area changes only by how much the selection area + changes, not by how much the list area changes. */ if (font_height(hFont1) == 10 && font_height(hFont2) == 8) { SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); @@ -124,21 +128,21 @@ static void test_setfont(DWORD style) expect_rect(r, 0, 0, 100, 18); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 99); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE); GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 16); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 97); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont2))); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 18); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 99); + todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); } else {

1 0