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

Józef Kucia : d3dx9: Allow D3DX_DEFAULT to be passed as srclevel to D3DXFilterTexture.
by Alexandre Julliard July 23, 2012

July 23, 2012

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 : gdi32: Work around a gcc array out of bounds warning.
by Alexandre Julliard July 23, 2012

July 23, 2012

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

Francois Gouget : d3dcompiler_43: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 28e06e3fb08c3ada75f4acf0eca83d013323089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e06e3fb08c3ada75f4acf0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 23 18:40:29 2012 +0200 d3dcompiler_43: Add a trailing '\n' to a couple of Wine traces. --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2072a66..915871d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1442,7 +1442,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig type = left->data_type; else { - FIXME("Assignments with writemasks not supported yet."); + FIXME("Assignments with writemasks not supported yet.\n"); type = NULL; } assign->node.type = HLSL_IR_ASSIGNMENT; @@ -1478,7 +1478,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig converted_rhs = implicit_conversion(rhs, type, &rhs->loc); if (!converted_rhs) { - ERR("Couldn't implicitly convert expression to %s.", debug_hlsl_type(type)); + ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); return NULL;

1 0

Jacek Caban : jscript: Added more tests.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: de6e95213ae988c7accc4e04bce5ecc97d83a15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6e95213ae988c7accc4e04b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 15:54:01 2012 +0200 jscript: Added more tests. --- dlls/jscript/tests/api.js | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f6b22d3..f8885dd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -198,6 +198,19 @@ tmp = "aA1~`!@#$%^&*()_+=-][{}';:/.,<>?\|"; ok(escape(tmp) === "aA1%7E%60%21@%23%24%25%5E%26*%28%29_+%3D-%5D%5B%7B%7D%27%3B%3A/.%2C%3C%3E%3F%7C", "escape('" + tmp + "') = " + escape(tmp)); ok(unescape(escape(tmp)) === tmp, "unescape(escape('" + tmp + "')) = " + unescape(escape(tmp))); +ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty('toString') is false"); +ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); +ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); + +obj = new Object(); + +ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); +ok(!obj.hasOwnProperty('isPrototypeOf'), "obj.hasOwnProperty('isPrototypeOf') is true"); +ok(!Object.hasOwnProperty('toString'), "Object.hasOwnProperty('toString') is true"); +ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeOf') is true"); +ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); +ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString; @@ -225,6 +238,11 @@ ok(tmp === "[object Object]", "toString.call(arguments) = " + tmp); tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); +function TSTestConstr() {} +TSTestConstr.prototype = { toString: function() { return "test"; } }; +obj = new TSTestConstr(); +ok(obj.toString() === "test", "obj.toString() = " + obj.toString()); + ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean");

1 0

Alexandre Julliard : opengl32: Load GLU functions from glu32. dll instead of the Unix library.
by Alexandre Julliard July 23, 2012

July 23, 2012

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 : mshtml: Added IHTMLFrameBase::frameBorder implementation.
by Alexandre Julliard July 23, 2012

July 23, 2012

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

Jacek Caban : mshtml: Share IHTMLFrameBase tests between iframe and frame element tests.
by Alexandre Julliard July 23, 2012

July 23, 2012

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

Dmitry Timoshkov : windowscodecs: Add support for adding trasparent color to generated palettes.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 106e7fb5896e1d0d4a67a6f043082ad7b74e3cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106e7fb5896e1d0d4a67a6f04… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:47:57 2012 +0900 windowscodecs: Add support for adding trasparent color to generated palettes. --- dlls/windowscodecs/palette.c | 82 ++++++++++++++++++++---------- dlls/windowscodecs/tests/palette.c | 98 +++++++++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=106e7fb5896e1d0d4a67a…

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone252 palette.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 0be2718baae2c0da05934eaf420a8ea68da60ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be2718baae2c0da05934eaf4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:46:54 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone252 palette. --- dlls/windowscodecs/palette.c | 26 ++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 21b6b36..803a138 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -260,6 +260,27 @@ static WICColor *generate_halftone216_palette(UINT *count) return entries; } +static WICColor *generate_halftone252_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 252; + entries = HeapAlloc(GetProcessHeap(), 0, 252 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 252; i++) + { + static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values_rb[i%6]; + entries[i] |= halftone_values_g[(i/6)%7] << 8; + entries[i] |= halftone_values_rb[(i/42)%6] << 16; + } + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -345,6 +366,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone252: + colors = generate_halftone252_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 53d64d4..ce29b6b 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -283,6 +283,23 @@ static void generate_halftone216_palette(DWORD *entries, UINT count) } } +static void generate_halftone252_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; + UINT i; + + assert(count == 252); + + for (i = 0; i < 252; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values_rb[i%6]; + entries[i] |= halftone_values_g[(i/6)%7] << 8; + entries[i] |= halftone_values_rb[(i/42)%6] << 16; + } +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -320,6 +337,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, { WICBitmapPaletteTypeFixedHalftone216, 0, 0, 224, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone252, 0, 0, 252, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -385,6 +403,8 @@ static void test_predefined_palette(void) generate_halftone125_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone216) generate_halftone216_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone252) + generate_halftone252_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone216 palette.
by Alexandre Julliard July 23, 2012

July 23, 2012

Module: wine Branch: master Commit: 87b23de9bb6de093a8161924135b6caa51db29d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b23de9bb6de093a81619241… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:45:53 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone216 palette. --- dlls/windowscodecs/palette.c | 33 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index a4124a7..21b6b36 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -232,6 +232,34 @@ static WICColor *generate_halftone125_palette(UINT *count) return entries; } +static WICColor *generate_halftone216_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 224; + entries = HeapAlloc(GetProcessHeap(), 0, 224 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 216; i++) + { + static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%6]; + entries[i] |= halftone_values[(i/6)%6] << 8; + entries[i] |= halftone_values[(i/36)%6] << 16; + } + + for (i = 216; i < 224; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-216]; + } + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -312,6 +340,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone216: + colors = generate_halftone216_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 32dbfc9..53d64d4 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -259,6 +259,30 @@ static void generate_halftone125_palette(DWORD *entries, UINT count) entries[i] = 0xffc0c0c0; } +static void generate_halftone216_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; + UINT i; + + assert(count == 224); + + for (i = 0; i < 216; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%6]; + entries[i] |= halftone_values[(i/6)%6] << 8; + entries[i] |= halftone_values[(i/36)%6] << 16; + } + + for (i = 216; i < 224; i++) + { + static const DWORD halftone[8] = { 0xc0c0c0, 0x808080, 0x800000, 0x008000, + 0x000080, 0x808000, 0x800080, 0x008080 }; + entries[i] = 0xff000000; + entries[i] |= halftone[i-216]; + } +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -295,6 +319,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone216, 0, 0, 224, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -358,6 +383,8 @@ static void test_predefined_palette(void) generate_halftone64_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone125) generate_halftone125_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone216) + generate_halftone216_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0