July 2011 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Simplify the optional free'ing of bits pointer.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 00a386ebf93867b561ff1263ee921142441effa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a386ebf93867b561ff1263e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:12:04 2011 +0100 gdi32: Simplify the optional free'ing of bits pointer. --- dlls/gdi32/dibdrv/dc.c | 19 ++++++++++--------- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1f8b321..575221b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -74,6 +74,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->height = bi->biHeight; dib->stride = ((dib->width * dib->bit_count + 31) >> 3) & ~3; dib->bits = bits; + dib->ptr_to_free = NULL; if(dib->height < 0) /* top-down */ { @@ -197,6 +198,7 @@ static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; dib->bits = NULL; + dib->ptr_to_free = NULL; } /********************************************************************** @@ -204,15 +206,14 @@ static void clear_dib_info(dib_info *dib) * * Free the resources associated with a dib and optionally the bits */ -void free_dib_info(dib_info *dib, BOOL free_bits) +void free_dib_info(dib_info *dib) { HeapFree(GetProcessHeap(), 0, dib->color_table); dib->color_table = NULL; - if(free_bits) - { - HeapFree(GetProcessHeap(), 0, dib->bits); - dib->bits = NULL; - } + + HeapFree(GetProcessHeap(), 0, dib->ptr_to_free); + dib->ptr_to_free = NULL; + dib->bits = NULL; } void copy_dib_color_info(dib_info *dst, const dib_info *src) @@ -254,7 +255,7 @@ BOOL convert_dib(dib_info *dst, const dib_info *src) dst->height = src->height; dst->width = src->width; dst->stride = ((dst->width * dst->bit_count + 31) >> 3) & ~3; - dst->bits = HeapAlloc(GetProcessHeap(), 0, dst->height * dst->stride); + dst->ptr_to_free = dst->bits = HeapAlloc(GetProcessHeap(), 0, dst->height * dst->stride); src_rect.left = src_rect.top = 0; src_rect.right = src->width; @@ -262,7 +263,7 @@ BOOL convert_dib(dib_info *dst, const dib_info *src) ret = dst->funcs->convert_to(dst, src, &src_rect); - if(!ret) free_dib_info(dst, TRUE); + if(!ret) free_dib_info(dst); return ret; } @@ -289,7 +290,7 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) TRACE("(%p)\n", dev); DeleteObject(pdev->clip); free_pattern_brush(pdev); - free_dib_info(&pdev->dib, FALSE); + free_dib_info(&pdev->dib); return 0; } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 9fde40a..e142a9b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -60,7 +60,7 @@ extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DEC extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; -extern void free_dib_info(dib_info *dib, BOOL free_bits) DECLSPEC_HIDDEN; +extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 69faaeb..1a3e989 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1072,7 +1072,7 @@ static void free_pattern_brush_bits( dibdrv_physdev *pdev ) void free_pattern_brush( dibdrv_physdev *pdev ) { free_pattern_brush_bits( pdev ); - free_dib_info( &pdev->brush_dib, TRUE ); + free_dib_info( &pdev->brush_dib ); } static BOOL create_pattern_brush_bits(dibdrv_physdev *pdev) @@ -1295,7 +1295,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->brush_rects = pattern_brush; pdev->defer &= ~DEFER_BRUSH; } - free_dib_info(&orig_dib, FALSE); + free_dib_info(&orig_dib); } GlobalUnlock((HGLOBAL)logbrush.lbHatch); break; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2d8ea5d..c5ff4ba 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -78,6 +78,7 @@ typedef struct int bit_count, width, height; int stride; /* stride in bytes. Will be -ve for bottom-up dibs (see bits). */ void *bits; /* points to the top-left corner of the dib. */ + void *ptr_to_free; DWORD red_mask, green_mask, blue_mask; int red_shift, green_shift, blue_shift;

1 0

