April 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Add support for locales in scanf helper functions.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 231fc1145772011aae5a73ebaf9b911756302393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=231fc1145772011aae5a73eba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:48:49 2010 +0200 msvcrt: Add support for locales in scanf helper functions. --- dlls/msvcrt/scanf.c | 24 ++++++++++++------------ dlls/msvcrt/scanf.h | 17 ++++++++++------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8959897..8cbe964 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -57,31 +57,31 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { return -1; } -/* vfscanf */ +/* vfscanf_l */ #undef WIDE_SCANF #undef CONSOLE #undef STRING #include "scanf.h" -/* vfwscanf */ +/* vfwscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #undef STRING #include "scanf.h" -/* vsscanf */ +/* vsscanf_l */ #undef WIDE_SCANF #undef CONSOLE #define STRING 1 #include "scanf.h" -/* vswscanf */ +/* vswscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE #define STRING 1 #include "scanf.h" -/* vcscanf */ +/* vcscanf_l */ #undef WIDE_SCANF #define CONSOLE 1 #undef STRING @@ -97,7 +97,7 @@ int CDECL MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf(file, format, valist); + res = MSVCRT_vfscanf_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -111,7 +111,7 @@ int CDECL MSVCRT_scanf(const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf(MSVCRT_stdin, format, valist); + res = MSVCRT_vfscanf_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -125,7 +125,7 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf(file, format, valist); + res = MSVCRT_vfwscanf_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -140,7 +140,7 @@ int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf(MSVCRT_stdin, format, valist); + res = MSVCRT_vfwscanf_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -155,7 +155,7 @@ int CDECL MSVCRT_sscanf(const char *str, const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vsscanf(str, format, valist); + res = MSVCRT_vsscanf_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -170,7 +170,7 @@ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format int res; __ms_va_start(valist, format); - res = MSVCRT_vswscanf(str, format, valist); + res = MSVCRT_vswscanf_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -185,7 +185,7 @@ int CDECL _cscanf(const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vcscanf(format, valist); + res = MSVCRT_vcscanf_l(format, NULL, valist); __ms_va_end(valist); return res; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 953c133..086854f 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,7 +48,7 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vcscanf(const char *format, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vcscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #else #ifdef STRING #undef _EOF_ @@ -56,19 +56,19 @@ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #ifdef WIDE_SCANF -#define _FUNCTION_ static int MSVCRT_vswscanf(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vswscanf_l(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* WIDE_SCANF */ -#define _FUNCTION_ static int MSVCRT_vsscanf(const char *file, const char *format, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vsscanf_l(const char *file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* WIDE_SCANF */ #else /* STRING */ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, MSVCRT_fgetwc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetwc(nch, file); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vfwscanf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vfwscanf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, MSVCRT_fgetc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetc(nch, file); consumed--; } while(0) -#define _FUNCTION_ static int MSVCRT_vfscanf(MSVCRT_FILE* file, const char *format, __ms_va_list ap) +#define _FUNCTION_ static int MSVCRT_vfscanf_l(MSVCRT_FILE* file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* WIDE_SCANF */ #endif /* STRING */ #endif /* CONSOLE */ @@ -91,6 +91,9 @@ _FUNCTION_ { nch = _GETC_(file); if (nch == _EOF_) return _EOF_RET; + if(!locale) + locale = get_locale(); + while (*format) { /* a whitespace character in the format string causes scanf to read, * but not store, all consecutive white-space characters in the input @@ -250,7 +253,7 @@ _FUNCTION_ { nch = _GETC_(file); } /* get first digit. */ - if ('.' != nch) { + if (*locale->locinfo->lconv->decimal_point != nch) { if (!_ISDIGIT_(nch)) break; cur = (nch - '0'); nch = _GETC_(file); @@ -265,7 +268,7 @@ _FUNCTION_ { cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ } /* handle decimals */ - if (width!=0 && nch == '.') { + if (width!=0 && nch == *locale->locinfo->lconv->decimal_point) { long double dec = 1; nch = _GETC_(file); if (width>0) width--;

1 0

