October 2011 - Wine-commits

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice3 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a90b2ad00266131d48b2242772223ff22c0e2d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90b2ad00266131d48b224277… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:53 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice3 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 14 +++++++------- dlls/ddraw/vertexbuffer.c | 16 ++++++++-------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1072f67..ae94810 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -342,6 +342,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawClipper implementation structure diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index dcc6475..c72b253 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6746,6 +6746,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device3_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice3_vtbl); +} + IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { if (!iface) return NULL; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 236b647..cec3122 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -295,18 +295,18 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 *ifac * *****************************************************************************/ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, - IDirect3DDevice3 *lpDirect3DDevice3, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial3(iface); - IDirect3DDeviceImpl *device = device_from_device3(lpDirect3DDevice3); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice3, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); EnterCriticalSection(&ddraw_cs); - This->active_device = device; + This->active_device = device_impl; if(!This->Handle) { - DWORD h = ddraw_allocate_handle(&device->handle_table, This, DDRAW_HANDLE_MATERIAL); + DWORD h = ddraw_allocate_handle(&device_impl->handle_table, This, DDRAW_HANDLE_MATERIAL); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a material handle.\n"); @@ -316,8 +316,8 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, This->Handle = h + 1; } - *lpHandle = This->Handle; - TRACE(" returning handle %08x.\n", *lpHandle); + *handle = This->Handle; + TRACE(" returning handle %08x.\n", *handle); LeaveCriticalSection(&ddraw_cs); return D3D_OK; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 21a3b6f..f675cda 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -351,17 +351,17 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexB static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVertexBuffer *iface, DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer *SrcBuffer, - DWORD SrcIndex, IDirect3DDevice3 *D3DDevice, DWORD Flags) + DWORD SrcIndex, IDirect3DDevice3 *device, DWORD Flags) { IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer(SrcBuffer); - IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", - iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags); + iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, device, Flags); return IDirect3DVertexBuffer7_ProcessVertices(&This->IDirect3DVertexBuffer7_iface, VertexOp, - DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, (IDirect3DDevice7 *)D3D, + DestIndex, Count, &Src->IDirect3DVertexBuffer7_iface, SrcIndex, (IDirect3DDevice7 *)device_impl, Flags); } @@ -451,15 +451,15 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 } static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer *iface, - IDirect3DDevice3 *D3DDevice, DWORD Flags) + IDirect3DDevice3 *device, DWORD Flags) { IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface); - IDirect3DDeviceImpl *D3D = D3DDevice ? device_from_device3(D3DDevice) : NULL; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device); - TRACE("iface %p, device %p, flags %#x.\n", iface, D3DDevice, Flags); + TRACE("iface %p, device %p, flags %#x.\n", iface, device, Flags); return IDirect3DVertexBuffer7_Optimize(&This->IDirect3DVertexBuffer7_iface, - (IDirect3DDevice7 *)D3D, Flags); + (IDirect3DDevice7 *)device_impl, Flags); } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: Rename device_from_device3 to impl_from_IDirect3DDevice3.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: bd530d3aba2e356b6ae7d2a82ba5aba283cbe9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd530d3aba2e356b6ae7d2a82… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:58:00 2011 +0300 ddraw: Rename device_from_device3 to impl_from_IDirect3DDevice3. --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 104 +++++++++++++++++++++++++++----------------- 2 files changed, 66 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd530d3aba2e356b6ae7d…

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice3 interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 6b7e3e77d0c1d9bd0cd5795b0fa8811c1e7cd47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7e3e77d0c1d9bd0cd5795b0… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:58:11 2011 +0300 ddraw: COM cleanup for IDirect3DDevice3 interface. --- dlls/ddraw/ddraw.c | 11 +++++++-- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 48 ++++++++++++++++++++++---------------------- dlls/ddraw/material.c | 4 +- dlls/ddraw/viewport.c | 8 +++--- 5 files changed, 40 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b7e3e77d0c1d9bd0cd57…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice7 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 31cf68dd95c407f74a8ead9f5e46eda393bd292e URL: http://source.winehq.org/git/wine.git/?a=commit;h=31cf68dd95c407f74a8ead9f5… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:58:25 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice7 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/vertexbuffer.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7031e15..f75fcbf 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -343,6 +343,7 @@ static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice3(IDirect3DDevice3 * IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawClipper implementation structure diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8513f71..e29ee15 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6770,6 +6770,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) +{ + if (!iface) return NULL; + assert((iface->lpVtbl == &d3d_device7_fpu_preserve_vtbl) || (iface->lpVtbl == &d3d_device7_fpu_setup_vtbl)); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, lpVtbl); +} + IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) { if (!iface) return NULL; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f675cda..8c4d201 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -303,16 +303,16 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Unlock(IDirect3DVertexBuffer * *****************************************************************************/ static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, DWORD VertexOp, DWORD DestIndex, DWORD Count, IDirect3DVertexBuffer7 *SrcBuffer, - DWORD SrcIndex, IDirect3DDevice7 *D3DDevice, DWORD Flags) + DWORD SrcIndex, IDirect3DDevice7 *device, DWORD Flags) { IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer7(iface); IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer7(SrcBuffer); - IDirect3DDeviceImpl *D3D = (IDirect3DDeviceImpl *)D3DDevice; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice7(device); BOOL oldClip, doClip; HRESULT hr; TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n", - iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, D3DDevice, Flags); + iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, device, Flags); /* Vertex operations: * D3DVOP_CLIP: Clips vertices outside the viewing frustrum. Needs clipping information @@ -332,19 +332,19 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexB * the vertex ops */ doClip = VertexOp & D3DVOP_CLIP ? TRUE : FALSE; - wined3d_device_get_render_state(D3D->wined3d_device, WINED3DRS_CLIPPING, (DWORD *)&oldClip); + wined3d_device_get_render_state(device_impl->wined3d_device, WINED3DRS_CLIPPING, (DWORD *)&oldClip); if (doClip != oldClip) - wined3d_device_set_render_state(D3D->wined3d_device, WINED3DRS_CLIPPING, doClip); + wined3d_device_set_render_state(device_impl->wined3d_device, WINED3DRS_CLIPPING, doClip); - wined3d_device_set_stream_source(D3D->wined3d_device, + wined3d_device_set_stream_source(device_impl->wined3d_device, 0, Src->wineD3DVertexBuffer, 0, get_flexible_vertex_size(Src->fvf)); - wined3d_device_set_vertex_declaration(D3D->wined3d_device, Src->wineD3DVertexDeclaration); - hr = wined3d_device_process_vertices(D3D->wined3d_device, SrcIndex, DestIndex, + wined3d_device_set_vertex_declaration(device_impl->wined3d_device, Src->wineD3DVertexDeclaration); + hr = wined3d_device_process_vertices(device_impl->wined3d_device, SrcIndex, DestIndex, Count, This->wineD3DVertexBuffer, NULL, Flags, This->fvf); /* Restore the states if needed */ if (doClip != oldClip) - wined3d_device_set_render_state(D3D->wined3d_device, WINED3DRS_CLIPPING, oldClip); + wined3d_device_set_render_state(device_impl->wined3d_device, WINED3DRS_CLIPPING, oldClip); LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Ričardas Barkauskas : ddraw: Use impl_from_IDirect3DDevice7 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 7dc08745d1edcf81347dcdf5fbe5b57ea1baf970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc08745d1edcf81347dcdf5f… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:58:40 2011 +0300 ddraw: Use impl_from_IDirect3DDevice7 for application provided interfaces. --- dlls/ddraw/ddraw.c | 4 +- dlls/ddraw/ddraw_private.h | 5 ++ dlls/ddraw/device.c | 88 ++++++++++++++++++++++---------------------- dlls/ddraw/surface.c | 4 +- 4 files changed, 54 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dc08745d1edcf81347dc…

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice7 interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 472a8f7a678e85de57e42de20d0563fb2006a221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472a8f7a678e85de57e42de20… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:58:51 2011 +0300 ddraw: COM cleanup for IDirect3DDevice7 interface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 100 ++++++++++++++++++++++---------------------- dlls/ddraw/executebuffer.c | 6 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/vertexbuffer.c | 6 +- dlls/ddraw/viewport.c | 6 +- 9 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=472a8f7a678e85de57e42…