Huw Davies : gdi32: Allow dib_info structures to share colour tables.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: e844bddc369fd3abb77cfc8e512359216e6070f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e844bddc369fd3abb77cfc8e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:12:05 2011 +0100 gdi32: Allow dib_info structures to share colour tables. --- dlls/gdi32/dibdrv/dc.c | 31 ++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 575221b..2923aeb 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -64,7 +64,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) } static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, int color_table_size, void *bits) + RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) { static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; @@ -75,6 +75,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->stride = ((dib->width * dib->bit_count + 31) >> 3) & ~3; dib->bits = bits; dib->ptr_to_free = NULL; + dib->flags = flags; if(dib->height < 0) /* top-down */ { @@ -138,10 +139,15 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD if(color_table) { - dib->color_table = HeapAlloc(GetProcessHeap(), 0, color_table_size * sizeof(dib->color_table[0])); - if(!dib->color_table) return FALSE; + if (flags & private_color_table) + { + dib->color_table = HeapAlloc(GetProcessHeap(), 0, color_table_size * sizeof(dib->color_table[0])); + if(!dib->color_table) return FALSE; + memcpy(dib->color_table, color_table, color_table_size * sizeof(color_table[0])); + } + else + dib->color_table = color_table; dib->color_table_size = color_table_size; - memcpy(dib->color_table, color_table, color_table_size * sizeof(color_table[0])); } else { @@ -191,7 +197,7 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u } } - return init_dib_info(dib, bi, masks, color_table, num_colors, ptr); + return init_dib_info(dib, bi, masks, color_table, num_colors, ptr, private_color_table); } static void clear_dib_info(dib_info *dib) @@ -208,7 +214,8 @@ static void clear_dib_info(dib_info *dib) */ void free_dib_info(dib_info *dib) { - HeapFree(GetProcessHeap(), 0, dib->color_table); + if (dib->flags & private_color_table) + HeapFree(GetProcessHeap(), 0, dib->color_table); dib->color_table = NULL; HeapFree(GetProcessHeap(), 0, dib->ptr_to_free); @@ -231,11 +238,17 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) dst->funcs = src->funcs; dst->color_table_size = src->color_table_size; dst->color_table = NULL; + dst->flags = src->flags; if(dst->color_table_size) { int size = dst->color_table_size * sizeof(dst->color_table[0]); - dst->color_table = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(dst->color_table, src->color_table, size); + if (dst->flags & private_color_table) + { + dst->color_table = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(dst->color_table, src->color_table, size); + } + else + dst->color_table = src->color_table; } } @@ -315,7 +328,7 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) pdev->brush_and_bits = pdev->brush_xor_bits = NULL; if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits)) + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, private_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c5ff4ba..7065d98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -73,6 +73,11 @@ typedef struct tagGDIOBJHDR /* Device functions for the Wine driver interface */ +enum dib_info_flags +{ + private_color_table = 1 +}; + typedef struct { int bit_count, width, height; @@ -87,6 +92,8 @@ typedef struct RGBQUAD *color_table; DWORD color_table_size; + enum dib_info_flags flags; + const struct primitive_funcs *funcs; } dib_info;

1 0

Huw Davies : gdi32: Use a local copy of the bitmap info structure to further simplify GetDIBits .
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: dd39da49e5de78e25fa237ca29ff5b13a3dfbe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd39da49e5de78e25fa237ca2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:10:50 2011 +0100 gdi32: Use a local copy of the bitmap info structure to further simplify GetDIBits. --- dlls/gdi32/dib.c | 190 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 114 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd39da49e5de78e25fa23…

