December 2011 - Wine-Commits

Alexandre Julliard : gdi32: Add a helper to build a color table from the DIB_PAL_COLORS bitmap info.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 91d19b4b1733cad4642ea91ecf20e460a2041c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d19b4b1733cad4642ea91ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 21:31:59 2011 +0100 gdi32: Add a helper to build a color table from the DIB_PAL_COLORS bitmap info. --- dlls/gdi32/dib.c | 42 ++++++++++++++++++++++++++---------------- dlls/gdi32/dibdrv/dc.c | 14 ++------------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ed5eea7..d870582 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -233,6 +233,28 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) return colors; } +int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) +{ + PALETTEENTRY entries[256]; + HPALETTE palette; + const WORD *index = (const WORD *)info->bmiColors; + int i, count, colors = get_dib_num_of_colors( info ); + + if (!colors) return 0; + if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; + if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return 0; + + for (i = 0; i < colors; i++, index++) + { + PALETTEENTRY *entry = &entries[*index % count]; + color_table[i].rgbRed = entry->peRed; + color_table[i].rgbGreen = entry->peGreen; + color_table[i].rgbBlue = entry->peBlue; + color_table[i].rgbReserved = 0; + } + return colors; +} + static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) { const int width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; @@ -1383,11 +1405,10 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, } /* Copy/synthesize RGB palette from BITMAPINFO */ -static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) +static void DIB_CopyColorTable( HDC hdc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) { - unsigned int colors, i; + unsigned int colors = get_dib_num_of_colors( info ); - colors = get_dib_num_of_colors( info ); if (!(bmp->color_table = HeapAlloc(GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) return; bmp->nb_colors = colors; @@ -1397,18 +1418,7 @@ static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BIT } else { - PALETTEENTRY entries[256]; - const WORD *index = (const WORD *)info->bmiColors; - UINT count = GetPaletteEntries( dc->hPalette, 0, colors, entries ); - - for (i = 0; i < colors; i++, index++) - { - PALETTEENTRY *entry = &entries[*index % count]; - bmp->color_table[i].rgbRed = entry->peRed; - bmp->color_table[i].rgbGreen = entry->peGreen; - bmp->color_table[i].rgbBlue = entry->peBlue; - bmp->color_table[i].rgbReserved = 0; - } + fill_color_table_from_pal_colors( hdc, info, bmp->color_table ); } } @@ -1521,7 +1531,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, bmp->dib = dib; bmp->funcs = physdev->funcs; /* create local copy of DIB palette */ - if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( dc, bmp, usage, info ); + if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( hdc, bmp, usage, info ); GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b9308bf..12d1168 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -162,7 +162,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return TRUE; } -BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE palette) +BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) { DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; RGBQUAD *color_table = NULL, pal_table[256]; @@ -172,17 +172,7 @@ BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, U { if(usage == DIB_PAL_COLORS) { - PALETTEENTRY entries[256]; - const WORD *index = (const WORD *)bi->bmiColors; - UINT i, count = GetPaletteEntries( palette, 0, num_colors, entries ); - for (i = 0; i < num_colors; i++, index++) - { - PALETTEENTRY *entry = &entries[*index % count]; - pal_table[i].rgbRed = entry->peRed; - pal_table[i].rgbGreen = entry->peGreen; - pal_table[i].rgbBlue = entry->peBlue; - pal_table[i].rgbReserved = 0; - } + fill_color_table_from_pal_colors( hdc, bi, pal_table ); color_table = pal_table; } else color_table = (RGBQUAD *)bi->bmiColors; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 28633e0..1bf0696 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -224,7 +224,7 @@ extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; 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_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE pal) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 0baafdb..9c85094 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1338,9 +1338,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE if (pdev->brush_pattern_usage == DIB_PAL_COLORS) { dib_info pattern; - HPALETTE pal = GetCurrentObject( pdev->dev.hdc, OBJ_PAL ); if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, - pdev->brush_pattern_bits, DIB_PAL_COLORS, pal )) + pdev->brush_pattern_bits, DIB_PAL_COLORS, pdev->dev.hdc )) return FALSE; select_pattern_brush( pdev, &pattern ); free_dib_info( &pattern ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 56fc96d..2bed05b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -235,6 +235,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: The VertexAttrib*h[v] calls in NV_half_float depend on NV_vertex_program.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 11efbbf1403ef65c7a6b03f9c03491ca06932c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11efbbf1403ef65c7a6b03f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:02 2011 +0100 wined3d: The VertexAttrib*h[v] calls in NV_half_float depend on NV_vertex_program. Based on a patch by Aurélien Couderc. --- dlls/wined3d/drawprim.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bfc5ba4..3b18c63 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -384,7 +384,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, /* Are those 16 bit floats. C doesn't have a 16 bit float type. I could read the single bits and calculate a 4 * byte float according to the IEEE standard */ - if (gl_info->supported[NV_HALF_FLOAT]) + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) { /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); @@ -397,7 +397,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, } break; case WINED3DFMT_R16G16B16A16_FLOAT: - if (gl_info->supported[NV_HALF_FLOAT]) + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) { /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib4hvNV(index, ptr));