1 0

Marcus Meissner : setupx.dll16: Fixed bad sizeof() (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 68f8eff5e0e8ea255349d28e617cfc27843a54b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f8eff5e0e8ea255349d28e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 17 00:26:21 2011 +0200 setupx.dll16: Fixed bad sizeof() (Coverity). --- dlls/setupx.dll16/virtcopy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 5137548..f2ce4e8 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -224,10 +224,10 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC vn_num += 20; if (pvnlist) pvnlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, pvnlist, - sizeof(LPVIRTNODE *) * vn_num); + sizeof(*pvnlist) * vn_num); else pvnlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, - sizeof(LPVIRTNODE *) * vn_num); + sizeof(*pvnlist) * vn_num); } pvnlist[vn_last] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VIRTNODE)); lpvn = pvnlist[vn_last];

1 0

Marcus Meissner : msvcrt: Replaced bad memcpy by strcpy (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 6ca6464cf3c175baa698abffaedce5aa9b6df7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca6464cf3c175baa698abffa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 17 00:42:28 2011 +0200 msvcrt: Replaced bad memcpy by strcpy (Coverity). --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6733522..c64e3d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -102,7 +102,7 @@ static void remap_synonym(char *name) if (!strcasecmp(_country_synonyms[i],name)) { TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]); - memcpy(name, _country_synonyms[i+1], sizeof(_country_synonyms[i+1])); + strcpy(name, _country_synonyms[i+1]); return; } }