1 0

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10RenderTargetView for app provided ifaces.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 0b78866a0f7dedbb37d4db510d80ea4ec50a3936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b78866a0f7dedbb37d4db510… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 12:34:22 2011 +0200 d3d10core: Use unsafe_impl_from_ID3D10RenderTargetView for app provided ifaces. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 5 ++--- dlls/d3d10core/view.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 457ba09..c53a61b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -141,6 +141,7 @@ struct d3d10_rendertarget_view HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; +struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; /* ID3D10ShaderResourceView */ struct d3d10_shader_resource_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4df04f1..1609baf 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -383,14 +383,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device *i ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - struct wined3d_rendertarget_view *wined3d_view; + struct d3d10_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); const WINED3DCOLORVALUE color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; TRACE("iface %p, render_target_view %p, color_rgba [%f %f %f %f]\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); - wined3d_view = ((struct d3d10_rendertarget_view *)render_target_view)->wined3d_view; - wined3d_device_clear_rendertarget_view(This->wined3d_device, wined3d_view, &color); + wined3d_device_clear_rendertarget_view(This->wined3d_device, view->wined3d_view, &color); } static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index fb289a6..75cb4b5 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #define NONAMELESSUNION #include "d3d10core_private.h" @@ -291,6 +292,11 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) return S_OK; } +static inline struct d3d10_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, vtbl); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, @@ -468,6 +474,15 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, return S_OK; } +struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_rendertarget_view_vtbl); + + return impl_from_ID3D10RenderTargetView(iface); +} + static inline struct d3d10_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) { return CONTAINING_RECORD(iface, struct d3d10_shader_resource_view, ID3D10ShaderResourceView_iface);

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10InputLayout iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 3808a6f37112b044796ab7548331a97ae0ec5e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3808a6f37112b044796ab7548… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 12:51:54 2011 +0200 d3d10core: COM cleanup for the ID3D10InputLayout iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/inputlayout.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2fb21a5..21e2e95 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -155,7 +155,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view) /* ID3D10InputLayout */ struct d3d10_input_layout { - const struct ID3D10InputLayoutVtbl *vtbl; + ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; struct wined3d_vertex_declaration *wined3d_decl; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index e4916bc..698c1ec 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -848,7 +848,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if } TRACE("Created input layout %p.\n", object); - *input_layout = (ID3D10InputLayout *)object; + *input_layout = &object->ID3D10InputLayout_iface; return S_OK; } diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index d41a9cf..7bf67f6 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -103,7 +103,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME static inline struct d3d10_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { - return CONTAINING_RECORD(iface, struct d3d10_input_layout, vtbl); + return CONTAINING_RECORD(iface, struct d3d10_input_layout, ID3D10InputLayout_iface); } /* IUnknown methods */ @@ -130,7 +130,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLa static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = (struct d3d10_input_layout *)iface; + struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -145,7 +145,7 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *ifac static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = (struct d3d10_input_layout *)iface; + struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -222,7 +222,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ UINT wined3d_element_count; HRESULT hr; - layout->vtbl = &d3d10_input_layout_vtbl; + layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count,

1 0