Huw Davies : wineps.drv: Defer accessing the font metrics until we really need them.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: dea3745eb8ed1b96f54e10bc097396e2fe524760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea3745eb8ed1b96f54e10bc0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 22 10:11:07 2010 +0100 wineps.drv: Defer accessing the font metrics until we really need them. --- dlls/wineps.drv/download.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index bf9cb09..a6ab9d0 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -196,29 +196,9 @@ static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) */ BOOL PSDRV_SelectDownloadFont(PSDRV_PDEVICE *physDev) { - char *ps_name; - LPOUTLINETEXTMETRICA potm; - DWORD len = GetOutlineTextMetricsA(physDev->hdc, 0, NULL); - - if(!len) return FALSE; - potm = HeapAlloc(GetProcessHeap(), 0, len); - GetOutlineTextMetricsA(physDev->hdc, len, potm); - get_download_name(physDev, potm, &ps_name); - physDev->font.fontloc = Download; - physDev->font.fontinfo.Download = is_font_downloaded(physDev, ps_name); + physDev->font.fontinfo.Download = NULL; - physDev->font.size = abs(PSDRV_YWStoDS(physDev, /* ppem */ - potm->otmTextMetrics.tmAscent + - potm->otmTextMetrics.tmDescent - - potm->otmTextMetrics.tmInternalLeading)); - physDev->font.underlineThickness = potm->otmsUnderscoreSize; - physDev->font.underlinePosition = potm->otmsUnderscorePosition; - physDev->font.strikeoutThickness = potm->otmsStrikeoutSize; - physDev->font.strikeoutPosition = potm->otmsStrikeoutPosition; - - HeapFree(GetProcessHeap(), 0, ps_name); - HeapFree(GetProcessHeap(), 0, potm); return TRUE; } @@ -241,6 +221,17 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) GetOutlineTextMetricsA(physDev->hdc, len, potm); get_download_name(physDev, potm, &ps_name); + physDev->font.fontinfo.Download = is_font_downloaded(physDev, ps_name); + + physDev->font.size = abs(PSDRV_YWStoDS(physDev, /* ppem */ + potm->otmTextMetrics.tmAscent + + potm->otmTextMetrics.tmDescent - + potm->otmTextMetrics.tmInternalLeading)); + physDev->font.underlineThickness = potm->otmsUnderscoreSize; + physDev->font.underlinePosition = potm->otmsUnderscorePosition; + physDev->font.strikeoutThickness = potm->otmsStrikeoutSize; + physDev->font.strikeoutPosition = potm->otmsStrikeoutPosition; + if(physDev->font.fontinfo.Download == NULL) { RECT bbox;

1 0

Piotr Caban : msvcrt: Added _scanf_l implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 00f704539f270036ab8a7ccf9c27f5649fa479ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f704539f270036ab8a7ccf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:49:16 2010 +0200 msvcrt: Added _scanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 15 ++++++++++++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 227d108..20a9d1b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -851,7 +851,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb -@ stub _scanf_l +@ varargs _scanf_l(str ptr) msvcrt._scanf_l @ stub _scanf_s_l @ stub _scprintf @ stub _scprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b8f4d5c..60f6132 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -837,7 +837,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb -@ stub _scanf_l +@ varargs _scanf_l(str ptr) msvcrt._scanf_l @ stub _scanf_s_l @ stub _scprintf @ stub _scprintf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6643e04..2c2f93b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -793,7 +793,7 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb -# stub _scanf_l +@ varargs _scanf_l(str ptr) MSVCRT__scanf_l # stub _scanf_s_l # stub _scprintf # stub _scprintf_l diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 13186bf..4d294ff 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -132,6 +132,20 @@ int CDECL MSVCRT_scanf(const char *format, ...) } /********************************************************************* + * _scanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__scanf_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfscanf_l(MSVCRT_stdin, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * fwscanf (MSVCRT.@) */ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) @@ -145,7 +159,6 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) return res; } - /********************************************************************* * wscanf (MSVCRT.@) */

1 0

Huw Davies : wineps.drv: Calculate the font size directly from the logfont.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 93f970ce7b086a31eb6e8faf1e17a5b2982c922f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f970ce7b086a31eb6e8faf1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 22 11:25:54 2010 +0100 wineps.drv: Calculate the font size directly from the logfont. --- dlls/wineps.drv/download.c | 45 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index a6ab9d0..5a873e1 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -202,6 +202,37 @@ BOOL PSDRV_SelectDownloadFont(PSDRV_PDEVICE *physDev) return TRUE; } +static UINT calc_ppem_for_height(HDC hdc, LONG height) +{ + BYTE os2[78]; /* size of version 0 table */ + BYTE hhea[8]; /* just enough to get the ascender and descender */ + LONG ascent = 0, descent = 0; + UINT emsize; + + if(height < 0) return -height; + + if(GetFontData(hdc, MS_MAKE_TAG('O','S','/','2'), 0, os2, sizeof(os2)) == sizeof(os2)) + { + ascent = GET_BE_WORD(os2 + 74); /* usWinAscent */ + descent = GET_BE_WORD(os2 + 76); /* usWinDescent */ + } + + if(ascent + descent == 0) + { + if(GetFontData(hdc, MS_MAKE_TAG('h','h','e','a'), 0, hhea, sizeof(hhea)) == sizeof(hhea)) + { + ascent = (signed short)GET_BE_WORD(hhea + 4); /* Ascender */ + descent = -(signed short)GET_BE_WORD(hhea + 6); /* Descender */ + } + } + + if(ascent + descent == 0) return height; + + get_bbox(hdc, NULL, &emsize); + + return MulDiv(emsize, height, ascent + descent); +} + /**************************************************************************** * PSDRV_WriteSetDownloadFont * @@ -214,6 +245,8 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) LPOUTLINETEXTMETRICA potm; DWORD len = GetOutlineTextMetricsA(physDev->hdc, 0, NULL); DOWNLOAD *pdl; + LOGFONTW lf; + UINT ppem; assert(physDev->font.fontloc == Download); @@ -223,16 +256,18 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) get_download_name(physDev, potm, &ps_name); physDev->font.fontinfo.Download = is_font_downloaded(physDev, ps_name); - physDev->font.size = abs(PSDRV_YWStoDS(physDev, /* ppem */ - potm->otmTextMetrics.tmAscent + - potm->otmTextMetrics.tmDescent - - potm->otmTextMetrics.tmInternalLeading)); + if (!GetObjectW( GetCurrentObject(physDev->hdc, OBJ_FONT), sizeof(lf), &lf )) + return FALSE; + + ppem = calc_ppem_for_height(physDev->hdc, lf.lfHeight); + + physDev->font.size = abs(PSDRV_YWStoDS(physDev, ppem)); + physDev->font.underlineThickness = potm->otmsUnderscoreSize; physDev->font.underlinePosition = potm->otmsUnderscorePosition; physDev->font.strikeoutThickness = potm->otmsStrikeoutSize; physDev->font.strikeoutPosition = potm->otmsStrikeoutPosition; - if(physDev->font.fontinfo.Download == NULL) { RECT bbox; UINT emsize;

1 0

Alexandre Julliard : winex11: Don' t set a hint for the small icon if it has the same size as the large one.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 09dc6019b6afb2b1b59c0d7224302942b180eed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dc6019b6afb2b1b59c0d722… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 14:47:57 2010 +0200 winex11: Don't set a hint for the small icon if it has the same size as the large one. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9f274f..831b7c9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -929,7 +929,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, unsigned int size_small; unsigned long *bits_small, *new; - if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small ))) + if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small )) && + (bits_small[0] != bits[0] || bits_small[1] != bits[1])) /* size must be different */ { if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, (size + size_small) * sizeof(unsigned long) ))) @@ -938,8 +939,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, memcpy( bits + size, bits_small, size_small * sizeof(unsigned long) ); size += size_small; } - HeapFree( GetProcessHeap(), 0, bits_small ); } + HeapFree( GetProcessHeap(), 0, bits_small ); DeleteObject( ii.hbmColor ); DeleteObject( ii.hbmMask ); }

