September 2012 - Wine-commits

Piotr Caban : msvcp100: Fixed RTTI structure on 64-bit systems.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: c41fd08ddca012b3eb5b841bf8746ea80dec5d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41fd08ddca012b3eb5b841bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:00:56 2012 +0200 msvcp100: Fixed RTTI structure on 64-bit systems. --- dlls/msvcp100/cxx.h | 113 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp100/exception.c | 15 ++++++ dlls/msvcp100/ios.c | 49 +++++++++++++++++++- dlls/msvcp100/locale.c | 27 +++++++++++ dlls/msvcp100/msvcp.h | 4 +- dlls/msvcp100/msvcp100.c | 4 +- 6 files changed, 205 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp100/cxx.h b/dlls/msvcp100/cxx.h index f709d12..956675c 100644 --- a/dlls/msvcp100/cxx.h +++ b/dlls/msvcp100/cxx.h @@ -64,7 +64,9 @@ #endif /* _WIN64 */ -#define DEFINE_RTTI_DATA(name, off, base_classes, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#ifndef __x86_64__ + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ static const type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -73,7 +75,7 @@ \ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ &name ##_type_info, \ - base_classes, \ + base_classes_no, \ { 0, -1, 0}, \ 64 \ }; \ @@ -96,7 +98,7 @@ static const rtti_base_array name ## _rtti_base_array = { \ static const rtti_object_hierarchy name ## _hierarchy = { \ 0, \ 0, \ - base_classes+1, \ + base_classes_no+1, \ &name ## _rtti_base_array \ }; \ \ @@ -108,6 +110,74 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#else + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + static const type_info name ## _type_info = { \ + &MSVCP_type_info_vtable, \ + NULL, \ + mangled_name \ + }; \ +\ +static rtti_base_descriptor name ## _rtti_base_descriptor = { \ + 0xdeadbeef, \ + base_classes_no, \ + { 0, -1, 0}, \ + 64 \ +}; \ +\ +static rtti_base_array name ## _rtti_base_array = { \ + { \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + } \ +}; \ +\ +static rtti_object_hierarchy name ## _hierarchy = { \ + 0, \ + 0, \ + base_classes_no+1, \ + 0xdeadbeef \ +}; \ +\ +rtti_object_locator name ## _rtti = { \ + 1, \ + off, \ + 0, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef \ +};\ +\ +static void init_ ## name ## _rtti(char *base) \ +{ \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + name ## _rtti_base_array.bases[0] = (char*)&name ## _rtti_base_descriptor - base; \ + name ## _rtti_base_array.bases[1] = (char*)cl1 - base; \ + name ## _rtti_base_array.bases[2] = (char*)cl2 - base; \ + name ## _rtti_base_array.bases[3] = (char*)cl3 - base; \ + name ## _rtti_base_array.bases[4] = (char*)cl4 - base; \ + name ## _rtti_base_array.bases[5] = (char*)cl5 - base; \ + name ## _rtti_base_array.bases[6] = (char*)cl6 - base; \ + name ## _rtti_base_array.bases[7] = (char*)cl7 - base; \ + name ## _rtti_base_array.bases[8] = (char*)cl8 - base; \ + name ## _rtti_base_array.bases[9] = (char*)cl9 - base; \ + name ## _hierarchy.base_classes = (char*)&name ## _rtti_base_array - base; \ + name ## _rtti.type_descriptor = (char*)&name ## _type_info - base; \ + name ## _rtti.type_hierarchy = (char*)&name ## _hierarchy - base; \ + name ## _rtti.object_locator = (char*)&name ## _rtti - base; \ +} + +#endif + #define DEFINE_RTTI_DATA0(name, off, mangled_name) \ DEFINE_RTTI_DATA(name, off, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA1(name, off, cl1, mangled_name) \ @@ -191,6 +261,8 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; +#ifndef __x86_64__ + typedef struct _rtti_base_descriptor { const type_info *type_descriptor; @@ -220,3 +292,38 @@ typedef struct _rtti_object_locator const type_info *type_descriptor; const rtti_object_hierarchy *type_hierarchy; } rtti_object_locator; + +#else + +typedef struct +{ + unsigned int type_descriptor; + int num_base_classes; + this_ptr_offsets offsets; /* offsets for computing the this pointer */ + unsigned int attributes; +} rtti_base_descriptor; + +typedef struct +{ + unsigned int bases[10]; /* First element is the class itself */ +} rtti_base_array; + +typedef struct +{ + unsigned int signature; + unsigned int attributes; + int array_len; /* Size of the array pointed to by 'base_classes' */ + unsigned int base_classes; +} rtti_object_hierarchy; + +typedef struct +{ + unsigned int signature; + int base_class_offset; + unsigned int flags; + unsigned int type_descriptor; + unsigned int type_hierarchy; + unsigned int object_locator; +} rtti_object_locator; + +#endif diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index a81fb54..55b7cd2 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -750,3 +750,18 @@ void throw_exception(exception_type et, const char *str) } } } + +void init_exception(void *base) +{ +#ifdef __x86_64__ + init_type_info_rtti(base); + init_exception_rtti(base); + init_bad_alloc_rtti(base); + init_logic_error_rtti(base); + init_length_error_rtti(base); + init_out_of_range_rtti(base); + init_invalid_argument_rtti(base); + init_runtime_error_rtti(base); + init_failure_rtti(base); +#endif +} diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 5889d57..b41bc19 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -12343,8 +12343,53 @@ struct { /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wclog = &wclog.obj; -void init_io(void) -{ +void init_io(void *base) +{ +#ifdef __x86_64__ + init_iosb_rtti(base); + init_ios_base_rtti(base); + init_basic_ios_char_rtti(base); + init_basic_ios_wchar_rtti(base); + init_basic_ios_short_rtti(base); + init_basic_streambuf_char_rtti(base); + init_basic_streambuf_wchar_rtti(base); + init_basic_streambuf_short_rtti(base); + init_basic_filebuf_char_rtti(base); + init_basic_filebuf_wchar_rtti(base); + init_basic_filebuf_short_rtti(base); + init_basic_stringbuf_char_rtti(base); + init_basic_stringbuf_wchar_rtti(base); + init_basic_stringbuf_short_rtti(base); + init_basic_ostream_char_rtti(base); + init_basic_ostream_wchar_rtti(base); + init_basic_ostream_short_rtti(base); + init_basic_istream_char_rtti(base); + init_basic_istream_wchar_rtti(base); + init_basic_istream_short_rtti(base); + init_basic_iostream_char_rtti(base); + init_basic_iostream_wchar_rtti(base); + init_basic_iostream_short_rtti(base); + init_basic_ofstream_char_rtti(base); + init_basic_ofstream_wchar_rtti(base); + init_basic_ofstream_short_rtti(base); + init_basic_ifstream_char_rtti(base); + init_basic_ifstream_wchar_rtti(base); + init_basic_ifstream_short_rtti(base); + init_basic_fstream_char_rtti(base); + init_basic_fstream_wchar_rtti(base); + init_basic_fstream_short_rtti(base); + init_basic_ostringstream_char_rtti(base); + init_basic_ostringstream_wchar_rtti(base); + init_basic_ostringstream_short_rtti(base); + init_basic_istringstream_char_rtti(base); + init_basic_istringstream_wchar_rtti(base); + init_basic_istringstream_short_rtti(base); + init_basic_stringstream_char_rtti(base); + init_basic_stringstream_wchar_rtti(base); + init_basic_stringstream_short_rtti(base); + init_strstreambuf_rtti(base); +#endif + basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); basic_istream_char_ctor(&cin.obj, &filebuf_char_stdin.base, FALSE/*FIXME*/, TRUE); diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 55b3134..e1abed8 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -8582,6 +8582,33 @@ void __asm_dummy_vtables(void) { } #endif +void init_locale(void *base) +{ +#ifdef __x86_64__ + init_locale_facet_rtti(base); + init_collate_char_rtti(base); + init_collate_wchar_rtti(base); + init_collate_short_rtti(base); + init_ctype_base_rtti(base); + init_ctype_char_rtti(base); + init_ctype_wchar_rtti(base); + init_ctype_short_rtti(base); + init_codecvt_base_rtti(base); + init_codecvt_char_rtti(base); + init_codecvt_wchar_rtti(base); + init_codecvt_short_rtti(base); + init_numpunct_char_rtti(base); + init_numpunct_wchar_rtti(base); + init_numpunct_short_rtti(base); + init_num_get_char_rtti(base); + init_num_get_wchar_rtti(base); + init_num_get_short_rtti(base); + init_num_put_char_rtti(base); + init_num_put_wchar_rtti(base); + init_num_put_short_rtti(base); +#endif +} + void free_locale(void) { facets_elem *iter, *safe; diff --git a/dlls/msvcp100/msvcp.h b/dlls/msvcp100/msvcp.h index f43982f..733b653 100644 --- a/dlls/msvcp100/msvcp.h +++ b/dlls/msvcp100/msvcp.h @@ -464,5 +464,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, o ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool); -void init_io(void); +void init_exception(void*); +void init_locale(void*); +void init_io(void*); void free_io(void); diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 60c2c8d..4238a24 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -113,7 +113,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit(); - init_io(); + init_exception(hinstDLL); + init_locale(hinstDLL); + init_io(hinstDLL); break; case DLL_PROCESS_DETACH: free_io();

