March 2008 - Wine-Commits - list.winehq.org

Paul Vriens : comctl32/tests: Free the library after use.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: ef5a4a447c1ad5dd66bcf5f6318b6121c4d06d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5a4a447c1ad5dd66bcf5f63… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 10 13:53:56 2008 +0100 comctl32/tests: Free the library after use. --- dlls/comctl32/tests/rebar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 0dd659c..e5bea38 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -835,6 +835,7 @@ START_TEST(rebar) MSG msg; RECT rc; + /* LoadLibrary is needed. This file has no references to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) @@ -879,4 +880,6 @@ START_TEST(rebar) DispatchMessageA(&msg); } DestroyWindow(hMainWnd); + + FreeLibrary(hComctl32); }

1 0

Alistair Leslie-Hughes : msxml3: Implemented IXMLDOMText_insertData.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 036953842d96a863bc96a070f9e3a29c4d28b5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=036953842d96a863bc96a070f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 10 21:33:58 2008 +1100 msxml3: Implemented IXMLDOMText_insertData. --- dlls/msxml3/tests/domdoc.c | 41 +++++++++++++++++++++++++++ dlls/msxml3/text.c | 66 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3c11be8..5d7fc0c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -653,6 +653,47 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); SysFreeString(str); + /* test insertData */ + str = SysAllocStringLen(NULL, 0); + r = IXMLDOMText_insertData(nodetext, -1, str); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, -1, NULL); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 1000, str); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 1000, NULL); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 0, NULL); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 0, str); + ok(r == S_OK, "ret %08x\n", r ); + SysFreeString(str); + + r = IXMLDOMText_insertData(nodetext, -1, _bstr_("Inserting")); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 1000, _bstr_("Inserting")); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 0, _bstr_("Begin ")); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 17, _bstr_("Middle")); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_insertData(nodetext, 39, _bstr_(" End")); + ok(r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMText_get_text(nodetext, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index eab8f26..92dec48 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -2,6 +2,7 @@ * DOM text node implementation * * Copyright 2006 Huw Davies + * Copyright 2007-2008 Alistair Leslie-Hughes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -617,8 +618,69 @@ static HRESULT WINAPI domtext_insertData( IXMLDOMText *iface, long offset, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pXmlContent; + BSTR sNewString; + HRESULT hr = S_FALSE; + long nLength = 0, nLengthP = 0; + xmlChar *str = NULL; + + TRACE("%p\n", This); + + /* If have a NULL or empty string, dont do anything. */ + if(SysStringLen(p) == 0) + return S_OK; + + if(offset < 0) + { + return E_INVALIDARG; + } + + pXmlContent = xmlNodeGetContent(pDOMNode->node); + if(pXmlContent) + { + BSTR sContent = bstr_from_xmlChar( pXmlContent ); + nLength = SysStringLen(sContent); + nLengthP = SysStringLen(p); + + if(nLength < offset) + { + SysFreeString(sContent); + xmlFree(pXmlContent); + + return E_INVALIDARG; + } + + sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); + if(sNewString) + { + if(offset > 0) + memcpy(sNewString, sContent, offset * sizeof(WCHAR)); + + memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); + + if(offset+nLengthP < nLength) + memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); + + sNewString[nLengthP + nLength] = 0; + + str = xmlChar_from_wchar((WCHAR*)sNewString); + if(str) + { + xmlNodeSetContent(pDOMNode->node, str); + hr = S_OK; + } + + SysFreeString(sNewString); + } + + SysFreeString(sContent); + + xmlFree(pXmlContent); + } + + return hr; } static HRESULT WINAPI domtext_deleteData(

1 0

Alistair Leslie-Hughes : msxml3: Support IXMLDOMCharacterData lookup in IXMLDOMText QueryInterface.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: b77af270673e0d97ce36826afbbccc855f024675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77af270673e0d97ce36826af… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 10 20:39:23 2008 +1100 msxml3: Support IXMLDOMCharacterData lookup in IXMLDOMText QueryInterface. --- dlls/msxml3/text.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index b446052..eab8f26 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -59,6 +59,7 @@ static HRESULT WINAPI domtext_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || + IsEqualGUID( riid, &IID_IXMLDOMCharacterData) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) {

1 0

Alexandre Julliard : winex11: Added an exception handler to catch bad pointers in X11DRV_SetImageBits.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 653c4140b49d3e42563bc69c1f0508f0e82178ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=653c4140b49d3e42563bc69c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 17:22:08 2008 +0100 winex11: Added an exception handler to catch bad pointers in X11DRV_SetImageBits. --- dlls/winex11.drv/dib.c | 151 ++++++++++++++++++++++++++---------------------- 1 files changed, 81 insertions(+), 70 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 91aab99..3d7bebf 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -39,7 +39,7 @@ #include "winbase.h" #include "wingdi.h" #include "x11drv.h" -#include "excpt.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(bitmap); @@ -3539,65 +3539,74 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask); /* Transfer the pixels */ - switch(descr->infoBpp) + __TRY { - case 1: - X11DRV_DIB_SetImageBits_1( descr->lines, descr->bits, descr->infoWidth, - descr->width, descr->xSrc, (int *)(descr->colorMap), - bmpImage, descr->dibpitch ); - break; - case 4: - if (descr->compression) { - X11DRV_DIB_SetImageBits_GetSubImage( descr, bmpImage); - X11DRV_DIB_SetImageBits_RLE4( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, (int *)(descr->colorMap), - bmpImage ); - } else - X11DRV_DIB_SetImageBits_4( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, (int*)(descr->colorMap), - bmpImage, descr->dibpitch ); - break; - case 8: - if (descr->compression) { - X11DRV_DIB_SetImageBits_GetSubImage( descr, bmpImage); - X11DRV_DIB_SetImageBits_RLE8( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, (int *)(descr->colorMap), - bmpImage ); - } else - X11DRV_DIB_SetImageBits_8( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, (int *)(descr->colorMap), - bmpImage, descr->dibpitch ); - break; - case 15: - case 16: - X11DRV_DIB_SetImageBits_16( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, descr->physDev, - descr->rMask, descr->gMask, descr->bMask, - bmpImage, descr->dibpitch); - break; - case 24: - X11DRV_DIB_SetImageBits_24( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, descr->physDev, - descr->rMask, descr->gMask, descr->bMask, - bmpImage, descr->dibpitch); - break; - case 32: - X11DRV_DIB_SetImageBits_32( descr->lines, descr->bits, - descr->infoWidth, descr->width, - descr->xSrc, descr->physDev, - descr->rMask, descr->gMask, descr->bMask, - bmpImage, descr->dibpitch); - break; - default: - WARN("(%d): Invalid depth\n", descr->infoBpp ); - break; + switch(descr->infoBpp) + { + case 1: + X11DRV_DIB_SetImageBits_1( descr->lines, descr->bits, descr->infoWidth, + descr->width, descr->xSrc, (int *)(descr->colorMap), + bmpImage, descr->dibpitch ); + break; + case 4: + if (descr->compression) { + X11DRV_DIB_SetImageBits_GetSubImage( descr, bmpImage); + X11DRV_DIB_SetImageBits_RLE4( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, (int *)(descr->colorMap), + bmpImage ); + } else + X11DRV_DIB_SetImageBits_4( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, (int*)(descr->colorMap), + bmpImage, descr->dibpitch ); + break; + case 8: + if (descr->compression) { + X11DRV_DIB_SetImageBits_GetSubImage( descr, bmpImage); + X11DRV_DIB_SetImageBits_RLE8( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, (int *)(descr->colorMap), + bmpImage ); + } else + X11DRV_DIB_SetImageBits_8( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, (int *)(descr->colorMap), + bmpImage, descr->dibpitch ); + break; + case 15: + case 16: + X11DRV_DIB_SetImageBits_16( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, descr->physDev, + descr->rMask, descr->gMask, descr->bMask, + bmpImage, descr->dibpitch); + break; + case 24: + X11DRV_DIB_SetImageBits_24( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, descr->physDev, + descr->rMask, descr->gMask, descr->bMask, + bmpImage, descr->dibpitch); + break; + case 32: + X11DRV_DIB_SetImageBits_32( descr->lines, descr->bits, + descr->infoWidth, descr->width, + descr->xSrc, descr->physDev, + descr->rMask, descr->gMask, descr->bMask, + bmpImage, descr->dibpitch); + break; + default: + WARN("(%d): Invalid depth\n", descr->infoBpp ); + break; + } } + __EXCEPT_PAGE_FAULT + { + WARN( "invalid bits pointer %p\n", descr->bits ); + lines = 0; + } + __ENDTRY TRACE("XPutImage(%ld,%p,%p,%d,%d,%d,%d,%d,%d)\n", descr->drawable, descr->gc, bmpImage, @@ -3605,20 +3614,22 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) descr->width, descr->height); wine_tsx11_lock(); -#ifdef HAVE_LIBXXSHM - if (descr->image && descr->useShm) + if (lines) { - XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, - descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, - descr->width, descr->height, FALSE ); - XSync( gdi_display, 0 ); - } - else +#ifdef HAVE_LIBXXSHM + if (descr->image && descr->useShm) + { + XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, + descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, + descr->width, descr->height, FALSE ); + XSync( gdi_display, 0 ); + } + else #endif - XPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, - descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, - descr->width, descr->height ); - + XPutImage( gdi_display, descr->drawable, descr->gc, bmpImage, + descr->xSrc, descr->ySrc, descr->xDest, descr->yDest, + descr->width, descr->height ); + } if (!descr->image) XDestroyImage( bmpImage ); wine_tsx11_unlock(); return lines;

1 0

Huw Davies : gdi32: Store the Windows path (if it's available) in the font registry entries.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 0436a5d14abf22af6ec10640496f9e0298a65f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0436a5d14abf22af6ec106404… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 10 12:31:43 2008 +0000 gdi32: Store the Windows path (if it's available) in the font registry entries. --- dlls/gdi32/freetype.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ab7760d..46a53c8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1807,14 +1807,21 @@ static void update_reg_entries(void) strcatW(valueW, face->StyleName); } strcatW(valueW, TrueType); - if((path = strrchr(face->file, '/')) == NULL) - path = face->file; + + file = wine_get_dos_file_name(face->file); + if(file) + len = strlenW(file) + 1; else - path++; - len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); + { + if((path = strrchr(face->file, '/')) == NULL) + path = face->file; + else + path++; + len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); - file = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, path, -1, file, len); + file = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, path, -1, file, len); + } RegSetValueExW(winnt_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); RegSetValueExW(win9x_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); RegSetValueExW(external_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR));

