wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : gdi32/tests: Add more char width tests.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: ba1769cb7d28e42537290ba6959255e26124d998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1769cb7d28e42537290ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:12 2021 +0100 gdi32/tests: Add more char width tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef1dc26595d..04fe6afd875 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1127,6 +1127,12 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); @@ -7009,8 +7015,9 @@ static void test_GetCharWidthI(void) HFONT hfont, prev_hfont; WORD glyphs[5]; INT widths[5]; + INT width; LOGFONTA lf; - ABC abc[5]; + ABC abc[5], abc1; int len, i; DWORD nb; BOOL ret; @@ -7033,10 +7040,20 @@ static void test_GetCharWidthI(void) ret = GetCharABCWidthsI(hdc, 0, len, glyphs, abc); ok(ret, "GetCharABCWidthsI failed\n"); + memset(&abc1, 0xcc, sizeof(abc1)); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, &abc1); + ok(ret, "GetCharABCWidthsI failed\n"); + ok(!memcmp(&abc1, abc, sizeof(abc1)), "unexpected abc1\n"); + memset(widths, 0xcc, sizeof(widths)); ret = GetCharWidthI(hdc, 0, len, glyphs, widths); ok(ret, "GetCharWidthI failed\n"); + width = 0xdeadbeef; + ret = GetCharWidthI(hdc, glyphs[0], 1, NULL, &width); + ok(ret, "GetCharWidthI failed\n"); + ok(width == widths[0], "unexpected width %u\n", width); + for (i = 0; i < len; i++) ok(widths[i] == abc[i].abcA + abc[i].abcB + abc[i].abcC, "%u, glyph %u, got width %d\n", i, glyphs[i], widths[i]);

1 0