1 0

Alexandre Julliard : gdi32: Remove the nb_colors fields in the bitmap object, we always allocate a full size color table.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 494bfa866a0858cdbdcd99d9820162275b03a29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=494bfa866a0858cdbdcd99d98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:00:36 2011 +0100 gdi32: Remove the nb_colors fields in the bitmap object, we always allocate a full size color table. --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/dib.c | 15 ++++++--------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 3 +-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 510d5f5..af9012b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -300,7 +300,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->funcs = &null_driver; bmpobj->dib = NULL; bmpobj->color_table = NULL; - bmpobj->nb_colors = 0; if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) { diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a360a1d..34d3a57 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -122,10 +122,10 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) bitmap_info_size( (BITMAPINFO *)&bmp->dib->dsBmih, DIB_RGB_COLORS )); if (!info) goto done; info->bmiHeader = bmp->dib->dsBmih; - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (info->bmiHeader.biCompression == BI_BITFIELDS) memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); - else if (bmp->nb_colors) - memcpy( &info->bmiHeader + 1, bmp->color_table, bmp->nb_colors * sizeof(RGBQUAD) ); + else if (info->bmiHeader.biClrUsed) + memcpy( &info->bmiHeader + 1, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) { HeapFree( GetProcessHeap(), 0, info ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4c75fc2..b2d18cc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -894,11 +894,10 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA /* Check if currently selected bitmap is a DIB */ if (bitmap->color_table) { - if (startpos < bitmap->nb_colors) + if (startpos < bitmap->dib->dsBmih.biClrUsed) { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(bitmap->color_table + startpos, colors, entries * sizeof(RGBQUAD)); - result = entries; + result = min( entries, bitmap->dib->dsBmih.biClrUsed - startpos ); + memcpy(bitmap->color_table + startpos, colors, result * sizeof(RGBQUAD)); } } GDI_ReleaseObj( dc->hBitmap ); @@ -925,11 +924,10 @@ UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *col /* Check if currently selected bitmap is a DIB */ if (bitmap->color_table) { - if (startpos < bitmap->nb_colors) + if (startpos < bitmap->dib->dsBmih.biClrUsed) { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); - result = entries; + result = min( entries, bitmap->dib->dsBmih.biClrUsed - startpos ); + memcpy(colors, bitmap->color_table + startpos, result * sizeof(RGBQUAD)); } } GDI_ReleaseObj( dc->hBitmap ); @@ -1534,7 +1532,6 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, bmp->dib = dib; bmp->funcs = physdev->funcs; bmp->color_table = color_table; - bmp->nb_colors = dib->dsBmih.biClrUsed; GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 384cb5e..44a4075 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -206,7 +206,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f flags | private_color_table ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); + bmp->color_table, bmp->dib->dsBmih.biClrUsed, bmp->dib->dsBm.bmBits, flags ); } static void clear_dib_info(dib_info *dib) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 23c8f38..6d47143 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -179,8 +179,7 @@ typedef struct tagBITMAPOBJ const struct gdi_dc_funcs *funcs; /* DC function table */ /* For device-independent bitmaps: */ DIBSECTION *dib; - RGBQUAD *color_table; /* DIB color table if <= 8bpp */ - UINT nb_colors; /* number of colors in table */ + RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ } BITMAPOBJ; /* bidi.c */

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 38c3cde6fdeacd42b71b0ec95ea2300a69a5512c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c3cde6fdeacd42b71b0ec95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:06 2011 +0100 wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef. --- dlls/d3d9/d3d9_private.h | 10 +++++----- dlls/wined3d/directx.c | 30 +++++++++++++++--------------- include/wine/wined3d.h | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b16498e..1c3748d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -115,11 +115,11 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ - _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.Caps; \ - _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.NumTemps; \ - _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.StaticFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.NumInstructionSlots; \ + _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.caps; \ + _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.dynamic_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.temp_count; \ + _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.static_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.instruction_slot_count; \ _pD3D9Caps->VertexTextureFilterCaps = _pWineCaps->VertexTextureFilterCaps; \ _pD3D9Caps->MaxVShaderInstructionsExecuted = _pWineCaps->MaxVShaderInstructionsExecuted; \ _pD3D9Caps->MaxPShaderInstructionsExecuted = _pWineCaps->MaxPShaderInstructionsExecuted; \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73a82d..fe77b88 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4804,18 +4804,18 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte /* Caps is more or less undocumented on MSDN but it appears to be * used for PS20Caps based on results from R9600/FX5900/Geforce6800 * cards from Windows */ - caps->PS20Caps.Caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | + caps->PS20Caps.caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | WINED3DPS20CAPS_GRADIENTINSTRUCTIONS | WINED3DPS20CAPS_PREDICATION | WINED3DPS20CAPS_NODEPENDENTREADLIMIT | WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->PS20Caps.DynamicFlowControlDepth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; + caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, @@ -4824,23 +4824,23 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_ps_temps); - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ + caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 512; /* Minimum value, a GeforceFX uses 1024 */ caps->MaxPixelShader30InstructionSlots = 0; } else /* PS 1.x */ { - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; - caps->PS20Caps.NumTemps = 0; - caps->PS20Caps.StaticFlowControlDepth = 0; - caps->PS20Caps.NumInstructionSlots = 0; + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; + caps->PS20Caps.temp_count = 0; + caps->PS20Caps.static_flow_control_depth = 0; + caps->PS20Caps.instruction_slot_count = 0; caps->MaxPShaderInstructionsExecuted = 0; caps->MaxPixelShader30InstructionSlots = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b8981d5..4f5998c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1750,14 +1750,14 @@ struct wined3d_vertex_shader_caps INT static_flow_control_depth; }; -typedef struct _WINED3DPSHADERCAPS2_0 +struct wined3d_pixel_shader_caps { - DWORD Caps; - INT DynamicFlowControlDepth; - INT NumTemps; - INT StaticFlowControlDepth; - INT NumInstructionSlots; -} WINED3DPSHADERCAPS2_0; + DWORD caps; + INT dynamic_flow_control_depth; + INT temp_count; + INT static_flow_control_depth; + INT instruction_slot_count; +}; typedef struct _WINEDDCAPS { @@ -1861,7 +1861,7 @@ typedef struct _WINED3DCAPS DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; struct wined3d_vertex_shader_caps VS20Caps; - WINED3DPSHADERCAPS2_0 PS20Caps; + struct wined3d_pixel_shader_caps PS20Caps; DWORD VertexTextureFilterCaps; DWORD MaxVShaderInstructionsExecuted; DWORD MaxPShaderInstructionsExecuted;

1 0

Alexandre Julliard : gdi32: Fix handling of DIB_PAL_COLORS in the various DIB functions.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: c441ebc21d122db1c9c14e0e34a5593df706cb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c441ebc21d122db1c9c14e0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 16:48:28 2011 +0100 gdi32: Fix handling of DIB_PAL_COLORS in the various DIB functions. --- dlls/gdi32/dib.c | 48 ++++++++++++++++++--------------------------- dlls/gdi32/dibdrv/dc.c | 18 +++++++--------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2cc89fd..4c75fc2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -245,7 +245,7 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) return colors; } -int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) +BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY entries[256]; RGBQUAD table[256]; @@ -253,9 +253,9 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * const WORD *index = (const WORD *)info->bmiColors; int i, count, colors = info->bmiHeader.biClrUsed; - if (!colors) return 0; - if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; - if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return 0; + if (!colors) return TRUE; + if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; + if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) { @@ -264,9 +264,10 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * table[i].rgbBlue = entries[*index % count].peBlue; table[i].rgbReserved = 0; } - memcpy( color_table, table, colors * sizeof(RGBQUAD) ); - memset( color_table + colors, 0, ((1 << info->bmiHeader.biBitCount) - colors) * sizeof(RGBQUAD) ); - return colors; + info->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount; + memcpy( info->bmiColors, table, colors * sizeof(RGBQUAD) ); + memset( info->bmiColors + colors, 0, (info->bmiHeader.biClrUsed - colors) * sizeof(RGBQUAD) ); + return TRUE; } static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) @@ -448,7 +449,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he src_bits.is_copy = FALSE; src_bits.free = NULL; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, dev->hdc )) return 0; rect.left = xDst; rect.top = yDst; @@ -656,7 +657,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.free = NULL; src_bits.param = NULL; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, hdc )) return 0; if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return 0; @@ -753,7 +754,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR src_bits.free = NULL; if (!lines) return 0; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, dev->hdc )) return 0; if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { @@ -1463,19 +1464,12 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (info->bmiHeader.biBitCount <= 8) /* build the color table */ { - unsigned int colors = 1 << info->bmiHeader.biBitCount; - - if (!(color_table = HeapAlloc( GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) - { - HeapFree( GetProcessHeap(), 0, dib ); - return 0; - } - if (usage == DIB_RGB_COLORS) - memcpy( color_table, info->bmiColors, colors * sizeof(RGBQUAD) ); - else - fill_color_table_from_pal_colors( hdc, info, color_table ); - - dib->dsBmih.biClrUsed = colors; + if (usage == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( info, hdc )) + goto error; + dib->dsBmih.biClrUsed = info->bmiHeader.biClrUsed; + if (!(color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ))) + goto error; + memcpy( color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); } /* set dsBitfields values */ @@ -1488,6 +1482,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, } else if (info->bmiHeader.biCompression == BI_BITFIELDS) { + if (usage == DIB_PAL_COLORS) goto error; dib->dsBitfields[0] = *(const DWORD *)info->bmiColors; dib->dsBitfields[1] = *((const DWORD *)info->bmiColors + 1); dib->dsBitfields[2] = *((const DWORD *)info->bmiColors + 2); @@ -1518,12 +1513,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dshSection = section; dib->dsOffset = offset; - if (!dib->dsBm.bmBits) - { - HeapFree( GetProcessHeap(), 0, color_table ); - HeapFree( GetProcessHeap(), 0, dib ); - return 0; - } + if (!dib->dsBm.bmBits) goto error; /* If the reference hdc is null, take the desktop dc */ if (hdc == 0) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 12d1168..384cb5e 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -164,20 +164,18 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) { - DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; - RGBQUAD *color_table = NULL, pal_table[256]; int num_colors = get_dib_num_of_colors( bi ); - if(num_colors) + if (num_colors && usage == DIB_PAL_COLORS) { - if(usage == DIB_PAL_COLORS) - { - fill_color_table_from_pal_colors( hdc, bi, pal_table ); - color_table = pal_table; - } - else color_table = (RGBQUAD *)bi->bmiColors; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + + copy_bitmapinfo( info, bi ); + fill_color_table_from_pal_colors( info, hdc ); + return init_dib_info_from_bitmapinfo( dib, info, bits, private_color_table ); } - return init_dib_info(dib, &bi->bmiHeader, masks, color_table, num_colors, bits, private_color_table); + return init_dib_info_from_bitmapinfo(dib, bi, bits, private_color_table ); } BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bed05b..23c8f38 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -235,7 +235,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; -extern int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) DECLSPEC_HIDDEN; +extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Always allocate a full-size color table when creating a DIB section.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 647a4d58441c0d0702a6c74b2894f929fdb319f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=647a4d58441c0d0702a6c74b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 16:20:04 2011 +0100 gdi32: Always allocate a full-size color table when creating a DIB section. --- dlls/gdi32/dib.c | 84 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d870582..2cc89fd 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -172,13 +172,11 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * UINT coloruse, BOOL allow_compression ) { void *src_colors; - unsigned int colors; if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE; if (!is_valid_dib_format( &dst->bmiHeader, allow_compression )) return FALSE; src_colors = (char *)info + info->bmiHeader.biSize; - colors = get_dib_num_of_colors( dst ); if (dst->bmiHeader.biCompression == BI_BITFIELDS) { @@ -186,12 +184,23 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); dst->bmiHeader.biClrUsed = 0; } - else if (colors) + else if (dst->bmiHeader.biBitCount <= 8) { + unsigned int colors = dst->bmiHeader.biClrUsed; + unsigned int max_colors = 1 << dst->bmiHeader.biBitCount; + + if (!colors) colors = max_colors; + else colors = min( colors, max_colors ); + if (coloruse == DIB_PAL_COLORS) + { memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); + max_colors = colors; + } else if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + { memcpy( dst->bmiColors, src_colors, colors * sizeof(RGBQUAD) ); + } else { unsigned int i; @@ -204,8 +213,11 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * dst->bmiColors[i].rgbReserved = 0; } } - dst->bmiHeader.biClrUsed = colors; + memset( dst->bmiColors + colors, 0, (max_colors - colors) * sizeof(RGBQUAD) ); + dst->bmiHeader.biClrUsed = max_colors; } + else dst->bmiHeader.biClrUsed = 0; + return TRUE; } @@ -236,9 +248,10 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) { PALETTEENTRY entries[256]; + RGBQUAD table[256]; HPALETTE palette; const WORD *index = (const WORD *)info->bmiColors; - int i, count, colors = get_dib_num_of_colors( info ); + int i, count, colors = info->bmiHeader.biClrUsed; if (!colors) return 0; if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; @@ -246,12 +259,13 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * for (i = 0; i < colors; i++, index++) { - PALETTEENTRY *entry = &entries[*index % count]; - color_table[i].rgbRed = entry->peRed; - color_table[i].rgbGreen = entry->peGreen; - color_table[i].rgbBlue = entry->peBlue; - color_table[i].rgbReserved = 0; + table[i].rgbRed = entries[*index % count].peRed; + table[i].rgbGreen = entries[*index % count].peGreen; + table[i].rgbBlue = entries[*index % count].peBlue; + table[i].rgbReserved = 0; } + memcpy( color_table, table, colors * sizeof(RGBQUAD) ); + memset( color_table + colors, 0, ((1 << info->bmiHeader.biBitCount) - colors) * sizeof(RGBQUAD) ); return colors; } @@ -1350,6 +1364,7 @@ INT WINAPI GetDIBits( *index = i; } + dst_info->bmiHeader.biClrUsed = 0; copy_color_info( info, dst_info, coloruse ); done: @@ -1404,23 +1419,6 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, return handle; } -/* Copy/synthesize RGB palette from BITMAPINFO */ -static void DIB_CopyColorTable( HDC hdc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) -{ - unsigned int colors = get_dib_num_of_colors( info ); - - if (!(bmp->color_table = HeapAlloc(GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) return; - bmp->nb_colors = colors; - - if (coloruse == DIB_RGB_COLORS) - { - memcpy( bmp->color_table, info->bmiColors, colors * sizeof(RGBQUAD)); - } - else - { - fill_color_table_from_pal_colors( hdc, info, bmp->color_table ); - } -} /*********************************************************************** * CreateDIBSection (GDI32.@) @@ -1435,6 +1433,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, BOOL bDesktopDC = FALSE; DIBSECTION *dib; BITMAPOBJ *bmp; + RGBQUAD *color_table = NULL; void *mapBits = NULL; if (bits) *bits = NULL; @@ -1462,9 +1461,22 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBm.bmBits = NULL; dib->dsBmih = info->bmiHeader; - /* set number of entries in bmi.bmiColors table */ - if( info->bmiHeader.biBitCount <= 8 ) - dib->dsBmih.biClrUsed = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biBitCount <= 8) /* build the color table */ + { + unsigned int colors = 1 << info->bmiHeader.biBitCount; + + if (!(color_table = HeapAlloc( GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) + { + HeapFree( GetProcessHeap(), 0, dib ); + return 0; + } + if (usage == DIB_RGB_COLORS) + memcpy( color_table, info->bmiColors, colors * sizeof(RGBQUAD) ); + else + fill_color_table_from_pal_colors( hdc, info, color_table ); + + dib->dsBmih.biClrUsed = colors; + } /* set dsBitfields values */ if (info->bmiHeader.biBitCount == 16 && info->bmiHeader.biCompression == BI_RGB) @@ -1476,9 +1488,9 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, } else if (info->bmiHeader.biCompression == BI_BITFIELDS) { - dib->dsBitfields[0] = *(const DWORD *)bmi->bmiColors; - dib->dsBitfields[1] = *((const DWORD *)bmi->bmiColors + 1); - dib->dsBitfields[2] = *((const DWORD *)bmi->bmiColors + 2); + dib->dsBitfields[0] = *(const DWORD *)info->bmiColors; + dib->dsBitfields[1] = *((const DWORD *)info->bmiColors + 1); + dib->dsBitfields[2] = *((const DWORD *)info->bmiColors + 2); if (!dib->dsBitfields[0] || !dib->dsBitfields[1] || !dib->dsBitfields[2]) goto error; } else dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; @@ -1508,6 +1520,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!dib->dsBm.bmBits) { + HeapFree( GetProcessHeap(), 0, color_table ); HeapFree( GetProcessHeap(), 0, dib ); return 0; } @@ -1530,8 +1543,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); bmp->dib = dib; bmp->funcs = physdev->funcs; - /* create local copy of DIB palette */ - if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( hdc, bmp, usage, info ); + bmp->color_table = color_table; + bmp->nb_colors = dib->dsBmih.biClrUsed; GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) @@ -1550,6 +1563,7 @@ error: if (bDesktopDC) DeleteDC( hdc ); if (section) UnmapViewOfFile( mapBits ); else if (!offset) VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); + HeapFree( GetProcessHeap(), 0, color_table ); HeapFree( GetProcessHeap(), 0, dib ); return 0; }