1 0

Piotr Caban : msvcrt: Fixed RTTI structure on 64-bit systems.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 8060752c09fd8794986f9fe3114513d78a36f903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8060752c09fd8794986f9fe31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:01:17 2012 +0200 msvcrt: Fixed RTTI structure on 64-bit systems. --- dlls/msvcrt/cpp.c | 128 +++++++++++++++++--------------------------------- dlls/msvcrt/cxx.h | 114 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + 4 files changed, 156 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8060752c09fd8794986f9…

1 0

Piotr Caban : msvcp90: Pass RTTI base pointer from DllMain.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: d161abb9b37111088b8ab5d342f814af221e5934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d161abb9b37111088b8ab5d34… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:01:35 2012 +0200 msvcp90: Pass RTTI base pointer from DllMain. --- dlls/msvcp90/exception.c | 3 +-- dlls/msvcp90/ios.c | 3 +-- dlls/msvcp90/locale.c | 3 +-- dlls/msvcp90/msvcp90.h | 6 +++--- dlls/msvcp90/msvcp90_main.c | 6 +++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7202a25..6aa3c0d 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -751,10 +751,9 @@ void throw_exception(exception_type et, const char *str) } } -void init_exception(void) +void init_exception(void *base) { #ifdef __x86_64__ - void *base = GetModuleHandleA("msvcp90.dll"); init_type_info_rtti(base); init_exception_rtti(base); init_bad_alloc_rtti(base); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e5d7233..164efcd 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12921,10 +12921,9 @@ struct { /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wclog = &wclog.obj; -void init_io(void) +void init_io(void *base) { #ifdef __x86_64__ - void *base = GetModuleHandleA("msvcp90.dll"); init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f5a4534..ddf1424 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8739,10 +8739,9 @@ void __asm_dummy_vtables(void) { } #endif -void init_locale(void) +void init_locale(void *base) { #ifdef __x86_64__ - void *base = GetModuleHandleA("msvcp90.dll"); init_locale_facet_rtti(base); init_collate_char_rtti(base); init_collate_wchar_rtti(base); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 84e39c5..1108591 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -463,7 +463,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, o ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool); -void init_exception(void); -void init_locale(void); -void init_io(void); +void init_exception(void*); +void init_locale(void*); +void init_io(void*); void free_io(void); diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 8d97c9d..31a2d82 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -90,9 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit(); - init_exception(); - init_locale(); - init_io(); + init_exception(hinstDLL); + init_locale(hinstDLL); + init_io(hinstDLL); break; case DLL_PROCESS_DETACH: free_io();

1 0

Piotr Caban : msvcp90: Added std::flush(basic_ostream) implementation.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: f2a26313e1fe24bfac66349f3832c2ef5854d16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a26313e1fe24bfac66349f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:01:55 2012 +0200 msvcp90: Added std::flush(basic_ostream) implementation. --- dlls/msvcp90/ios.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 164efcd..7cf646b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5501,6 +5501,13 @@ basic_ostream_char* __thiscall basic_ostream_char_flush(basic_ostream_char *this return this; } +/* ?flush(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ +/* ?flush(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ +basic_ostream_char* __cdecl flush_ostream_char(basic_ostream_char *ostream) +{ + return basic_ostream_char_flush(ostream); +} + /* ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ */ /* ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(basic_ostream_char__Osfx, 4) @@ -6291,6 +6298,15 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_flush(basic_ostream_wchar *t return this; } +/* ?flush(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ +/* ?flush(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ +/* ?flush(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ +/* ?flush(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z */ +basic_ostream_wchar* __cdecl flush_ostream_wchar(basic_ostream_wchar *ostream) +{ + return basic_ostream_wchar_flush(ostream); +} + /* ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXXZ */ /* ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ */ /* ?_Osfx@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 680830f..a14225a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3953,12 +3953,12 @@ @ cdecl -arch=win64 ?flush@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)XZ(ptr) basic_ostream_wchar_flush @ thiscall -arch=win32 ?flush@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)XZ(ptr) basic_ostream_wchar_flush @ cdecl -arch=win64 ?flush@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)XZ(ptr) basic_ostream_wchar_flush -@ stub -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z +@ cdecl -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(ptr) flush_ostream_char +@ cdecl -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z(ptr) flush_ostream_char +@ cdecl -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z(ptr) flush_ostream_wchar +@ cdecl -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) flush_ostream_wchar +@ cdecl -arch=win32 ?flush(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) flush_ostream_wchar +@ cdecl -arch=win64 ?flush(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) flush_ostream_wchar @ stub -arch=win32 ?frac_digits@?$_Mpunct(a)D@std@@QBEHXZ @ stub -arch=win64 ?frac_digits@?$_Mpunct(a)D@std@@QEBAHXZ @ stub -arch=win32 ?frac_digits@?$_Mpunct(a)G@std@@QBEHXZ

1 0

Piotr Caban : msvcp: Sync spec files and implementations.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 789565362d7a7888ba39a76e200c801c7953ed93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789565362d7a7888ba39a76e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 11:02:17 2012 +0200 msvcp: Sync spec files and implementations. --- dlls/msvcp100/ios.c | 16 ++++++++++++++++ dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp71/msvcp71.spec | 12 ++++++------ dlls/msvcp80/msvcp80.spec | 12 ++++++------ 5 files changed, 40 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=789565362d7a7888ba39a…

1 0

James Eder : include/winternl.h: Fix CPU_FEATURE_3DNOW bit mask.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: b97a07bc0721f3c6c7308e365e12c15c0f25237a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97a07bc0721f3c6c7308e365… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 6 09:23:13 2012 -0600 include/winternl.h: Fix CPU_FEATURE_3DNOW bit mask. --- include/winternl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index bcf18f5..79078f0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1146,8 +1146,7 @@ typedef struct _SYSTEM_CPU_INFORMATION { #define CPU_FEATURE_FXSR 0x00000800 /* FXSAVE and FXSTORE instructions */ #define CPU_FEATURE_SEP 0x00001000 /* SYSENTER and SYSEXIT instructions */ #define CPU_FEATURE_SSE 0x00002000 /* SSE extensions (ext. MMX) */ -#define CPU_FEATURE_3DNOW 0x00008000 /* 3DNOW instructions available - (FIXME: needs to be confirmed) */ +#define CPU_FEATURE_3DNOW 0x00004000 /* 3DNOW instructions available */ #define CPU_FEATURE_SSE2 0x00010000 /* SSE2 extensions (XMMI64) */ #define CPU_FEATURE_DS 0x00020000 /* Debug Store */ #define CPU_FEATURE_HTT 0x00040000 /* Hyper Threading Technology */

1 0

James Eder : kernel32: Use PROCESSOR_FEATURE_MAX in IsProcessorFeaturePresent.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 7e8a5490bd0da9dc0586e8438671380dfc3fc359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8a5490bd0da9dc0586e8438… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 6 09:23:14 2012 -0600 kernel32: Use PROCESSOR_FEATURE_MAX in IsProcessorFeaturePresent. --- dlls/kernel32/cpu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 996d776..0860362 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -212,7 +212,7 @@ VOID WINAPI GetNativeSystemInfo( BOOL WINAPI IsProcessorFeaturePresent ( DWORD feature /* [in] Feature number, (PF_ constants from "winnt.h") */) { - if (feature < 64) + if (feature < PROCESSOR_FEATURE_MAX) return SHARED_DATA->ProcessorFeatures[feature]; else return FALSE;

1 0

James Eder : kernel32: Remove outdated comment.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 10ff9b4f13a42e292e3f775ef58aa356c41382ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ff9b4f13a42e292e3f775ef… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 6 09:23:15 2012 -0600 kernel32: Remove outdated comment. --- dlls/kernel32/cpu.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0860362..333e402 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -99,12 +99,6 @@ BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) * * RETURNS * Nothing. - * - * NOTES - * On the first call it creates cached values, so it doesn't have to determine - * them repeatedly. On Linux, the "/proc/cpuinfo" special file is used. - * - * It also creates a cached flag array for IsProcessorFeaturePresent(). */ VOID WINAPI GetSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */)

1 0

Jiang Yike : wined3d: Add AMD Radeon HD 7700 series and HD 7800 series graphics cards.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: a308bde74aadaba2a6b742faf2a34b6bbbb3bf1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a308bde74aadaba2a6b742faf… Author: Jiang Yike <futureway(a)asia.com> Date: Fri Sep 7 06:48:00 2012 +0800 wined3d: Add AMD Radeon HD 7700 series and HD 7800 series graphics cards. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 58397e9..39083eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1141,6 +1141,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_830M, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1699,6 +1701,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in { /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, + {"HD 7800", CARD_AMD_RADEON_HD7800}, + {"HD 7700", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, @@ -1908,6 +1912,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info { /* Southern Islands */ {"TAHITI", CARD_AMD_RADEON_HD7900}, + {"PITCAIRN", CARD_AMD_RADEON_HD7800}, + {"CAPE VERDE", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ead1a49..bd5c5e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1333,6 +1333,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6700 = 0x68ba, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, + CARD_AMD_RADEON_HD7700 = 0x683d, + CARD_AMD_RADEON_HD7800 = 0x6819, CARD_AMD_RADEON_HD7900 = 0x679a, CARD_NVIDIA_RIVA_128 = 0x0018,

1 0

Qian Hong : gdi32/tests: Added font name tests on English locale.
by Alexandre Julliard 07 Sep '12

07 Sep '12

Module: wine Branch: master Commit: 180185d890b6df54ab38f539fd4eedef35624029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180185d890b6df54ab38f539f… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Sep 7 18:39:51 2012 +0800 gdi32/tests: Added font name tests on English locale. --- dlls/gdi32/tests/font.c | 157 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 151 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d14160b..d5126a0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2056,6 +2056,12 @@ struct enum_font_data LOGFONT lf[MAX_ENUM_FONTS]; }; +struct enum_fullname_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + struct enum_font_dataW { int total; @@ -2386,6 +2392,20 @@ static INT CALLBACK enum_font_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm return 1; } +static INT CALLBACK enum_fullname_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; + + if (type != TRUETYPE_FONTTYPE) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_EnumFontFamiliesEx_default_charset(void) { struct enum_font_data efd; @@ -2759,9 +2779,12 @@ end: #define TT_PLATFORM_MICROSOFT 3 #define TT_MS_ID_UNICODE_CS 1 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 +#define TT_NAME_ID_FONT_FAMILY 1 +#define TT_NAME_ID_FONT_SUBFAMILY 2 +#define TT_NAME_ID_UNIQUE_ID 3 #define TT_NAME_ID_FULL_NAME 4 -static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, char *out_buf, SIZE_T out_size) +static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size) { struct sfnt_name_header { @@ -3977,11 +4000,13 @@ static BOOL is_font_installed_fullname(const char *family, const char *fullname) static void test_fullname(void) { static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic", "Lucida Sans Regular"}; - char buf[LF_FULLFACESIZE]; + WCHAR bufW[LF_FULLFACESIZE]; + char bufA[LF_FULLFACESIZE]; HFONT hfont, of; LOGFONTA lf; HDC hdc; int i; + DWORD ret; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4008,16 +4033,135 @@ static void test_fullname(void) ok(hfont != 0, "CreateFontIndirectA failed\n"); of = SelectObject(hdc, hfont); - buf[0] = 0; - ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)), - "face full name could not be read\n"); - ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf); + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW)); + ok(ret, "face full name could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufW), NULL, FALSE); + ok(!lstrcmpA(bufA, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], bufA); + SelectObject(hdc, of); + DeleteObject(hfont); + } + DeleteDC(hdc); +} + +static void test_fullname2_helper(const char *Family) +{ + char *FamilyName, *FaceName, *StyleName, *otmStr; + struct enum_fullname_data efnd; + WCHAR *bufW; + char *bufA; + HFONT hfont, of; + LOGFONTA lf; + HDC hdc; + int i; + DWORD otm_size, ret, buf_size; + OUTLINETEXTMETRICA *otm; + LCID lcid = GetSystemDefaultLangID(); + + if (lcid != TT_MS_LANGID_ENGLISH_UNITED_STATES) + { + skip("Skip test: LCID = %d\n", lcid); + return; + } + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + lstrcpy(lf.lfFaceName, Family); + efnd.total = 0; + EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + if (efnd.total == 0) + skip("%s is not installed\n", lf.lfFaceName); + + for (i = 0; i < efnd.total; i++) + { + FamilyName = (char *)efnd.elf[i].elfLogFont.lfFaceName; + FaceName = (char *)efnd.elf[i].elfFullName; + StyleName = (char *)efnd.elf[i].elfStyle; + + trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); + + lstrcpyA(lf.lfFaceName, FaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + + of = SelectObject(hdc, hfont); + buf_size = GetFontData(hdc, MS_NAME_TAG, 0, NULL, 0); + ok(buf_size != GDI_ERROR, "no name table found\n"); + if (buf_size == GDI_ERROR) continue; + + bufW = HeapAlloc(GetProcessHeap(), 0, buf_size); + bufA = HeapAlloc(GetProcessHeap(), 0, buf_size); + + otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); + otm = HeapAlloc(GetProcessHeap(), 0, otm_size); + memset(otm, 0, otm_size); + ret = GetOutlineTextMetrics(hdc, otm_size, otm); + ok(ret != 0, "GetOutlineTextMetrics fails!\n"); + if (ret == 0) continue; + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size); + ok(ret, "FAMILY (family name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFamilyName; + ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size); + ok(ret, "FULL_NAME (face name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; + if(!lstrcmpA(FaceName, "Lucida Sans Regular")) + todo_wine ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + else + ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size); + ok(ret, "SUBFAMILY (style name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", FaceName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; + ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size); + ok(ret, "UNIQUE_ID (full name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; + todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + SelectObject(hdc, of); DeleteObject(hfont); + + HeapFree(GetProcessHeap(), 0, otm); + HeapFree(GetProcessHeap(), 0, bufW); + HeapFree(GetProcessHeap(), 0, bufA); } DeleteDC(hdc); } +static void test_fullname2(void) +{ + test_fullname2_helper("Lucida Sans"); +} + static BOOL write_ttf_file(const char *fontname, char *tmp_name) { char tmp_path[MAX_PATH]; @@ -4531,6 +4675,7 @@ START_TEST(font) test_CreateFontIndirectEx(); test_oemcharset(); test_fullname(); + test_fullname2(); test_east_asian_font_selection(); /* These tests should be last test until RemoveFontResource

1 0