January 2013 - Wine-Commits

Alexandre Julliard : gdi32: Add ref counting to the face and family objects .
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 865078b05a2216522aef5db5f9232f24de5d98fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=865078b05a2216522aef5db5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 15:19:14 2013 +0100 gdi32: Add ref counting to the face and family objects. --- dlls/gdi32/freetype.c | 81 +++++++++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ab9a1af..0798414 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -259,6 +259,7 @@ struct enum_data typedef struct tagFace { struct list entry; + unsigned int refcount; WCHAR *StyleName; WCHAR *FullName; WCHAR *file; @@ -280,6 +281,7 @@ typedef struct tagFace { typedef struct tagFamily { struct list entry; + unsigned int refcount; WCHAR *FamilyName; WCHAR *EnglishName; struct list faces; @@ -966,7 +968,9 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n file = face->file; else file++; - if(!strcmpiW(file, file_name)) return face; + if(strcmpiW(file, file_name)) continue; + face->refcount++; + return face; } } return NULL; @@ -1233,27 +1237,29 @@ static inline BOOL faces_equal( const Face *f1, const Face *f2 ) return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); } -static inline void free_face( Face *face ) +static void release_family( Family *family ) { - HeapFree( GetProcessHeap(), 0, face->file ); - HeapFree( GetProcessHeap(), 0, face->StyleName ); - HeapFree( GetProcessHeap(), 0, face->FullName ); - HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); - HeapFree( GetProcessHeap(), 0, face ); + if (--family->refcount) return; + assert( list_empty( &family->faces )); + list_remove( &family->entry ); + HeapFree( GetProcessHeap(), 0, family->FamilyName ); + HeapFree( GetProcessHeap(), 0, family->EnglishName ); + HeapFree( GetProcessHeap(), 0, family ); } -static inline void free_family( Family *family ) +static void release_face( Face *face ) { - Face *face, *cursor2; - - LIST_FOR_EACH_ENTRY_SAFE( face, cursor2, &family->faces, Face, entry ) + if (--face->refcount) return; + if (face->family) { list_remove( &face->entry ); - free_face( face ); + release_family( face->family ); } - HeapFree( GetProcessHeap(), 0, family->FamilyName ); - HeapFree( GetProcessHeap(), 0, family->EnglishName ); - HeapFree( GetProcessHeap(), 0, family ); + HeapFree( GetProcessHeap(), 0, face->file ); + HeapFree( GetProcessHeap(), 0, face->StyleName ); + HeapFree( GetProcessHeap(), 0, face->FullName ); + HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); + HeapFree( GetProcessHeap(), 0, face ); } static inline int style_order(const Face *face) @@ -1301,8 +1307,9 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) debugstr_w(cursor->file), debugstr_w(face->file)); list_add_before( &cursor->entry, &face->entry ); face->family = family; - list_remove( &cursor->entry); - free_face( cursor ); + family->refcount++; + face->refcount++; + release_face( cursor ); return TRUE; } } @@ -1314,6 +1321,8 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) list_add_before( &cursor->entry, &face->entry ); face->family = family; + family->refcount++; + face->refcount++; return TRUE; } @@ -1324,10 +1333,12 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) static Family *create_family( WCHAR *name, WCHAR *english_name ) { Family * const family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->refcount = 1; family->FamilyName = name; family->EnglishName = english_name; list_init( &family->faces ); family->replacement = &family->faces; + list_add_tail( &font_list, &family->entry ); return family; } @@ -1363,7 +1374,9 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; + face->family = NULL; + face->refcount = 1; face->file = strdupW( buffer ); face->StyleName = strdupW(face_name); @@ -1406,9 +1419,10 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - insert_face_in_family_list(face, family); + if (insert_face_in_family_list(face, family)) + TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); - TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + release_face( face ); } /* load bitmap strikes */ @@ -1446,7 +1460,6 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) english_family = strdupW( buffer ); family = create_family(family_name, english_family); - list_add_tail(&font_list, &family->entry); if(english_family) { @@ -1473,6 +1486,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) size = sizeof(buffer); } RegCloseKey(hkey_family); + release_family( family ); size = sizeof(buffer); } } @@ -1601,8 +1615,6 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) if (!family) { family = create_family( name, english_name ); - list_add_tail( &font_list, &family->entry ); - if (english_name) { FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); @@ -1617,6 +1629,7 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) { HeapFree( GetProcessHeap(), 0, name ); HeapFree( GetProcessHeap(), 0, english_name ); + family->refcount++; } return family; @@ -1733,6 +1746,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; + face->refcount = 1; face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); if (!face->StyleName) face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); @@ -1806,17 +1820,16 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical, aa_flags ); family = get_family( ft_face, vertical ); - if (!insert_face_in_family_list( face, family )) + if (insert_face_in_family_list( face, family )) { - free_face( face ); - return; - } - - if (flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache( face ); + if (flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache( face ); - TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName)); + TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), + debugstr_w(face->StyleName)); + } + release_face( face ); + release_family( family ); } static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_data_size, @@ -2323,6 +2336,7 @@ skip_internal: new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); new_child->face = font_link_entry->face; new_child->font = NULL; + new_child->face->refcount++; system_font_link->fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; system_font_link->fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; list_add_tail(&system_font_link->links, &new_child->entry); @@ -3001,7 +3015,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) pFT_Done_Face( ft_face ); GetEnumStructs( face, name, &elf, &ntm, &type ); - free_face( face ); + release_face( face ); HeapFree( GetProcessHeap(), 0, name ); HeapFree( GetProcessHeap(), 0, english_name ); @@ -4042,6 +4056,7 @@ static void free_font(GdiFont *font) list_remove(&child->entry); if(child->font) free_font(child->font); + release_face( child->face ); HeapFree(GetProcessHeap(), 0, child); } @@ -4354,6 +4369,7 @@ static BOOL create_child_font_list(GdiFont *font) new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); new_child->face = font_link_entry->face; new_child->font = NULL; + new_child->face->refcount++; list_add_tail(&font->child_fonts, &new_child->entry); TRACE("font %s %ld\n", debugstr_w(new_child->face->file), new_child->face->face_index); } @@ -4376,6 +4392,7 @@ static BOOL create_child_font_list(GdiFont *font) new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); new_child->face = font_link_entry->face; new_child->font = NULL; + new_child->face->refcount++; list_add_tail(&font->child_fonts, &new_child->entry); TRACE("font %s %ld\n", debugstr_w(new_child->face->file), new_child->face->face_index); }

