October 2012 - Wine-commits

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.AdapterType.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: b0045eccde3042ac9e443a47fef1540773bcb148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0045eccde3042ac9e443a47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:01:22 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.AdapterType. --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9beb3e2..5be3b2c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,6 +74,8 @@ static const WCHAR class_stdregprovW[] = static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_adaptertypeW[] = + {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_acceptpauseW[] = {'A','c','c','e','p','t','P','a','u','s','e',0}; static const WCHAR prop_acceptstopW[] = @@ -249,6 +251,7 @@ static const struct column col_logicaldisk[] = }; static const struct column col_networkadapter[] = { + { prop_adaptertypeW, CIM_STRING }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -422,6 +425,7 @@ struct record_logicaldisk }; struct record_networkadapter { + const WCHAR *adaptertype; const WCHAR *device_id; INT32 interface_index; const WCHAR *mac_address; @@ -711,6 +715,23 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } +static const WCHAR *get_adaptertype( DWORD type ) +{ + static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; + static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; + static const WCHAR firewireW[] = {'1','3','9','4',0}; + static const WCHAR tunnelW[] = {'T','u','n','n','e','l',0}; + + switch (type) + { + case IF_TYPE_ETHERNET_CSMACD: return ethernetW; + case IF_TYPE_IEEE80211: return wirelessW; + case IF_TYPE_IEEE1394: return firewireW; + case IF_TYPE_TUNNEL: return tunnelW; + default: break; + } + return NULL; +} static void fill_networkadapter( struct table *table ) { @@ -740,6 +761,7 @@ static void fill_networkadapter( struct table *table ) { rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); + rec->adaptertype = get_adaptertype( aa->IfType ); rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength );

1 0

