wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Huw Davies : gdi32: Add a helper to retrieve the ntm flags.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: afae44da2528b09ca8a302d072b2256ba55eee62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afae44da2528b09ca8a302d07… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:42 2012 +0100 gdi32: Add a helper to retrieve the ntm flags. --- dlls/gdi32/freetype.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2926d59..446175e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1579,6 +1579,21 @@ static inline FT_Fixed get_font_version( FT_Face ft_face ) return version; } +static inline DWORD get_ntm_flags( FT_Face ft_face ) +{ + DWORD flags = 0; + FT_ULong table_size = 0; + + if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) flags |= NTM_ITALIC; + if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) flags |= NTM_BOLD; + if (flags == 0) flags = NTM_REGULAR; + + if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size )) + flags |= NTM_PS_OPENTYPE; + + return flags; +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1597,7 +1612,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr int internal_leading; FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; - FT_ULong tmp_size; FT_Fixed version; if(!FT_IS_SCALABLE(ft_face)) @@ -1676,12 +1690,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->font_data_size = font_data_size; } face->face_index = face_index; - face->ntmFlags = 0; - if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) - face->ntmFlags |= NTM_ITALIC; - if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) - face->ntmFlags |= NTM_BOLD; - if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; + face->ntmFlags = get_ntm_flags( ft_face ); face->font_version = version; face->family = family; face->vertical = vertical; @@ -1704,14 +1713,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->scalable = FALSE; } - /* check for the presence of the 'CFF ' table to check if the font is Type1 */ - tmp_size = 0; - if (!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) - { - TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); - face->ntmFlags |= NTM_PS_OPENTYPE; - } - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1],

1 0

Huw Davies : gdi32: Add a helper to retrieve the font version.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 37eb3867391a18313159738883bdfabfb0cc947d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37eb3867391a1831315973888… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:41 2012 +0100 gdi32: Add a helper to retrieve the font version. --- dlls/gdi32/freetype.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3afc2ea..2926d59 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1568,6 +1568,16 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) return family; } +static inline FT_Fixed get_font_version( FT_Face ft_face ) +{ + FT_Fixed version = 0; + TT_Header *header; + + header = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_head ); + if (header) version = header->Font_Revision; + + return version; +} #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 @@ -1581,7 +1591,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; - TT_Header *pHeader; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1589,6 +1598,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; FT_ULong tmp_size; + FT_Fixed version; if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; @@ -1626,16 +1636,15 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr internal_leading = winfnt_header.internal_leading; } - pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head); + version = get_font_version( ft_face ); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(!strcmpiW(face->StyleName, StyleW) && (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", debugstr_w(family->FamilyName), debugstr_w(StyleW), - face->font_version, pHeader ? pHeader->Font_Revision : 0); - - if(!pHeader || pHeader->Font_Revision <= face->font_version) { + face->font_version, version); + if(version <= face->font_version) { TRACE("Original font is newer so skipping this one\n"); HeapFree(GetProcessHeap(), 0, StyleW); return; @@ -1673,7 +1682,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) face->ntmFlags |= NTM_BOLD; if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; - face->font_version = pHeader ? pHeader->Font_Revision : 0; + face->font_version = version; face->family = family; face->vertical = vertical; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE;

1 0

Huw Davies : gdi32: Add a helper to create a family.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: e27a633b93dd43ad17268fd6bca52ae1dc51e080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a633b93dd43ad17268fd6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:40 2012 +0100 gdi32: Add a helper to create a family. --- dlls/gdi32/freetype.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1b38a8e..3afc2ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1520,6 +1520,21 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO } } +/**************************************************************** + * NB This function stores the ptrs to the strings to save copying. + * Don't free them after calling. + */ +static Family *create_family( WCHAR *name, WCHAR *english_name ) +{ + Family *family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->FamilyName = name; + family->EnglishName = english_name; + list_init( &family->faces ); + family->replacement = &family->faces; + + return family; +} + static Family *get_family( FT_Face ft_face, BOOL vertical ) { Family *family; @@ -1531,11 +1546,7 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) if (!family) { - family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); - family->FamilyName = strdupW( name ); - family->EnglishName = english_name ? strdupW( english_name ) : NULL; - list_init( &family->faces ); - family->replacement = &family->faces; + family = create_family( name, english_name ); list_add_tail( &font_list, &family->entry ); if (english_name) @@ -1548,8 +1559,11 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) add_font_subst( &font_subst_list, subst, 0 ); } } - HeapFree( GetProcessHeap(), 0, name ); - HeapFree( GetProcessHeap(), 0, english_name ); + else + { + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, english_name ); + } return family; }

