March 2012 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Add a helper to free a face object and fix a potential memory leak.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 8d50bb6711e3e3e3cc0bfd56ad15aafa2ef712a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d50bb6711e3e3e3cc0bfd56a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:45 2012 +0100 gdi32: Add a helper to free a face object and fix a potential memory leak. --- dlls/gdi32/freetype.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index be03c34..efa36bb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1668,6 +1668,15 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } +static inline void free_face( Face *face ) +{ + 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 ); +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1709,10 +1718,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry); - HeapFree(GetProcessHeap(), 0, face->file); - HeapFree(GetProcessHeap(), 0, face->StyleName); - HeapFree(GetProcessHeap(), 0, face->FullName); - HeapFree(GetProcessHeap(), 0, face); + free_face( face ); break; } }

1 0

Piotr Caban : msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 1650f09158a558de101368f77fb51b86764cd39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1650f09158a558de101368f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:40:31 2012 +0200 msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>. --- dlls/msvcp90/locale.c | 129 +++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1650f09158a558de10136…

1 0

Huw Davies : gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 2489c3285c74ba5d09aabad42186d0851014ce44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2489c3285c74ba5d09aabad42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:46 2012 +0100 gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces. Windows format bitmap fonts have been enumerated as separate faces since FreeType 2.1.5, since we require 2.1.9 for bitmap support we can safely drop this loop. --- dlls/gdi32/freetype.c | 168 +++++++++++++++++++++++++------------------------ 1 files changed, 86 insertions(+), 82 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efa36bb..d7accf0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1683,97 +1683,101 @@ static inline void free_face( Face *face ) static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) { - int bitmap_num = 0; Family *family; WCHAR *StyleW; + Face *face; + struct list *face_elem_ptr; + FONTSIGNATURE fs; + My_FT_Bitmap_Size *size = NULL; + FT_Fixed version; - do { - Face *face; - struct list *face_elem_ptr; - FONTSIGNATURE fs; - My_FT_Bitmap_Size *size = NULL; - FT_Fixed version; - - if(!FT_IS_SCALABLE(ft_face)) - size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; + if(!FT_IS_SCALABLE(ft_face)) + size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - family = get_family( ft_face, vertical ); + family = get_family( ft_face, vertical ); - StyleW = towstr(CP_ACP, ft_face->style_name); + StyleW = towstr(CP_ACP, ft_face->style_name); - get_fontsig( ft_face, &fs ); + get_fontsig( ft_face, &fs ); - 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, version); - if(version <= face->font_version) { - TRACE("Original font is newer so skipping this one\n"); - HeapFree(GetProcessHeap(), 0, StyleW); - return; - } else { - TRACE("Replacing original with this one\n"); - list_remove(&face->entry); - free_face( face ); - break; - } - } - } - face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cached_enum_data = NULL; - face->StyleName = StyleW; - face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); - if (file) - { - face->file = strdupA(file); - face->font_data_ptr = NULL; - face->font_data_size = 0; - } - else + 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)) ))) { - face->file = NULL; - face->font_data_ptr = font_data_ptr; - face->font_data_size = font_data_size; + 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, version); + if(version <= face->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + HeapFree(GetProcessHeap(), 0, StyleW); + return; + } + else + { + TRACE("Replacing original with this one\n"); + list_remove(&face->entry); + free_face( face ); + break; + } } - face->face_index = face_index; - face->ntmFlags = get_ntm_flags( ft_face ); - face->font_version = version; - face->family = family; - face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - face->fs = fs; + } - if(FT_IS_SCALABLE(ft_face)) { - memset(&face->size, 0, sizeof(face->size)); - face->scalable = TRUE; - } else { - TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", - size->height, size->width, size->size >> 6, - size->x_ppem >> 6, size->y_ppem >> 6); - face->size.height = size->height; - face->size.width = size->width; - face->size.size = size->size; - face->size.x_ppem = size->x_ppem; - face->size.y_ppem = size->y_ppem; - face->size.internal_leading = get_bitmap_internal_leading( ft_face ); - face->scalable = FALSE; - } + face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); + face->cached_enum_data = NULL; + face->StyleName = StyleW; + face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); + if (file) + { + face->file = strdupA(file); + face->font_data_ptr = NULL; + face->font_data_size = 0; + } + else + { + face->file = NULL; + face->font_data_ptr = font_data_ptr; + face->font_data_size = font_data_size; + } + face->face_index = face_index; + face->ntmFlags = get_ntm_flags( ft_face ); + face->font_version = version; + face->family = family; + face->vertical = vertical; + face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->fs = fs; - 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], - face->fs.fsUsb[2], face->fs.fsUsb[3]); + if(FT_IS_SCALABLE(ft_face)) + { + memset(&face->size, 0, sizeof(face->size)); + face->scalable = TRUE; + } + else + { + TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", + size->height, size->width, size->size >> 6, + size->x_ppem >> 6, size->y_ppem >> 6); + face->size.height = size->height; + face->size.width = size->width; + face->size.size = size->size; + face->size.x_ppem = size->x_ppem; + face->size.y_ppem = size->y_ppem; + face->size.internal_leading = get_bitmap_internal_leading( ft_face ); + face->scalable = FALSE; + } - if(flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache(face); + 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], + face->fs.fsUsb[2], face->fs.fsUsb[3]); - AddFaceToFamily(face, family); + if(flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache(face); - } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); + AddFaceToFamily(face, family); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(StyleW));