Piotr Caban : msvcp90: Don't use throw_exception helper for bad_alloc exception.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 1c09a7c5c4bd4ef851a42180396d87ea6cd500b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c09a7c5c4bd4ef851a42180… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:28 2021 +0200 msvcp90: Don't use throw_exception helper for bad_alloc exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/msvcp.h | 1 + dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 21 ++++++++++++--------- dlls/msvcp90/memory.c | 12 ++---------- dlls/msvcp90/msvcp90.h | 3 ++- dlls/msvcp90/msvcp_main.c | 5 ++--- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 9d77fd190ca..cecea919bed 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -65,7 +65,7 @@ void* (__cdecl *MSVCRT_set_new_handler)(void*); void* __cdecl operator_new(size_t size) { void *ret = MSVCRT_operator_new(size); - if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + if (!ret) _Xmem(); return ret; } diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index d60a588b3eb..1f53a31ad97 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -485,3 +485,4 @@ typedef struct { } complex_double; void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); +void __cdecl DECLSPEC_NORETURN _Xmem(void); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 50d78dbddb6..c1000579443 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -317,7 +317,6 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { EXCEPTION, - EXCEPTION_BAD_ALLOC, EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index b265bf1be71..d2c51b7ff0a 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -89,7 +89,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_throw_exception( const _Concurrent_queue_base_v4 *this) { TRACE("(%p)\n", this); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + _Xmem(); } /* ??0_Concurrent_queue_base_v4@details@Concurrency@@IAE@I@Z */ diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index eec72b9964d..115e0374f7f 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -867,17 +867,25 @@ DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exceptio DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory@std@@YAXXZ */ -void __cdecl _Nomemory(void) +void __cdecl DECLSPEC_NORETURN _Nomemory(void) { + bad_alloc e; + TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + + MSVCP_bad_alloc_default_ctor(&e); + _CxxThrowException(&e, &bad_alloc_cxx_type); } /* ?_Xmem@tr1@std@@YAXXZ */ -void __cdecl _Xmem(void) +void __cdecl DECLSPEC_NORETURN _Xmem(void) { + bad_alloc e; + TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + + MSVCP_bad_alloc_default_ctor(&e); + _CxxThrowException(&e, &bad_alloc_cxx_type); } /* ?_Xinvalid_argument@std@@YAXPBD@Z */ @@ -1048,11 +1056,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_exception_ctor(&e, name); _CxxThrowException(&e, &exception_cxx_type); } - case EXCEPTION_BAD_ALLOC: { - bad_alloc e; - MSVCP_bad_alloc_ctor(&e, name); - _CxxThrowException(&e, &bad_alloc_cxx_type); - } case EXCEPTION_BAD_CAST: { bad_cast e; MSVCP_bad_cast_ctor(&e, str); diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 0e3fb2347e8..d1fe7ce5786 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -170,11 +170,7 @@ void __thiscall MSVCP_allocator_wchar_deallocate(void *this, DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate, 8) wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, size_t count) { - if(UINT_MAX/count < sizeof(wchar_t)) { - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - + if(UINT_MAX/count < sizeof(wchar_t)) _Xmem(); return operator_new(count * sizeof(wchar_t)); } @@ -269,11 +265,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate, 8) unsigned short* __thiscall MSVCP_allocator_short_allocate( void *this, size_t count) { - if(UINT_MAX/count < sizeof(unsigned short)) { - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - + if(UINT_MAX/count < sizeof(unsigned short)) _Xmem(); return operator_new(count * sizeof(unsigned short)); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 94098d84135..0ef02b96ea8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -663,4 +663,5 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif -void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); +void __cdecl DECLSPEC_NORETURN _Xmem(void); diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index eed4beb41ac..7f61f59a078 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -94,8 +94,7 @@ void* __cdecl operator_new(size_t size) } while (freed); TRACE("(%Iu) out of memory\n", size); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); - return NULL; + _Xmem(); } void __cdecl operator_delete(void *mem) @@ -116,7 +115,7 @@ void* __cdecl operator_new(size_t size) { void *ret = MSVCRT_operator_new(size); #if _MSVCP_VER < 80 - if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + if (!ret) _Xmem(); #endif return ret; }

1 0

Piotr Caban : msvcp90: Fix _Xmem and _Nomemory exception message.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 5630ce26382cbf0eed29cdf9df68e087f188419f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5630ce26382cbf0eed29cdf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:19 2021 +0200 msvcp90: Fix _Xmem and _Nomemory exception message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 4eac9e92bc8..eec72b9964d 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -870,14 +870,14 @@ DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_ void __cdecl _Nomemory(void) { TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); } /* ?_Xmem@tr1@std@@YAXXZ */ void __cdecl _Xmem(void) { TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); } /* ?_Xinvalid_argument@std@@YAXPBD@Z */

1 0

Piotr Caban : msvcp90: Don't use throw_exception helper for rethrow.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: eebc5c505e4eecb31d7829715b4bb1df393a9ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eebc5c505e4eecb31d782971… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:03 2021 +0200 msvcp90: Don't use throw_exception helper for rethrow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/msvcp.h | 2 ++ dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 3 --- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/msvcp90.h | 2 ++ 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 764ec72e264..8657fd9b3e5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4847,7 +4847,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool return; if(reraise) - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index fa42ba1b6be..d60a588b3eb 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -483,3 +483,5 @@ typedef struct { double real; double imag; } complex_double; + +void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 012354ac9c8..50d78dbddb6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -316,7 +316,6 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { - EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_BAD_CAST, diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 4d3abf46141..b265bf1be71 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -526,7 +526,7 @@ static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this, __EXCEPT_ALL { this->segment[seg] = NULL; - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); } __ENDTRY if(!this->segment[seg]) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7b87c44c1af..4eac9e92bc8 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -31,7 +31,6 @@ CREATE_TYPE_INFO_VTABLE #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 -void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) @@ -1044,8 +1043,6 @@ void throw_exception(exception_type et, const char *str) exception_name name = EXCEPTION_NAME(str); switch(et) { - case EXCEPTION_RERAISE: - _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, name); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index ea0c8783491..8275635096a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5264,7 +5264,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool return; if(reraise) - throw_exception(EXCEPTION_RERAISE, NULL); + _CxxThrowException(NULL, NULL); else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a525c8adc1e..94098d84135 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -662,3 +662,5 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count ) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif + +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*);