1 0

Huw Davies : gdi32: Add a helper to retrieve the family pointer.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 7ad330deef3a8e108ce6cc456b7721b8e3e506bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad330deef3a8e108ce6cc456… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:39 2012 +0100 gdi32: Add a helper to retrieve the family pointer. --- dlls/gdi32/freetype.c | 59 +++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e174921..1b38a8e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1520,6 +1520,41 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO } } +static Family *get_family( FT_Face ft_face, BOOL vertical ) +{ + Family *family; + WCHAR *name, *english_name; + + get_family_names( ft_face, &name, &english_name, vertical ); + + family = find_family_from_name( name ); + + if (!family) + { + family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->FamilyName = strdupW( name ); + family->EnglishName = english_name ? strdupW( english_name ) : NULL; + list_init( &family->faces ); + family->replacement = &family->faces; + list_add_tail( &font_list, &family->entry ); + + if (english_name) + { + FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); + subst->from.name = strdupW( english_name ); + subst->from.charset = -1; + subst->to.name = strdupW( name ); + subst->to.charset = -1; + add_font_subst( &font_subst_list, subst, 0 ); + } + } + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, english_name ); + + return family; +} + + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1533,7 +1568,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; TT_Header *pHeader; - WCHAR *family_name, *english_family; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1545,28 +1579,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - get_family_names( ft_face, &family_name, &english_family, vertical ); - - family = find_family_from_name( family_name ); - if(!family) { - family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = strdupW( family_name ); - family->EnglishName = english_family ? strdupW( english_family ) : NULL; - list_init(&family->faces); - family->replacement = &family->faces; - list_add_tail(&font_list, &family->entry); - - if(english_family) { - FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); - subst->from.name = strdupW(english_family); - subst->from.charset = -1; - subst->to.name = strdupW(family_name); - subst->to.charset = -1; - add_font_subst(&font_subst_list, subst, 0); - } - } - HeapFree(GetProcessHeap(), 0, family_name); - HeapFree(GetProcessHeap(), 0, english_family); + family = get_family( ft_face, vertical ); StyleW = towstr(CP_ACP, ft_face->style_name);

1 0