1 0

Piotr Caban : msvcrt: Added _fscanf_l implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 66042e00414774f0ad8c2d517a4a2a702c65f379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66042e00414774f0ad8c2d517… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:49:06 2010 +0200 msvcrt: Added _fscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cec8736..227d108 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -432,7 +432,7 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ stub _fscanf_l +@ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l @ stub _fscanf_s_l @ stub _fseek_nolock @ stub _fseeki64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 16ec74b..b8f4d5c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -424,7 +424,7 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ stub _fscanf_l +@ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l @ stub _fscanf_s_l @ stub _fseek_nolock @ stub _fseeki64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d7b9c94..6643e04 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1285,7 +1285,7 @@ # stub _free_dbg # stub _freea # stub _freea_s -# stub _fscanf_l +@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l # stub _fscanf_s_l # stub _fseeki64 @ cdecl qsort(ptr long long ptr) ntdll.qsort diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8cbe964..13186bf 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -103,6 +103,21 @@ int CDECL MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...) } /********************************************************************* + * _fscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__fscanf_l(MSVCRT_FILE *file, const char *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vfscanf_l(file, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * scanf (MSVCRT.@) */ int CDECL MSVCRT_scanf(const char *format, ...)

1 0

Huw Davies : wineps.drv: Make the rectangle an optional parameter to get_bbox().
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: d99754adc15f60ea1f7f9bf6b70788d028876bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99754adc15f60ea1f7f9bf6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 22 09:29:30 2010 +0100 wineps.drv: Make the rectangle an optional parameter to get_bbox(). --- dlls/wineps.drv/download.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 82b70b4..bf9cb09 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -168,20 +168,23 @@ static BOOL is_room_for_font(PSDRV_PDEVICE *physDev) * the font size we'll get the data directly from the TrueType HEAD table rather * than using GetOutlineTextMetrics. */ -static BOOL get_bbox(PSDRV_PDEVICE *physDev, RECT *rc, UINT *emsize) +static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) { BYTE head[54]; /* the head table is 54 bytes long */ - if(GetFontData(physDev->hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, - sizeof(head)) == GDI_ERROR) { + if(GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, sizeof(head)) == GDI_ERROR) + { ERR("Can't retrieve head table\n"); return FALSE; } *emsize = GET_BE_WORD(head + 18); /* unitsPerEm */ - rc->left = (signed short)GET_BE_WORD(head + 36); /* xMin */ - rc->bottom = (signed short)GET_BE_WORD(head + 38); /* yMin */ - rc->right = (signed short)GET_BE_WORD(head + 40); /* xMax */ - rc->top = (signed short)GET_BE_WORD(head + 42); /* yMax */ + if(rc) + { + rc->left = (signed short)GET_BE_WORD(head + 36); /* xMin */ + rc->bottom = (signed short)GET_BE_WORD(head + 38); /* yMin */ + rc->right = (signed short)GET_BE_WORD(head + 40); /* xMax */ + rc->top = (signed short)GET_BE_WORD(head + 42); /* yMax */ + } return TRUE; } @@ -243,7 +246,7 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) RECT bbox; UINT emsize; - if (!get_bbox(physDev, &bbox, &emsize)) { + if (!get_bbox(physDev->hdc, &bbox, &emsize)) { HeapFree(GetProcessHeap(), 0, potm); return FALSE; }