Francois Gouget : d3dx9_36: Use copysignf() instead of signbit().
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: a369b2bd630cbeaddc94b5b4078e38e5e285ff6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a369b2bd630cbeaddc94b5b40… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 12 14:23:38 2011 +0200 d3dx9_36: Use copysignf() instead of signbit(). --- dlls/d3dx9_36/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index f13f2fb..481278e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1776,7 +1776,7 @@ static inline unsigned short float_32_to_16(const float in) { int exp = 0, origexp; float tmp = fabs(in); - int sign = signbit(in); + int sign = (copysignf(1, in) < 0); unsigned int mantissa; unsigned short ret;

1 0

Huw Davies : gdi32: Don't use a dib-section' s bitfields unless its depth matches the requested depth.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 74707e956e9c9a3060bbc31447d053820d385a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74707e956e9c9a3060bbc3144… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:10:49 2011 +0100 gdi32: Don't use a dib-section's bitfields unless its depth matches the requested depth. --- dlls/gdi32/dib.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3268086..5103919 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -439,6 +439,10 @@ static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palet { 0xff, 0xff, 0xff, 0x00 } }; +static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; +static const DWORD bit_fields_565[3] = {0xf800, 0x07e0, 0x001f}; +static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; + /****************************************************************************** * GetDIBits [GDI32.@] * @@ -646,11 +650,7 @@ INT WINAPI GetDIBits( case 15: if (info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)info->bmiColors)[0] = 0x7c00; - ((PDWORD)info->bmiColors)[1] = 0x03e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_555, sizeof(bit_fields_555) ); break; case 16: @@ -658,21 +658,13 @@ INT WINAPI GetDIBits( { if (bmp->dib) { - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && bmp->dib->dsBmih.biBitCount == bpp) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); else - { - ((PDWORD)info->bmiColors)[0] = 0x7c00; - ((PDWORD)info->bmiColors)[1] = 0x03e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_555, sizeof(bit_fields_555) ); } else - { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_565, sizeof(bit_fields_565) ); } break; @@ -680,14 +672,10 @@ INT WINAPI GetDIBits( case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - if (bmp->dib && bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (bmp->dib && bmp->dib->dsBmih.biCompression == BI_BITFIELDS && bmp->dib->dsBmih.biBitCount == bpp) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); else - { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; - } + memcpy( info->bmiColors, bit_fields_888, sizeof(bit_fields_888) ); } break; }

1 0

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10InputLayout for an app provided iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 6c866e06bfe24c37f7d53aa5adc3aed83819b2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c866e06bfe24c37f7d53aa5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 12:50:41 2011 +0200 d3d10core: Use unsafe_impl_from_ID3D10InputLayout for an app provided iface. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 3 ++- dlls/d3d10core/inputlayout.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 16cc17c..2fb21a5 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -164,6 +164,7 @@ struct d3d10_input_layout HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_device *device, const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN; +struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ struct d3d10_vertex_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 239f79a..e4916bc 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -192,11 +192,12 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, ID3D10InputLayout *input_layout) { struct d3d10_device *This = impl_from_ID3D10Device(iface); + struct d3d10_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); TRACE("iface %p, input_layout %p\n", iface, input_layout); wined3d_device_set_vertex_declaration(This->wined3d_device, - input_layout ? ((struct d3d10_input_layout *)input_layout)->wined3d_decl : NULL); + layout ? layout->wined3d_decl : NULL); } static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *iface, UINT start_slot, diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index f224559..d41a9cf 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include "d3d10core_private.h" @@ -100,6 +101,11 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME return S_OK; } +static inline struct d3d10_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_input_layout, vtbl); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLayout *iface, @@ -238,3 +244,12 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ return S_OK; } + +struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_input_layout_vtbl); + + return impl_from_ID3D10InputLayout(iface); +}

1 0

Alistair Leslie-Hughes : oleaut32: Correct ISupportErrorInfo clsid value.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 4b9b9b3be6ba669286278af62ecefc818e16665c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9b9b3be6ba669286278af62… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 9 21:19:47 2011 +1000 oleaut32: Correct ISupportErrorInfo clsid value. --- dlls/oleaut32/oleaut32.rgs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rgs b/dlls/oleaut32/oleaut32.rgs index 36dcafd..1c558e7 100644 --- a/dlls/oleaut32/oleaut32.rgs +++ b/dlls/oleaut32/oleaut32.rgs @@ -83,7 +83,7 @@ HKCR } '{DF0B3D60-548F-101B-8E65-08002B2BD119}' { - ProxyStubClsid32 = s '{00020420-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{DF0B3D60-548F-101B-8E65-08002B2BD119}' } } }

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10RenderTargetView iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: dc3ee8b94716e8f17e8b0b67f369b7de607a4c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3ee8b94716e8f17e8b0b67f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 12:37:59 2011 +0200 d3d10core: COM cleanup for the ID3D10RenderTargetView iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index c53a61b..16cc17c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -132,7 +132,7 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) DECLS /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view { - const struct ID3D10RenderTargetViewVtbl *vtbl; + ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; struct wined3d_rendertarget_view *wined3d_view; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1609baf..239f79a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -782,7 +782,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic } TRACE("Created rendertarget view %p.\n", object); - *view = (ID3D10RenderTargetView *)object; + *view = &object->ID3D10RenderTargetView_iface; return S_OK; } diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 75cb4b5..57c4148 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -294,7 +294,7 @@ HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) static inline struct d3d10_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { - return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, vtbl); + return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, ID3D10RenderTargetView_iface); } /* IUnknown methods */ @@ -322,7 +322,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10Re static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -332,7 +332,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTarget static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -384,7 +384,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, ID3D10Resource **resource) { - struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); struct wined3d_resource *wined3d_resource; IUnknown *parent; HRESULT hr; @@ -414,7 +414,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView *iface, D3D10_RENDER_TARGET_VIEW_DESC *desc) { - struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -444,7 +444,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct wined3d_resource *wined3d_resource; HRESULT hr; - view->vtbl = &d3d10_rendertarget_view_vtbl; + view->ID3D10RenderTargetView_iface.lpVtbl = &d3d10_rendertarget_view_vtbl; view->refcount = 1; if (!desc)

1 0