Hans Leidekker : wbemprox: Add reference counting to the table structure.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: ef6fa2b9f2e5141000d8602625159dfe45867fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6fa2b9f2e5141000d860262… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:01:44 2012 +0200 wbemprox: Add reference counting to the table structure. --- dlls/wbemprox/class.c | 35 ++++++++++++++++++++--------------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/services.c | 8 +++++--- dlls/wbemprox/table.c | 37 ++++++++++++++++++++++++++++++------- dlls/wbemprox/wbemprox_private.h | 8 +++++--- 5 files changed, 62 insertions(+), 30 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5a70e9d..5bbd6aa 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -382,11 +382,14 @@ static HRESULT WINAPI class_object_Put( if (co->record) { - struct table *table = get_table( co->name ); + struct table *table = grab_table( co->name ); UINT index; HRESULT hr; - if ((hr = get_column_index( table, wszName, &index )) != S_OK) return hr; + if (!table) return WBEM_E_FAILED; + hr = get_column_index( table, wszName, &index ); + release_table( table ); + if (hr != S_OK) return hr; return record_set_value( co->record, index, pVal ); } return put_propval( ec->query->view, co->index, wszName, pVal, Type ); @@ -450,18 +453,18 @@ static HRESULT WINAPI class_object_Next( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); struct view *view = ec->query->view; - const WCHAR *property; + BSTR property; HRESULT hr; TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; - if (!(*strName = SysAllocString( property ))) return E_OUTOFMEMORY; if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) { - SysFreeString( *strName ); + SysFreeString( property ); return hr; } + *strName = property; co->index_property++; return S_OK; } @@ -834,7 +837,7 @@ static HRESULT WINAPI class_object_NextMethod( IWbemClassObject **ppOutSignature) { struct class_object *co = impl_from_IWbemClassObject( iface ); - const WCHAR *method; + BSTR method; HRESULT hr; TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); @@ -842,18 +845,20 @@ static HRESULT WINAPI class_object_NextMethod( if (!(method = get_method_name( co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA; hr = create_signature( co->name, method, PARAM_IN, ppInSignature ); - if (hr != S_OK) return hr; - + if (hr != S_OK) + { + SysFreeString( method ); + return hr; + } hr = create_signature( co->name, method, PARAM_OUT, ppOutSignature ); - if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + if (hr != S_OK) + { + SysFreeString( method ); + IWbemClassObject_Release( *ppInSignature ); + } else { - if (!(*pstrName = SysAllocString( method ))) - { - IWbemClassObject_Release( *ppInSignature ); - IWbemClassObject_Release( *ppOutSignature ); - return E_OUTOFMEMORY; - } + *pstrName = method; co->index_method++; } return hr; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 223a373..8df09bc 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -37,7 +37,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, if (!view) return E_OUTOFMEMORY; view->proplist = proplist; - view->table = get_table( class ); + view->table = grab_table( class ); view->cond = cond; view->result = NULL; view->count = 0; @@ -47,7 +47,7 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, void destroy_view( struct view *view ) { - free_table( view->table ); + if (view->table) release_table( view->table ); heap_free( view->result ); heap_free( view ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5e9cec0..3f87d5b 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -578,7 +578,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { - const struct table *table; + struct table *table; class_method *func; struct path *path; HRESULT hr; @@ -590,11 +590,13 @@ static HRESULT WINAPI wbem_services_ExecMethod( if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; - table = get_table( path->class ); + table = grab_table( path->class ); free_path( path ); if (!table) return WBEM_E_NOT_FOUND; - if ((hr = get_method( table, strMethodName, &func )) != S_OK) return hr; + hr = get_method( table, strMethodName, &func ); + release_table( table ); + if (hr != S_OK) return hr; return func( pInParams, ppOutParams ); } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c414aa9..a49bf58 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -316,7 +316,12 @@ void free_table( struct table *table ) } } -struct table *get_table( const WCHAR *name ) +void release_table( struct table *table ) +{ + if (!InterlockedDecrement( &table->refs )) free_table( table ); +} + +struct table *grab_table( const WCHAR *name ) { struct table *table; @@ -325,6 +330,8 @@ struct table *get_table( const WCHAR *name ) if (!strcmpiW( table->name, name )) { if (table->fill && !table->data) table->fill( table ); + InterlockedIncrement( &table->refs ); + TRACE("returning %p\n", table); return table; } } @@ -344,6 +351,7 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum table->data = data; table->fill = fill; table->flags = TABLE_FLAG_DYNAMIC; + table->refs = 0; list_init( &table->entry ); return table; } @@ -361,41 +369,56 @@ BOOL add_table( struct table *table ) } } list_add_tail( table_list, &table->entry ); + TRACE("added %p\n", table); return TRUE; } -const WCHAR *get_method_name( const WCHAR *class, UINT index ) +BSTR get_method_name( const WCHAR *class, UINT index ) { struct table *table; UINT i, count = 0; + BSTR ret; - if (!(table = get_table( class ))) return NULL; + if (!(table = grab_table( class ))) return NULL; for (i = 0; i < table->num_cols; i++) { if (table->columns[i].type & COL_FLAG_METHOD) { - if (index == count) return table->columns[i].name; + if (index == count) + { + ret = SysAllocString( table->columns[i].name ); + release_table( table ); + return ret; + } count++; } } + release_table( table ); return NULL; } -const WCHAR *get_property_name( const WCHAR *class, UINT index ) +BSTR get_property_name( const WCHAR *class, UINT index ) { struct table *table; UINT i, count = 0; + BSTR ret; - if (!(table = get_table( class ))) return NULL; + if (!(table = grab_table( class ))) return NULL; for (i = 0; i < table->num_cols; i++) { if (!(table->columns[i].type & COL_FLAG_METHOD)) { - if (index == count) return table->columns[i].name; + if (index == count) + { + ret = SysAllocString( table->columns[i].name ); + release_table( table ); + return ret; + } count++; } } + release_table( table ); return NULL; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index b99897e..b0e9933 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -57,6 +57,7 @@ struct table void (*fill)(struct table *); UINT flags; struct list entry; + LONG refs; }; struct property @@ -151,7 +152,8 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; -struct table *get_table( const WCHAR * ) DECLSPEC_HIDDEN; +struct table *grab_table( const WCHAR * ) DECLSPEC_HIDDEN; +void release_table( struct table * ) DECLSPEC_HIDDEN; struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BYTE *, void (*)(struct table *)) DECLSPEC_HIDDEN; BOOL add_table( struct table * ) DECLSPEC_HIDDEN; @@ -169,8 +171,8 @@ HRESULT put_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYP HRESULT variant_to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; -const WCHAR *get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; -const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; +BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add support for uncommitted instances in IWbemClassObject::Get.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: b552ad3672aabedea9f58d52eb37c3f41c3838cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b552ad3672aabedea9f58d52e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:02:05 2012 +0200 wbemprox: Add support for uncommitted instances in IWbemClassObject::Get. --- dlls/wbemprox/class.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5bbd6aa..8e1d664 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -323,6 +323,32 @@ static HRESULT WINAPI class_object_GetQualifierSet( return E_NOTIMPL; } +static HRESULT record_get_value( const struct record *record, UINT index, VARIANT *var, CIMTYPE *type ) +{ + if (type) *type = record->fields[index].type; + + switch (record->fields[index].type) + { + case CIM_STRING: + case CIM_DATETIME: + V_VT( var ) = VT_BSTR; + V_BSTR( var ) = SysAllocString( record->fields[index].u.sval ); + return S_OK; + case CIM_SINT32: + V_VT( var ) = VT_I4; + V_I4( var ) = record->fields[index].u.ival; + return S_OK; + case CIM_UINT32: + V_VT( var ) = VT_UI4; + V_UI4( var ) = record->fields[index].u.ival; + return S_OK; + default: + FIXME("unhandled type %u\n", record->fields[index].type); + break; + } + return WBEM_E_INVALID_PARAMETER; +} + static HRESULT WINAPI class_object_Get( IWbemClassObject *iface, LPCWSTR wszName, @@ -333,11 +359,22 @@ static HRESULT WINAPI class_object_Get( { struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - return get_propval( view, co->index, wszName, pVal, pType, plFlavor ); + if (co->record) + { + struct table *table = grab_table( co->name ); + UINT index; + HRESULT hr; + + if (!table) return WBEM_E_FAILED; + hr = get_column_index( table, wszName, &index ); + release_table( table ); + if (hr != S_OK) return hr; + return record_get_value( co->record, index, pVal, pType ); + } + return get_propval( ec->query->view, co->index, wszName, pVal, pType, plFlavor ); } static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var )

1 0

Hans Leidekker : wbemprox: Add support for array types.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 3e52cea324af31fa7436615db2602fbb6984f6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e52cea324af31fa7436615db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 10 12:03:10 2012 +0200 wbemprox: Add support for array types. --- dlls/wbemprox/class.c | 18 ++++- dlls/wbemprox/query.c | 175 ++++++++++++++++++++++++++++++++------ dlls/wbemprox/table.c | 4 +- dlls/wbemprox/wbemprox_private.h | 10 ++- 4 files changed, 177 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e52cea324af31fa74366…

1 0

Nikolay Sivov : dwrite: Implement GetFontStretch().
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 0a6663908d9eb2156e92ca25f5e2b5655c51822e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6663908d9eb2156e92ca25f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 10 08:37:55 2012 -0400 dwrite: Implement GetFontStretch(). --- dlls/dwrite/font.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4acd35f..c218c25 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -27,6 +27,69 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +/* PANOSE is 10 bytes in size, need to pack the structure properly */ +#include "pshpack2.h" +typedef struct +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; + /* version 2 (OpenType 1.2) */ + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} TT_OS2_V2; +#include "poppack.h" + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))); +#endif + +#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) +#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -41,6 +104,7 @@ struct dwrite_font { IDWriteFontFamily *family; IDWriteFontFace *face; DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; }; struct dwrite_fontface { @@ -314,8 +378,8 @@ static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STRETCH_UNDEFINED; + TRACE("(%p)\n", This); + return This->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) @@ -528,12 +592,37 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa return S_OK; } +static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) +{ + DWRITE_FONT_STRETCH stretch; + TT_OS2_V2 tt_os2; + LONG size; + + /* default stretch to normal */ + stretch = DWRITE_FONT_STRETCH_NORMAL; + + size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); + if (size == GDI_ERROR) return stretch; + + if (size > sizeof(tt_os2)) size = sizeof(tt_os2); + + memset(&tt_os2, 0, sizeof(tt_os2)); + if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; + + /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ + if (GET_BE_WORD(tt_os2.usWeightClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + stretch = GET_BE_WORD(tt_os2.usWeightClass); + + return stretch; +} + HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { const WCHAR* facename, *familyname; struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; + DWRITE_FONT_STRETCH stretch; HRESULT hr; HFONT hfont; HDC hdc; @@ -552,6 +641,8 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); + stretch = get_font_stretch(hdc); + DeleteDC(hdc); DeleteObject(hfont); @@ -575,6 +666,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->family = family; This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + This->stretch = stretch; *font = &This->IDWriteFont_iface;

1 0

Nikolay Sivov : dwrite: Added IDWriteTextFormat stub implementation.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 9a32882c4da3e44164f73eaf187aba72cb700bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a32882c4da3e44164f73eaf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 10 14:58:20 2012 -0400 dwrite: Added IDWriteTextFormat stub implementation. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 275 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- 3 files changed, 278 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a32882c4da3e44164f73…

1 0

Alexandre Julliard : gdi32: Return the full DIB height in GetImage instead of clipping to the visible rect .
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 86cf1126a5cc6035e21db3df01088827f5b2245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cf1126a5cc6035e21db3df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:05:41 2012 +0200 gdi32: Return the full DIB height in GetImage instead of clipping to the visible rect. --- dlls/gdi32/dibdrv/bitblt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bac5a60..bcaa585 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -812,12 +812,11 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, { info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; - info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->rect.bottom - dib->rect.top; + info->bmiHeader.biHeight = dib->height - dib->rect.top; info->bmiHeader.biBitCount = dib->bit_count; info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight;

1 0

Alexandre Julliard : gdi32: Limit the allocation size to the useful data when converting DIB bits.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 34b70728f386eda7b67eb77aa4ebae8c00c4a3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b70728f386eda7b67eb77aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:06:06 2012 +0200 gdi32: Limit the allocation size to the useful data when converting DIB bits. --- dlls/gdi32/bitblt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7a1f06f..151434f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -162,9 +162,12 @@ DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, { void *ptr; DWORD err; + BOOL top_down = dst_info->bmiHeader.biHeight < 0; dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; + dst_info->bmiHeader.biHeight = src->visrect.bottom - src->visrect.top; dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); + if (top_down) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY;

1 0

Alexandre Julliard : gdi32: Use BI_BITFIELDS to indicate that a 32-bpp DIB doesn' t have an alpha channel.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 76272e077364d3d78ceaf8912e3bc22ff6a31a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76272e077364d3d78ceaf8912… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:08:05 2012 +0200 gdi32: Use BI_BITFIELDS to indicate that a 32-bpp DIB doesn't have an alpha channel. --- dlls/gdi32/bitblt.c | 8 ++++++-- dlls/gdi32/dibdrv/bitblt.c | 8 ++++++-- dlls/gdi32/dibdrv/dc.c | 13 +++++++++++++ dlls/winex11.drv/xrender.c | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 151434f..ea6d8a7 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -357,6 +357,7 @@ DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_ BITMAPINFO *dst_info = (BITMAPINFO *)buffer; struct gdi_image_bits dst_bits; struct bitblt_coords orig_dst; + DWORD *masks = (DWORD *)info->bmiColors; DC *dc = get_nulldrv_dc( dev ); DWORD err; @@ -364,7 +365,7 @@ DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_ if (info->bmiHeader.biBitCount != 32) goto update_format; if (info->bmiHeader.biCompression == BI_BITFIELDS) { - DWORD *masks = (DWORD *)info->bmiColors; + if (blend.AlphaFormat & AC_SRC_ALPHA) return ERROR_INVALID_PARAMETER; if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) goto update_format; } @@ -390,8 +391,11 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 32; - info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biCompression = BI_BITFIELDS; info->bmiHeader.biClrUsed = 0; + masks[0] = 0xff0000; + masks[1] = 0x00ff00; + masks[2] = 0x0000ff; return ERROR_BAD_FORMAT; } diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bcaa585..ccddac9 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1001,6 +1001,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dib_info src_dib; + DWORD *masks = (DWORD *)info->bmiColors; TRACE( "%p %p\n", dev, info ); @@ -1008,7 +1009,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b if (info->bmiHeader.biBitCount != 32) goto update_format; if (info->bmiHeader.biCompression == BI_BITFIELDS) { - DWORD *masks = (DWORD *)info->bmiColors; + if (blend.AlphaFormat & AC_SRC_ALPHA) return ERROR_INVALID_PARAMETER; if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) goto update_format; } @@ -1027,8 +1028,11 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 32; - info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biCompression = BI_BITFIELDS; info->bmiHeader.biClrUsed = 0; + masks[0] = 0xff0000; + masks[1] = 0x00ff00; + masks[2] = 0x0000ff; return ERROR_BAD_FORMAT; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 00e2229..0e68f80 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -760,6 +760,19 @@ static DWORD windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, lock_surface( physdev->surface ); dev = GET_NEXT_PHYSDEV( dev, pGetImage ); ret = dev->funcs->pGetImage( dev, info, bits, src ); + + /* don't return alpha if original surface doesn't support it */ + if (info->bmiHeader.biBitCount == 32 && + info->bmiHeader.biCompression == BI_RGB && + physdev->dibdrv->dib.compression == BI_BITFIELDS) + { + DWORD *colors = (DWORD *)info->bmiColors; + colors[0] = 0xff0000; + colors[1] = 0x00ff00; + colors[2] = 0x0000ff; + info->bmiHeader.biCompression = BI_BITFIELDS; + } + if (!bits->is_copy) { /* use the freeing callback to unlock the surface */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bdb8865..d7f0508 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2077,7 +2077,7 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct format = get_xrender_format_from_bitmapinfo( info ); if (!(func.AlphaFormat & AC_SRC_ALPHA)) format = get_format_without_alpha( format ); - else if (format != WXR_FORMAT_A8R8G8B8) + else if (format != WXR_FORMAT_A8R8G8B8 || info->bmiHeader.biCompression != BI_RGB) return ERROR_INVALID_PARAMETER; if (!(pict_format = pict_formats[format])) goto update_format;

1 0

Alexandre Julliard : gdi32: Handle a missing source alpha directly in the blend_rect primitive instead of modifying the source data .
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 6e325afaa78f2037521e899838be91fa1dc35a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e325afaa78f2037521e89983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:19:42 2012 +0200 gdi32: Handle a missing source alpha directly in the blend_rect primitive instead of modifying the source data. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/dibdrv/dc.c | 14 +------------- dlls/gdi32/dibdrv/primitives.c | 14 +++++++++++++- dlls/gdi32/gdi_private.h | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ea6d8a7..4750d1b 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -158,7 +158,7 @@ void free_heap_bits( struct gdi_image_bits *bits ) } DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) + BITMAPINFO *dst_info, struct gdi_image_bits *bits ) { void *ptr; DWORD err; @@ -172,7 +172,7 @@ DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; - err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, add_alpha ); + err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr ); if (bits->free) bits->free( bits ); bits->ptr = ptr; bits->is_copy = TRUE; @@ -287,7 +287,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); } - if (!(err = convert_bits( src_info, src, dst_info, &bits, FALSE ))) + if (!(err = convert_bits( src_info, src, dst_info, &bits ))) { /* get rid of the fake destination table */ dst_info->bmiHeader.biClrUsed = dst_colors; @@ -330,7 +330,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, src, dst_info, &bits, TRUE ); + err = convert_bits( src_info, src, dst_info, &bits ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 91cfae7..eed57e8 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -572,7 +572,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he dst_info->bmiHeader.biClrUsed = 1; } - if (!(err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ))) + if (!(err = convert_bits( src_info, &src, dst_info, &src_bits ))) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; @@ -738,7 +738,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, err = put_image_into_bitmap( bitmap, clip, dst_info, &src_bits, &src, &dst ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + err = convert_bits( src_info, &src, dst_info, &src_bits ); if (!err) err = put_image_into_bitmap( bitmap, clip, dst_info, &src_bits, &src, &dst ); } if(err) result = 0; @@ -855,7 +855,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + err = convert_bits( src_info, &src, dst_info, &src_bits ); if (!err) err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); } if (err) lines = 0; @@ -1387,7 +1387,7 @@ INT WINAPI GetDIBits( else dst_info->bmiHeader.biHeight = -src.height; - convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits, FALSE ); + convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); ret = lines; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0e68f80..0b6013d 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -214,7 +214,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) + const BITMAPINFO *dst_info, void *dst_bits ) { dib_info src_dib, dst_dib; DWORD ret; @@ -234,24 +234,12 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit } __ENDTRY - /* We shared the color tables, so there's no need to free the dib_infos here */ if(!ret) return ERROR_BAD_FORMAT; /* update coordinates, the destination rectangle is always stored at 0,0 */ src->x -= src->visrect.left; src->y -= src->visrect.top; offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); - - if (add_alpha && dst_dib.funcs == &funcs_8888 && src_dib.funcs != &funcs_8888) - { - DWORD *pixel = dst_dib.bits.ptr; - int x, y; - - for (y = src->visrect.top; y < src->visrect.bottom; y++, pixel += dst_dib.stride / 4) - for (x = src->visrect.left; x < src->visrect.right; x++) - pixel[x] |= 0xff000000; - } - return ERROR_SUCCESS; } diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 07dd1d5..6feb819 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -3838,6 +3838,14 @@ static inline DWORD blend_argb_constant_alpha( DWORD dst, DWORD src, DWORD alpha blend_color( dst >> 24, src >> 24, alpha ) << 24); } +static inline DWORD blend_argb_no_src_alpha( DWORD dst, DWORD src, DWORD alpha ) +{ + return (blend_color( dst, src, alpha ) | + blend_color( dst >> 8, src >> 8, alpha ) << 8 | + blend_color( dst >> 16, src >> 16, alpha ) << 16 | + blend_color( dst >> 24, 255, alpha ) << 24); +} + static inline DWORD blend_argb( DWORD dst, DWORD src ) { BYTE b = (BYTE)src; @@ -3898,10 +3906,14 @@ static void blend_rect_8888(const dib_info *dst, const RECT *rc, for (x = 0; x < rc->right - rc->left; x++) dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); } - else + else if (src->compression == BI_RGB) for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) for (x = 0; x < rc->right - rc->left; x++) dst_ptr[x] = blend_argb_constant_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + else + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_no_src_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); } static void blend_rect_32(const dib_info *dst, const RECT *rc, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 29d4286..5b79526 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -222,7 +222,7 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, /* bitblt.c */ extern DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) DECLSPEC_HIDDEN; + BITMAPINFO *dst_info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, @@ -264,7 +264,7 @@ 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; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN; + const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; 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,

1 0