Huw Davies : gdi32: Add a helper to retrieve the family names and simplify the logic.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: c6af1d541680fb43fc9f6252c45198ea24f45b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6af1d541680fb43fc9f6252c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:38 2012 +0100 gdi32: Add a helper to retrieve the family names and simplify the logic. --- dlls/gdi32/freetype.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 461d646..e174921 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1496,6 +1496,30 @@ static WCHAR *prepend_at(WCHAR *family) return str; } +static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BOOL vertical ) +{ + *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); + + *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID() ); + if (!*name) + { + *name = *english; + *english = NULL; + } + else if (!strcmpiW( *name, *english )) + { + HeapFree( GetProcessHeap(), 0, *english ); + *english = NULL; + } + + if (vertical) + { + *name = prepend_at( *name ); + *english = prepend_at( *english ); + } +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1509,7 +1533,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; TT_Header *pHeader; - WCHAR *english_family, *localised_family; + WCHAR *family_name, *english_family; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1521,42 +1545,27 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); - if (!english_family) - english_family = towstr(CP_ACP, ft_face->family_name); - - localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); - if (localised_family && !strcmpiW(localised_family, english_family)) - { - HeapFree(GetProcessHeap(), 0, localised_family); - localised_family = NULL; - } - - if (vertical) - { - english_family = prepend_at(english_family); - localised_family = prepend_at(localised_family); - } + get_family_names( ft_face, &family_name, &english_family, vertical ); - family = find_family_from_name(localised_family ? localised_family : english_family); + family = find_family_from_name( family_name ); if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = strdupW(localised_family ? localised_family : english_family); - family->EnglishName = localised_family ? strdupW(english_family) : NULL; + family->FamilyName = strdupW( family_name ); + family->EnglishName = english_family ? strdupW( english_family ) : NULL; list_init(&family->faces); family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); - if(localised_family) { + if(english_family) { FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); subst->from.name = strdupW(english_family); subst->from.charset = -1; - subst->to.name = strdupW(localised_family); + subst->to.name = strdupW(family_name); subst->to.charset = -1; add_font_subst(&font_subst_list, subst, 0); } } - HeapFree(GetProcessHeap(), 0, localised_family); + HeapFree(GetProcessHeap(), 0, family_name); HeapFree(GetProcessHeap(), 0, english_family); StyleW = towstr(CP_ACP, ft_face->style_name);

1 0

