December 2008 - Wine-commits

Michael Stefaniuc : d3dxof/tests: Remove redundant NULL check before HeapFree (Smatch).
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 1825e371b75e7b3fbe45db74a174eda98e640418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1825e371b75e7b3fbe45db74a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 16 13:10:58 2008 +0100 d3dxof/tests: Remove redundant NULL check before HeapFree (Smatch). --- dlls/d3dxof/tests/d3dxof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 4bd52ca..3315721 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -261,9 +261,7 @@ static void test_dump(void) CloseHandle(hFile); exit: - - if (pvData) - HeapFree(GetProcessHeap(), 0, pvData); + HeapFree(GetProcessHeap(), 0, pvData); } START_TEST(d3dxof)

1 0

Hans Leidekker : pidgen: Add a placeholder BINK resource.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 425fc8def3c4f4cc143b47c37b75480232eb72a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425fc8def3c4f4cc143b47c37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 15 11:56:18 2008 +0100 pidgen: Add a placeholder BINK resource. Adds a binary resource that consists of the string "Wine placeholder BINK resource" padded with zeroes. --- dlls/pidgen/Makefile.in | 2 ++ dlls/pidgen/bink.bin | Bin 0 -> 368 bytes dlls/pidgen/rsrc.rc | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index 98e6b9a..e05833d 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ main.c +RS_SRCS = rsrc.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/pidgen/bink.bin b/dlls/pidgen/bink.bin new file mode 100644 index 0000000..996f8ba Binary files /dev/null and b/dlls/pidgen/bink.bin differ diff --git a/dlls/pidgen/rsrc.rc b/dlls/pidgen/rsrc.rc new file mode 100644 index 0000000..549fc84 --- /dev/null +++ b/dlls/pidgen/rsrc.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 + */ + +/* @makedep: bink.bin */ +1 BINK "bink.bin" +2 BINK "bink.bin"

1 0

Hans Leidekker : pidgen: Add stub implementation.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: efa2fcc07378285216ac9ea696e135985ed7bd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa2fcc07378285216ac9ea69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 15 11:55:32 2008 +0100 pidgen: Add stub implementation. --- configure | 9 +++++++++ configure.ac | 1 + dlls/pidgen/Makefile.in | 13 +++++++++++++ dlls/pidgen/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/pidgen/pidgen.spec | 7 +++++++ 5 files changed, 75 insertions(+), 0 deletions(-) diff --git a/configure b/configure index eaa4da7..20d0182 100755 --- a/configure +++ b/configure @@ -25781,6 +25781,14 @@ dlls/pdh/tests/Makefile: dlls/pdh/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/pdh/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/pidgen/Makefile" +test "x$enable_pidgen" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + pidgen" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/pidgen/Makefile: dlls/pidgen/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/pidgen/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/powrprof/Makefile" test "x$enable_powrprof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ powrprof" @@ -28230,6 +28238,7 @@ do "dlls/opengl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/tests/Makefile" ;; "dlls/pdh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/Makefile" ;; "dlls/pdh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/tests/Makefile" ;; + "dlls/pidgen/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pidgen/Makefile" ;; "dlls/powrprof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/powrprof/Makefile" ;; "dlls/printui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/printui/Makefile" ;; "dlls/propsys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/propsys/Makefile" ;; diff --git a/configure.ac b/configure.ac index 071013c..b74fb19 100644 --- a/configure.ac +++ b/configure.ac @@ -1981,6 +1981,7 @@ WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/pidgen/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in new file mode 100644 index 0000000..98e6b9a --- /dev/null +++ b/dlls/pidgen/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = pidgen.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c new file mode 100644 index 0000000..3aa3e84 --- /dev/null +++ b/dlls/pidgen/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(pidgen); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec new file mode 100644 index 0000000..ad5c369 --- /dev/null +++ b/dlls/pidgen/pidgen.spec @@ -0,0 +1,7 @@ +@ stub PIDGenA +@ stub PIDGenW +@ stub PIDGenSimpA +@ stub PIDGenSimpW +@ stub SetupPIDGenA +@ stub SetupPIDGenW +@ stub VerifyPIDSequenceW