1 0

Alexandre Julliard : winex11: Invert the icon mask only after the conversion to ARGB.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 9ff982f2a8ffaab03382ee6c7407cdc0629ee0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff982f2a8ffaab03382ee6c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 14:16:44 2010 +0200 winex11: Invert the icon mask only after the conversion to ARGB. --- dlls/winex11.drv/window.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bf71cad..a9f274f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -853,7 +853,7 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns ptr = bits + 2; for (i = 0; i < bm.bmHeight; i++) for (j = 0; j < bm.bmWidth; j++, ptr++) - if ((mask_bits[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr |= 0xff000000; + if (!((mask_bits[i * width_bytes + j / 8] << (j % 8)) & 0x80)) *ptr |= 0xff000000; HeapFree( GetProcessHeap(), 0, mask_bits ); } HeapFree( GetProcessHeap(), 0, info ); @@ -923,19 +923,6 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, rcMask.bottom = bm.bmHeight; hDC = CreateCompatibleDC(0); - hbmOrig = SelectObject(hDC, ii.hbmMask); - InvertRect(hDC, &rcMask); - SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ - SelectObject(hDC, hbmOrig); - - data->hWMIconBitmap = ii.hbmColor; - data->hWMIconMask = ii.hbmMask; - - hints->icon_pixmap = X11DRV_get_pixmap(data->hWMIconBitmap); - hints->icon_mask = X11DRV_get_pixmap(data->hWMIconMask); - destroy_icon_window( display, data ); - hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint; - bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); if (GetIconInfo( icon_small, &ii )) { @@ -965,6 +952,19 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, bits ); + hbmOrig = SelectObject(hDC, ii.hbmMask); + InvertRect(hDC, &rcMask); + SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ + SelectObject(hDC, hbmOrig); + + data->hWMIconBitmap = ii.hbmColor; + data->hWMIconMask = ii.hbmMask; + + hints->icon_pixmap = X11DRV_get_pixmap(data->hWMIconBitmap); + hints->icon_mask = X11DRV_get_pixmap(data->hWMIconMask); + destroy_icon_window( display, data ); + hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint; + DeleteDC(hDC); } }

