December 2011 - Wine-Commits

André Hentschel : secur32/tests: Fail on missing NTLM.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 962230064dc371cc32cf6d01bb2bf68d200a81fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=962230064dc371cc32cf6d01b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 19 19:00:30 2011 +0100 secur32/tests: Fail on missing NTLM. --- dlls/secur32/tests/ntlm.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index ddc9462..d3cd915 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -578,7 +578,7 @@ static void testInitializeSecurityContextFlags(void) if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("Package not installed, skipping test!\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -800,7 +800,7 @@ static void testAuth(ULONG data_rep, BOOL fake) if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { - skip("Package not installed, skipping test.\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -942,7 +942,7 @@ static void testSignSeal(void) */ if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("Package not installed, skipping test.\n"); + ok(0, "NTLM package not installed, skipping test.\n"); return; } @@ -1192,7 +1192,7 @@ end: HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); } -static void testAcquireCredentialsHandle(void) +static BOOL testAcquireCredentialsHandle(void) { CredHandle cred; TimeStamp ttl; @@ -1206,8 +1206,8 @@ static void testAcquireCredentialsHandle(void) if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); - return; + ok(0, "NTLM package not installed, skipping test\n"); + return FALSE; } pFreeContextBuffer(pkg_info); @@ -1258,6 +1258,7 @@ static void testAcquireCredentialsHandle(void) ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", getSecError(ret)); pFreeCredentialsHandle(&cred); + return TRUE; } static void test_cred_multiple_use(void) @@ -1279,7 +1280,7 @@ static void test_cred_multiple_use(void) if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); + ok(0, "NTLM package not installed, skipping test\n"); return; } buffers[0].cbBuffer = pkg_info->cbMaxToken; @@ -1340,7 +1341,7 @@ static void test_null_auth_data(void) if(pQuerySecurityPackageInfoA((SEC_CHAR *)"NTLM", &info) != SEC_E_OK) { - skip("NTLM package not installed, skipping test\n"); + ok(0, "NTLM package not installed, skipping test\n"); return; } @@ -1383,7 +1384,8 @@ START_TEST(ntlm) pInitializeSecurityContextA && pCompleteAuthToken && pQuerySecurityPackageInfoA) { - testAcquireCredentialsHandle(); + if(!testAcquireCredentialsHandle()) + goto cleanup; testInitializeSecurityContextFlags(); if(pAcceptSecurityContext) { @@ -1402,6 +1404,7 @@ START_TEST(ntlm) else win_skip("Needed functions are not available\n"); +cleanup: if(secdll) FreeLibrary(secdll); }

1 0

Frédéric Delanoy : cmd: Merge two if blocks.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: dbdf927e745e4b9af59af037bdc2ff9ef77bbd9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdf927e745e4b9af59af037b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 20 14:48:24 2011 +0100 cmd: Merge two if blocks. --- programs/cmd/wcmdmain.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d82427a..67a524d 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1161,10 +1161,7 @@ void WCMD_run_program (WCHAR *command, int called) { launched = TRUE; /* Special case BAT and CMD */ - if (ext && !strcmpiW(ext, batExt)) { - WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE); - return; - } else if (ext && !strcmpiW(ext, cmdExt)) { + if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE); return; } else {

1 0

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

Dec. 20, 2011

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

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

Dec. 20, 2011

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

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

Dec. 20, 2011

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

Kusanagi Kouichi : gdi32: Merge two ifs.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 4dfe084bba35413f2610d6ff2ce213e81317e8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfe084bba35413f2610d6ff2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:05:31 2011 +0900 gdi32: Merge two ifs. --- dlls/gdi32/freetype.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8fe307d..7c19635 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1587,16 +1587,14 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(fake_family) { english_family = towstr(CP_ACP, fake_family); + localised_family = NULL; } else { english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); if(!english_family) english_family = towstr(CP_ACP, ft_face->family_name); - } - localised_family = NULL; - if(!fake_family) { localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); if(localised_family && !strcmpiW(localised_family, english_family)) { HeapFree(GetProcessHeap(), 0, localised_family);

1 0

Kusanagi Kouichi : gdi32: Use find_family_from_name and LIST_FOR_EACH instead of open-coding them.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 6c268cf1c5e2d191f000e2f82a7273aac53ca396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c268cf1c5e2d191f000e2f82… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:05:17 2011 +0900 gdi32: Use find_family_from_name and LIST_FOR_EACH instead of open-coding them. --- dlls/gdi32/freetype.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 41d4392..8fe307d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1462,7 +1462,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ WCHAR *english_family, *localised_family, *StyleW; Family *family; Face *face; - struct list *family_elem_ptr, *face_elem_ptr; + struct list *face_elem_ptr; FT_Error err; FT_Long face_index = 0, num_faces; FT_WinFNT_HeaderRec winfnt_header; @@ -1604,13 +1604,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } } - family = NULL; - LIST_FOR_EACH(family_elem_ptr, &font_list) { - family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, localised_family ? localised_family : english_family)) - break; - family = NULL; - } + family = find_family_from_name(localised_family ? localised_family : english_family); if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); family->FamilyName = strdupW(localised_family ? localised_family : english_family); @@ -1661,10 +1655,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ internal_leading = winfnt_header.internal_leading; } - face_elem_ptr = list_head(&family->faces); - while(face_elem_ptr) { + LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - face_elem_ptr = list_next(&family->faces, face_elem_ptr); 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",

1 0

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

Dec. 20, 2011

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: Added collate<char>::compare implementation.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

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

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

Dec. 20, 2011

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