1 0

Hans Leidekker : hal: Add version resource.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 152c2492547f4827e91a0fd8f23cb4127ce08d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152c2492547f4827e91a0fd8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 15 11:54:16 2008 +0100 hal: Add version resource. --- dlls/hal/Makefile.in | 2 ++ dlls/hal/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 4f3cf1c..026268a 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 ntdll C_SRCS = \ hal.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/hal/version.rc b/dlls/hal/version.rc new file mode 100644 index 0000000..126fe31 --- /dev/null +++ b/dlls/hal/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Hans Leidekker + * + * 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 + */ + +#define WINE_FILENAME_STR "hal.dll" + +#define WINE_FILEVERSION 5,1,2600,5512 +#define WINE_FILEVERSION_STR "5.1.2600.5512" +#define WINE_PRODUCTVERSION 5,1,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.1.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : wine.inf: Create fake hal.dll.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 6a204001cea84f289fa7a86065d6b0afc3288c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a204001cea84f289fa7a8606… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 15 11:55:01 2008 +0100 wine.inf: Create fake hal.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4756d7d..a9903e5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2263,6 +2263,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.vxd 11,,gdi32.dll 11,,glu32.dll +11,,hal.dll 11,,hhctrl.ocx 11,,imaadp32.acm 11,,imagehlp.dll

1 0

Jacek Caban : mshtml: Fixed IHTMLInputTextElement vtbl and QueryInterface implementation.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: db5d8a2bd016c091310242f79e9bc24c95a25e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5d8a2bd016c091310242f79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 15 22:50:10 2008 +0100 mshtml: Fixed IHTMLInputTextElement vtbl and QueryInterface implementation. Spotted by Andrew Talbot. --- dlls/mshtml/htmlinput.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index abb6e2e..3c85118 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1082,7 +1082,7 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = HTMLINPUT(This); }else if(IsEqualGUID(&IID_IHTMLInputTextElement, riid)) { TRACE("(%p)->(IID_IHTMLInputTextElement %p)\n", This, ppv); - *ppv = HTMLINPUT(This); + *ppv = HTMLINPUTTEXT(This); } if(*ppv) { @@ -1145,6 +1145,7 @@ HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) nsresult nsres; ret->lpHTMLInputElementVtbl = &HTMLInputElementVtbl; + ret->lpHTMLInputTextElementVtbl = &HTMLInputTextElementVtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLINPUT(ret), &HTMLInputElement_dispex);

1 0