1 0

Alexandre Julliard : gdi32: Properly handle SetDIBits failure in StretchDIBits.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 5953a86ab180575c71f3d001e0c6a05cf8348c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5953a86ab180575c71f3d001e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 10 17:21:33 2008 +0100 gdi32: Properly handle SetDIBits failure in StretchDIBits. --- dlls/gdi32/dib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f5e8707..3205d0d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -290,13 +290,13 @@ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, dwRop ); } - SetDIBits(hdcMem, hBitmap, 0, height, bits, info, wUsage); + heightSrc = SetDIBits(hdcMem, hBitmap, 0, height, bits, info, wUsage); /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ - StretchBlt( hdc, xDst, yDst, widthDst, heightDst, - hdcMem, xSrc, abs(height) - heightSrc - ySrc, - widthSrc, heightSrc, dwRop ); + if (heightSrc) StretchBlt( hdc, xDst, yDst, widthDst, heightDst, + hdcMem, xSrc, abs(height) - heightSrc - ySrc, + widthSrc, heightSrc, dwRop ); if(hpal) SelectPalette(hdcMem, hpal, FALSE); SelectObject( hdcMem, hOldBitmap );

1 0

Alexander Dorofeyev : wined3d: Use primary_render_target_is_p8 in read_from_framebuffer.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: fc064cb04b2d3bccac27cd6b8a8b90e967d6b69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc064cb04b2d3bccac27cd6b8… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 9 16:09:52 2008 +0200 wined3d: Use primary_render_target_is_p8 in read_from_framebuffer. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b7439a..413d3af 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -690,7 +690,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v { case WINED3DFMT_P8: { - if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + if(primary_render_target_is_p8(myDevice)) { /* In case of P8 render targets the index is stored in the alpha component */ fmt = GL_ALPHA; type = GL_UNSIGNED_BYTE; @@ -792,9 +792,9 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v /* For P8 textures we need to perform an inverse palette lookup. This is done by searching for a palette * index which matches the RGB value. Note this isn't guaranteed to work when there are multiple entries for * the same color but we have no choice. - * In case of render targets, the index is stored in the alpha component so no conversion is needed. + * In case of P8 render targets, the index is stored in the alpha component so no conversion is needed. */ - if((This->resource.format == WINED3DFMT_P8) && !(This->resource.usage & WINED3DUSAGE_RENDERTARGET)) { + if((This->resource.format == WINED3DFMT_P8) && !primary_render_target_is_p8(myDevice)) { PALETTEENTRY *pal; DWORD width = pitch / 3; int x, y, c;

1 0

Dmitry Timoshkov : fonts: Add some missing Ukrainian and Belarusian cyrillic glyphs.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 66386eb46df7b8608e5c20993e6baff6880e2e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66386eb46df7b8608e5c20993… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 10 17:32:00 2008 +0800 fonts: Add some missing Ukrainian and Belarusian cyrillic glyphs. --- fonts/tahoma.sfd | 879 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 840 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66386eb46df7b8608e5c2…

1 0

Alexander Dorofeyev : d3d8/tests: Cover one more case in p8_texture_test.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 785e6fa61f2366ca16fb6c1634231aa5ddf5db0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=785e6fa61f2366ca16fb6c163… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 9 16:09:26 2008 +0200 d3d8/tests: Cover one more case in p8_texture_test. Test if a P8 texture gets properly updated if there was a palette change while this texture wasn't bound to any stage. --- dlls/d3d8/tests/visual.c | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 601a33c..f997bc9 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -914,7 +914,7 @@ static void p8_texture_test(IDirect3DDevice8 *device) { IDirect3D8 *d3d = NULL; HRESULT hr; - IDirect3DTexture8 *texture = NULL; + IDirect3DTexture8 *texture = NULL, *texture2 = NULL; D3DLOCKED_RECT lr; unsigned char *data; DWORD color, red, green, blue; @@ -943,6 +943,23 @@ static void p8_texture_test(IDirect3DDevice8 *device) } hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, + D3DPOOL_MANAGED, &texture2); + ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); + if(!texture2) { + skip("Failed to create D3DFMT_P8 texture\n"); + goto out; + } + + memset(&lr, 0, sizeof(lr)); + hr = IDirect3DTexture8_LockRect(texture2, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); + data = lr.pBits; + *data = 1; + + hr = IDirect3DTexture8_UnlockRect(texture2, 0); + ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, D3DPOOL_MANAGED, &texture); ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); if(!texture) { @@ -959,9 +976,6 @@ static void p8_texture_test(IDirect3DDevice8 *device) hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); @@ -998,12 +1012,18 @@ static void p8_texture_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 0); ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture2); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); hr = IDirect3DDevice8_SetCurrentTexturePalette(device, 1); ok(hr == D3D_OK, "IDirect3DDevice8_SetCurrentTexturePalette failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, 5 * sizeof(float)); ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); @@ -1030,6 +1050,34 @@ static void p8_texture_test(IDirect3DDevice8 *device) "got color %08x, expected 0x000000ff\n", color); } + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr = %08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture2); + ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr = %08x\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr = %08x\n", hr); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); + + todo_wine { + color = getPixelColor(device, 32, 32); + red = (color & 0x00ff0000) >> 16; + green = (color & 0x0000ff00) >> 8; + blue = (color & 0x000000ff) >> 0; + ok(red == 0 && blue == 0xff && green == 0, + "got color %08x, expected 0x000000ff\n", color); + } + /* Test palettes with alpha */ IDirect3DDevice8_GetDeviceCaps(device, &caps); if (!(caps.TextureCaps & D3DPTEXTURECAPS_ALPHAPALETTE)) { @@ -1110,6 +1158,7 @@ static void p8_texture_test(IDirect3DDevice8 *device) out: if(texture) IDirect3DTexture8_Release(texture); + if(texture2) IDirect3DTexture8_Release(texture2); IDirect3D8_Release(d3d); }

1 0

Alexander Dorofeyev : wined3d: Get rid of spurious err when locking with WINED3DLOCK_DISCARD.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 8f8076c3f7203451d030567f3421ac5e2fded77f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8076c3f7203451d030567f3… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Mar 9 16:08:57 2008 +0200 wined3d: Get rid of spurious err when locking with WINED3DLOCK_DISCARD. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fdc16cd..1b7439a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -986,7 +986,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED if (Flags & WINED3DLOCK_DISCARD) { /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); + surface_prepare_system_memory(This); /* Makes sure memory is allocated */ This->Flags |= SFLAG_INSYSMEM; + goto lock_end; } if (This->Flags & SFLAG_INSYSMEM) {

1 0