Piotr Caban : shell32: Handle ASSOCDATA_EDITFLAGS in IQueryAssociations: GetData function.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 924538f22a7a42434845015e17288bf19e5e8c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924538f22a7a42434845015e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:05:38 2012 +0200 shell32: Handle ASSOCDATA_EDITFLAGS in IQueryAssociations:GetData function. --- dlls/shell32/assoc.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 8364e9f..0131da7 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -670,19 +670,39 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( * Success: S_OK. pszOut contains the data, pcbOut contains its length. * Failure: An HRESULT error code indicating the error. */ -static HRESULT WINAPI IQueryAssociations_fnGetData( - IQueryAssociations *iface, - ASSOCF cfFlags, - ASSOCDATA assocdata, - LPCWSTR pszExtra, - LPVOID pvOut, - DWORD *pcbOut) +static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, + ASSOCF cfFlags, ASSOCDATA assocdata, LPCWSTR pszExtra, LPVOID pvOut, + DWORD *pcbOut) { - IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); + static const WCHAR edit_flags[] = {'E','d','i','t','F','l','a','g','s',0}; - FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, - debugstr_w(pszExtra), pvOut, pcbOut); - return E_NOTIMPL; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); + void *data; + DWORD size; + HRESULT hres; + + TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, assocdata, + debugstr_w(pszExtra), pvOut, pcbOut); + + if(cfFlags) + FIXME("Unsupported flags: %x\n", cfFlags); + + switch(assocdata) { + case ASSOCDATA_EDITFLAGS: + if(!This->hkeyProgID) + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + + hres = ASSOC_GetValue(This->hkeyProgID, edit_flags, &data, &size); + if(FAILED(hres) || !pcbOut) + return hres; + + hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); + HeapFree(GetProcessHeap(), 0, data); + return hres; + default: + FIXME("Unsupported ASSOCDATA value: %d\n", assocdata); + return E_NOTIMPL; + } } /**************************************************************************

1 0

Piotr Caban : shell32: Prepare QueryAssociations helper functions to work on non LPWSTR data.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d55061b9da47465fab8179d735e6ddaa851de836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55061b9da47465fab8179d73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:04:55 2012 +0200 shell32: Prepare QueryAssociations helper functions to work on non LPWSTR data. --- dlls/shell32/assoc.c | 62 ++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index d7161ca..8364e9f 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -215,27 +215,28 @@ static HRESULT WINAPI IQueryAssociations_fnInit( return E_INVALIDARG; } -static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size) { - DWORD len; + DWORD size; LONG ret; - assert(pszText); - ret = RegQueryValueExW(hkey, NULL, 0, NULL, NULL, &len); + assert(data); + ret = RegQueryValueExW(hkey, name, 0, NULL, NULL, &size); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - if (!len) + if (!size) return E_FAIL; - *pszText = HeapAlloc(GetProcessHeap(), 0, len); - if (!*pszText) + *data = HeapAlloc(GetProcessHeap(), 0, size); + if (!*data) return E_OUTOFMEMORY; - ret = RegQueryValueExW(hkey, NULL, 0, NULL, (LPBYTE)*pszText, - &len); + ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); if (ret != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, *pszText); + HeapFree(GetProcessHeap(), 0, *data); return HRESULT_FROM_WIN32(ret); } + if(data_size) + *data_size = size; return S_OK; } @@ -253,7 +254,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; static const WCHAR shellW[] = { 's','h','e','l','l',0 }; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); @@ -268,7 +269,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, if (!pszExtra) { - hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); + hr = ASSOC_GetValue(hkeyShell, NULL, (void**)&pszExtraFromReg, NULL); /* if no default action */ if (hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { @@ -311,7 +312,7 @@ static HRESULT ASSOC_GetCommand(IQueryAssociationsImpl *This, RegCloseKey(hkeyVerb); if (ret != ERROR_SUCCESS) return HRESULT_FROM_WIN32(ret); - hr = ASSOC_GetValue(hkeyCommand, ppszCommand); + hr = ASSOC_GetValue(hkeyCommand, NULL, (void**)ppszCommand, NULL); RegCloseKey(hkeyCommand); return hr; } @@ -361,7 +362,7 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, return S_OK; } -static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, +static HRESULT ASSOC_ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen) { assert(outlen); @@ -374,7 +375,7 @@ static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, return E_POINTER; } *outlen = datalen; - lstrcpynW(out, data, datalen); + memcpy(out, data, datalen); return S_OK; } else @@ -384,6 +385,19 @@ static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, } } +static HRESULT ASSOC_ReturnString(LPWSTR out, DWORD *outlen, LPCWSTR data, + DWORD datalen) +{ + HRESULT hres; + + assert(outlen); + + *outlen *= sizeof(WCHAR); + hres = ASSOC_ReturnData(out, outlen, data, datalen*sizeof(WCHAR)); + *outlen /= sizeof(WCHAR); + return hres; +} + /************************************************************************** * IQueryAssociations_GetString * @@ -432,7 +446,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( hr = ASSOC_GetCommand(This, pszExtra, &command); if (SUCCEEDED(hr)) { - hr = ASSOC_ReturnData(pszOut, pcchOut, command, strlenW(command) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, command, strlenW(command) + 1); HeapFree(GetProcessHeap(), 0, command); } return hr; @@ -444,7 +458,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( if (FAILED(hr)) return hr; len++; - return ASSOC_ReturnData(pszOut, pcchOut, path, len); + return ASSOC_ReturnString(pszOut, pcchOut, path, len); } case ASSOCSTR_FRIENDLYDOCNAME: @@ -453,7 +467,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( DWORD ret; DWORD size; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; size = 0; @@ -465,7 +479,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, docName, strlenW(docName) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, docName, strlenW(docName) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, docName); @@ -521,7 +535,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - hr = ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnString(pszOut, pcchOut, bufW, len); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -531,7 +545,7 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - hr = ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, path, strlenW(path) + 1); HeapFree(GetProcessHeap(), 0, verinfoW); return hr; } @@ -552,7 +566,7 @@ get_friendly_name_fail: { ret = RegGetValueW(This->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, contentType, strlenW(contentType) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, contentType, strlenW(contentType) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, contentType); @@ -570,7 +584,7 @@ get_friendly_name_fail: DWORD size; HKEY hkeyFile; - hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); if (FAILED(hr)) return hr; ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); @@ -585,7 +599,7 @@ get_friendly_name_fail: { ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnData(pszOut, pcchOut, icon, strlenW(icon) + 1); + hr = ASSOC_ReturnString(pszOut, pcchOut, icon, strlenW(icon) + 1); else hr = HRESULT_FROM_WIN32(ret); HeapFree(GetProcessHeap(), 0, icon);

1 0

Detlef Riekenberg : comdlg32/tests: Add HDC tests for PrintDlgEx.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: ed4167330601e27d152037575b0342fc1268bce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4167330601e27d152037575… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:24 2012 +0100 comdlg32/tests: Add HDC tests for PrintDlgEx. --- dlls/comdlg32/tests/printdlg.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 2eaf9d4..b6c8325 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -344,6 +344,32 @@ static void test_PrintDlgExW(void) GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); + /* this works: PD_RETURNDC with PD_RETURNDEFAULT */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS | PD_RETURNDC; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNDC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + + /* this works: PD_RETURNIC with PD_RETURNDEFAULT */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_RETURNDEFAULT | PD_NOWARNING | PD_NOPAGENUMS | PD_RETURNIC; + pDlg->nStartPage = START_PAGE_GENERAL; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNIC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + HeapFree(GetProcessHeap(), 0, pDlg); return;

