July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add a test for invalid predefined palette type.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 9083bcc59c48736641381dd87551c47804be5572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9083bcc59c48736641381dd87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:49:03 2012 +0900 windowscodecs: Add a test for invalid predefined palette type. --- dlls/windowscodecs/palette.c | 4 ++-- dlls/windowscodecs/tests/palette.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 62c7907..096258a 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -403,8 +403,8 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, break; default: - FIXME("(%p,%u,%d): stub\n", iface, type, add_transparent); - return E_NOTIMPL; + WARN("invalid palette type %u\n", type); + return E_INVALIDARG; } EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 5a8c808..499d59d 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -402,6 +402,16 @@ static void test_predefined_palette(void) &IID_IWICImagingFactory, (void **)&factory); ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeMedianCut, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + hr = IWICPalette_InitializePredefined(palette, 0x0f, FALSE); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + IWICPalette_Release(palette); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { hr = IWICImagingFactory_CreatePalette(factory, &palette);

1 0

Alexandre Julliard : gdi32: Work around a gcc array out of bounds warning.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 592e6aa94234299c7696abce28df762f16054d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592e6aa94234299c7696abce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 14:51:50 2012 +0200 gdi32: Work around a gcc array out of bounds warning. --- dlls/gdi32/palette.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 338d860..afb723b 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -89,18 +89,11 @@ HPALETTE PALETTE_Init(void) palPtr->palVersion = 0x300; palPtr->palNumEntries = 20; - for (i = 0; i < 10; i++) + for (i = 0; i < 20; i++) { - palPtr->palPalEntry[i].peRed = entries[i].rgbRed; - palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen; - palPtr->palPalEntry[i].peBlue = entries[i].rgbBlue; - palPtr->palPalEntry[i].peFlags = 0; - } - for (i = 10; i < 20; i++) - { - palPtr->palPalEntry[i].peRed = entries[236 + i].rgbRed; - palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen; - palPtr->palPalEntry[i].peBlue = entries[236 + i].rgbBlue; + palPtr->palPalEntry[i].peRed = entries[i < 10 ? i : 236 + i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[i < 10 ? i : 236 + i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[i < 10 ? i : 236 + i].rgbBlue; palPtr->palPalEntry[i].peFlags = 0; } return CreatePalette( palPtr );

1 0

Jacek Caban : mshtml: Fixed tests on Vista.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 68fa7d3b0e9c34f821b79ad093c81156ea29463e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fa7d3b0e9c34f821b79ad09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:03:27 2012 +0200 mshtml: Fixed tests on Vista. --- dlls/mshtml/tests/htmldoc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3a35abf..803d505 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -191,6 +191,7 @@ DEFINE_EXPECT(GetPendingUrl); DEFINE_EXPECT(ActiveElementChanged); DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(get_LocationURL); +DEFINE_EXPECT(CountEntries); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -3245,7 +3246,7 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl) static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(CountEntries); return E_NOTIMPL; } @@ -5069,6 +5070,8 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_ShellDocView_140); if(!is_js) { SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); + if(support_wbapp) /* Called on some Vista installations */ + SET_EXPECT(CountEntries); SET_EXPECT(Exec_HTTPEQUIV_DONE); } SET_EXPECT(SetStatusText); @@ -5158,6 +5161,8 @@ static void test_download(DWORD flags) CLEAR_CALLED(Exec_ShellDocView_140); if(!is_js) { CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); + if(support_wbapp) /* Called on some Vista installations */ + CLEAR_CALLED(CountEntries); CHECK_CALLED(Exec_HTTPEQUIV_DONE); } SET_CALLED(SetStatusText);

1 0

Jacek Caban : mshtml: Unescape script from javascript: URLs before executing them.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 5401efaef0d12a3c36e4491f6f194d5deb94e73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5401efaef0d12a3c36e4491f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:03:45 2012 +0200 mshtml: Unescape script from javascript: URLs before executing them. --- dlls/mshtml/navigate.c | 6 ++++++ dlls/mshtml/tests/htmldoc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ecc8ef3..09c9f3d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1789,6 +1789,12 @@ static void navigate_javascript_proc(task_t *_task) if(FAILED(hres)) return; + hres = UrlUnescapeW(code, NULL, NULL, URL_UNESCAPE_INPLACE); + if(FAILED(hres)) { + SysFreeString(code); + return; + } + set_download_state(window->doc_obj, 1); V_VT(&v) = VT_EMPTY; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 803d505..d8cef24 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6874,7 +6874,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); test_travellog(doc); } - test_put_href(doc, FALSE, NULL, "javascript:external&&undefined", TRUE, FALSE, 0); + test_put_href(doc, FALSE, NULL, "javascript:external%20&&undefined", TRUE, FALSE, 0); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0);