1 0

Alexandre Julliard : gdi32: Add a fall back implementation of BlendImage using client-side blending.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: bfdac3e885f12dfd4b16c0c16f4767c451d0994d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdac3e885f12dfd4b16c0c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 13:25:05 2011 +0200 gdi32: Add a fall back implementation of BlendImage using client-side blending. --- dlls/gdi32/bitblt.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 14 ++++++++++ dlls/gdi32/driver.c | 6 ---- dlls/gdi32/gdi_private.h | 5 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index eee6fa2..28b1a73 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -198,6 +198,24 @@ static DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src return err; } +static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits *src_bits, + struct bitblt_coords *src, BITMAPINFO *dst_info, + struct gdi_image_bits *dst_bits, struct bitblt_coords *dst, BLENDFUNCTION blend ) +{ + if (!dst_bits->is_copy) + { + int size = get_dib_image_size( dst_info ); + void *ptr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return ERROR_OUTOFMEMORY; + memcpy( ptr, dst_bits->ptr, size ); + if (dst_bits->free) dst_bits->free( dst_bits ); + dst_bits->ptr = ptr; + dst_bits->is_copy = TRUE; + dst_bits->free = free_heap_bits; + } + return blend_bitmapinfo( src_info, src_bits->ptr, src, dst_info, dst_bits->ptr, dst, blend ); +} + /*********************************************************************** * null driver fallback implementations */ @@ -328,6 +346,51 @@ done: } +DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)buffer; + struct gdi_image_bits dst_bits; + struct bitblt_coords orig_dst; + DC *dc = get_nulldrv_dc( dev ); + DWORD err; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != 32) goto update_format; + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *masks = (DWORD *)info->bmiColors; + if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) + goto update_format; + } + + if (!bits) return ERROR_SUCCESS; + if ((src->width != dst->width) || (src->height != dst->height)) return ERROR_TRANSFORM_NOT_SUPPORTED; + + dev = GET_DC_PHYSDEV( dc, pGetImage ); + orig_dst = *dst; + err = dev->funcs->pGetImage( dev, 0, dst_info, &dst_bits, dst ); + if (err) return err; + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + err = blend_bits( info, bits, src, dst_info, &dst_bits, dst, blend ); + if (!err) err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &dst_bits, dst, &orig_dst, SRCCOPY ); + + if (dst_bits.free) dst_bits.free( &dst_bits ); + return err; + +update_format: + if (blend.AlphaFormat & AC_SRC_ALPHA) /* source alpha requires A8R8G8B8 format */ + return ERROR_INVALID_PARAMETER; + + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biClrUsed = 0; + return ERROR_BAD_FORMAT; +} + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bf1256e..de60f47 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1202,6 +1202,20 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit return ERROR_SUCCESS; } +DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, + BLENDFUNCTION blend ) +{ + dib_info src_dib, dst_dib; + + if (!init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + return ERROR_BAD_FORMAT; + if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + return ERROR_BAD_FORMAT; + + return blend_rect( &dst_dib, &dst->visrect, &src_dib, &src->visrect, NULL, blend ); +} + /*********************************************************************** * dibdrv_StretchBlt */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4f111c3..8647b95 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -196,12 +196,6 @@ static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, return TRUE; } -static DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) -{ - return TRUE; -} - static INT nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 76e146b..d8648ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -257,6 +257,9 @@ extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, str extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) DECLSPEC_HIDDEN; +extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, + BLENDFUNCTION blend ) DECLSPEC_HIDDEN; /* driver.c */ extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN; @@ -388,6 +391,8 @@ extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;

1 0

Ken Sharp : ntdll: Update Win2k8 to SP2.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e8d9483da93bad6773990eea75fb667538eb3b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d9483da93bad6773990eea7… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Sat Oct 15 03:59:52 2011 +0100 ntdll: Update Win2k8 to SP2. --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 74010dd..dfe7c3b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -147,8 +147,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN2K8 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WIN7 */ @@ -157,7 +157,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, - /* WIN2K8 */ + /* WIN2K8R2 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d2c9e7d..3a4c908 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, - { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, + { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"},

1 0