October 2011 - Wine-commits

Nikolay Sivov : msxml3: Init dynamic data pointer in IDispatchEx implementation.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 4d5b3ddf7c07ac89f003bb6f9a1e9681f1017b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5b3ddf7c07ac89f003bb6f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 29 00:43:00 2011 +0400 msxml3: Init dynamic data pointer in IDispatchEx implementation. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index fa9fbb8..67570c0 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -658,4 +658,5 @@ void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data; + dispex->dynamic_data = NULL; }

1 0

Nikolay Sivov : msxml3: Release IDispatchEx dynamic data properly.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: a35513bbd07d7630d4d3c2e889b780374886cbe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35513bbd07d7630d4d3c2e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 01:27:50 2011 +0400 msxml3: Release IDispatchEx dynamic data properly. --- dlls/msxml3/dispex.c | 16 ++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 6 ++---- dlls/msxml3/selection.c | 9 +++++---- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 67570c0..274f604 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -653,6 +653,22 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) return TRUE; } +void release_dispex(DispatchEx *This) +{ + dynamic_prop_t *prop; + + if(!This->dynamic_data) + return; + + for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { + VariantClear(&prop->var); + heap_free(prop->name); + } + + heap_free(This->dynamic_data->props); + heap_free(This->dynamic_data); +} + void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2962a0e..8b84aca 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -156,6 +156,7 @@ typedef struct { extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7219bd3..0e00b38 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1110,6 +1110,7 @@ void destroy_xmlnode(xmlnode *This) { if(This->node) xmldoc_release(This->node->doc); + release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) @@ -1121,10 +1122,7 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe This->iface = node_iface; This->parent = NULL; - if(dispex_data) - init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); - else - This->dispex.outer = NULL; + init_dispex(&This->dispex, dispex_data ? (IUnknown*)This->iface : NULL, dispex_data); } typedef struct { diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index c90c8c2..0e62a68 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -155,6 +155,7 @@ static ULONG WINAPI domselection_Release( xmlXPathFreeObject(This->result); xmldoc_release(This->node->doc); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); + release_dispex(&This->dispex); heap_free(This); } @@ -756,8 +757,9 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) *out = NULL; if (!This || !ctxt || !query) { - hr = E_OUTOFMEMORY; - goto cleanup; + xmlXPathFreeContext(ctxt); + heap_free(This); + return E_OUTOFMEMORY; } This->IXMLDOMSelection_iface.lpVtbl = &domselection_vtbl; @@ -765,6 +767,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) This->resultPos = 0; This->node = node; This->enumvariant = NULL; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); xmldoc_add_ref(This->node->doc); ctxt->error = query_serror; @@ -804,8 +807,6 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) goto cleanup; } - init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); - *out = (IXMLDOMNodeList*)&This->IXMLDOMSelection_iface; hr = S_OK; TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval));

1 0

Alexandre Julliard : wineps: Fix the output of indexed bitmaps in PutImage.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: dd3721c0f99dc0becc26674adfcd22cfff17c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3721c0f99dc0becc26674ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 23:04:53 2011 +0200 wineps: Fix the output of indexed bitmaps in PutImage. --- dlls/wineps.drv/ps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 7b8a0bf..4b70f79 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -680,7 +680,7 @@ BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) int i; ptr = buf; - for(i = 0; i < number; i++) + for(i = 0; i < number; i++, rgb++) ptr += sprintf(ptr, "%02x%02x%02x%c", rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue, ((i & 0x7) == 0x7) || (i == number - 1) ? '\n' : ' ');

1 0

Alexandre Julliard : wineps: Make color devices report 32 bits per pixel.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 8a808a49f9c1ebbe42faf8c74a016879c82be8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a808a49f9c1ebbe42faf8c74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 23:11:04 2011 +0200 wineps: Make color devices report 32 bits per pixel. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index d667436..5235998 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -452,7 +452,7 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: - return (physDev->pi->ppd->ColorDevice != CD_False) ? 8 : 1; + return (physDev->pi->ppd->ColorDevice != CD_False) ? 32 : 1; case PLANES: return 1; case NUMBRUSHES: @@ -464,7 +464,7 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case NUMFONTS: return 39; case NUMCOLORS: - return (physDev->pi->ppd->ColorDevice != CD_False) ? 256 : -1; + return -1; case PDEVICESIZE: return sizeof(PSDRV_PDEVICE); case CURVECAPS:

1 0

Alexandre Julliard : wineps: PaintRgn should leave the path empty on exit.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: e5f21b952fd06ff1fc352fa93a136f60ef116536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f21b952fd06ff1fc352fa93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 30 08:47:36 2011 +0100 wineps: PaintRgn should leave the path empty on exit. --- dlls/wineps.drv/graphics.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index ac3e82e..ce7013e 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -380,7 +380,6 @@ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT p PSDRV_WriteSpool(dev, "%PolyPolygon\n",13); PSDRV_SetPen(dev); PSDRV_SetClip(dev); - PSDRV_WriteNewPath(dev); for(polygon = 0; polygon < polygons; polygon++) { PSDRV_WriteMoveTo(dev, pt->x, pt->y); @@ -461,11 +460,11 @@ BOOL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) LPtoDP(dev->hdc, (POINT*)rgndata->Buffer, rgndata->rdh.nCount * 2); PSDRV_SetClip(dev); - PSDRV_WriteNewPath(dev); for(i = 0, pRect = (RECT*)rgndata->Buffer; i < rgndata->rdh.nCount; i++, pRect++) PSDRV_WriteRectangle(dev, pRect->left, pRect->top, pRect->right - pRect->left, pRect->bottom - pRect->top); PSDRV_Brush(dev, 0); + PSDRV_WriteNewPath(dev); PSDRV_ResetClip(dev); end:

1 0

André Hentschel : include: Clean up some comments.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: d3ad06fb8bef0da3d8c494ee64a4c66fc32b9c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ad06fb8bef0da3d8c494ee6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 28 21:20:29 2011 +0200 include: Clean up some comments. --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0354649..5fe5bc5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3412,7 +3412,7 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_PPC_BRNTAKEN 0x0400 #define IMAGE_REL_PPC_TOCDEFN 0x0800 -/* SH3 ? relocation type */ +/* SH3 relocation types */ #define IMAGE_REL_SH3_ABSOLUTE 0x0000 #define IMAGE_REL_SH3_DIRECT16 0x0001 #define IMAGE_REL_SH3_DIRECT 0x0002 @@ -3433,7 +3433,7 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_SH3_GPREL4_LONG 0x0011 #define IMAGE_REL_SH3_TOKEN 0x0012 -/* ARM (Archimedes?) relocation types */ +/* ARM relocation types */ #define IMAGE_REL_ARM_ABSOLUTE 0x0000 #define IMAGE_REL_ARM_ADDR 0x0001 #define IMAGE_REL_ARM_ADDR32NB 0x0002

1 0

André Hentschel : include: Add some new ARM defines.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: ed4527a5a9b7d094b6a07b9679b48a149751c368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4527a5a9b7d094b6a07b967… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 28 21:22:05 2011 +0200 include: Add some new ARM defines. --- include/winnt.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5fe5bc5..79fcf66 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2718,6 +2718,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_SH5 0x01a8 #define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_THUMB 0x01c2 +#define IMAGE_FILE_MACHINE_ARMV7 0x01c4 #define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 @@ -3317,8 +3318,10 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_BASED_HIGHLOW 3 #define IMAGE_REL_BASED_HIGHADJ 4 #define IMAGE_REL_BASED_MIPS_JMPADDR 5 +#define IMAGE_REL_BASED_ARM_MOV32A 5 /* yes, 5 too */ #define IMAGE_REL_BASED_SECTION 6 #define IMAGE_REL_BASED_REL 7 +#define IMAGE_REL_BASED_ARM_MOV32T 7 /* yes, 7 too */ #define IMAGE_REL_BASED_MIPS_JMPADDR16 9 #define IMAGE_REL_BASED_IA64_IMM64 9 /* yes, 9 too */ #define IMAGE_REL_BASED_DIR64 10 @@ -3446,6 +3449,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_ARM_BLX11 0x0009 #define IMAGE_REL_ARM_SECTION 0x000E #define IMAGE_REL_ARM_SECREL 0x000F +#define IMAGE_REL_ARM_MOV32A 0x0010 +#define IMAGE_REL_ARM_MOV32T 0x0011 +#define IMAGE_REL_ARM_BRANCH20T 0x0012 +#define IMAGE_REL_ARM_BRANCH24T 0x0014 +#define IMAGE_REL_ARM_BLX23T 0x0015 /* IA64 relocation types */ #define IMAGE_REL_IA64_ABSOLUTE 0x0000