1 0

Jacek Caban : mshtml: Share IHTMLFrameBase tests between iframe and frame element tests.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 7e35abdd028fede55728f8cfae880a44f87f4b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e35abdd028fede55728f8cfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:03:59 2012 +0200 mshtml: Share IHTMLFrameBase tests between iframe and frame element tests. --- dlls/mshtml/tests/dom.c | 112 +++++++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1eed229..eef5114 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4182,6 +4182,66 @@ static void test_mime_types_col(IOmNavigator *nav) ok(!ref, "ref=%d\n", ref); } +#define test_framebase_name(a,b) _test_framebase_name(__LINE__,a,b) +static void _test_framebase_name(unsigned line, IHTMLElement *elem, const char *name) +{ + BSTR str = (void*)0xdeadbeef; + IHTMLFrameBase *fbase; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + hres = IHTMLFrameBase_get_name(fbase, &str); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_name failed: 0x%08x\n", hres); + if(name) + ok_(__FILE__,line)(!strcmp_wa(str, name), "name = %s, expected %s\n", wine_dbgstr_w(str), name); + else + ok_(__FILE__,line)(!str, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFrameBase_Release(fbase); +} + +static void test_framebase(IUnknown *unk) +{ + IHTMLFrameBase *fbase; + BSTR str; + HRESULT hres; + + /* get/put scrolling */ + hres = IUnknown_QueryInterface(unk, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + hres = IHTMLFrameBase_get_scrolling(fbase, &str); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(!strcmp_wa(str, "auto"), "get_scrolling should have given 'auto', gave: %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("no"); + hres = IHTMLFrameBase_put_scrolling(fbase, str); + ok(hres == S_OK, "IHTMLFrameBase_put_scrolling failed: 0x%08x\n", hres); + SysFreeString(str); + + hres = IHTMLFrameBase_get_scrolling(fbase, &str); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(!strcmp_wa(str, "no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("junk"); + hres = IHTMLFrameBase_put_scrolling(fbase, str); + ok(hres == E_INVALIDARG, "IHTMLFrameBase_put_scrolling should have failed " + "with E_INVALIDARG, instead: 0x%08x\n", hres); + SysFreeString(str); + + hres = IHTMLFrameBase_get_scrolling(fbase, &str); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(!strcmp_wa(str, "no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFrameBase_Release(fbase); +} + #define test_language_string(a,b) _test_language_string(__LINE__,a,b) static void _test_language_string(unsigned line, const WCHAR *lang, LCID lcid) { @@ -4938,6 +4998,7 @@ static void test_iframe_elem(IHTMLElement *elem) }; test_frame_doc((IUnknown*)elem, TRUE); + test_framebase((IUnknown*)elem); content_window = get_frame_content_window((IUnknown*)elem); test_window_length(content_window, 0); @@ -6111,8 +6172,6 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLWindow2 *window; IHTMLFramesCollection2 *frames; IHTMLElement *elem; - IHTMLFrameBase *fbase; - BSTR str; HRESULT hres; window = get_doc_window(doc); @@ -6142,57 +6201,16 @@ static void test_frameset(IHTMLDocument2 *doc) elem = get_doc_elem_by_id(doc, "nm1"); test_elem_id((IUnknown*)elem, "fr1"); - /* get/put scrolling */ - hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); - - hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); - ok(!strcmp_wa(str, "auto"), "get_scrolling should have given 'auto', gave: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - str = a2bstr("no"); - hres = IHTMLFrameBase_put_scrolling(fbase, str); - ok(hres == S_OK, "IHTMLFrameBase_put_scrolling failed: 0x%08x\n", hres); - SysFreeString(str); - - hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); - ok(!strcmp_wa(str, "no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - str = a2bstr("junk"); - hres = IHTMLFrameBase_put_scrolling(fbase, str); - ok(hres == E_INVALIDARG, "IHTMLFrameBase_put_scrolling should have failed " - "with E_INVALIDARG, instead: 0x%08x\n", hres); - SysFreeString(str); - - hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); - ok(!strcmp_wa(str, "no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - /* get_name */ - hres = IHTMLFrameBase_get_name(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_name failed: 0x%08x\n", hres); - ok(!strcmp_wa(str, "nm1"), "get_name should have given 'nm1', gave: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + test_framebase((IUnknown*)elem); + test_framebase_name(elem, "nm1"); - IHTMLFrameBase_Release(fbase); IHTMLElement_Release(elem); /* get_name with no name attr */ elem = get_doc_elem_by_id(doc, "fr3"); - hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); - - hres = IHTMLFrameBase_get_name(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_name failed: 0x%08x\n", hres); - ok(str == NULL, "get_name should have given 'null', gave: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IHTMLFrameBase_Release(fbase); + test_framebase_name(elem, NULL); IHTMLElement_Release(elem); + IHTMLWindow2_Release(window); }

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase::frameBorder implementation.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 39bc0bcf2551030d9d76a6a178ef52d5a40cc22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bc0bcf2551030d9d76a6a17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 14:04:19 2012 +0200 mshtml: Added IHTMLFrameBase::frameBorder implementation. --- dlls/mshtml/htmlframebase.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index a5344ec..bc00761 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -190,15 +190,49 @@ static HRESULT WINAPI HTMLFrameBase_get_border(IHTMLFrameBase *iface, VARIANT *p static HRESULT WINAPI HTMLFrameBase_put_frameBorder(IHTMLFrameBase *iface, BSTR v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached ns frame object\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&nsstr, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetFrameBorder(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetFrameBorder(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetFrameBorder failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFrameBase_get_frameBorder(IHTMLFrameBase *iface, BSTR *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached ns frame object\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetFrameBorder(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetFrameBorder(This->nsiframe, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLFrameBase_put_frameSpacing(IHTMLFrameBase *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index eef5114..8907a98 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4239,6 +4239,19 @@ static void test_framebase(IUnknown *unk) ok(!strcmp_wa(str, "no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLFrameBase_get_frameBorder(fbase, &str); + ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); + ok(!str, "frameBorder = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("1"); + hres = IHTMLFrameBase_put_frameBorder(fbase, str); + ok(hres == S_OK, "put_frameBorder failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLFrameBase_get_frameBorder(fbase, &str); + ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); + ok(!strcmp_wa(str, "1"), "frameBorder = %s, expected \"1\"\n", wine_dbgstr_w(str)); + IHTMLFrameBase_Release(fbase); }

1 0

Józef Kucia : d3dx9: Allow D3DX_DEFAULT to be passed as srclevel to D3DXFilterTexture.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 2c1968aef99fd51e715c8ed89e23fc25e249416a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1968aef99fd51e715c8ed89… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Jul 23 14:37:45 2012 +0200 d3dx9: Allow D3DX_DEFAULT to be passed as srclevel to D3DXFilterTexture. --- dlls/d3dx9_36/tests/texture.c | 3 +++ dlls/d3dx9_36/texture.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 95e1dc5..1edfe9e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -758,6 +758,9 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, D3DX_DEFAULT, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index ec9bad9..2d94f72 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -78,7 +78,9 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, if ((filter & 0xFFFF) > D3DX_FILTER_BOX && filter != D3DX_DEFAULT) return D3DERR_INVALIDCALL; - if (srclevel >= IDirect3DBaseTexture9_GetLevelCount(texture)) + if (srclevel == D3DX_DEFAULT) + srclevel = 0; + else if (srclevel >= IDirect3DBaseTexture9_GetLevelCount(texture)) return D3DERR_INVALIDCALL; switch (type = IDirect3DBaseTexture9_GetType(texture))

1 0

Alexandre Julliard : opengl32: Load GLU functions from glu32. dll instead of the Unix library.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 719db58a9276ffa5f81ca3e7df79f540ee921a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=719db58a9276ffa5f81ca3e7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 15:51:14 2012 +0200 opengl32: Load GLU functions from glu32.dll instead of the Unix library. --- dlls/opengl32/wgl.c | 117 +++++++++++++++++---------------------------------- 1 files changed, 39 insertions(+), 78 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 86903c4..ca953e0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -34,36 +34,16 @@ #include "winnt.h" #include "opengl_ext.h" -#ifdef HAVE_GL_GLU_H -#undef far -#undef near -#include <GL/glu.h> -#endif #define WGL_WGLEXT_PROTOTYPES #include "wine/wglext.h" #include "wine/gdi_driver.h" #include "wine/wgl_driver.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -#ifdef SONAME_LIBGLU -#define MAKE_FUNCPTR(f) static typeof(f) * p##f; -MAKE_FUNCPTR(gluNewTess) -MAKE_FUNCPTR(gluDeleteTess) -MAKE_FUNCPTR(gluTessBeginContour) -MAKE_FUNCPTR(gluTessBeginPolygon) -MAKE_FUNCPTR(gluTessCallback) -MAKE_FUNCPTR(gluTessEndContour) -MAKE_FUNCPTR(gluTessEndPolygon) -MAKE_FUNCPTR(gluTessVertex) -#undef MAKE_FUNCPTR -#endif /* SONAME_LIBGLU */ - static HMODULE opengl32_handle; -static void* libglu_handle = NULL; extern struct opengl_funcs null_opengl_funcs; @@ -1198,42 +1178,51 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase return wglUseFontBitmaps_common( hdc, first, count, listBase, TRUE ); } -#ifdef SONAME_LIBGLU +/* FIXME: should probably have a glu.h header */ + +typedef struct GLUtesselator GLUtesselator; +typedef void (WINAPI *_GLUfuncptr)(void); + +#define GLU_TESS_BEGIN 100100 +#define GLU_TESS_VERTEX 100101 +#define GLU_TESS_END 100102 + +static GLUtesselator * (WINAPI *pgluNewTess)(void); +static void (WINAPI *pgluDeleteTess)(GLUtesselator *tess); +static void (WINAPI *pgluTessBeginPolygon)(GLUtesselator *tess, void *polygon_data); +static void (WINAPI *pgluTessEndPolygon)(GLUtesselator *tess); +static void (WINAPI *pgluTessCallback)(GLUtesselator *tess, GLenum which, _GLUfuncptr fn); +static void (WINAPI *pgluTessBeginContour)(GLUtesselator *tess); +static void (WINAPI *pgluTessEndContour)(GLUtesselator *tess); +static void (WINAPI *pgluTessVertex)(GLUtesselator *tess, GLdouble *location, GLvoid* data); -static void *load_libglu(void) +static HMODULE load_libglu(void) { + static const WCHAR glu32W[] = {'g','l','u','3','2','.','d','l','l',0}; static int already_loaded; - void *handle; + static HMODULE module; - if (already_loaded) return libglu_handle; + if (already_loaded) return module; already_loaded = 1; - TRACE("Trying to load GLU library: %s\n", SONAME_LIBGLU); - handle = wine_dlopen(SONAME_LIBGLU, RTLD_NOW, NULL, 0); - if (!handle) + TRACE("Trying to load GLU library\n"); + module = LoadLibraryW( glu32W ); + if (!module) { - WARN("Failed to load %s\n", SONAME_LIBGLU); + WARN("Failed to load glu32\n"); return NULL; } - -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(handle, #f, NULL, 0)) == NULL) goto sym_not_found; -LOAD_FUNCPTR(gluNewTess) -LOAD_FUNCPTR(gluDeleteTess) -LOAD_FUNCPTR(gluTessBeginContour) -LOAD_FUNCPTR(gluTessBeginPolygon) -LOAD_FUNCPTR(gluTessCallback) -LOAD_FUNCPTR(gluTessEndContour) -LOAD_FUNCPTR(gluTessEndPolygon) -LOAD_FUNCPTR(gluTessVertex) +#define LOAD_FUNCPTR(f) p##f = (void *)GetProcAddress( module, #f ) + LOAD_FUNCPTR(gluNewTess); + LOAD_FUNCPTR(gluDeleteTess); + LOAD_FUNCPTR(gluTessBeginContour); + LOAD_FUNCPTR(gluTessBeginPolygon); + LOAD_FUNCPTR(gluTessCallback); + LOAD_FUNCPTR(gluTessEndContour); + LOAD_FUNCPTR(gluTessEndPolygon); + LOAD_FUNCPTR(gluTessVertex); #undef LOAD_FUNCPTR - libglu_handle = handle; - return handle; - -sym_not_found: - WARN("Unable to load function ptrs from libGLU\n"); - /* Close the library as we won't use it */ - wine_dlclose(handle, NULL, 0); - return NULL; + return module; } static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) @@ -1243,7 +1232,7 @@ static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) vertex[2] = 0.0; } -static void tess_callback_vertex(GLvoid *vertex) +static void WINAPI tess_callback_vertex(GLvoid *vertex) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; GLdouble *dbl = vertex; @@ -1251,14 +1240,14 @@ static void tess_callback_vertex(GLvoid *vertex) funcs->gl.p_glVertex3dv(vertex); } -static void tess_callback_begin(GLenum which) +static void WINAPI tess_callback_begin(GLenum which) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("%d\n", which); funcs->gl.p_glBegin(which); } -static void tess_callback_end(void) +static void WINAPI tess_callback_end(void) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("\n"); @@ -1292,7 +1281,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if (!load_libglu()) { - ERR("libGLU is required for this function but isn't loaded\n"); + ERR("glu32 is required for this function but isn't available\n"); return FALSE; } @@ -1425,24 +1414,6 @@ error_in_list: } -#else /* SONAME_LIBGLU */ - -static BOOL wglUseFontOutlines_common(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase, - FLOAT deviation, - FLOAT extrusion, - int format, - LPGLYPHMETRICSFLOAT lpgmf, - BOOL unicode) -{ - FIXME("Unable to compile in wglUseFontOutlines support without GL/glu.h\n"); - return FALSE; -} - -#endif /* SONAME_LIBGLU */ - /*********************************************************************** * wglUseFontOutlinesA (OPENGL32.@) */ @@ -1560,13 +1531,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) return GdiSwapBuffers(hdc); } -/**********************************************************************/ - -static void process_detach(void) -{ - if (libglu_handle) wine_dlclose(libglu_handle, NULL, 0); -} - /*********************************************************************** * OpenGL initialisation routine */ @@ -1582,9 +1546,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_THREAD_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; break; - case DLL_PROCESS_DETACH: - process_detach(); - break; } return TRUE; }

1 0

Jacek Caban : jscript: Don' t expose properties belonging to Object prototype from Object instance.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: a2c2103cd3c78e3a570d80bba27b1355ce543465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c2103cd3c78e3a570d80bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:53:22 2012 +0200 jscript: Don't expose properties belonging to Object prototype from Object instance. --- dlls/jscript/object.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index ce43eb5..173c227 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -211,6 +211,14 @@ static const builtin_info_t Object_info = { NULL }; +static const builtin_info_t ObjectInst_info = { + JSCLASS_OBJECT, + {NULL, Object_value, 0}, + 0, NULL, + Object_destructor, + NULL +}; + static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -282,7 +290,7 @@ HRESULT create_object(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t **ret) if(!object) return E_OUTOFMEMORY; - hres = init_dispex_from_constr(object, ctx, &Object_info, constr ? constr : ctx->object_constr); + hres = init_dispex_from_constr(object, ctx, &ObjectInst_info, constr ? constr : ctx->object_constr); if(FAILED(hres)) { heap_free(object); return hres;

1 0

Jacek Caban : jscript: Don' t expose properties that belong to function prototype from function instance .
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 15a83f0ff50d313e45ace2d31c0676e2f6145d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a83f0ff50d313e45ace2d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:53:38 2012 +0200 jscript: Don't expose properties that belong to function prototype from function instance. --- dlls/jscript/function.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1ce1124..23ce98c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -571,6 +571,20 @@ static const builtin_info_t Function_info = { NULL }; +static const builtin_prop_t FunctionInst_props[] = { + {argumentsW, Function_arguments, 0}, + {lengthW, Function_length, 0} +}; + +static const builtin_info_t FunctionInst_info = { + JSCLASS_FUNCTION, + {NULL, Function_value, 0}, + sizeof(FunctionInst_props)/sizeof(*FunctionInst_props), + FunctionInst_props, + Function_destructor, + NULL +}; + static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_info, DWORD flags, BOOL funcprot, jsdisp_t *prototype, FunctionInstance **ret) { @@ -582,11 +596,11 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ return E_OUTOFMEMORY; if(funcprot) - hres = init_dispex(&function->dispex, ctx, &Function_info, prototype); + hres = init_dispex(&function->dispex, ctx, builtin_info, prototype); else if(builtin_info) hres = init_dispex_from_constr(&function->dispex, ctx, builtin_info, ctx->function_constr); else - hres = init_dispex_from_constr(&function->dispex, ctx, &Function_info, ctx->function_constr); + hres = init_dispex_from_constr(&function->dispex, ctx, &FunctionInst_info, ctx->function_constr); if(FAILED(hres)) return hres; @@ -835,14 +849,14 @@ HRESULT init_function_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) static const WCHAR FunctionW[] = {'F','u','n','c','t','i','o','n',0}; - hres = create_function(ctx, NULL, PROPF_CONSTR, TRUE, object_prototype, &prot); + hres = create_function(ctx, &Function_info, PROPF_CONSTR, TRUE, object_prototype, &prot); if(FAILED(hres)) return hres; prot->value_proc = FunctionProt_value; prot->name = prototypeW; - hres = create_function(ctx, NULL, PROPF_CONSTR|1, TRUE, &prot->dispex, &constr); + hres = create_function(ctx, &FunctionInst_info, PROPF_CONSTR|1, TRUE, &prot->dispex, &constr); if(SUCCEEDED(hres)) { constr->value_proc = FunctionConstr_value; constr->name = FunctionW;

1 0