October 2012 - Wine-commits

Nikolay Sivov : dwrite: Added basic GetFirstMatchingFont() for font family.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 22508806fc8c2abef7816c4f5c06dc0917a6e5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22508806fc8c2abef7816c4f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:18:32 2012 -0400 dwrite: Added basic GetFirstMatchingFont() for font family. --- dlls/dwrite/font.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bdc84ee..4b697e9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -607,8 +607,16 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFont **font) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - FIXME("(%p)->(%d %d %d %p): stub\n", This, weight, stretch, style, font); - return E_NOTIMPL; + LOGFONTW lf; + + TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = weight; + lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; + strcpyW(lf.lfFaceName, This->familyname); + + return create_font_from_logfont(&lf, font); } static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight,

1 0

Nikolay Sivov : dwrite: Separate format data and keep it in both layout and text format.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 2e977e112fc96f1d3eead6f67ae19c3664b2ab8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e977e112fc96f1d3eead6f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:32:34 2012 -0400 dwrite: Separate format data and keep it in both layout and text format. --- dlls/dwrite/layout.c | 54 +++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 91360ee..a2d1ef9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -32,17 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -struct dwrite_textlayout { - IDWriteTextLayout IDWriteTextLayout_iface; - LONG ref; - - WCHAR *str; -}; - -struct dwrite_textformat { - IDWriteTextFormat IDWriteTextFormat_iface; - LONG ref; - +struct dwrite_textformat_data { WCHAR *family_name; WCHAR *locale; @@ -55,6 +45,27 @@ struct dwrite_textformat { IDWriteFontCollection *collection; }; +struct dwrite_textlayout { + IDWriteTextLayout IDWriteTextLayout_iface; + LONG ref; + + WCHAR *str; + struct dwrite_textformat_data format; +}; + +struct dwrite_textformat { + IDWriteTextFormat IDWriteTextFormat_iface; + LONG ref; + struct dwrite_textformat_data format; +}; + +static void release_format_data(struct dwrite_textformat_data *data) +{ + if (data->collection) IDWriteFontCollection_Release(data->collection); + heap_free(data->family_name); + heap_free(data->locale); +} + static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) { return CONTAINING_RECORD(iface, struct dwrite_textlayout, IDWriteTextLayout_iface); @@ -665,6 +676,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layo This->IDWriteTextLayout_iface.lpVtbl = &dwritetextlayoutvtbl; This->ref = 1; This->str = heap_strdupnW(str, len); + memset(&This->format, 0, sizeof(This->format)); *layout = &This->IDWriteTextLayout_iface; @@ -707,9 +719,7 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) if (!ref) { - if (This->collection) IDWriteFontCollection_Release(This->collection); - heap_free(This->family_name); - heap_free(This->locale); + release_format_data(&This->format); heap_free(This); } @@ -838,7 +848,7 @@ static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *ifac TRACE("(%p)->(%p)\n", This, collection); - *collection = This->collection; + *collection = This->format.collection; IDWriteFontCollection_AddRef(*collection); return S_OK; @@ -943,20 +953,20 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; - This->family_name = heap_strdupW(family_name); - This->locale = heap_strdupW(locale); - This->weight = weight; - This->style = style; - This->size = size; + This->format.family_name = heap_strdupW(family_name); + This->format.locale = heap_strdupW(locale); + This->format.weight = weight; + This->format.style = style; + This->format.size = size; if (collection) { - This->collection = collection; + This->format.collection = collection; IDWriteFontCollection_AddRef(collection); } else { - HRESULT hr = get_system_fontcollection(&This->collection); + HRESULT hr = get_system_fontcollection(&This->format.collection); if (hr != S_OK) { IDWriteTextFormat_Release(&This->IDWriteTextFormat_iface);

1 0

Christian Costa : d3dxof/tests: Document dump function and rename X files with .x extension.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 834512f186b9138d8e43dbc86b7da3cc74fdf742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834512f186b9138d8e43dbc86… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Oct 22 21:39:19 2012 +0200 d3dxof/tests: Document dump function and rename X files with .x extension. --- dlls/d3dxof/tests/d3dxof.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 6361317..182bf33 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -706,6 +706,8 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } +/* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents + * Useful for debug by comparing outputs from native and builtin dlls */ static void test_dump(void) { HRESULT hr; @@ -724,12 +726,12 @@ static void test_dump(void) } /* Dump data only if there is an object and a template */ - hFile = CreateFileA("objects.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileA("objects.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return; CloseHandle(hFile); - hFile = CreateFileA("templates.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileA("templates.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return;

1 0

Christian Costa : krnl386.exe: If we use operands order of AT&T asm syntax, we' d better use % for registers as in winedbg and GNU assembler to avoid confusion .
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 2a43bb22618ac4d2a29487414a55cfaac9a6b5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a43bb22618ac4d2a29487414… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Oct 22 21:29:21 2012 +0200 krnl386.exe: If we use operands order of AT&T asm syntax, we'd better use % for registers as in winedbg and GNU assembler to avoid confusion. --- dlls/krnl386.exe16/instr.c | 78 ++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 5db0b2b..59420ef 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -512,57 +512,57 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x0f: /* extended instruction */ switch(instr[1]) { - case 0x22: /* mov eax, crX */ + case 0x22: /* mov %eax, %crX */ switch (instr[2]) { - case 0xc0: - ERR("mov eax,cr0 at 0x%08x, EAX=0x%08x\n", - context->Eip,context->Eax ); + case 0xc0: + ERR("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", + context->Eip,context->Eax ); context->Eip += prefixlen+3; - return ExceptionContinueExecution; - default: - break; /*fallthrough to bad instruction handling */ - } - break; /*fallthrough to bad instruction handling */ - case 0x20: /* mov crX, eax */ + return ExceptionContinueExecution; + default: + break; /* Fallthrough to bad instruction handling */ + } + break; /* Fallthrough to bad instruction handling */ + case 0x20: /* mov %crX, %eax */ switch (instr[2]) { - case 0xe0: /* mov cr4, eax */ - /* CR4 register . See linux/arch/i386/mm/init.c, X86_CR4_ defs - * bit 0: VME Virtual Mode Exception ? - * bit 1: PVI Protected mode Virtual Interrupt - * bit 2: TSD Timestamp disable - * bit 3: DE Debugging extensions - * bit 4: PSE Page size extensions - * bit 5: PAE Physical address extension - * bit 6: MCE Machine check enable - * bit 7: PGE Enable global pages - * bit 8: PCE Enable performance counters at IPL3 - */ - ERR("mov cr4,eax at 0x%08x\n",context->Eip); + case 0xe0: /* mov %cr4, %eax */ + /* CR4 register: See linux/arch/i386/mm/init.c, X86_CR4_ defs + * bit 0: VME Virtual Mode Exception ? + * bit 1: PVI Protected mode Virtual Interrupt + * bit 2: TSD Timestamp disable + * bit 3: DE Debugging extensions + * bit 4: PSE Page size extensions + * bit 5: PAE Physical address extension + * bit 6: MCE Machine check enable + * bit 7: PGE Enable global pages + * bit 8: PCE Enable performance counters at IPL3 + */ + ERR("mov %%cr4, %%eax at 0x%08x\n",context->Eip); context->Eax = 0; context->Eip += prefixlen+3; - return ExceptionContinueExecution; - case 0xc0: /* mov cr0, eax */ - ERR("mov cr0,eax at 0x%08x\n",context->Eip); + return ExceptionContinueExecution; + case 0xc0: /* mov %cr0, %eax */ + ERR("mov %%cr0, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x10; /* FIXME: set more bits ? */ context->Eip += prefixlen+3; - return ExceptionContinueExecution; - default: /* fallthrough to illegal instruction */ - break; - } - /* fallthrough to illegal instruction */ - break; - case 0x21: /* mov drX, eax */ + return ExceptionContinueExecution; + default: /* Fallthrough to illegal instruction */ + break; + } + /* Fallthrough to illegal instruction */ + break; + case 0x21: /* mov %drX, %eax */ switch (instr[2]) { - case 0xc8: /* mov dr1, eax */ - TRACE("mov dr1,eax at 0x%08x\n",context->Eip); + case 0xc8: /* mov %dr1, %eax */ + TRACE("mov %%dr1, %%eax at 0x%08x\n",context->Eip); context->Eax = context->Dr1; context->Eip += prefixlen+3; return ExceptionContinueExecution; - case 0xf8: /* mov dr7, eax */ - TRACE("mov dr7,eax at 0x%08x\n",context->Eip); + case 0xf8: /* mov %dr7, %eax */ + TRACE("mov %%dr7, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x400; context->Eip += prefixlen+3; return ExceptionContinueExecution; @@ -570,10 +570,10 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; - case 0x23: /* mov eax drX */ + case 0x23: /* mov %eax, %drX */ switch (instr[2]) { - case 0xc8: /* mov eax, dr1 */ + case 0xc8: /* mov %eax, %dr1 */ context->Dr1 = context->Eax; context->Eip += prefixlen+3; return ExceptionContinueExecution;

1 0

Alexandre Julliard : Revert "winex11: Refuse to set the pixel format for HWND_MESSAGE windows."
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: f950f41bfe821879b9974f204c1f0e7ad26ebf89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f950f41bfe821879b9974f204… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 23 16:34:57 2012 +0200 Revert "winex11: Refuse to set the pixel format for HWND_MESSAGE windows." This reverts commit 53806917a3fc32460201a40a9edd6d8d24983c25. Tests show that this is allowed. --- dlls/opengl32/tests/opengl.c | 79 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 12 ++---- 2 files changed, 83 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4f799d2..02a72c8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1110,6 +1110,84 @@ static void test_window_dc(void) DestroyWindow(window); } +static void test_message_window(void) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window; + RECT vp, r; + HGLRC ctx; + BOOL ret; + HDC dc; + GLenum glerr; + + window = CreateWindowA("static", "opengl32_test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, HWND_MESSAGE, 0, 0, 0); + if (!window) + { + win_skip( "HWND_MESSAGE not supported\n" ); + return; + } + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + GetClientRect(window, &r); + glGetIntegerv(GL_VIEWPORT, (GLint *)&vp); + ok(EqualRect(&r, &vp), "Viewport not equal to client rect.\n"); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + glerr = glGetError(); + ok(glerr == GL_NO_ERROR, "Failed glClear, error %#x.\n", glerr); + ret = SwapBuffers(dc); + ok(ret, "Failed SwapBuffers, error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#x.\n", GetLastError()); + + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window, dc); + DestroyWindow(window); +} + static void test_destroy(HDC oldhdc) { PIXELFORMATDESCRIPTOR pf_desc = @@ -1458,6 +1536,7 @@ START_TEST(opengl) test_bitmap_rendering( FALSE ); test_minimized(); test_window_dc(); + test_message_window(); test_dc(hwnd, hdc); hglrc = wglCreateContext(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7c30ce0..61aff532 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1170,9 +1170,9 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) gl->drawable = 0; - if (parent == GetDesktopWindow()) /* top-level window */ + if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { - Window xparent = X11DRV_get_whole_window( hwnd ); + Window parent = X11DRV_get_whole_window( hwnd ); gl->type = DC_GL_WINDOW; gl->colormap = XCreateColormap( gdi_display, root_window, gl->visual->visual, @@ -1185,8 +1185,8 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) attrib.backing_store = NotUseful; /* put the initial rect outside of the window, it will be moved into place by SetWindowPos */ OffsetRect( &gl->rect, gl->rect.right, gl->rect.bottom ); - if (xparent) - gl->drawable = XCreateWindow( gdi_display, xparent, gl->rect.left, gl->rect.top, + if (parent) + gl->drawable = XCreateWindow( gdi_display, parent, gl->rect.left, gl->rect.top, gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top, 0, default_visual.depth, InputOutput, gl->visual->visual, CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, @@ -1196,10 +1196,6 @@ static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) else XFreeColormap( gdi_display, gl->colormap ); } - else if (!GetAncestor( parent, GA_PARENT )) - { - FIXME( "can't set format of HWND_MESSAGE window %p\n", hwnd ); - } #ifdef SONAME_LIBXCOMPOSITE else if(usexcomposite) {

1 0

Jacek Caban : mshtml: Added IHTMLStyle::clear property implementation.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 04c97d08ebcd6762346bde625a882e1dc75f58b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c97d08ebcd6762346bde625… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 13:41:13 2012 +0200 mshtml: Added IHTMLStyle::clear property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cb164dc..6427bee 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,6 +91,8 @@ static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrBottom[] = {'b','o','t','t','o','m',0}; +static const WCHAR attrClear[] = + {'c','l','e','a','r',0}; static const WCHAR attrClip[] = {'c','l','i','p',0}; static const WCHAR attrColor[] = @@ -212,6 +214,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, + {attrClear, DISPID_IHTMLSTYLE_CLEAR}, {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -2063,15 +2066,19 @@ static HRESULT WINAPI HTMLStyle_get_styleFloat(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_clear(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_CLEAR, v, 0); } static HRESULT WINAPI HTMLStyle_get_clear(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_CLEAR, p); } static HRESULT WINAPI HTMLStyle_put_display(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 571931b..0a45e05 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -61,6 +61,7 @@ typedef enum { STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_BOTTOM, + STYLEID_CLEAR, STYLEID_CLIP, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 0584ef4..fd0f78e 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1910,6 +1910,21 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "rect(0px 1px 500px 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* clear */ + hres = IHTMLStyle_get_clear(style, &str); + ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(!str, "clear = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("both"); + hres = IHTMLStyle_put_clear(style, str); + ok(hres == S_OK, "put_clear failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_clear(style, &str); + ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(!strcmp_wa(str, "both"), "clear = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* pageBreakAfter */ hres = IHTMLStyle_get_pageBreakAfter(style, &str); ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres);

1 0

Józef Kucia : d3dx9/tests: Only release a texture when it was created.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: cdc9f283fb77738af1e4c3efa47dcd5f3f974edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9f283fb77738af1e4c3efa… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:26 2012 +0200 d3dx9/tests: Only release a texture when it was created. --- dlls/d3dx9_36/tests/texture.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3c2cd95..997b0c3 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -964,12 +964,12 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DTexture9_Release(tex); - hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1006,11 +1006,11 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } IDirect3DTexture9_UnlockRect(tex, 0); } + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DTexture9_Release(tex); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1117,12 +1117,12 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DCubeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateCubeTexture(device, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1162,11 +1162,11 @@ static void test_D3DXFillCubeTexture(IDirect3DDevice9 *device) IDirect3DCubeTexture9_UnlockRect(tex, f, 0); } } + + IDirect3DCubeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DCubeTexture9_Release(tex); } static void WINAPI fillfunc_volume(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord, @@ -1232,12 +1232,12 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } size >>= 1; } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DVolumeTexture9_Release(tex); - hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 4, 1, 0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &tex, NULL); @@ -1277,11 +1277,11 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device) } IDirect3DVolumeTexture9_UnlockBox(tex, 0); } + + IDirect3DVolumeTexture9_Release(tex); } else skip("Failed to create texture\n"); - - IDirect3DVolumeTexture9_Release(tex); } static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device)

