December 2011 - Wine-commits

Kusanagi Kouichi : gdi32: Add vertical fonts to font list.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 69a26387b311c318b2a6845bc827664a645d464a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a26387b311c318b2a6845bc… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:05:53 2011 +0900 gdi32: Add vertical fonts to font list. --- dlls/gdi32/freetype.c | 34 +++++++++++++++++++++++++++++++--- dlls/gdi32/tests/font.c | 4 ---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3b40442..d9607e6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1450,11 +1450,25 @@ static void AddFaceToFamily(Face *face, Family *family) list_add_before( entry, &face->entry ); } +static WCHAR *prepend_at(WCHAR *family) +{ + WCHAR *str; + + if (!family) + return NULL; + + str = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * (strlenW(family) + 2)); + str[0] = '@'; + strcpyW(str + 1, family); + HeapFree(GetProcessHeap(), 0, family); + return str; +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 -static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags) +static void AddFaceToList(FT_Face ft_face, char *fake_family, 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; @@ -1494,6 +1508,12 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, } } + if (vertical) + { + english_family = prepend_at(english_family); + localised_family = prepend_at(localised_family); + } + family = find_family_from_name(localised_family ? localised_family : english_family); if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); @@ -1671,6 +1691,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ WCHAR *localised_family; FT_Error err; FT_Long face_index = 0, num_faces; + INT ret = 0; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -1779,12 +1800,19 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ HeapFree(GetProcessHeap(), 0, localised_family); } - AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + ++ret; + + if (FT_HAS_VERTICAL(ft_face)) + { + AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + ++ret; + } num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); - return num_faces; + return ret; } static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *target_family, DWORD flags) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 98c61a0..710ee56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4121,7 +4121,6 @@ static void test_vertical_font(void) } num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); - todo_wine ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); check_vertical_font("@WineTestVertical", &installed, &selected, &gm); @@ -4133,11 +4132,8 @@ static void test_vertical_font(void) gm.gmBlackBoxX, gm.gmBlackBoxY); check_vertical_font("@@WineTestVertical", &installed, &selected, &gm); - todo_wine ok(installed, "@@WineTestVertical is not installed\n"); - todo_wine ok(selected, "@@WineTestVertical is not selected\n"); - todo_wine ok(gm.gmBlackBoxX < gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY);

1 0