Lei Zhang : quartz: Enumerate all the pins on filter and check directions when rendering.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 7e1b714f740c3f17a9c8024b0d1d374063e14494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1b714f740c3f17a9c8024b0… Author: Lei Zhang <thestig(a)google.com> Date: Mon Dec 15 15:31:43 2008 -0800 quartz: Enumerate all the pins on filter and check directions when rendering. --- dlls/quartz/filtergraph.c | 75 ++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8480d25..967a578 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1318,7 +1318,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) GUID clsid; IPin* ppinfilter; IBaseFilter* pfilter = NULL; - IEnumPins* penumpins; + IEnumPins* penumpins = NULL; ULONG pin; hr = GetFilterInfo(pMoniker, &clsid, &var); @@ -1348,40 +1348,61 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) WARN("Splitter Enumpins (%x)\n", hr); goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); - IEnumPins_Release(penumpins); - if (FAILED(hr)) { - WARN("Next (%x)\n", hr); - goto error; - } - if (pin == 0) { - WARN("No Pin\n"); - hr = E_FAIL; - goto error; - } - /* Connect the pin to the "Renderer" */ - hr = IPin_Connect(ppinOut, ppinfilter, NULL); - IPin_Release(ppinfilter); + while ((hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin)) == S_OK) + { + PIN_DIRECTION dir; - if (FAILED(hr)) { - WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_UNION(&var, bstrVal)), hr); - goto error; - } - TRACE("Connected, recursing %s\n", debugstr_w(V_UNION(&var, bstrVal))); + if (pin == 0) { + WARN("No Pin\n"); + hr = E_FAIL; + goto error; + } - VariantClear(&var); + hr = IPin_QueryDirection(ppinfilter, &dir); + if (FAILED(hr)) { + IPin_Release(ppinfilter); + WARN("QueryDirection failed (%x)\n", hr); + goto error; + } + if (dir != PINDIR_INPUT) { + IPin_Release(ppinfilter); + continue; /* Wrong direction */ + } - hr = FilterGraph2_RenderRecurse(This, ppinfilter); - if (FAILED(hr)) { - WARN("Unable to connect recursively (%x)\n", hr); - goto error; + /* Connect the pin to the "Renderer" */ + hr = IPin_Connect(ppinOut, ppinfilter, NULL); + IPin_Release(ppinfilter); + + if (FAILED(hr)) { + WARN("Unable to connect %s to renderer (%x)\n", debugstr_w(V_UNION(&var, bstrVal)), hr); + goto error; + } + TRACE("Connected, recursing %s\n", debugstr_w(V_UNION(&var, bstrVal))); + + VariantClear(&var); + + hr = FilterGraph2_RenderRecurse(This, ppinfilter); + if (FAILED(hr)) { + WARN("Unable to connect recursively (%x)\n", hr); + goto error; + } + IBaseFilter_Release(pfilter); + break; + } + if (SUCCEEDED(hr)) { + IEnumPins_Release(penumpins); + break; /* out of IEnumMoniker_Next loop */ } - IBaseFilter_Release(pfilter); - break; + + /* IEnumPins_Next failed, all other failure case caught by goto error */ + WARN("IEnumPins_Next (%x)\n", hr); + /* goto error */ error: VariantClear(&var); + if (penumpins) + IEnumPins_Release(penumpins); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter);

1 0