1 0

Alexandre Julliard : gdi32: Avoid creating a family object just to retrieve the font data.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 634840579c378f87cbf33c0022138e7b7b5967d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634840579c378f87cbf33c002… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 14:45:40 2013 +0100 gdi32: Avoid creating a family object just to retrieve the font data. --- dlls/gdi32/freetype.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9b6a909..ab9a1af 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2983,14 +2983,13 @@ struct fontdir #include <poppack.h> -static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, +static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, NEWTEXTMETRICEXW *pntm, LPDWORD ptype); static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) { FT_Face ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); Face *face; - Family *family; WCHAR *name, *english_name; ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; @@ -2999,12 +2998,12 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) if (!ft_face) return FALSE; face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); - family = create_family( name, english_name ); - insert_face_in_family_list( face, family ); pFT_Done_Face( ft_face ); - GetEnumStructs( face, &elf, &ntm, &type ); - free_family( family ); + GetEnumStructs( face, name, &elf, &ntm, &type ); + free_face( face ); + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, english_name ); if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE; @@ -5091,7 +5090,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l return n; } -static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, +static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, NEWTEXTMETRICEXW *pntm, LPDWORD ptype) { GdiFont *font; @@ -5123,7 +5122,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, return; } - font->name = strdupW(face->family->FamilyName); + font->name = strdupW( family_name ); font->ntmFlags = face->ntmFlags; if (get_outline_text_metrics(font)) @@ -5152,11 +5151,11 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; - lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); + lstrcpynW(pelf->elfLogFont.lfFaceName, family_name, LF_FACESIZE); if (face->FullName) lstrcpynW(pelf->elfFullName, face->FullName, LF_FULLFACESIZE); else - lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); + lstrcpynW(pelf->elfFullName, family_name, LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE); } @@ -5227,7 +5226,7 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha DWORD type = 0; int i; - GetEnumStructs(face, &elf, &ntm, &type); + GetEnumStructs(face, face->family->FamilyName, &elf, &ntm, &type); for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET;

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::GetClassName.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 5a12f6c088d06ae66b4e282cfa29e4faf6aa1397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a12f6c088d06ae66b4e282cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 14 10:51:24 2013 +0100 wmiutils: Implement IWbemPath::GetClassName. --- dlls/wmiutils/path.c | 15 ++++++-- dlls/wmiutils/tests/path.c | 87 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index c146671..5075bfc 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -547,11 +547,18 @@ static HRESULT WINAPI path_SetClassName( static HRESULT WINAPI path_GetClassName( IWbemPath *iface, - ULONG *puBufferLength, - LPWSTR pszName) + ULONG *len, + LPWSTR name) { - FIXME("%p,%p, %p\n", iface, puBufferLength, pszName); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %p, %p\n", iface, len, name); + + if (!len || (*len && !name)) return WBEM_E_INVALID_PARAMETER; + if (!path->class) return WBEM_E_INVALID_OBJECT_PATH; + if (*len > path->len_class) strcpyW( name, path->class ); + *len = path->len_class + 1; + return S_OK; } static HRESULT WINAPI path_GetKeyList( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 6824d25..affd408 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -61,6 +61,20 @@ static const WCHAR path17[] = {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=','"','C',':','"',0}; +static IWbemPath *create_path(void) +{ + HRESULT hr; + IWbemPath *path; + + hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); + if (hr != S_OK) + { + win_skip( "can't create WbemDefPath instance, skipping tests\n" ); + return NULL; + } + return path; +} + static void test_IWbemPath_SetText(void) { static const struct @@ -102,13 +116,7 @@ static void test_IWbemPath_SetText(void) HRESULT hr; UINT i; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_SetText( path, 0, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -135,25 +143,17 @@ static void test_IWbemPath_SetText(void) ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); } } - IWbemPath_Release( path ); - CoUninitialize(); } static void test_IWbemPath_GetText(void) { - IWbemPath *path; WCHAR buf[128]; ULONG len, count; + IWbemPath *path; HRESULT hr; - CoInitialize( NULL ); - hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); - if (hr != S_OK) - { - win_skip( "can't create WbemDefPath instance, skipping tests\n" ); - return; - } + if (!(path = create_path())) return; hr = IWbemPath_GetText( path, 0, NULL, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); @@ -274,11 +274,62 @@ static void test_IWbemPath_GetText(void) todo_wine ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); - CoUninitialize(); +} + +static void test_IWbemPath_GetClassName(void) +{ + static const WCHAR classW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; + IWbemPath *path; + HRESULT hr; + WCHAR buf[32]; + ULONG len; + + if (!(path = create_path())) return; + + hr = IWbemPath_GetClassName( path, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = 0; + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( len == sizeof(buf) / sizeof(buf[0]), "unexpected length %u\n", len ); + + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetClassName( path, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); } START_TEST (path) { + CoInitialize( NULL ); + test_IWbemPath_SetText(); test_IWbemPath_GetText(); + test_IWbemPath_GetClassName(); + + CoUninitialize(); }

1 0

Piotr Caban : msvcrt: Be less strict while parsing file open mode in fopen function.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 5515170d136dfd639b16b409434c5a182174315d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5515170d136dfd639b16b4094… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 14 10:24:18 2013 +0100 msvcrt: Be less strict while parsing file open mode in fopen function. --- dlls/msvcrt/file.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 60af1a7..f0d0f7d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1263,6 +1263,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st TRACE("%s\n", debugstr_w(mode)); + while(*mode == ' ') mode++; + switch(*mode++) { case 'R': case 'r': @@ -1301,6 +1303,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st break; case '+': case ' ': + case 'a': + case 'w': break; default: MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL);

1 0

Dmitry Timoshkov : windowscodecs: Implement CreateBitmapFromHICON.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 4ba27f79309b440b3a6d39807a79065b96679352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba27f79309b440b3a6d39807… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 12:45:24 2013 +0800 windowscodecs: Implement CreateBitmapFromHICON. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/imgfactory.c | 138 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 4 - 3 files changed, 136 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index d031daa..ffe0925 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 +IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = @PNGINCL@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 1d05ef5..8762c81 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -597,10 +597,142 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactory *iface, - HICON hIcon, IWICBitmap **ppIBitmap) + HICON hicon, IWICBitmap **bitmap) { - FIXME("(%p,%p,%p): stub\n", iface, hIcon, ppIBitmap); - return E_NOTIMPL; + IWICBitmapLock *lock; + ICONINFO info; + BITMAP bm; + int width, height, x, y; + UINT stride, size; + BYTE *buffer; + DWORD *bits; + BITMAPINFO bi; + HDC hdc; + BOOL has_alpha; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, hicon, bitmap); + + if (!bitmap) return E_INVALIDARG; + + if (!GetIconInfo(hicon, &info)) + return HRESULT_FROM_WIN32(GetLastError()); + + GetObjectW(info.hbmColor ? info.hbmColor : info.hbmMask, sizeof(bm), &bm); + + width = bm.bmWidth; + height = info.hbmColor ? abs(bm.bmHeight) : abs(bm.bmHeight) / 2; + stride = width * 4; + size = stride * height; + + hr = BitmapImpl_Create(width, height, stride, size, NULL, + &GUID_WICPixelFormat32bppBGRA, WICBitmapCacheOnLoad, bitmap); + if (hr != S_OK) goto failed; + + hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock); + if (hr != S_OK) + { + IWICBitmap_Release(*bitmap); + goto failed; + } + IWICBitmapLock_GetDataPointer(lock, &size, &buffer); + + hdc = CreateCompatibleDC(0); + + memset(&bi, 0, sizeof(bi)); + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = width; + bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + + has_alpha = FALSE; + + if (info.hbmColor) + { + GetDIBits(hdc, info.hbmColor, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (bm.bmBitsPixel == 32) + { + /* If any pixel has a non-zero alpha, ignore hbmMask */ + bits = (DWORD *)buffer; + for (x = 0; x < width && !has_alpha; x++, bits++) + { + for (y = 0; y < height; y++) + { + if (*bits & 0xff000000) + { + has_alpha = TRUE; + break; + } + } + } + } + } + else + GetDIBits(hdc, info.hbmMask, 0, height, buffer, &bi, DIB_RGB_COLORS); + + if (!has_alpha) + { + DWORD *rgba; + + if (info.hbmMask) + { + BYTE *mask; + + mask = HeapAlloc(GetProcessHeap(), 0, size); + if (!mask) + { + IWICBitmapLock_Release(lock); + IWICBitmap_Release(*bitmap); + DeleteDC(hdc); + hr = E_OUTOFMEMORY; + goto failed; + } + + /* read alpha data from the mask */ + GetDIBits(hdc, info.hbmMask, info.hbmColor ? 0 : height, height, mask, &bi, DIB_RGB_COLORS); + + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + bits = (DWORD *)(mask + y * stride); + + for (x = 0; x < width; x++, rgba++, bits++) + { + if (!info.hbmColor) *rgba = ~*rgba; + + if (*bits) + *rgba = 0; + else + *rgba |= 0xff000000; + } + } + + HeapFree(GetProcessHeap(), 0, mask); + } + else + { + /* set constant alpha of 255 */ + for (y = 0; y < height; y++) + { + rgba = (DWORD *)(buffer + y * stride); + for (x = 0; x < width; x++, rgba++) + *rgba |= 0xff000000; + } + } + + } + + IWICBitmapLock_Release(lock); + DeleteDC(hdc); + +failed: + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + return hr; } static HRESULT WINAPI ComponentFactory_CreateComponentEnumerator(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 40b8ce6..fb7183b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -529,19 +529,15 @@ static void test_CreateBitmapFromHICON(void) DeleteObject(info.hbmMask); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); -todo_wine ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); DestroyIcon(icon); if (hr != S_OK) return;