Kusanagi Kouichi : gdi32: Substitute glyph for vertical font only.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 53385314d03252d98ac3f605ee6a514b1bafd934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53385314d03252d98ac3f605e… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:06:00 2011 +0900 gdi32: Substitute glyph for vertical font only. --- dlls/gdi32/freetype.c | 4 +++- dlls/gdi32/tests/font.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d9607e6..b907209 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -269,6 +269,7 @@ typedef struct tagFace { DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; + BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ BOOL external; /* TRUE if we should manually add this font to the registry */ struct tagFamily *family; @@ -1619,6 +1620,7 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; face->font_version = pHeader ? pHeader->Font_Revision : 0; face->family = family; + face->vertical = vertical; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; face->fs = fs; memset(&face->fs_links, 0, sizeof(face->fs_links)); @@ -4248,7 +4250,7 @@ found_face: ret->strikeout = lf.lfStrikeOut ? 0xff : 0; create_child_font_list(ret); - if (lf.lfFaceName[0]=='@') /* We need to try to load the GSUB table */ + if (face->vertical) /* We need to try to load the GSUB table */ { int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 710ee56..4d53aaf 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4126,7 +4126,6 @@ static void test_vertical_font(void) check_vertical_font("@WineTestVertical", &installed, &selected, &gm); ok(installed, "@WineTestVertical is not installed\n"); ok(selected, "@WineTestVertical is not selected\n"); - todo_wine ok(gm.gmBlackBoxX > gm.gmBlackBoxY, "gmBlackBoxX(%u) should be greater than gmBlackBoxY(%u) if horizontal\n", gm.gmBlackBoxX, gm.gmBlackBoxY);

1 0

Aric Stewart : usp10: Improve selection drawing if selection starts in the middle of a cluster.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: dbe168fe9991e0dc8783a3cc468d880c4ff71dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe168fe9991e0dc8783a3cc4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 20 08:38:24 2011 -0600 usp10: Improve selection drawing if selection starts in the middle of a cluster. --- dlls/usp10/usp10.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4f532f5..93d7b0f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1877,6 +1877,8 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, INT runStart, runEnd; INT iGlyph, cGlyphs; HFONT oldFont = 0x0; + RECT crc; + int i; TRACE("(%p,%d,%d,%d,%d,%d, 0x%1x, %d, %d)\n", ssa, iX, iY, iItem, cStart, cEnd, uOptions, fSelected, fDisabled); @@ -1887,6 +1889,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, (cEnd >= 0 && analysis->pItem[iItem].iCharPos >= cEnd)) return S_OK; + CopyRect(&crc,prc); if (fSelected) { BkMode = GetBkMode(analysis->hdc); @@ -1917,6 +1920,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, ScriptStringCPtoX(ssa, cEnd, FALSE, &off_x); else ScriptStringCPtoX(ssa, analysis->pItem[iItem+1].iCharPos-1, TRUE, &off_x); + crc.left = iX + off_x; } else { @@ -1924,6 +1928,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, ScriptStringCPtoX(ssa, cStart, FALSE, &off_x); else ScriptStringCPtoX(ssa, analysis->pItem[iItem].iCharPos, FALSE, &off_x); + crc.left = iX + off_x; } if (analysis->pItem[iItem].a.fRTL) @@ -1938,6 +1943,24 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, cGlyphs++; + /* adjust for cluster glyphs when starting */ + if (analysis->pItem[iItem].a.fRTL) + i = analysis->pItem[iItem+1].iCharPos - 1; + else + i = analysis->pItem[iItem].iCharPos; + + for (; i >=analysis->pItem[iItem].iCharPos && i < analysis->pItem[iItem+1].iCharPos; (analysis->pItem[iItem].a.fRTL)?i--:i++) + { + if (analysis->glyphs[iItem].pwLogClust[i - analysis->pItem[iItem].iCharPos] == iGlyph) + { + if (analysis->pItem[iItem].a.fRTL) + ScriptStringCPtoX(ssa, i, TRUE, &off_x); + else + ScriptStringCPtoX(ssa, i, FALSE, &off_x); + break; + } + } + if (cEnd < 0 || scriptInformation[analysis->pItem[iItem].a.eScript].props.fNeedsCaretInfo) { INT direction; @@ -1959,7 +1982,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->glyphs[iItem].sc, iX + off_x, - iY, uOptions, prc, &analysis->pItem[iItem].a, NULL, 0, + iY, uOptions, &crc, &analysis->pItem[iItem].a, NULL, 0, &analysis->glyphs[iItem].glyphs[iGlyph], cGlyphs, &analysis->glyphs[iItem].piAdvance[iGlyph], NULL, &analysis->glyphs[iItem].pGoffset[iGlyph]);

1 0

Aric Stewart : user32: Modify EDIT_GetLineRect to better handle RTL lines.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 3f1a8f66680e6bb6c9916973e24476c456c828b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1a8f66680e6bb6c9916973e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 20 10:37:19 2011 -0600 user32: Modify EDIT_GetLineRect to better handle RTL lines. --- dlls/user32/edit.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0ceb8cf..6380d4b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1156,18 +1156,52 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) */ static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc) { - INT line_index = EDIT_EM_LineIndex(es, line); - INT pt1, pt2; + SCRIPT_STRING_ANALYSIS ssa; + INT line_index = 0; + INT pt1, pt2, pt3; if (es->style & ES_MULTILINE) + { + const LINEDEF *line_def = NULL; rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height; + if (line >= es->line_count) + return; + + line_def = es->first_line_def; + if (line == -1) { + INT index = es->selection_end - line_def->length; + while ((index >= 0) && line_def->next) { + line_index += line_def->length; + line_def = line_def->next; + index -= line_def->length; + } + } else { + while (line > 0) { + line_index += line_def->length; + line_def = line_def->next; + line--; + } + } + ssa = line_def->ssa; + } else + { + line_index = 0; rc->top = es->format_rect.top; + ssa = es->ssa; + } + rc->bottom = rc->top + es->line_height; pt1 = (scol == 0) ? es->format_rect.left : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + scol, TRUE)); pt2 = (ecol == -1) ? es->format_rect.right : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE)); - rc->right = max(pt1 , pt2); - rc->left = min(pt1, pt2); + if (ssa) + { + ScriptStringCPtoX(ssa, line_index + scol, FALSE, &pt3); + pt3+=es->format_rect.left; + } + else pt3 = pt1; + rc->right = max(max(pt1 , pt2),pt3); + rc->left = min(min(pt1, pt2),pt3); } @@ -3678,11 +3712,13 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) if (es->style & ES_MULTILINE) { INT vlc = get_vertical_line_count(es); for (i = es->y_offset ; i <= min(es->y_offset + vlc, es->y_offset + es->line_count - 1) ; i++) { + EDIT_UpdateUniscribeData(es, dc, i); EDIT_GetLineRect(es, i, 0, -1, &rcLine); if (IntersectRect(&rc, &rcRgn, &rcLine)) EDIT_PaintLine(es, dc, i, rev); } } else { + EDIT_UpdateUniscribeData(es, dc, 0); EDIT_GetLineRect(es, 0, 0, -1, &rcLine); if (IntersectRect(&rc, &rcRgn, &rcLine)) EDIT_PaintLine(es, dc, 0, rev);

1 0

Aric Stewart : user32: Do not simply return 0 in EDIT_EM_PosFromChar if line ssa is NULL.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: b83c587f6e68c77d15a9b9335044a643172bc975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83c587f6e68c77d15a9b9335… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 20 10:54:39 2011 -0600 user32: Do not simply return 0 in EDIT_EM_PosFromChar if line ssa is NULL. --- dlls/user32/edit.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 6380d4b..4a54fa0 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1069,13 +1069,15 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) while (line_def->index != li) line_def = line_def->next; - if (!line_def->ssa) - return 0; - lw = line_def->width; w = es->format_rect.right - es->format_rect.left; - ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); - x -= es->x_offset; + if (line_def->ssa) + { + ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); + x -= es->x_offset; + } + else + x = es->x_offset; if (es->style & ES_RIGHT) x = w - (lw - x);

