October 2011 - Wine-Commits

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

Oct. 31, 2011

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 Oct. 31, 2011

Oct. 31, 2011

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 Oct. 31, 2011

Oct. 31, 2011

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

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

Oct. 31, 2011

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 ddraw_surface7_BltFast() on top of wined3d_surface_blt().
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 1bf36a3f40fc47009b59b3bbee17b74a12d6ae73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf36a3f40fc47009b59b3bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:34 2011 +0100 ddraw: Implement ddraw_surface7_BltFast() on top of wined3d_surface_blt(). --- dlls/ddraw/surface.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9f85153..3860959 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3700,6 +3700,8 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d IDirectDrawSurfaceImpl *src = unsafe_impl_from_IDirectDrawSurface7(Source); DWORD src_w, src_h, dst_w, dst_h; HRESULT hr = DD_OK; + DWORD flags = 0; + RECT dst_rect; TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", iface, dstx, dsty, Source, wine_dbgstr_rect(rsrc), trans); @@ -3728,17 +3730,24 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d return DDERR_INVALIDRECT; } + SetRect(&dst_rect, dstx, dsty, dstx + src_w, dsty + src_h); + if (trans & DDBLTFAST_SRCCOLORKEY) + flags |= WINEDDBLT_KEYSRC; + if (trans & DDBLTFAST_DESTCOLORKEY) + flags |= WINEDDBLT_KEYDEST; + if (trans & DDBLTFAST_WAIT) + flags |= WINEDDBLT_WAIT; + if (trans & DDBLTFAST_DONOTWAIT) + flags |= WINEDDBLT_DONOTWAIT; + EnterCriticalSection(&ddraw_cs); if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_bltfast(This->wined3d_surface, dstx, dsty, - src->wined3d_surface, rsrc, trans); + hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, + src->wined3d_surface, rsrc, flags, NULL, WINED3DTEXF_POINT); if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - { - RECT dst_rect = {dstx, dsty, dstx + src_w, dsty + src_h}; hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); - } LeaveCriticalSection(&ddraw_cs); switch(hr) {

1 0

Piotr Caban : urlmon: Improve disk detection in MapUrlToZone.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

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

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

Oct. 31, 2011

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

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

Oct. 31, 2011

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

Henri Verbeet : wined3d: Make the device parameter to wined3d_event_query_finish() const.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 76b5b8a67bc381132ea7b9b55cd37a3d0f377112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b5b8a67bc381132ea7b9b55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:35 2011 +0100 wined3d: Make the device parameter to wined3d_event_query_finish() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ae03479..d88d182 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -111,7 +111,7 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win } enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, - struct wined3d_device *device) + const struct wined3d_device *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25a24e5..73f1ea1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1045,7 +1045,7 @@ enum wined3d_event_query_result void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, - struct wined3d_device *device) DECLSPEC_HIDDEN; + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

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

Oct. 31, 2011

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