1 0

Piotr Caban : urlmon: Improve disk detection in MapUrlToZone.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: a39761a68e9493071252832dd8799abf52b68269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39761a68e9493071252832dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Oct 30 17:45:27 2011 +0100 urlmon: Improve disk detection in MapUrlToZone. --- dlls/urlmon/sec_mgr.c | 6 +++--- dlls/urlmon/tests/sec_mgr.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index b7e1c36..8e55712 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -543,11 +543,11 @@ static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) else path_start = path; - if(((ptr = strchrW(path_start, '\\')) || (ptr = strchrW(path_start, '/'))) && ptr-path_start < sizeof(root)/sizeof(WCHAR)) { + if((ptr = strchrW(path_start, ':')) && ptr-path_start+1 < sizeof(root)/sizeof(WCHAR)) { UINT type; - memcpy(root, path_start, (ptr-path_start)*sizeof(WCHAR)); - root[ptr-path_start] = 0; + memcpy(root, path_start, (ptr-path_start+1)*sizeof(WCHAR)); + root[ptr-path_start+1] = 0; type = GetDriveTypeW(root); diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 1311ea9..2f33f02 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -103,6 +103,8 @@ static const WCHAR url12[] = {'f','i','l','e',':','/','/','/','c',':','/','I','n static const WCHAR url13[] = {'h','t','t','p',':','g','o','o','g','l','e','.','c','o','m',0}; static const WCHAR url14[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c','o','m','/','t','e','s','t','i','n','g',0}; static const WCHAR url15[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','c','o','m','.','u','k',0}; +static const WCHAR url16[] = {'f','i','l','e',':','/','/','/','c',':',0}; +static const WCHAR url17[] = {'f','i','l','e',':','/','/','/','c',':','c','\\',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -157,7 +159,9 @@ static struct secmgr_test { {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, {url7, 3, S_OK, sizeof(secid7), secid7, S_OK}, {url11,0, S_OK, sizeof(secid1), secid1, S_OK}, - {url12,0, S_OK, sizeof(secid1), secid1, S_OK} + {url12,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url16,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url17,0, S_OK, sizeof(secid1), secid1, S_OK} }; static int strcmp_w(const WCHAR *str1, const WCHAR *str2)

1 0

Henri Verbeet : d3d8: Implement CopyRects() on top of wined3d_surface_blt() .
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 94fd6dc03da936d2eebec0ce381ae4488f298c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fd6dc03da936d2eebec0ce3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:32 2011 +0100 d3d8: Implement CopyRects() on top of wined3d_surface_blt(). --- dlls/d3d8/device.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2a78117..1ead518 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -931,6 +931,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, enum wined3d_format_id srcFormat, destFormat; struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; + UINT src_w, src_h; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); @@ -942,6 +943,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, wined3d_resource = wined3d_surface_get_resource(Source->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); srcFormat = wined3d_desc.format; + src_w = wined3d_desc.width; + src_h = wined3d_desc.height; wined3d_resource = wined3d_surface_get_resource(Dest->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); @@ -964,8 +967,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, /* Quick if complete copy ... */ if (!cRects && !pSourceRects && !pDestPoints) { - wined3d_surface_bltfast(Dest->wined3d_surface, 0, 0, - Source->wined3d_surface, NULL, WINEDDBLTFAST_NOCOLORKEY); + RECT rect = {0, 0, src_w, src_h}; + wined3d_surface_blt(Dest->wined3d_surface, &rect, + Source->wined3d_surface, &rect, 0, NULL, WINED3DTEXF_POINT); } else { @@ -975,16 +979,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, { for (i = 0; i < cRects; ++i) { - wined3d_surface_bltfast(Dest->wined3d_surface, pDestPoints[i].x, pDestPoints[i].y, - Source->wined3d_surface, &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); + UINT w = pSourceRects[i].right - pSourceRects[i].left; + UINT h = pSourceRects[i].bottom - pSourceRects[i].top; + RECT dst_rect = {pDestPoints[i].x, pDestPoints[i].y, + pDestPoints[i].x + w, pDestPoints[i].y + h}; + + wined3d_surface_blt(Dest->wined3d_surface, &dst_rect, + Source->wined3d_surface, &pSourceRects[i], 0, NULL, WINED3DTEXF_POINT); } } else { for (i = 0; i < cRects; ++i) { - wined3d_surface_bltfast(Dest->wined3d_surface, 0, 0, - Source->wined3d_surface, &pSourceRects[i], WINEDDBLTFAST_NOCOLORKEY); + UINT w = pSourceRects[i].right - pSourceRects[i].left; + UINT h = pSourceRects[i].bottom - pSourceRects[i].top; + RECT dst_rect = {0, 0, w, h}; + + wined3d_surface_blt(Dest->wined3d_surface, &dst_rect, + Source->wined3d_surface, &pSourceRects[i], 0, NULL, WINED3DTEXF_POINT); } } }

1 0

Henri Verbeet : ddraw: Implement copy_mipmap_chain() on top of wined3d_surface_blt().
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 5193f6704caeada611cfdc594e8eea57ec1a283e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5193f6704caeada611cfdc594… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:33 2011 +0100 ddraw: Implement copy_mipmap_chain() on top of wined3d_surface_blt(). --- dlls/ddraw/device.c | 41 +++++++++++++---------------------------- 1 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0b99e59..63616f4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5942,12 +5942,11 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, IDirectDrawSurface7 *temp; DDSURFACEDESC2 ddsd; POINT point; - RECT rect; + RECT src_rect; HRESULT hr; IDirectDrawPalette *pal = NULL, *pal_src = NULL; DWORD ckeyflag; DDCOLORKEY ddckey; - BOOL palette_missing = FALSE; /* Copy palette, if possible. */ IDirectDrawSurface7_GetPalette(&src->IDirectDrawSurface7_iface, &pal_src); @@ -5961,12 +5960,6 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent); } - if (dest->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | - DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8) && !pal) - { - palette_missing = TRUE; - } - if (pal) IDirectDrawPalette_Release(pal); if (pal_src) IDirectDrawPalette_Release(pal_src); @@ -5985,28 +5978,20 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, dest_level = dest; point = *DestPoint; - rect = *SrcRect; + src_rect = *SrcRect; for (;src_level && dest_level;) { if (src_level->surface_desc.dwWidth == dest_level->surface_desc.dwWidth && src_level->surface_desc.dwHeight == dest_level->surface_desc.dwHeight) { - /* Try UpdateSurface that may perform a more direct OpenGL - * loading. But skip this if destination is paletted texture and - * has no palette. Some games like Sacrifice set palette after - * Load, and it is a waste of effort to try to load texture - * without palette and generates warnings in wined3d. */ - if (!palette_missing) - hr = wined3d_device_update_surface(device->wined3d_device, src_level->wined3d_surface, - &rect, dest_level->wined3d_surface, &point); - - if (palette_missing || FAILED(hr)) - { - /* UpdateSurface may fail e.g. if dest is in system memory. Fall back to BltFast that is less strict. */ - wined3d_surface_bltfast(dest_level->wined3d_surface, point.x, point.y, - src_level->wined3d_surface, &rect, 0); - } + UINT src_w = src_rect.right - src_rect.left; + UINT src_h = src_rect.bottom - src_rect.top; + RECT dst_rect = {point.x, point.y, point.x + src_w, point.y + src_h}; + + if (FAILED(hr = wined3d_surface_blt(dest_level->wined3d_surface, &dst_rect, + src_level->wined3d_surface, &src_rect, 0, NULL, WINED3DTEXF_POINT))) + ERR("Blit failed, hr %#x.\n", hr); ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; @@ -6028,10 +6013,10 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, point.x /= 2; point.y /= 2; - rect.top /= 2; - rect.left /= 2; - rect.right = (rect.right + 1) / 2; - rect.bottom = (rect.bottom + 1) / 2; + src_rect.top /= 2; + src_rect.left /= 2; + src_rect.right = (src_rect.right + 1) / 2; + src_rect.bottom = (src_rect.bottom + 1) / 2; } if (src_level && src_level != src) IDirectDrawSurface7_Release(&src_level->IDirectDrawSurface7_iface);

1 0