1 0

Huw Davies : usp10: Fix MarkToBase offset for RTL text.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 7ba38ad62e1d92f4b3db74ea2077add20547c07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba38ad62e1d92f4b3db74ea2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:17 2013 +0000 usp10: Fix MarkToBase offset for RTL text. --- dlls/usp10/opentype.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1938892..f8cf8a1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1730,7 +1730,9 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); + if (!analysis->fRTL) pGoffset[glyph_index].du -= piAdvance[glyph_index-1]; + else if (analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du += round(devX); pGoffset[glyph_index].dv += round(devY); } break;

1 0

Henri Verbeet : ddraw: Avoid LPD3DPICKRECORD.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: d210b875872c7aedd0bc845109a2ea69005465b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d210b875872c7aedd0bc84510… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:06 2013 +0100 ddraw: Avoid LPD3DPICKRECORD. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 94367da..2ee638e 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -950,7 +950,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) IDirect3DViewport **viewport, DWORD flags) PURE; STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect) PURE; - STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; + STDMETHOD(GetPickRecords)(THIS_ DWORD *count, D3DPICKRECORD *records) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE;

1 0

Nikolay Sivov : comctl32/listview: Remove some dead code.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: ea57e29d083895c16825e0fe71c592c682fcc4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea57e29d083895c16825e0fe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 12 21:33:13 2013 +0400 comctl32/listview: Remove some dead code. --- dlls/comctl32/listview.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75aa51b..49da83c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3490,26 +3490,15 @@ static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT */ static void LISTVIEW_ShiftIndices(LISTVIEW_INFO *infoPtr, INT nItem, INT direction) { - BOOL bOldChange; - - /* temporarily disable change notification while shifting items */ - bOldChange = infoPtr->bDoChangeNotify; - infoPtr->bDoChangeNotify = FALSE; - TRACE("Shifting %i, %i steps\n", nItem, direction); ranges_shift(infoPtr->selectionRanges, nItem, direction, infoPtr->nItemCount); - assert(abs(direction) == 1); - infoPtr->nSelectionMark = shift_item(infoPtr, infoPtr->nSelectionMark, nItem, direction); - - /* But we are not supposed to modify nHotItem! */ - infoPtr->bDoChangeNotify = bOldChange; + /* But we are not supposed to modify nHotItem! */ } - /** * DESCRIPTION: * Adds a block of selections.

1 0

Henri Verbeet : ddraw: Avoid LPD3DINSTRUCTION.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: cc60cc6abb6d662745d211bff444f9cc38bc4737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc60cc6abb6d662745d211bff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:05 2013 +0100 ddraw: Avoid LPD3DINSTRUCTION. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1b412f7..5e8e475 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -71,8 +71,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data)); - while (1) { - LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr; + for (;;) + { + D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; BYTE size; WORD count;

1 0

Henri Verbeet : ddraw: Get rid of dump_light().
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: af377acabed7fce13dea9aab9e55381d4d961c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af377acabed7fce13dea9aab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:08 2013 +0100 ddraw: Get rid of dump_light(). --- dlls/ddraw/light.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 1d81803..c4062ac 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -166,24 +166,6 @@ static HRESULT WINAPI d3d_light_Initialize(IDirect3DLight *iface, IDirect3D *d3d return D3D_OK; } -/***************************************************************************** - * IDirect3DLight::SetLight - * - * Assigns a lighting value to this object - * - * Params: - * Light: Lighting parameter to set - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Light is NULL - * - *****************************************************************************/ -static void dump_light(const D3DLIGHT2 *light) -{ - TRACE(" - dwSize : %d\n", light->dwSize); -} - static const float zero_value[] = { 0.0, 0.0, 0.0, 0.0 }; @@ -195,12 +177,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) TRACE("iface %p, data %p.\n", iface, data); - if (TRACE_ON(ddraw)) - { - TRACE(" Light definition :\n"); - dump_light((D3DLIGHT2 *)data); - } - if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; @@ -252,12 +228,6 @@ static HRESULT WINAPI d3d_light_GetLight(IDirect3DLight *iface, D3DLIGHT *lpLigh TRACE("iface %p, light %p.\n", iface, lpLight); - if (TRACE_ON(ddraw)) - { - TRACE(" Returning light definition :\n"); - dump_light(&light->light); - } - wined3d_mutex_lock(); memcpy(lpLight, &light->light, lpLight->dwSize); wined3d_mutex_unlock();

1 0