1 0

Piotr Caban : msvcp90: Added macro to call functions from vtable.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: ddebdbf1e6580f5fbc1f4a954312e6e281df41af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddebdbf1e6580f5fbc1f4a954… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:56:42 2011 +0100 msvcp90: Added macro to call functions from vtable. --- dlls/msvcp90/locale.c | 21 ++------------------- dlls/msvcp90/msvcp90.h | 12 ++++++++++++ dlls/msvcp90/msvcp90_main.c | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 16eda98..0c441c9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -117,6 +117,8 @@ void __thiscall locale_facet_dtor(locale_facet *this) } DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) +#define call_locale_facet_vector_dtor(this, flags) CALL_VTBL_FUNC(this, 0, \ + locale_facet*, (locale_facet*, unsigned int), (this, flags)) locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); @@ -139,25 +141,6 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi const vtable_ptr MSVCP_locale_facet_vtable[] = { (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) }; -#ifdef __i386__ -static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) -{ - locale_facet *ret; - void *dummy; - - __asm__ __volatile__ ("pushl %3\n\tcall *%2" - : "=a" (ret), "=c" (dummy) - : "r" (this->vtable[0]), "r" (flags), "1" (this) - : "edx", "memory" ); - return ret; -} -#else -static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) -{ - locale_facet * (__thiscall *dtor)(locale_facet *, unsigned int) = (void *)this->vtable[0]; - return dtor(this, flags); -} -#endif /* ??0id(a)locale@std@@QAE(a)I@Z */ /* ??0id(a)locale@std@@QEAA(a)_K@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e906c6c..ee793b1 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -130,6 +130,18 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#ifdef __i386__ + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args + +extern void *vtbl_wrapper_0; + +#else + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (__cdecl***)type)this)[0][off/4]args + +#endif + /* exception object */ typedef void (*vtable_ptr)(void); typedef struct __exception diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 35fabfc..3aacf6d 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -28,6 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); + +#endif + void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*);

