August 2021 - Wine-commits - list.winehq.org

Michael Stefaniuc : qedit/tests: Remove duplicated ok() call.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 58da7108aeae19104649ed09ea20d7da47ce529a URL: https://source.winehq.org/git/wine.git/?a=commit;h=58da7108aeae19104649ed09… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 20:09:14 2021 +0200 qedit/tests: Remove duplicated ok() call. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index f82c375b76f..6a58d5ea7e6 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -661,7 +661,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemInputPin_GetAllocator(input, &ret_allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); - ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(ret_allocator); hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props);

1 0

Michael Stefaniuc : qcap/tests: Remove duplicated ok() call.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: b706834a234d210aa7340d1bd7aba5356a31732a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b706834a234d210aa7340d1b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 20:09:15 2021 +0200 qcap/tests: Remove duplicated ok() call. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index e5ae66ff2d3..6842fccb863 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -706,7 +706,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemInputPin_GetAllocator(input, &ret_allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); - ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(ret_allocator); hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props);

1 0

Michael Stefaniuc : windows.gaming.input/tests: Test the correct return value.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 07ecdf6ce27590edbcf4c6787abef28c1ccc2768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ecdf6ce27590edbcf4c678… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 20:09:16 2021 +0200 windows.gaming.input/tests: Test the correct return value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/tests/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index b05dc508637..6e863def54d 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -190,7 +190,7 @@ static void test_Gamepad(void) ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); + hr = IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); ok(hr == S_OK, "IGamepadStatics_add_GamepadRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IGamepadStatics_add_GamepadRemoved returned token %#I64x\n", token.value); @@ -367,7 +367,7 @@ static void test_RawGameController(void) ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); + hr = IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value);

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

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

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: 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 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: 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: 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(a)tr1@std@@YAXXZ */ void __cdecl _Xmem(void) { TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); } /* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */

1 0