1 0

Huw Davies : gdi32: Add a helper to retrieve the fontsignature.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: b5115f77bc1c24111d4e8182f24916c292600e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5115f77bc1c24111d4e8182f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:44 2012 +0100 gdi32: Add a helper to retrieve the fontsignature. --- dlls/gdi32/freetype.c | 112 ++++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6f916c1..be03c34 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1605,6 +1605,69 @@ static inline int get_bitmap_internal_leading( FT_Face ft_face ) return internal_leading; } +static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) +{ + TT_OS2 *os2; + FT_UInt dummy; + CHARSETINFO csi; + FT_WinFNT_HeaderRec winfnt_header; + int i; + + memset( fs, 0, sizeof(*fs) ); + + os2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 ); + if (os2) + { + fs->fsUsb[0] = os2->ulUnicodeRange1; + fs->fsUsb[1] = os2->ulUnicodeRange2; + fs->fsUsb[2] = os2->ulUnicodeRange3; + fs->fsUsb[3] = os2->ulUnicodeRange4; + + if (os2->version == 0) + { + if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) + fs->fsCsb[0] = FS_LATIN1; + else + fs->fsCsb[0] = FS_SYMBOL; + } + else + { + fs->fsCsb[0] = os2->ulCodePageRange1; + fs->fsCsb[1] = os2->ulCodePageRange2; + } + } + else + { + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + { + TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, + winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); + if (TranslateCharsetInfo( (DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET )) + *fs = csi.fs; + } + } + + if (fs->fsCsb[0] == 0) + { + /* let's see if we can find any interesting cmaps */ + for (i = 0; i < ft_face->num_charmaps; i++) + { + switch (ft_face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs->fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs->fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } + } + } +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1616,10 +1679,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr WCHAR *StyleW; do { - TT_OS2 *pOS2; Face *face; struct list *face_elem_ptr; - FT_WinFNT_HeaderRec winfnt_header; FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; FT_Fixed version; @@ -1631,32 +1692,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr StyleW = towstr(CP_ACP, ft_face->style_name); - memset(&fs, 0, sizeof(fs)); - - pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); - if(pOS2) { - fs.fsCsb[0] = pOS2->ulCodePageRange1; - fs.fsCsb[1] = pOS2->ulCodePageRange2; - fs.fsUsb[0] = pOS2->ulUnicodeRange1; - fs.fsUsb[1] = pOS2->ulUnicodeRange2; - fs.fsUsb[2] = pOS2->ulUnicodeRange3; - fs.fsUsb[3] = pOS2->ulUnicodeRange4; - if(pOS2->version == 0) { - FT_UInt dummy; - - if(pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs.fsCsb[0] |= FS_LATIN1; - else - fs.fsCsb[0] |= FS_SYMBOL; - } - } - else if(!pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) { - CHARSETINFO csi; - TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, - winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); - if(TranslateCharsetInfo((DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET)) - fs = csi.fs; - } + get_fontsig( ft_face, &fs ); version = get_font_version( ft_face ); LIST_FOR_EACH(face_elem_ptr, &family->faces) { @@ -1726,26 +1762,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - if(face->fs.fsCsb[0] == 0) - { - int i; - - /* let's see if we can find any interesting cmaps */ - for(i = 0; i < ft_face->num_charmaps; i++) { - switch(ft_face->charmaps[i]->encoding) { - case FT_ENCODING_UNICODE: - case FT_ENCODING_APPLE_ROMAN: - face->fs.fsCsb[0] |= FS_LATIN1; - break; - case FT_ENCODING_MS_SYMBOL: - face->fs.fsCsb[0] |= FS_SYMBOL; - break; - default: - break; - } - } - } - if(flags & ADDFONT_ADD_TO_CACHE) add_face_to_cache(face);

1 0

Huw Davies : gdi32: Add a helper to retrieve the font version.
by Alexandre Julliard March 27, 2012

March 27, 2012

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

Detlef Riekenberg : comdlg32/tests: Remove outdated/unused code.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 65ab4b2cf077aa200a76cc8cb7b8f8dc39aeeaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ab4b2cf077aa200a76cc8cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:17 2012 +0100 comdlg32/tests: Remove outdated/unused code. --- dlls/comdlg32/tests/printdlg.c | 47 +++++++-------------------------------- 1 files changed, 9 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index c295df0..8597d5f 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -36,7 +36,6 @@ /* ########################### */ static HMODULE hcomdlg32; -static HRESULT (WINAPI * pPrintDlgExA)(LPPRINTDLGEXA); static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); /* ########################### */ @@ -46,27 +45,6 @@ static const CHAR PrinterPortsA[] = "PrinterPorts"; /* ########################### */ -static LPCSTR load_functions(void) -{ - LPCSTR ptr; - - ptr = "comdlg32.dll"; - hcomdlg32 = GetModuleHandleA(ptr); - - ptr = "PrintDlgExA"; - pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExA) return ptr; - - ptr = "PrintDlgExW"; - pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, ptr); - if (!pPrintDlgExW) return ptr; - - return NULL; - -} - -/* ########################### */ - static void test_PageSetupDlgA(void) { LPPAGESETUPDLGA pDlg; @@ -237,15 +215,16 @@ static void test_PrintDlgExW(void) LPPRINTDLGEXW pDlg; HRESULT res; + /* PrintDlgEx not present before w2k */ + if (!pPrintDlgExW) { + skip("PrintDlgExW not available\n"); + return; + } + /* Set CommDlgExtendedError != 0 */ PrintDlg(NULL); SetLastError(0xdeadbeef); res = pPrintDlgExW(NULL); - if(res == E_NOTIMPL) - { - win_skip("PrintDlgExW returns not implemented\n"); - return; - } ok( (res == E_INVALIDARG), "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", res, GetLastError(), CommDlgExtendedError()); @@ -371,19 +350,11 @@ end: START_TEST(printdlg) { - LPCSTR ptr; - - ptr = load_functions(); + hcomdlg32 = GetModuleHandleA("comdlg32.dll"); + pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, "PrintDlgExW"); test_PageSetupDlgA(); test_PrintDlgA(); - test_abort_proc(); - - /* PrintDlgEx not present before w2k */ - if (ptr) { - win_skip("%s\n", ptr); - return; - } - test_PrintDlgExW(); + test_abort_proc(); }

