October 2012 - Wine-commits

Piotr Caban : msvcp90: Added ios_base::Init class implementation.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: a221f87709c959a10a69cc819687cdd11d04971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a221f87709c959a10a69cc819… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:56 2012 +0200 msvcp90: Added ios_base::Init class implementation. --- dlls/msvcp100/ios.c | 70 ++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp100/msvcp100.spec | 30 +++++++++--------- dlls/msvcp71/ios.c | 63 ++++++++++++++++++++++++++++++++++++-- dlls/msvcp71/msvcp71.spec | 18 +++++----- dlls/msvcp90/ios.c | 70 ++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 30 +++++++++--------- 6 files changed, 230 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a221f87709c959a10a69c…

1 0

Piotr Caban : msvcp90: Added _Winit class implementation.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: ea5b845b32913048931864750fcb78630d501e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5b845b32913048931864750… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:14:15 2012 +0200 msvcp90: Added _Winit class implementation. --- dlls/msvcp100/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 14 +++++++------- dlls/msvcp71/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 14 +++++++------- dlls/msvcp90/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 14 +++++++------- 6 files changed, 147 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea5b845b3291304893186…

1 0

Piotr Caban : msvcp60: Sync exceptions implementations.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: d844ceeae8faac9b96fa3e56a0607b2e7c1ae97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d844ceeae8faac9b96fa3e56a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:14:31 2012 +0200 msvcp60: Sync exceptions implementations. --- dlls/msvcp60/exception.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index dde066c..2b4ffcd 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -74,6 +74,7 @@ extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; /* ??_7runtime_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_runtime_error_vtable; +extern const vtable_ptr MSVCP_failure_vtable; static void MSVCP_type_info_dtor(type_info * _this) { @@ -704,6 +705,76 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) return MSVCP_basic_string_char_c_str(&this->str); } +/* failure class data */ +typedef runtime_error failure; + +static failure* MSVCP_failure_ctor( + failure *this, const char *name) +{ + TRACE("%p %s\n", this, name); + MSVCP_runtime_error_ctor(this, name); + this->e.vtable = &MSVCP_failure_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_copy_ctor, 8) +failure* __thiscall MSVCP_failure_copy_ctor( + failure *this, failure *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_runtime_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_failure_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_dtor, 4) +void __thiscall MSVCP_failure_dtor(failure *this) +{ + TRACE("%p\n", this); + MSVCP_logic_error_dtor(this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_vector_dtor, 8) +void* __thiscall MSVCP_failure_vector_dtor( + failure *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_runtime_error_vector_dtor(this, flags); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_what, 4) +const char* __thiscall MSVCP_failure_what(failure *this) +{ + TRACE("%p\n", this); + return MSVCP_runtime_error_what(this); +} + +DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); + +static const cxx_type_info failure_cxx_type_info = { + 0, + &failure_type_info, + { 0, -1, 0 }, + sizeof(failure), + (cxx_copy_ctor)THISCALL(MSVCP_failure_copy_ctor) +}; + +static const cxx_type_info_table failure_cxx_type_table = { + 3, + { + &failure_cxx_type_info, + &runtime_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type failure_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_failure_dtor), + NULL, + &failure_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -737,6 +808,9 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); + __ASM_VTABLE(failure, + VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_failure_what)); #ifndef __GNUC__ } #endif @@ -745,6 +819,8 @@ void __asm_dummy_vtables(void) { void throw_exception(exception_type et, const char *str) { switch(et) { + case EXCEPTION_RERAISE: + _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, str); @@ -780,6 +856,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_runtime_error_ctor(&e, str); _CxxThrowException((exception*)&e, &runtime_error_cxx_type); } + case EXCEPTION_FAILURE: { + failure e; + MSVCP_failure_ctor(&e, str); + _CxxThrowException((exception*)&e, &failure_cxx_type); + } default: ERR("exception type not handled: %d\n", et); } @@ -796,5 +877,6 @@ void init_exception(void *base) init_out_of_range_rtti(base); init_invalid_argument_rtti(base); init_runtime_error_rtti(base); + init_failure_rtti(base); #endif }

1 0