1 0

Piotr Caban : msvcp90: Remove MSVCP_SIZE_T_MAX definition.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 38d6dbc6f7bf4fc01d76e12556984b31879d53a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d6dbc6f7bf4fc01d76e125… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:59 2021 +0200 msvcp90: Remove MSVCP_SIZE_T_MAX definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/details.c | 12 ++++++------ dlls/msvcp90/msvcp90.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 4dc5c0ea98c..4d3abf46141 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -671,7 +671,7 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_compact( (alloc_seg + 1) * sizeof(this->segment[0])); this->first_block = 0; _Concurrent_vector_base_v4__Internal_reserve(this, size, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); for(i = 0; i < seg_no; i++) copy(this->segment[i], b->blocks[i], i ? 1 << i : 2); copy_element = size - ((1 << seg_no) & ~1); @@ -703,7 +703,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_copy( return; } _Concurrent_vector_base_v4__Internal_reserve(this, v_size, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); seg_no = _vector_base_v4__Segment_index_of(v_size - 1); for(i = 0; i < seg_no; i++) copy(this->segment[i], v->segment[i], i ? 1 << i : 2); @@ -764,7 +764,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_assign( if(i < v_seg_no) { _Concurrent_vector_base_v4__Internal_reserve(this, v_size, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); for(i++; i < v_seg_no; i++) copy(this->segment[i], v->segment[i], 1 << i); copy(this->segment[i], v->segment[i], v->early_size - (1 << i)); @@ -788,7 +788,7 @@ size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_by( do { size = this->early_size; _Concurrent_vector_base_v4__Internal_reserve(this, size + count, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); } while(InterlockedCompareExchangeSizeT(&this->early_size, size + count, size) != size); seg_no = size ? _vector_base_v4__Segment_index_of(size - 1) : 0; @@ -818,7 +818,7 @@ size_t __thiscall _Concurrent_vector_base_v4__Internal_grow_to_at_least_with_res TRACE("(%p %Iu %Iu %p %p)\n", this, count, element_size, copy, v); _Concurrent_vector_base_v4__Internal_reserve(this, count, element_size, - MSVCP_SIZE_T_MAX / element_size); + ~(size_t)0 / element_size); do { size = this->early_size; if(size >= count) return size; @@ -853,7 +853,7 @@ void * __thiscall _Concurrent_vector_base_v4__Internal_push_back( do { index = this->early_size; _Concurrent_vector_base_v4__Internal_reserve(this, index + 1, - element_size, MSVCP_SIZE_T_MAX / element_size); + element_size, ~(size_t)0 / element_size); } while(InterlockedCompareExchangeSizeT(&this->early_size, index + 1, index) != index); seg = _vector_base_v4__Segment_index_of(index); segment_base = (seg == 0) ? 0 : (1 << seg); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 6aee436df53..a525c8adc1e 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -24,7 +24,6 @@ #define CXX_EXCEPTION 0xe06d7363 #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) -#define MSVCP_SIZE_T_MAX (~(size_t)0) #if _MSVCP_VER >= 100 typedef __int64 DECLSPEC_ALIGN(8) streamoff; typedef __int64 DECLSPEC_ALIGN(8) streamsize;

1 0

Piotr Caban : msvcp90: Always throw bad_alloc exception in operator_new on allocation failure.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: ff5d176ce22ea9b3f65a3701d41232d29e2c1493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5d176ce22ea9b3f65a3701… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:56 2021 +0200 msvcp90: Always throw bad_alloc exception in operator_new on allocation failure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 16 --- dlls/msvcp60/main.c | 24 +++- dlls/msvcp60/msvcp.h | 4 +- dlls/msvcp90/ios.c | 16 --- dlls/msvcp90/locale.c | 355 ++-------------------------------------------- dlls/msvcp90/misc.c | 5 - dlls/msvcp90/msvcp90.h | 5 - dlls/msvcp90/msvcp_main.c | 26 +++- dlls/msvcp90/string.c | 8 -- 9 files changed, 54 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff5d176ce22ea9b3f65a…

1 0

Piotr Caban : msvcp90: Remove MSVCRT_ prefix from new() and delete().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 3a86f0a68fb137b1ddc1194125c1546bf72613bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a86f0a68fb137b1ddc11941… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:53 2021 +0200 msvcp90: Remove MSVCRT_ prefix from new() and delete(). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 124 ++++++++++----------- dlls/msvcp60/ios.c | 172 ++++++++++++++--------------- dlls/msvcp60/main.c | 12 +- dlls/msvcp60/msvcp.h | 4 +- dlls/msvcp90/details.c | 8 +- dlls/msvcp90/exception.c | 24 ++-- dlls/msvcp90/ios.c | 166 ++++++++++++++-------------- dlls/msvcp90/locale.c | 274 +++++++++++++++++++++++----------------------- dlls/msvcp90/memory.c | 12 +- dlls/msvcp90/misc.c | 18 +-- dlls/msvcp90/msvcp90.h | 9 +- dlls/msvcp90/msvcp_main.c | 19 ++-- dlls/msvcp90/string.c | 8 +- 13 files changed, 427 insertions(+), 423 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a86f0a68fb137b1ddc1…

1 0

Piotr Caban : msvcp90: Move Concurrency::details functions to details.c file.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 6cca4e254c7a487e7b3c3da2ad9a4035f2b2abbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cca4e254c7a487e7b3c3da2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:50 2021 +0200 msvcp90: Move Concurrency::details functions to details.c file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/Makefile.in | 1 + dlls/msvcp110/Makefile.in | 1 + dlls/msvcp120/Makefile.in | 1 + dlls/msvcp140/Makefile.in | 1 + dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/details.c | 1135 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 1235 +++------------------------------------------ dlls/msvcp90/msvcp90.h | 7 +- dlls/msvcp90/msvcp_main.c | 1 + 9 files changed, 1208 insertions(+), 1175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cca4e254c7a487e7b3c…

1 0

Francois Gouget : user32/tests: Fix ASCII / ANSI mixups in dde comments.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: fa18bc566067c5b1dfff617b2ad517c10559fa74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa18bc566067c5b1dfff617b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:13:47 2021 +0200 user32/tests: Fix ASCII / ANSI mixups in dde comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 888801dad90..dc0bb85d736 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2438,7 +2438,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV test_cmd_w_to_a, sizeof(test_cmd_w_to_a), NULL, NULL ); switch (str_index) { - case 0: /* ASCII string */ + case 0: /* ANSI string */ if (unicode_server) { ok(size == size_a_to_w, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); @@ -2447,7 +2447,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } else if (unicode_client) { - /* ASCII string mapped W->A -> garbage */ + /* ANSI string mapped W->A -> garbage */ } else {

1 0

Francois Gouget : user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 2d52e16f2a6b2fc2971eb3dd071686a5d640ddc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d52e16f2a6b2fc2971eb3dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:13:35 2021 +0200 user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 96cf210d542..888801dad90 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2649,8 +2649,8 @@ static void test_end_to_end_server(void) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("client %s, server %s\n", unicode_client ? "unicode" : "ascii", - unicode_server ? "unicode" : "ascii"); + trace("client %s, server %s\n", unicode_client ? "unicode" : "ansi", + unicode_server ? "unicode" : "ansi"); server_pid = 0; msg_index = 0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021