1 0

Detlef Riekenberg : comdlg32: Return a device context when requested.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 24047e902f6287c54b401cd1163126b2b0455225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24047e902f6287c54b401cd11… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:23 2012 +0100 comdlg32: Return a device context when requested. --- dlls/comdlg32/printdlg.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 0ac3650..3d3ac2a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -4002,7 +4002,19 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) hr = E_FAIL; lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm); - if (!lppd->hDevMode) + if (!hr && lppd->hDevMode) { + if (lppd->Flags & PD_RETURNDC) { + lppd->hDC = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + else if (lppd->Flags & PD_RETURNIC) { + lppd->hDC = CreateICA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + } + else hr = E_FAIL; HeapFree(GetProcessHeap(), 0, pbuf); @@ -4111,7 +4123,19 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) hr = E_FAIL; lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm); - if (!lppd->hDevMode) + if (!hr && lppd->hDevMode) { + if (lppd->Flags & PD_RETURNDC) { + lppd->hDC = CreateDCW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + else if (lppd->Flags & PD_RETURNIC) { + lppd->hDC = CreateICW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + } + else hr = E_FAIL; HeapFree(GetProcessHeap(), 0, pbuf);

1 0

Detlef Riekenberg : comdlg32: Use a helper to update the devmode handle.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: ecd6f40acb0ca7ad51d8488f1ebd85a7b15ddb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd6f40acb0ca7ad51d8488f1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:22 2012 +0100 comdlg32: Use a helper to update the devmode handle. --- dlls/comdlg32/printdlg.c | 170 ++++++++++++++++++++++++++++++---------------- 1 files changed, 112 insertions(+), 58 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ccb7b5f..0ac3650 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -254,6 +254,68 @@ static PRINTER_INFO_2A * get_printer_infoA(HANDLE hprn) return NULL; } + +/*********************************************************************** + * update_devmode_handle [internal] + * + * update a devmode handle for the given DEVMODE, alloc the buffer, when needed + */ +static HGLOBAL update_devmode_handleW(HGLOBAL hdm, DEVMODEW *dm) +{ + SIZE_T size = GlobalSize(hdm); + LPVOID ptr; + + /* Increase / alloc the global memory block, when needed */ + if ((dm->dmSize + dm->dmDriverExtra) > size) { + if (hdm) + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + else + hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); + } + + if (hdm) { + ptr = GlobalLock(hdm); + if (ptr) { + memcpy(ptr, dm, dm->dmSize + dm->dmDriverExtra); + GlobalUnlock(hdm); + } + else + { + GlobalFree(hdm); + hdm = NULL; + } + } + return hdm; +} + +static HGLOBAL update_devmode_handleA(HGLOBAL hdm, DEVMODEA *dm) +{ + SIZE_T size = GlobalSize(hdm); + LPVOID ptr; + + /* Increase / alloc the global memory block, when needed */ + if ((dm->dmSize + dm->dmDriverExtra) > size) { + if (hdm) + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + else + hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); + } + + if (hdm) { + ptr = GlobalLock(hdm); + if (ptr) { + memcpy(ptr, dm, dm->dmSize + dm->dmDriverExtra); + GlobalUnlock(hdm); + } + else + { + GlobalFree(hdm); + hdm = NULL; + } + } + return hdm; +} + /*********************************************************** * convert_to_devmodeA * @@ -3868,10 +3930,12 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) */ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) { - DWORD ret = E_FAIL; - LPVOID ptr; + PRINTER_INFO_2A *pbuf; + DRIVER_INFO_3A *dbuf; + DEVMODEA *dm; + HRESULT hr = S_OK; + HANDLE hprn; - FIXME("(%p) not fully implemented\n", lppd); if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) return E_INVALIDARG; @@ -3894,10 +3958,6 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) if (lppd->Flags & PD_RETURNDEFAULT) { - PRINTER_INFO_2A *pbuf; - DRIVER_INFO_3A *dbuf; - HANDLE hprn; - if (lppd->hDevMode || lppd->hDevNames) { WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); @@ -3926,32 +3986,29 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) ClosePrinter(hprn); return E_FAIL; } - ClosePrinter(hprn); - - PRINTDLG_CreateDevNames(&(lppd->hDevNames), - dbuf->pDriverPath, - pbuf->pPrinterName, - pbuf->pPortName); - lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - if (lppd->hDevMode) - { - ptr = GlobalLock(lppd->hDevMode); - if (ptr) - { - memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - GlobalUnlock(lppd->hDevMode); - ret = S_OK; - } - } - HeapFree(GetProcessHeap(), 0, pbuf); - HeapFree(GetProcessHeap(), 0, dbuf); + dm = pbuf->pDevMode; + } + else + { + FIXME("(%p) dialog not implemented\n", lppd); + return E_NOTIMPL; - return ret; } - return E_NOTIMPL; + ClosePrinter(hprn); + + PRINTDLG_CreateDevNames(&(lppd->hDevNames), dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); + if (!lppd->hDevNames) + hr = E_FAIL; + + lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm); + if (!lppd->hDevMode) + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return hr; } /*********************************************************************** @@ -3982,10 +4039,11 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) */ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) { - DWORD ret = E_FAIL; - LPVOID ptr; - - FIXME("(%p) not fully implemented\n", lppd); + PRINTER_INFO_2W *pbuf; + DRIVER_INFO_3W *dbuf; + DEVMODEW *dm; + HRESULT hr = S_OK; + HANDLE hprn; if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXW))) { return E_INVALIDARG; @@ -4010,9 +4068,6 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) } if (lppd->Flags & PD_RETURNDEFAULT) { - PRINTER_INFO_2W *pbuf; - DRIVER_INFO_3W *dbuf; - HANDLE hprn; if (lppd->hDevMode || lppd->hDevNames) { WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); @@ -4040,28 +4095,27 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) ClosePrinter(hprn); return E_FAIL; } - ClosePrinter(hprn); - - PRINTDLG_CreateDevNamesW(&(lppd->hDevNames), - dbuf->pDriverPath, - pbuf->pPrinterName, - pbuf->pPortName); - lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - if (lppd->hDevMode) { - ptr = GlobalLock(lppd->hDevMode); - if (ptr) { - memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - GlobalUnlock(lppd->hDevMode); - ret = S_OK; - } - } - HeapFree(GetProcessHeap(), 0, pbuf); - HeapFree(GetProcessHeap(), 0, dbuf); + dm = pbuf->pDevMode; + } + else + { + FIXME("(%p) dialog not implemented\n", lppd); + return E_NOTIMPL; - return ret; } - return E_NOTIMPL; + ClosePrinter(hprn); + + PRINTDLG_CreateDevNamesW(&(lppd->hDevNames), dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); + if (!lppd->hDevNames) + hr = E_FAIL; + + lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm); + if (!lppd->hDevMode) + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return hr; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012