1 0

Alexandre Julliard : gdi32: Don' t make a copy of the DIB color table when selecting it into a DC.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 71199eab77848feddbf3fce04d67c0f8837c8359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71199eab77848feddbf3fce04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 17:04:14 2011 +0100 gdi32: Don't make a copy of the DIB color table when selecting it into a DC. --- dlls/gdi32/dibdrv/dc.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2c61d29..b9308bf 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -422,7 +422,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) free_dib_info(&pdev->dib); pdev->defer = 0; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); @@ -495,11 +495,8 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p, %d, %d, %p)\n", dev, pos, count, colors); - if( pdev->dib.color_table && pos < pdev->dib.color_table_size ) + if (pdev->dib.color_table) { - if( pos + count > pdev->dib.color_table_size ) count = pdev->dib.color_table_size - pos; - memcpy( pdev->dib.color_table + pos, colors, count * sizeof(RGBQUAD) ); - pdev->bkgnd_color = get_pixel_color( pdev, GetBkColor( dev->hdc ), FALSE ); update_fg_colors( pdev );

1 0

Jacek Caban : wininet: Properly handle closed connection in HTTP_HttpEndRequestW.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 892d3cd46bb748bbb6f65d9733ec6b2fff0bc8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892d3cd46bb748bbb6f65d973… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:27 2011 +0100 wininet: Properly handle closed connection in HTTP_HttpEndRequestW. --- dlls/wininet/http.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5d6fdd0..631a184 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4977,6 +4977,12 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ DWORD dwBufferSize; DWORD res = ERROR_SUCCESS; + if(!request->netconn) { + WARN("Not connected\n"); + send_request_complete(request, 0, ERROR_INTERNET_OPERATION_CANCELLED); + return ERROR_INTERNET_OPERATION_CANCELLED; + } + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);