Piotr Caban : msvcp60: Copy source files from msvcp90.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 9d7f3c7651940c7f3164ccf09b9576bb563586f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7f3c7651940c7f3164ccf09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:15:41 2012 +0200 msvcp60: Copy source files from msvcp90. --- dlls/msvcp60/Makefile.in | 4 +- dlls/msvcp60/cxx.h | 2 - dlls/msvcp60/exception.c | 36 +- dlls/msvcp60/ios.c |11564 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/locale.c | 8198 ++++++++++++++++++++++++++++++++ dlls/msvcp60/main.c | 9 +- dlls/msvcp60/memory.c | 264 +- dlls/msvcp60/misc.c | 42 +- dlls/msvcp60/msvcp.h | 396 ++- dlls/msvcp60/msvcp60.spec | 3208 +++++++------- dlls/msvcp60/string.c | 67 +- 11 files changed, 21851 insertions(+), 1939 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7f3c7651940c7f3164c…

1 0

Piotr Caban : msvcp60: Handle differences in basic_string:: c_str function behavior on empty strings.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 458a39051dd8cd81ee23febb9c07d2669bc56e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458a39051dd8cd81ee23febb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:04 2012 +0200 msvcp60: Handle differences in basic_string::c_str function behavior on empty strings. --- dlls/msvcp60/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 17c754d..0cc3807 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5101,7 +5101,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; istreambuf_iterator_char_val(first); if(first->strbuf && (first->val=='-' || first->val=='+')) { @@ -5258,7 +5258,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -6007,7 +6007,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6090,7 +6090,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++;

1 0

Piotr Caban : msvcp60: Fixed vtables in IO classes.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: b84d5d991ce0a6e8da7bc3af94795d88fdab516a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84d5d991ce0a6e8da7bc3af9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:34 2012 +0200 msvcp60: Fixed vtables in IO classes. --- dlls/msvcp60/ios.c | 56 ++++++++++++++++++--------------------------------- 1 files changed, 20 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b84d5d991ce0a6e8da7bc…

1 0

Piotr Caban : msvcp60: Fixed ctype class vtable.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 291edc484ff25393c6bcae92e995ad355d2ca42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=291edc484ff25393c6bcae92e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:52 2012 +0200 msvcp60: Fixed ctype class vtable. --- dlls/msvcp60/cxx.h | 1 - dlls/msvcp60/locale.c | 92 ++++--------------------------------------------- dlls/msvcp60/main.c | 1 - 3 files changed, 7 insertions(+), 87 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index de934ce..42e9975 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -210,7 +210,6 @@ extern void *vtbl_wrapper_36; extern void *vtbl_wrapper_40; extern void *vtbl_wrapper_44; extern void *vtbl_wrapper_48; -extern void *vtbl_wrapper_52; #else diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 0cc3807..4471096 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -1087,12 +1087,6 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla return this; } -/* ?_Xran(a)ctype_base@std@@KAXXZ */ -static void ctype_base__Xran(void) -{ - throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); -} - /* ?id@?$ctype(a)D@std@@2V0locale(a)2@A */ locale_id ctype_char_id = {0}; /* ?table_size@?$ctype(a)D@std@@2IB */ @@ -1206,7 +1200,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) -#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \ char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { @@ -1217,7 +1211,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) -#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \ const char*, (const ctype_char*, const char*, const char*, char, char*), \ (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, @@ -1228,20 +1222,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this, return last; } -/* ?_Do_narrow_s@?$ctype(a)D@std@@MBEPBDPBD0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) -#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ - const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ - (this, first, last, unused, dest, size)) -const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, - const char *last, char unused, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?narrow@?$ctype(a)D@std@@QBEDDD(a)Z */ /* ?narrow@?$ctype(a)D@std@@QEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_narrow_ch, 12) @@ -1286,20 +1266,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this, return last; } -/* ?_Do_widen_s@?$ctype(a)D@std@@MBEPBDPBD0PADI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) -#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ - const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, - const char *first, const char *last, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?widen@?$ctype(a)D@std@@QBEDD(a)Z */ /* ?widen@?$ctype(a)D@std@@QEBADD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_widen_ch, 8) @@ -1768,7 +1734,7 @@ static char ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char dflt /* ?do_narrow@?$ctype(a)G@std@@MBEDGD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBADGD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \ char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { @@ -1780,7 +1746,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype(a)G@std@@MBEPBGPBG0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) -#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \ const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, @@ -1792,25 +1758,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, return last; } -/* ?_Do_narrow_s@?$ctype(a)_W@std@@MBEPB_WPB_W0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)_W@std@@MEBAPEB_WPEB_W0DPEAD_K(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)G@std@@MBEPBGPBG0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) -#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ - const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ - (this, first, last, dflt, dest, size)) -const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, - const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); - /* This function converts all multi-byte characters to dflt, - * thanks to it result size is known before converting */ - if(last-first > size) - ctype_base__Xran(); - return ctype_wchar_do_narrow(this, first, last, dflt, dest); -} - /* ?narrow@?$ctype(a)_W@std@@QBED_WD(a)Z */ /* ?narrow@?$ctype(a)_W@std@@QEBAD_WD(a)Z */ /* ?narrow@?$ctype(a)G@std@@QBEDGD(a)Z */ @@ -1944,25 +1891,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this, return last; } -/* ?_Do_widen_s@?$ctype(a)_W@std@@MBEPBDPBD0PA_WI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)_W@std@@MEBAPEBDPEBD0PEA_W_K(a)Z */ -/* ?_Do_widen_s@?$ctype(a)G@std@@MBEPBDPBD0PAGI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)G@std@@MEBAPEBDPEBD0PEAG_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20) -#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \ - const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this, - const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - /* This function converts all multi-byte characters to WEOF, - * thanks to it result size is known before converting */ - if(size < last-first) - ctype_base__Xran(); - return ctype_wchar_do_widen(this, first, last, dest); -} - /* ?widen@?$ctype(a)_W@std@@QBE_WD(a)Z */ /* ?widen@?$ctype(a)_W@std@@QEBA_WD(a)Z */ /* ?widen@?$ctype(a)G@std@@QBEGD(a)Z */ @@ -7991,10 +7919,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_toupper_ch) VTABLE_ADD_FUNC(ctype_char_do_widen) VTABLE_ADD_FUNC(ctype_char_do_widen_ch) - VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8007,10 +7933,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8023,10 +7947,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 5b375dc..dd7a4ef 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -51,7 +51,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetBlendState().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: e69c28a0f70bfea72efb701833b86fafda1123be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69c28a0f70bfea72efb70183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:25 2012 +0200 d3d10core: Implement d3d10_device_OMSetBlendState(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/device.c | 8 +++++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2dcd89a..4297adf 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -217,6 +217,7 @@ struct d3d10_blend_state }; HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state @@ -269,6 +270,9 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct d3d10_blend_state *blend_state; + float blend_factor[4]; + UINT sample_mask; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ae3b865..95b337a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -318,8 +318,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device *iface, ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + + device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state); + memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); + device->sample_mask = sample_mask; } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 1d927ce..9e64ea6 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -140,6 +140,15 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) return S_OK; } +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_blend_state_vtbl); + + return impl_from_ID3D10BlendState(iface); +} + static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetBlendState().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 272f63263e4fc8647052067daa021671816caab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272f63263e4fc8647052067da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:26 2012 +0200 d3d10core: Implement d3d10_device_OMGetBlendState(). --- dlls/d3d10core/device.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 95b337a..43cafa5 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -571,8 +571,15 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device *iface, ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor %p, sample_mask %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); + + if ((*blend_state = device->blend_state ? &device->blend_state->ID3D10BlendState_iface : NULL)) + ID3D10BlendState_AddRef(*blend_state); + memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); + *sample_mask = device->sample_mask; } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_swapchain_get_back_buffer().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 5fcc1f8f70100a3b1b29c36d53fa69d11804c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fcc1f8f70100a3b1b29c36d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:27 2012 +0200 wined3d: Just return the surface from wined3d_swapchain_get_back_buffer(). --- dlls/d3d8/device.c | 1 - dlls/d3d8/swapchain.c | 12 +++++++----- dlls/d3d9/device.c | 1 - dlls/d3d9/swapchain.c | 12 +++++++----- dlls/dxgi/swapchain.c | 8 +++----- dlls/wined3d/device.c | 4 +++- dlls/wined3d/stateblock.c | 5 +---- dlls/wined3d/swapchain.c | 19 +++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 10 files changed, 31 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fcc1f8f70100a3b1b29c…

1 0