1 0

Józef Kucia : d3dx9: Introduce a separate pixel format type for compressed pixel formats.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 84935d4312d094b21247e1d2dd4fcba2cbb1a082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84935d4312d094b21247e1d2d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:27 2012 +0200 d3dx9: Introduce a separate pixel format type for compressed pixel formats. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/surface.c | 29 ++++++++++------------------- dlls/d3dx9_36/util.c | 10 +++++----- dlls/d3dx9_36/volume.c | 4 +--- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index bd208f8..a7efbee 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -47,6 +47,7 @@ struct volume /* for internal use */ enum format_type { FORMAT_ARGB, /* unsigned */ + FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index daa6cfe..d49730d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -307,7 +307,7 @@ static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT hei UINT *pitch, UINT *size) { const struct pixel_format_desc *format_desc = get_format_info(format); - if (format_desc->format == D3DFMT_UNKNOWN) + if (format_desc->type == FORMAT_UNKNOWN) return E_NOTIMPL; if (format_desc->block_width != 1 || format_desc->block_height != 1) @@ -460,7 +460,11 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (FAILED(hr)) return hr; pixel_format = get_format_info(src_desc.Format); - if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; + if (pixel_format->type != FORMAT_ARGB) + { + FIXME("Unsupported pixel format %#x\n", src_desc.Format); + return E_NOTIMPL; + } file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); @@ -1028,7 +1032,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, formatdesc = get_format_info(imginfo.Format); - if (formatdesc->format == D3DFMT_UNKNOWN) + if (formatdesc->type == FORMAT_UNKNOWN) { FIXME("Unsupported pixel format\n"); hr = D3DXERR_INVALIDDATA; @@ -1676,15 +1680,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (srcformatdesc->bytes_per_pixel > 4 || destformatdesc->bytes_per_pixel > 4 - || srcformatdesc->block_height != 1 || srcformatdesc->block_width != 1 - || destformatdesc->block_height != 1 || destformatdesc->block_width != 1) + if (srcformatdesc->type != FORMAT_ARGB || destformatdesc->type != FORMAT_ARGB) { FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); return E_NOTIMPL; } - if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) + if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; if ((filter & 0xf) == D3DX_FILTER_NONE) @@ -1952,7 +1954,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE src_format_desc = get_format_info(src_surface_desc.Format); dst_format_desc = get_format_info(d3d_pixel_format); - if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Unsupported pixel format conversion %#x -> %#x\n", src_surface_desc.Format, d3d_pixel_format); @@ -1960,17 +1962,6 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE goto cleanup; } - if (src_format_desc->bytes_per_pixel > 4 - || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) - { - FIXME("Format conversion missing %#x -> %#x\n", - src_surface_desc.Format, d3d_pixel_format); - hr = E_NOTIMPL; - goto cleanup; - } - size.width = width; size.height = height; size.depth = 1; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 72008a2..40972d8 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -65,11 +65,11 @@ static const struct pixel_format_desc formats[] = {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, - {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, - {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT4, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, + {D3DFMT_DXT5, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, {0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, }; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 2becba5..f773c7f 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -195,9 +195,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, { const BYTE *src_addr; - if (src_format_desc->bytes_per_pixel > 4 || dst_format_desc->bytes_per_pixel > 4 - || src_format_desc->block_height != 1 || src_format_desc->block_width != 1 - || dst_format_desc->block_height != 1 || dst_format_desc->block_width != 1) + if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) { FIXME("Pixel format conversion not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format);