1 0

Alexandre Julliard : gdi32: Use PutImage directly to set the initial bitmap bits.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 910fb482916b8515a59752f64d3153a4811bb9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910fb482916b8515a59752f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 19:58:47 2011 +0100 gdi32: Use PutImage directly to set the initial bitmap bits. --- dlls/gdi32/bitmap.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 4f0b173..510d5f5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -513,14 +513,43 @@ LONG WINAPI SetBitmapBits( static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; + char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; + char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; + DWORD err; + struct gdi_image_bits bits; + struct bitblt_coords src, dst; if (!bmp->bitmap.bmBits) return; if (bmp->funcs->pPutImage == nulldrv_PutImage) return; - get_ddb_bitmapinfo( bmp, info ); - SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); + get_ddb_bitmapinfo( bmp, src_info ); + + bits.ptr = bmp->bitmap.bmBits; + bits.is_copy = FALSE; + bits.free = NULL; + bits.param = NULL; + + src.x = 0; + src.y = 0; + src.width = bmp->bitmap.bmWidth; + src.height = bmp->bitmap.bmHeight; + src.visrect.left = 0; + src.visrect.top = 0; + src.visrect.right = bmp->bitmap.bmWidth; + src.visrect.bottom = bmp->bitmap.bmHeight; + dst = src; + + copy_bitmapinfo( dst_info, src_info ); + + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); + if (err == ERROR_BAD_FORMAT) + { + err = convert_bits( src_info, &src, dst_info, &bits, FALSE ); + if (!err) err = bmp->funcs->pPutImage( NULL, hbitmap, 0, dst_info, &bits, &src, &dst, 0 ); + if (bits.free) bits.free( &bits ); + } } /***********************************************************************

1 0

Jacek Caban : winebrowser: Use IUri API for URL-related logic.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: dd7c38d044ce28626dfc1f04500c3f9fdc6eb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7c38d044ce28626dfc1f045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 16:36:33 2011 +0100 winebrowser: Use IUri API for URL-related logic. --- programs/winebrowser/Makefile.in | 2 +- programs/winebrowser/main.c | 183 ++++++++++++++++++-------------------- 2 files changed, 87 insertions(+), 98 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 0dee070..a2e2793 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = winebrowser.exe APPMODE = -mwindows -municode -IMPORTS = shlwapi user32 advapi32 +IMPORTS = urlmon oleaut32 user32 advapi32 C_SRCS = \ main.c diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 8635ad2..9e94fd5 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -36,6 +36,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define COBJMACROS #include "config.h" #include "wine/port.h" @@ -66,15 +67,6 @@ static char *strdup_unixcp( const WCHAR *str ) return ret; } -static WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) - strcpyW( dst, src ); - return dst; -} - /* try to launch a unix app from a comma separated string of app names */ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) { @@ -316,6 +308,58 @@ done: return ret; } +static IUri *convert_file_uri(IUri *uri) +{ + wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + IUriBuilder *uri_builder; + struct stat dummy; + WCHAR *new_path; + char *unixpath; + BSTR filename; + IUri *new_uri; + HRESULT hres; + + /* check if the argument is a local file */ + wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t) + GetProcAddress( GetModuleHandleA( "KERNEL32" ), "wine_get_unix_file_name" ); + if(!wine_get_unix_file_name_ptr) + return NULL; + + hres = IUri_GetPath(uri, &filename); + if(FAILED(hres)) + return NULL; + + unixpath = wine_get_unix_file_name_ptr(filename); + SysFreeString(filename); + if(unixpath && stat(unixpath, &dummy) >= 0) { + int len; + + len = MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, NULL, 0); + new_path = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if(new_path) + MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, new_path, len); + HeapFree(GetProcessHeap(), 0, unixpath); + }else { + WINE_WARN("File %s does not exist\n", wine_dbgstr_a(unixpath)); + HeapFree(GetProcessHeap(), 0, unixpath); + new_path = NULL; + } + + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); + if(SUCCEEDED(hres) && new_path) + hres = IUriBuilder_SetPath(uri_builder, new_path); + HeapFree(GetProcessHeap(), 0, new_path); + if(FAILED(hres)) + return NULL; + + hres = IUriBuilder_CreateUri(uri_builder, 0, 0, 0, &new_uri); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NULL; + + return new_uri; +} + /***************************************************************************** * Main entry point. This is a console application so we have a wmain() not a * winmain(). @@ -323,11 +367,12 @@ done: int wmain(int argc, WCHAR *argv[]) { static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; - static const WCHAR mailtoW[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR fileW[] = {'f','i','l','e',':',0}; - WCHAR *p, *filenameW = NULL, *fileurlW = NULL, *url = argv[1]; - wine_get_unix_file_name_t wine_get_unix_file_name_ptr; + WCHAR *url = argv[1]; + BSTR display_uri; + DWORD scheme; + IUri *uri; + HRESULT hres; int ret = 1; /* DDE used only if -nohome is specified; avoids delay in printing usage info @@ -335,103 +380,47 @@ int wmain(int argc, WCHAR *argv[]) if (url && !strcmpiW( url, nohomeW )) url = argc > 2 ? argv[2] : get_url_from_dde(); - if (!url) - { + if (!url) { WINE_ERR( "Usage: winebrowser URL\n" ); - goto done; + return -1; } - /* handle an RFC1738 file URL */ - if (!strncmpiW( url, fileW, 5 )) - { - DWORD len = strlenW( url ) + 1; - - if (UrlUnescapeW( url, NULL, &len, URL_UNESCAPE_INPLACE ) != S_OK) - { - WINE_ERR( "unescaping URL failed: %s\n", wine_dbgstr_w(url) ); - goto done; - } - - /* look for a Windows path after 'file:' */ - p = url + 5; - while (*p) - { - if (isalphaW( p[0] ) && (p[1] == ':' || p[1] == '|')) break; - p++; - } - if (!*p) - { - WINE_ERR( "no valid Windows path in: %s\n", wine_dbgstr_w(url) ); - goto done; - } - - if (p[1] == '|') p[1] = ':'; - url = p; - - while (*p) - { - if (*p == '/') *p = '\\'; - p++; - } + hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) { + WINE_ERR("Failed to parse URL\n"); + ret = open_http_url(url); + HeapFree(GetProcessHeap(), 0, ddeString); + return ret; } - /* check if the argument is a local file */ - wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t) - GetProcAddress( GetModuleHandleA( "KERNEL32" ), "wine_get_unix_file_name" ); + HeapFree(GetProcessHeap(), 0, ddeString); + IUri_GetScheme(uri, &scheme); - if (wine_get_unix_file_name_ptr == NULL) - { - WINE_ERR( "cannot get the address of 'wine_get_unix_file_name'\n" ); - } - else - { - char *unixpath; - WCHAR c = 0; + if(scheme == URL_SCHEME_FILE) { + IUri *file_uri; - if (!(filenameW = strdupW( url ))) goto done; - if ((p = strchrW( filenameW, '?' )) || (p = strchrW( filenameW, '#' ))) - { - c = *p; - *p = 0; + file_uri = convert_file_uri(uri); + if(file_uri) { + IUri_Release(uri); + uri = file_uri; + }else { + WINE_ERR("Failed to convert file URL to unix path\n"); } + } - if ((unixpath = wine_get_unix_file_name_ptr( filenameW ))) - { - struct stat dummy; - if (stat( unixpath, &dummy ) >= 0) - { - static const WCHAR schemeW[] = {'f','i','l','e',':','/','/',0}; - int len, len_scheme; - - len = len_scheme = strlenW( schemeW ); - len += MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, NULL, 0 ); - if (p) - { - *p = c; - len += strlenW( p ); - } - - if (!(fileurlW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done; - - strcpyW( fileurlW, schemeW ); - MultiByteToWideChar( CP_UNIXCP, 0, unixpath, -1, fileurlW + len_scheme, len - len_scheme ); - if (p) strcatW( fileurlW, p ); + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + if(FAILED(hres)) + return -1; - ret = open_http_url( fileurlW ); - goto done; - } - } - } + WINE_TRACE("opening %s\n", wine_dbgstr_w(display_uri)); - if (!strncmpiW( url, mailtoW, 7 )) - ret = open_mailto_url( url ); + if(scheme == URL_SCHEME_MAILTO) + ret = open_mailto_url(display_uri); else /* let the browser decide how to handle the given url */ - ret = open_http_url( url ); + ret = open_http_url(display_uri); -done: - HeapFree(GetProcessHeap(), 0, ddeString); - HeapFree( GetProcessHeap(), 0, filenameW ); - HeapFree( GetProcessHeap(), 0, fileurlW ); + SysFreeString(display_uri); return ret; }

1 0