1 0

Piotr Caban : msvcp90: Added collate<char>::compare implementation.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 50518766602f6c2ec3ed974af99d37bd0ec206d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50518766602f6c2ec3ed974af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:57:08 2011 +0100 msvcp90: Added collate<char>::compare implementation. --- dlls/msvcp90/locale.c | 20 ++++++++++++++++---- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/msvcp90_main.c | 1 + dlls/msvcp90/tests/misc.c | 41 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0c441c9..ec2f5d5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); @@ -742,14 +743,25 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca return LC_COLLATE; } +/* _Strcoll */ +int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, + const char *last2, const _Collvec *coll) +{ + TRACE("(%s %s)\n", debugstr_an(first1, last1-first1), debugstr_an(first2, last2-first2)); + return CompareStringA(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2; +} + /* ?do_compare@?$collate(a)D@std@@MBEHPBD000(a)Z */ /* ?do_compare@?$collate(a)D@std@@MEBAHPEBD000(a)Z */ DEFINE_THISCALL_WRAPPER(collate_char_do_compare, 20) +#define call_collate_char_do_compare(this, first1, last1, first2, last2) CALL_VTBL_FUNC(this, 4, int, \ + (const collate*, const char*, const char*, const char*, const char*), \ + (this, first1, last1, first2, last2)) int __thiscall collate_char_do_compare(const collate *this, const char *first1, const char *last1, const char *first2, const char *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return _Strcoll(first1, last1, first2, last2, &this->coll); } /* ?compare@?$collate(a)D@std@@QBEHPBD000(a)Z */ @@ -758,8 +770,8 @@ DEFINE_THISCALL_WRAPPER(collate_char_compare, 20) int __thiscall collate_char_compare(const collate *this, const char *first1, const char *last1, const char *first2, const char *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return call_collate_char_do_compare(this, first1, last1, first2, last2); } /* ?do_hash@?$collate(a)D@std@@MBEJPBD0(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index ee793b1..23254af 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -135,6 +135,7 @@ const rtti_object_locator name ## _rtti = { \ #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args extern void *vtbl_wrapper_0; +extern void *vtbl_wrapper_4; #else diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d288bbc..3c62462 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5796,7 +5796,7 @@ @ stub _Stoull @ stub _Stoullx @ stub _Stoulx -@ stub _Strcoll +@ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ stub _Tolower @ stub _Toupper diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 3aacf6d..f27ac0c 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); "jmp *" #off "(%eax)\n\t") DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); #endif diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 221edf1..8e77e95 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -60,6 +60,11 @@ static char* (__thiscall *p_char_allocate)(void*, size_t); static void (__thiscall *p_char_construct)(void*, char*, const char*); static size_t (__thiscall *p_char_max_size)(void*); +void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); +int (__thiscall *p_collate_char_compare)(const void*, const char*, + const char*, const char*, const char*); +void (__thiscall *p_collate_char_dtor)(void*); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -90,6 +95,8 @@ struct thiscall_thunk static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, + const void *c, const void *d ); static void init_thiscall_thunk(void) { @@ -103,11 +110,14 @@ static void init_thiscall_thunk(void) call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; call_thiscall_func3 = (void *)thunk; + call_thiscall_func5 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)a,(const void*)b) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),(const void*)(b), \ + (const void*)(c), (const void *)(d)) #else @@ -115,6 +125,7 @@ static void init_thiscall_thunk(void) #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) +#define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #endif /* __i386__ */ @@ -158,6 +169,10 @@ static BOOL init(void) SET(p_char_allocate, "?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z"); SET(p_char_construct, "?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z"); SET(p_char_max_size, "?max_size@?$allocator(a)D@std@@QEBA_KXZ"); + + SET(p_collate_char_ctor_refs, "??0?$collate(a)D@std@@QEAA(a)_K@Z"); + SET(p_collate_char_compare, "?compare@?$collate(a)D@std@@QEBAHPEBD000(a)Z"); + SET(p_collate_char_dtor, "??1?$collate(a)D@std@@MEAA(a)XZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -175,6 +190,10 @@ static BOOL init(void) SET(p_char_allocate, "?allocate@?$allocator(a)D@std@@QAEPADI(a)Z"); SET(p_char_construct, "?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z"); SET(p_char_max_size, "?max_size@?$allocator(a)D@std@@QBEIXZ"); + + SET(p_collate_char_ctor_refs, "??0?$collate(a)D@std@@QAE(a)I@Z"); + SET(p_collate_char_compare, "?compare@?$collate(a)D@std@@QBEHPBD000(a)Z"); + SET(p_collate_char_dtor, "??1?$collate(a)D@std@@MAE(a)XZ"); } init_thiscall_thunk(); @@ -356,6 +375,23 @@ static void test_allocator_char(void) ok(size == (unsigned int)0xffffffff, "size = %x\n", size); } +static void test_virtual_call(void) +{ + BYTE collate_char[16]; + char str1[] = "test"; + char str2[] = "TEST"; + int ret; + + call_func2(p_collate_char_ctor_refs, collate_char, 0); + ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+4, str1, str1+4); + ok(ret == 0, "collate<char>::compare returned %d\n", ret); + ret = (int)call_func5(p_collate_char_compare, collate_char, str2, str2+4, str1, str1+4); + ok(ret == 1, "collate<char>::compare returned %d\n", ret); + ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+3, str1, str1+4); + ok(ret == -1, "collate<char>::compare returned %d\n", ret); + call_func1(p_collate_char_dtor, collate_char); +} + START_TEST(misc) { if(!init()) @@ -366,6 +402,7 @@ START_TEST(misc) test_Copy_s(); test_wctype(); test__Getctype(); + test_virtual_call(); test_allocator_char();

1 0

Piotr Caban : msvcp90: Added collate<char>::do_hash implementation.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 0e8d13b82c69c1c50b927afa8e9e1554458cf931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8d13b82c69c1c50b927afa8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:57:19 2011 +0100 msvcp90: Added collate<char>::do_hash implementation. --- dlls/msvcp90/locale.c | 15 +++++++++++---- dlls/msvcp90/msvcp90.h | 8 ++++++++ dlls/msvcp90/msvcp90_main.c | 9 +++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ec2f5d5..7b0fa5f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -777,11 +777,18 @@ int __thiscall collate_char_compare(const collate *this, const char *first1, /* ?do_hash@?$collate(a)D@std@@MBEJPBD0(a)Z */ /* ?do_hash@?$collate(a)D@std@@MEBAJPEBD0(a)Z */ DEFINE_THISCALL_WRAPPER(collate_char_do_hash, 12) +#define call_collate_char_do_hash(this, first, last) CALL_VTBL_FUNC(this, 12, LONG, \ + (const collate*, const char*, const char*), (this, first, last)) LONG __thiscall collate_char_do_hash(const collate *this, const char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + ULONG ret = 0; + + TRACE("(%p %p %p)\n", this, first, last); + + for(; first<last; first++) + ret = (ret<<8 | ret>>24) + *first; + return ret; } /* ?hash@?$collate(a)D@std@@QBEJPBD0(a)Z */ @@ -790,8 +797,8 @@ DEFINE_THISCALL_WRAPPER(collate_char_hash, 12) LONG __thiscall collate_char_hash(const collate *this, const char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + TRACE("(%p %p %p)\n", this, first, last); + return call_collate_char_do_hash(this, first, last); } /* ?do_transform@?$collate(a)D@std@@MBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)PBD0@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 23254af..63350fc 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -136,6 +136,14 @@ const rtti_object_locator name ## _rtti = { \ extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; +extern void *vtbl_wrapper_12; +extern void *vtbl_wrapper_16; +extern void *vtbl_wrapper_20; +extern void *vtbl_wrapper_24; +extern void *vtbl_wrapper_28; +extern void *vtbl_wrapper_32; +extern void *vtbl_wrapper_36; +extern void *vtbl_wrapper_40; #else diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index f27ac0c..ac29af9 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -40,6 +40,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); DEFINE_VTBL_WRAPPER(0); DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); #endif

1 0

Piotr Caban : msvcp90: Correctly export collate<short> constructors.
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 9e8e6e6dac73a8b04c566132244bb0434b579f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8e6e6dac73a8b04c5661322… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:57:34 2011 +0100 msvcp90: Correctly export collate<short> constructors. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3c62462..687bacc 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -854,12 +854,12 @@ @ cdecl -arch=win64 ??0?$collate(a)D@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_char_ctor_locinfo @ thiscall -arch=win32 ??0?$collate(a)D@std@@QAE(a)I@Z(ptr long) collate_char_ctor_refs @ cdecl -arch=win64 ??0?$collate(a)D@std@@QEAA(a)_K@Z(ptr long) collate_char_ctor_refs -@ thiscall -arch=win32 ??0?$collate(a)G@std@@IAE(a)PBDI@Z(ptr str long) collate_char_ctor_name -@ cdecl -arch=win64 ??0?$collate(a)G@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_char_ctor_name -@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_char_ctor_locinfo -@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_char_ctor_locinfo -@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)I@Z(ptr long) collate_char_ctor_refs -@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)_K@Z(ptr long) collate_char_ctor_refs +@ thiscall -arch=win32 ??0?$collate(a)G@std@@IAE(a)PBDI@Z(ptr str long) collate_short_ctor_name +@ cdecl -arch=win64 ??0?$collate(a)G@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_short_ctor_name +@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_short_ctor_locinfo +@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_short_ctor_locinfo +@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)I@Z(ptr long) collate_short_ctor_refs +@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)_K@Z(ptr long) collate_short_ctor_refs @ thiscall -arch=win32 ??0?$collate(a)_W@std@@IAE(a)PBDI@Z(ptr str long) collate_wchar_ctor_name @ cdecl -arch=win64 ??0?$collate(a)_W@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_wchar_ctor_name @ thiscall -arch=win32 ??0?$collate(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_wchar_ctor_locinfo @@ -1999,8 +1999,8 @@ @ stub -arch=win64 ??_F?$codecvt(a)_WDH@std@@QEAAXXZ @ thiscall -arch=win32 ??_F?$collate(a)D@std@@QAEXXZ(ptr) collate_char_ctor @ cdecl -arch=win64 ??_F?$collate(a)D@std@@QEAAXXZ(ptr) collate_char_ctor -@ thiscall -arch=win32 ??_F?$collate(a)G@std@@QAEXXZ(ptr) collate_char_ctor -@ cdecl -arch=win64 ??_F?$collate(a)G@std@@QEAAXXZ(ptr) collate_char_ctor +@ thiscall -arch=win32 ??_F?$collate(a)G@std@@QAEXXZ(ptr) collate_short_ctor +@ cdecl -arch=win64 ??_F?$collate(a)G@std@@QEAAXXZ(ptr) collate_short_ctor @ thiscall -arch=win32 ??_F?$collate(a)_W@std@@QAEXXZ(ptr) collate_wchar_ctor @ cdecl -arch=win64 ??_F?$collate(a)_W@std@@QEAAXXZ(ptr) collate_wchar_ctor @ stub -arch=win32 ??_F?$complex(a)M@std@@QAEXXZ

1 0

Frédéric Delanoy : comctl32: Avoid using uninitialized value (Coverity).
by Alexandre Julliard 20 Dec '11

20 Dec '11

Module: wine Branch: master Commit: 8d6f9e3036adec3814b1f37d34fc88713129ef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6f9e3036adec3814b1f37d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 15 15:41:10 2011 +0100 comctl32: Avoid using uninitialized value (Coverity). --- dlls/comctl32/theming.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 3ff6814..aa99fc1 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -129,8 +129,12 @@ void THEMING_Initialize (void) WNDCLASSEXW class; class.cbSize = sizeof(class); - class.style |= CS_GLOBALCLASS; - GetClassInfoExW (NULL, subclasses[i].className, &class); + if (!GetClassInfoExW (NULL, subclasses[i].className, &class)) + { + ERR("Could not retrieve information for class %s\n", + debugstr_w (subclasses[i].className)); + continue; + } originalProcs[i] = class.lpfnWndProc; class.lpfnWndProc = subclassProcs[i];

1 0