Nikolay Sivov : gdiplus: Fix Font test failure on charset mismatch.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: e2615cc059339bd62c2be741a8461765c028debc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2615cc059339bd62c2be741a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 16 05:10:48 2008 +0300 gdiplus: Fix Font test failure on charset mismatch. --- dlls/gdiplus/font.c | 1 + dlls/gdiplus/tests/font.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 220409b..22fd393 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -195,6 +195,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfHeight = -textmet.tmHeight; (*font)->lfw.lfWeight = textmet.tmWeight; + (*font)->lfw.lfCharSet = textmet.tmCharSet; (*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */ (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7ff5afc..125535d 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -134,7 +134,7 @@ static void test_logfont(void) expect(0, lfw2.lfItalic); expect(0, lfw2.lfUnderline); expect(0, lfw2.lfStrikeOut); - expect(0, lfw2.lfCharSet); + expect(GetTextCharset(hdc), lfw2.lfCharSet); expect(0, lfw2.lfOutPrecision); expect(0, lfw2.lfClipPrecision); expect(0, lfw2.lfQuality); @@ -164,7 +164,7 @@ static void test_logfont(void) expect(TRUE, lfw2.lfItalic); expect(TRUE, lfw2.lfUnderline); expect(TRUE, lfw2.lfStrikeOut); - expect(0, lfw2.lfCharSet); + expect(GetTextCharset(hdc), lfw2.lfCharSet); expect(0, lfw2.lfOutPrecision); expect(0, lfw2.lfClipPrecision); expect(0, lfw2.lfQuality);

1 0

Jacek Caban : jscript: Delay setting named info if SCRIPTITEM_GLOBALMEMBER flag is not set.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 4eb80d8d5136031e7b591b977dc69699178a3bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb80d8d5136031e7b591b977… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 15 22:24:33 2008 +0100 jscript: Delay setting named info if SCRIPTITEM_GLOBALMEMBER flag is not set. --- dlls/jscript/engine.c | 21 ++++++++++++++++ dlls/jscript/jscript.c | 41 +++++++++++++++++++++----------- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/run.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 107 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f4d4796..5a14c5f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -459,6 +459,27 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex for(item = ctx->parser->script->named_items; item; item = item->next) { if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpW(item->name, identifier)) { + if(!item->disp) { + IUnknown *unk; + + if(!ctx->parser->script->site) + break; + + hres = IActiveScriptSite_GetItemInfo(ctx->parser->script->site, identifier, + SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + break; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + break; + } + } + ret->type = EXPRVAL_VARIANT; V_VT(&ret->u.var) = VT_DISPATCH; V_DISPATCH(&ret->u.var) = item->disp; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c2fb987..bc182f4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -144,6 +144,9 @@ static HRESULT set_ctx_site(JScript *This) if(FAILED(hres)) return hres; + IActiveScriptSite_AddRef(This->site); + This->ctx->site = This->site; + change_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; } @@ -325,7 +328,8 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) while(iter) { iter2 = iter->next; - IDispatch_Release(iter->disp); + if(iter->disp) + IDispatch_Release(iter->disp); heap_free(iter->name); heap_free(iter); iter = iter2; @@ -334,6 +338,11 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) This->ctx->named_items = NULL; } + if(This->ctx->site) { + IActiveScriptSite_Release(This->ctx->site); + This->ctx->site = NULL; + } + if (This->site) change_state(This, SCRIPTSTATE_CLOSED); @@ -361,8 +370,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, { JScript *This = ACTSCRIPT_THIS(iface); named_item_t *item; - IDispatch *disp; - IUnknown *unk; + IDispatch *disp = NULL; HRESULT hres; TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); @@ -370,22 +378,27 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); - return hres; - } + if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { + IUnknown *unk; - hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); - IUnknown_Release(unk); - if(FAILED(hres)) { - WARN("object does not implement IDispatch\n"); - return hres; + hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + return hres; + } } item = heap_alloc(sizeof(*item)); if(!item) { - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); return E_OUTOFMEMORY; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6930ec6..4862b28 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -165,6 +165,7 @@ struct _script_ctx_t { SCRIPTSTATE state; exec_ctx_t *exec_ctx; named_item_t *named_items; + IActiveScriptSite *site; LCID lcid; jsheap_t tmp_heap; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 20d710d..926e45e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -64,6 +64,7 @@ DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(testobj_delete); +DEFINE_EXPECT(GetItemInfo_testVal); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -74,6 +75,7 @@ DEFINE_EXPECT(testobj_delete); #define DISPID_GLOBAL_TESTOBJ 0x1006 static const WCHAR testW[] = {'t','e','s','t',0}; +static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static BOOL strict_dispid_check; static const char *test_name = "(null)"; @@ -485,10 +487,14 @@ static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *p static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti) { - ok(!lstrcmpW(pstrName, testW), "unexpected pstrName %s\n", debugstr_w(pstrName)); ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); + if(!lstrcmpW(pstrName, test_valW)) + CHECK_EXPECT(GetItemInfo_testVal); + else if(lstrcmpW(pstrName, testW)) + ok(0, "unexpected pstrName %s\n", debugstr_w(pstrName)); + *ppiunkItem = (IUnknown*)&Global; return S_OK; } @@ -673,6 +679,54 @@ static void run_from_res(const char *name) SysFreeString(str); } +static void test_isvisible(BOOL global_members) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + HRESULT hres; + + static const WCHAR script_textW[] = + {'v','a','r',' ','v',' ','=',' ','t','e','s','t','V','a','l',';',0}; + + engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + if(global_members) + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE| + (global_members ? SCRIPTITEM_GLOBALMEMBERS : 0)); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + if(global_members) + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + if(!global_members) + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + if(!global_members) + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); +} + static void run_tests(void) { strict_dispid_check = TRUE; @@ -707,6 +761,9 @@ static void run_tests(void) run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js"); + + test_isvisible(FALSE); + test_isvisible(TRUE); } START_TEST(run)

1 0

Henri Verbeet : wined3d: Shaders will never have a NULL function.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: f3743fb402351922f1b4fdf505fd92f2dbabcb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3743fb402351922f1b4fdf50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 15 16:35:14 2008 +0100 wined3d: Shaders will never have a NULL function. --- dlls/wined3d/baseshader.c | 15 --------------- dlls/wined3d/nvidia_texture_shader.c | 7 ++----- dlls/wined3d/pixelshader.c | 25 ++++++++----------------- dlls/wined3d/state.c | 18 ++++-------------- dlls/wined3d/vertexshader.c | 30 +++++++----------------------- dlls/wined3d/wined3d_private.h | 4 +--- 6 files changed, 22 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 392c512..9cc0e2b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -216,13 +216,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m memset(reg_maps->bumpmat, 0, sizeof(reg_maps->bumpmat)); memset(reg_maps->luminanceparams, 0, sizeof(reg_maps->luminanceparams)); - if (!pToken) - { - WARN("Got a NULL pFunction, returning.\n"); - This->baseShader.functionLength = 0; - return WINED3D_OK; - } - /* get_registers_used is called on every compile on some 1.x shaders, which can result * in stacking up a collection of local constants. Delete the old constants if existing */ @@ -844,8 +837,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, hw_arg.reg_maps = reg_maps; This->baseShader.parse_state.current_row = 0; - if (!pToken) return; - while (WINED3DPS_END() != *pToken) { /* Skip version token */ @@ -970,12 +961,6 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table TRACE("Parsing %p\n", pFunction); - if (!pFunction) - { - WARN("Got a NULL pFunction, returning.\n"); - return; - } - /* The version token is supposed to be the first token */ if (!shader_is_version_token(*pToken)) { diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 1b31c74..e761288 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -457,11 +457,8 @@ static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 TRACE("Setting color op for stage %d\n", stage); - if (stateblock->pixelShader && stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && - ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function) { - /* Using a pixel shader? Don't care for anything here, the shader applying does it */ - return; - } + /* Using a pixel shader? Don't care for anything here, the shader applying does it */ + if (use_ps(stateblock->wineD3DDevice)) return; if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f3d4386..1dd3888 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -115,13 +115,10 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_GetFunction(IWineD3DPixelShader* * return D3DERR_MOREDATA. That's not actually true. */ return WINED3DERR_INVALIDCALL; } - if (NULL == This->baseShader.function) { /* no function defined */ - TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData); - (*(DWORD **) pData) = NULL; - } else { - TRACE("(%p) : GetFunction copying to %p\n", This, pData); - memcpy(pData, This->baseShader.function, This->baseShader.functionLength); - } + + TRACE("(%p) : GetFunction copying to %p\n", This, pData); + memcpy(pData, This->baseShader.function, This->baseShader.functionLength); + return WINED3D_OK; } @@ -382,16 +379,10 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i This->baseShader.shader_mode = deviceImpl->ps_selected_mode; TRACE("(%p) : Copying the function\n", This); - if (NULL != pFunction) { - void *function; - function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); - if (!function) return E_OUTOFMEMORY; - memcpy(function, pFunction, This->baseShader.functionLength); - This->baseShader.function = function; - } else { - This->baseShader.function = NULL; - } + This->baseShader.function = HeapAlloc(GetProcessHeap(), 0, This->baseShader.functionLength); + if (!This->baseShader.function) return E_OUTOFMEMORY; + memcpy(This->baseShader.function, pFunction, This->baseShader.functionLength); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ccaf6f5..085e3d4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2917,11 +2917,8 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D TRACE("Setting color op for stage %d\n", stage); - if (stateblock->pixelShader && stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && - ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function) { - /* Using a pixel shader? Don't care for anything here, the shader applying does it */ - return; - } + /* Using a pixel shader? Don't care for anything here, the shader applying does it */ + if (use_ps(stateblock->wineD3DDevice)) return; if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); @@ -4365,13 +4362,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo BOOL load_numbered = FALSE; BOOL load_named = FALSE; - if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && - ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { - useVertexShaderFunction = TRUE; - } else { - useVertexShaderFunction = FALSE; - } - + useVertexShaderFunction = (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader) ? TRUE : FALSE; if(device->up_strided) { /* Note: this is a ddraw fixed-function code path */ @@ -4459,8 +4450,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { BOOL useVertexShaderFunction = FALSE, updateFog = FALSE; - BOOL usePixelShaderFunction = stateblock->wineD3DDevice->ps_selected_mode != SHADER_NONE && stateblock->pixelShader - && ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function; + BOOL usePixelShaderFunction = use_ps(stateblock->wineD3DDevice); BOOL transformed; /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ef55f67..063f576 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -412,13 +412,10 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_GetFunction(IWineD3DVertexShader* * return D3DERR_MOREDATA. That's not actually true. */ return WINED3DERR_INVALIDCALL; } - if (NULL == This->baseShader.function) { /* no function defined */ - TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData); - (*(DWORD **) pData) = NULL; - } else { - TRACE("(%p) : GetFunction copying to %p\n", This, pData); - memcpy(pData, This->baseShader.function, This->baseShader.functionLength); - } + + TRACE("(%p) : GetFunction copying to %p\n", This, pData); + memcpy(pData, This->baseShader.function, This->baseShader.functionLength); + return WINED3D_OK; } @@ -474,16 +471,9 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader This->baseShader.load_local_constsF = This->baseShader.reg_maps.usesrelconstF && !list_empty(&This->baseShader.constantsF); /* copy the function ... because it will certainly be released by application */ - if (NULL != pFunction) { - void *function; - - function = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->baseShader.functionLength); - if (!function) return E_OUTOFMEMORY; - memcpy(function, pFunction, This->baseShader.functionLength); - This->baseShader.function = function; - } else { - This->baseShader.function = NULL; - } + This->baseShader.function = HeapAlloc(GetProcessHeap(), 0, This->baseShader.functionLength); + if (!This->baseShader.function) return E_OUTOFMEMORY; + memcpy(This->baseShader.function, pFunction, This->baseShader.functionLength); return WINED3D_OK; } @@ -611,12 +601,6 @@ HRESULT IWineD3DVertexShaderImpl_CompileShader(IWineD3DVertexShader *iface) { deviceImpl->shader_backend->shader_destroy((IWineD3DBaseShader *) iface); } - /* We don't need to compile */ - if (!function) { - This->baseShader.is_compiled = TRUE; - return WINED3D_OK; - } - /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); IWineD3DVertexShaderImpl_GenerateShader(iface, &This->baseShader.reg_maps, function); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a660581..9500031 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2465,14 +2465,12 @@ const StaticPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, static inline BOOL use_vs(IWineD3DDeviceImpl *device) { return (device->vs_selected_mode != SHADER_NONE && device->stateBlock->vertexShader - && ((IWineD3DVertexShaderImpl *)device->stateBlock->vertexShader)->baseShader.function && !device->strided_streams.u.s.position_transformed); } static inline BOOL use_ps(IWineD3DDeviceImpl *device) { return (device->ps_selected_mode != SHADER_NONE - && device->stateBlock->pixelShader - && ((IWineD3DPixelShaderImpl *)device->stateBlock->pixelShader)->baseShader.function); + && device->stateBlock->pixelShader); } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect,

1 0