1 0

Gerald Pfeifer : user32: Remove variable mask which is not really used from check_alpha_draw.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: f2c94fa1380c9e91618a405f9a8526dc1f9fc922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c94fa1380c9e91618a405f9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 21 19:43:22 2010 +0200 user32: Remove variable mask which is not really used from check_alpha_draw. --- dlls/user32/tests/cursoricon.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8534875..eb22ce4 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1005,11 +1005,9 @@ static BOOL color_match(COLORREF a, COLORREF b) static void check_alpha_draw(HDC hdc, BOOL drawiconex, BOOL alpha, int bpp, int line) { HICON hicon; - UINT32 mask; UINT32 color[2]; COLORREF modern_expected, legacy_expected, result; - mask = 0x00000000; color[0] = 0x00A0B0C0; color[1] = alpha ? 0xFF000000 : 0x00000000; modern_expected = alpha ? 0x00FFFFFF : 0x00C0B0A0;

1 0

Jeff Latimer : usp10/tests: Add tests for CR and LF chars and remove some trailing white space.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 0b9b96a81b490c0d407964d9f609ad691eab9e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9b96a81b490c0d407964d9f… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Apr 22 20:06:02 2010 +1000 usp10/tests: Add tests for CR and LF chars and remove some trailing white space. --- dlls/usp10/tests/usp10.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9be26e5..124526b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -670,9 +670,9 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; WCHAR TestItem2[] = {'T', 'e', 's', 't', 'b', 0}; - WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; - WCHAR TestItem4[] = {'T', 'e', 's', 't', 'c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; - WCHAR TestItem5[] = {0x0684,'T','e','s','t','c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; + WCHAR TestItem4[] = {'T', 'e', 's', 't', 'd',' ',0x0684,0x0694,0x06a4,' ',' ','\r','\n','e','n','d',0}; + WCHAR TestItem5[] = {0x0684,'T','e','s','t','e',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; SCRIPT_CACHE psc; int cChars; @@ -692,7 +692,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 * by checking a known value in the table */ hr = ScriptGetProperties(&ppSp, &iMaxProps); trace("number of script properties %d\n", iMaxProps); - ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); + ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); if (iMaxProps > 0) ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ /* ptrs work */ @@ -754,7 +754,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 cMaxItems = 255; hr = ScriptItemize(TestItem2, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * + /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * * returned. */ ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, "Start pos not = 0 (%d) or end pos not = %d (%d)\n", @@ -809,15 +809,15 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (!psc, "psc is not null after ScriptFreeCache\n"); } - /* This is a valid test that will cause parsing to take place and create 3 script_items */ + /* This is a valid test that will cause parsing to take place and create 5 script_items */ cInChars = (sizeof(TestItem4)/2)-1; cMaxItems = 255; hr = ScriptItemize(TestItem4, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); if (hr == 0) { - ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); - if (pcItems > 2) + ok (pcItems == 5, "The number of SCRIPT_ITEMS should be 5 not %d\n", pcItems); + if (pcItems > 4) { ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", @@ -825,9 +825,15 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", pItem[1].iCharPos, pItem[2].iCharPos); - ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == cInChars, - "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", - pItem[2].iCharPos, pItem[3].iCharPos, cInChars); + ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == 12, + "Start pos [2] not = 11 (%d) or end [3] pos not = 12 (%d)\n", + pItem[2].iCharPos, pItem[3].iCharPos); + ok (pItem[3].iCharPos == 12 && pItem[4].iCharPos == 13, + "Start pos [3] not = 12 (%d) or end [4] pos not = 13 (%d)\n", + pItem[3].iCharPos, pItem[4].iCharPos); + ok (pItem[4].iCharPos == 13 && pItem[5].iCharPos == cInChars, + "Start pos [4] not = 13 (%d) or end [5] pos not = 16 (%d), cInChars = %d\n", + pItem[4].iCharPos, pItem[5].iCharPos, cInChars); } hr = ScriptFreeCache( &psc); ok (!psc, "psc is not null after ScriptFreeCache\n"); @@ -835,12 +841,12 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 /* * This test is for when the first unicode character requires bidi support - */ + */ cInChars = (sizeof(TestItem5)-1)/sizeof(WCHAR); hr = ScriptItemize(TestItem5, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); - ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", + ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", pItem[0].a.s.uBidiLevel); }

1 0