1 0

Józef Kucia : d3dx9: Do not try to fill textures other than ARGB in fill texture functions.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 2c19f22c8a83cf0e1dfc8932b3e30047c4382898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c19f22c8a83cf0e1dfc8932b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:28 2012 +0200 d3dx9: Do not try to fill textures other than ARGB in fill texture functions. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8aa5f97..050bb7a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1344,7 +1344,7 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1746,7 +1746,7 @@ HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1840,7 +1840,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(LPDIRECT3DVOLUMETEXTURE9 texture, return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->format == D3DFMT_UNKNOWN) + if (format->type != FORMAT_ARGB) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL;

1 0

Józef Kucia : d3dx9/tests: Add tests for filling floating-point textures.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 15d642803bfb4dcb4cf64f840a7029257f29b362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d642803bfb4dcb4cf64f840… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Oct 22 17:20:29 2012 +0200 d3dx9/tests: Add tests for filling floating-point textures. --- dlls/d3dx9_36/tests/texture.c | 124 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 997b0c3..ba3b2c7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -85,6 +85,43 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +#define ADMITTED_ERROR 0.0001f + +static inline float relative_error(float expected, float got) +{ + return expected == 0.0f ? fabs(expected - got) : fabs(1.0f - got / expected); +} + +#define expect_vec4(expected, got) expect_vec4_(__LINE__, expected, got) +static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *got) +{ + ok_(__FILE__, line)(relative_error(expected->x, got->x) < ADMITTED_ERROR + && relative_error(expected->y, got->y) < ADMITTED_ERROR + && relative_error(expected->z, got->z) < ADMITTED_ERROR + && relative_error(expected->w, got->w) < ADMITTED_ERROR, + "Expected (%f, %f, %f, %f), got (%f, %f, %f, %f)\n", + expected->x, expected->y, expected->z, expected->w, + got->x, got->y, got->z, got->w); +} + +static inline float float_16_to_32(unsigned short in) +{ + unsigned short s = (in & 0x8000); + unsigned short e = (in & 0x7C00) >> 10; + unsigned short m = in & 0x3FF; + float sgn = (s ? -1.0f : 1.0f); + + if (e == 0) + { + if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ + else return sgn * powf(2, -14.0f) * (m / 1024.0f); + } + else + { + return sgn * powf(2, e - 15.0f) * (1.0f + (m / 1024.0f)); + } +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1011,6 +1048,93 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) } else skip("Failed to create texture\n"); + + /* test floating-point textures */ + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A16B16G16R16F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(WORD); + for (y = 0; y < 4; y++) + { + WORD *ptr = (WORD *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = float_16_to_32(*ptr++); + got.y = float_16_to_32(*ptr++); + got.z = float_16_to_32(*ptr++); + got.w = float_16_to_32(*ptr++); + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A16B16G16R16F texture\n"); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_A32B32G32R32F, + D3DPOOL_MANAGED, &tex, NULL); + + if (SUCCEEDED(hr)) + { + hr = D3DXFillTexture(tex, fillfunc, NULL); + todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); + if (SUCCEEDED(hr)) + { + pitch = lock_rect.Pitch / sizeof(float); + for (y = 0; y < 4; y++) + { + float *ptr = (float *)lock_rect.pBits + y * pitch; + for (x = 0; x < 4; x++) + { + D3DXVECTOR4 got, expected; + + got.x = *ptr++; + got.y = *ptr++; + got.z = *ptr++; + got.w = *ptr++; + + expected.x = (x + 0.5f) / 4.0f; + expected.y = (y + 0.5f) / 4.0f; + expected.z = 1.0f / 4.0f; + expected.w = 1.0f; + + todo_wine expect_vec4(&expected, &got); + } + } + + IDirect3DTexture9_UnlockRect(tex, 0); + } + else + skip("Failed to lock texture\n"); + + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create D3DFMT_A32B32G32R32F texture\n"); } static void WINAPI fillfunc_cube(D3DXVECTOR4 *value, const D3DXVECTOR3 *texcoord,

1 0