1 0

Detlef Riekenberg : comdlg32: Use a helper to get the printer driver info.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: ce9f0463880de180c1e2e400595ce19a1a11ea6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9f0463880de180c1e2e4005… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 18 22:14:21 2012 +0100 comdlg32: Use a helper to get the printer driver info. --- dlls/comdlg32/printdlg.c | 83 ++++++++++++++++++++++++++++++---------------- 1 files changed, 54 insertions(+), 29 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2d563ca..ccb7b5f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -162,6 +162,53 @@ static LPWSTR strdupW(LPCWSTR p) } /*********************************************************************** + * get_driver_info [internal] + * + * get DRIVER_INFO_3W for the current printer handle, + * alloc the buffer, when needed + */ +static DRIVER_INFO_3W * get_driver_infoW(HANDLE hprn) +{ + DRIVER_INFO_3W *di3 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + di3 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)di3, needed, &needed); + } + + if (res) + return di3; + + TRACE("GetPrinterDriverW failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, di3); + return NULL; +} + +static DRIVER_INFO_3A * get_driver_infoA(HANDLE hprn) +{ + DRIVER_INFO_3A *di3 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + di3 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)di3, needed, &needed); + } + + if (res) + return di3; + + TRACE("GetPrinterDriverA failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, di3); + return NULL; +} + + +/*********************************************************************** * get_printer_info [internal] * * get PRINTER_INFO_2W for the current printer handle, @@ -3848,10 +3895,8 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) if (lppd->Flags & PD_RETURNDEFAULT) { PRINTER_INFO_2A *pbuf; - DRIVER_INFO_2A *dbuf; + DRIVER_INFO_3A *dbuf; HANDLE hprn; - DWORD needed = 1024; - BOOL bRet; if (lppd->hDevMode || lppd->hDevNames) { @@ -3873,19 +3918,9 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) return E_FAIL; } - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + dbuf = get_driver_infoA(hprn); + if (!dbuf) { - HeapFree(GetProcessHeap(), 0, dbuf); - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - } - if (!bRet) - { - ERR("GetPrinterDriverА failed, last error %d, fix your config for printer %s!\n", - GetLastError(), pbuf->pPrinterName); - HeapFree(GetProcessHeap(), 0, dbuf); HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); ClosePrinter(hprn); @@ -3976,10 +4011,8 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) if (lppd->Flags & PD_RETURNDEFAULT) { PRINTER_INFO_2W *pbuf; - DRIVER_INFO_2W *dbuf; + DRIVER_INFO_3W *dbuf; HANDLE hprn; - DWORD needed = 1024; - BOOL bRet; if (lppd->hDevMode || lppd->hDevNames) { WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); @@ -3999,17 +4032,9 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_FAIL; } - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - HeapFree(GetProcessHeap(), 0, dbuf); - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - } - if (!bRet) { - ERR("GetPrinterDriverW failed, last error %d, fix your config for printer %s!\n", - GetLastError(), debugstr_w(pbuf->pPrinterName)); - HeapFree(GetProcessHeap(), 0, dbuf); + dbuf = get_driver_infoW(hprn); + if (!dbuf) + { HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); ClosePrinter(hprn);

1 0

Detlef Riekenberg : comdlg32: Use a helper to update the devmode handle.
by Alexandre Julliard March 27, 2012

March 27, 2012

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

Detlef Riekenberg : comdlg32: Return a device context when requested.
by Alexandre Julliard March 27, 2012

March 27, 2012

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/tests: Add HDC tests for PrintDlgEx.
by Alexandre Julliard March 27, 2012

March 27, 2012

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