January 2018 - Wine-Commits

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4 destructor implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 7686be0a5d67a8fa9b6af04f8a98987eb01cfab9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7686be0a5d67a8fa9b6af04f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:03:12 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4 destructor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ac6de38..c5c0a4f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1275,7 +1275,8 @@ _Concurrent_queue_base_v4* __thiscall _Concurrent_queue_base_v4_ctor( DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_dtor, 4) void __thiscall _Concurrent_queue_base_v4_dtor(_Concurrent_queue_base_v4 *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + MSVCRT_operator_delete(this->data); } DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4_vector_dtor, 8)

1 0

Nikolay Sivov : comctl32/tests: Remove not so useful macro.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 056ce0e85a0efca07c42ff8f08a513301d74f684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=056ce0e85a0efca07c42ff8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 14:44:19 2018 +0300 comctl32/tests: Remove not so useful macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/v6util.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index afdc12c..b78290a 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) - #ifdef __i386__ #define ARCH "x86" #elif defined __x86_64__ @@ -106,7 +104,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) ok(*hCtx != 0, "Expected context handle\n"); ret = ActivateActCtx(*hCtx, pcookie); - expect(TRUE, ret); + ok(ret, "Failed to activate context, error %d.\n", GetLastError()); if (!ret) { @@ -124,5 +122,4 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) return ret; } -#undef expect #undef ARCH

1 0

Nikolay Sivov : comctl32/tests: Add a helper to replace macro.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: f09deaca43a0da3a72169940c29cc47d3083f635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09deaca43a0da3a72169940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 23 14:44:20 2018 +0300 comctl32/tests: Add a helper to replace macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d72e22a..958c82f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1029,12 +1029,22 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN cleanup_memstream(&stream); } -static void image_list_init(HIMAGELIST himl) +static void image_list_add_bitmap(HIMAGELIST himl, BYTE grey, int i) { - HBITMAP hbm; char comment[16]; - INT n = 1; - DWORD i; + HBITMAP hbm; + int ret; + + sprintf(comment, "%d", i); + hbm = create_bitmap(BMP_CX, BMP_CX, RGB(grey, grey, grey), comment); + ret = pImageList_Add(himl, hbm, NULL); + ok(ret != -1, "Failed to add image to imagelist.\n"); + DeleteObject(hbm); +} + +static void image_list_init(HIMAGELIST himl) +{ + unsigned int i; static const struct test_data { BYTE grey; @@ -1070,18 +1080,11 @@ static void image_list_init(HIMAGELIST himl) check_iml_data(himl, BMP_CX, BMP_CX, 0, 2, 4, ILC_COLOR24, "total 0"); -#define add_bitmap(grey) \ - sprintf(comment, "%d", n++); \ - hbm = create_bitmap(BMP_CX, BMP_CX, RGB((grey),(grey),(grey)), comment); \ - ImageList_Add(himl, hbm, NULL); \ - DeleteObject(hbm); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - add_bitmap(td[i].grey); + image_list_add_bitmap(himl, td[i].grey, i + 1); check_iml_data(himl, td[i].cx, td[i].cy, td[i].cur, td[i].max, td[i].grow, td[i].bpp, td[i].comment); } -#undef add_bitmap } static void test_imagelist_storage(void)

1 0

Jacek Caban : kernel32: Always set bytes written in WriteFile.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 84ae4b937ffa5191db834916b8917c03f4cb684c URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ae4b937ffa5191db834916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:51:58 2018 +0100 kernel32: Always set bytes written in WriteFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 86e5431..a0cd5f9 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -577,8 +577,8 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, status = piosb->u.Status; } - if (status != STATUS_PENDING && bytesWritten) - *bytesWritten = piosb->Information; + if (bytesWritten) + *bytesWritten = overlapped && status ? 0 : piosb->Information; if (status && status != STATUS_TIMEOUT) { diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c4beb19..e0b8713 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2767,7 +2767,7 @@ static void _overlapped_write_async(unsigned line, HANDLE writer, void *buf, DWO overlapped->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); res = WriteFile(writer, buf, size, &written_bytes, overlapped); ok_(__FILE__,line)(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %x(%u)\n", res, GetLastError()); - todo_wine ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes); + ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes); _test_not_signaled(line, overlapped->hEvent); }

1 0

Alex Henrie : dhtmled.ocx: Add dll and stub DHTMLEdit object.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 6c788af6d1c11723838a01333cb112963670591b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c788af6d1c11723838a0133… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 23 16:27:29 2018 +0100 dhtmled.ocx: Add dll and stub DHTMLEdit object. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_private.h | 19 ++ dlls/dhtmled.ocx/dhtmled_tlb.idl | 22 ++ dlls/dhtmled.ocx/edit.c | 534 +++++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 156 +++++++++++ 8 files changed, 746 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c788af6d1c11723838a…

1 0

Alexandre Julliard : configure: Check the positive form of the warning options.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 8cf375de353dc16d834f6447b2765b2d9c2d9ddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cf375de353dc16d834f6447… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 13:37:15 2018 +0100 configure: Check the positive form of the warning options. Checking the -Wno- form doesn't fail and causes warnings on gcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 36 ++++++++++++++++++------------------ configure.ac | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure b/configure index be625ee..f46da94 100755 --- a/configure +++ b/configure @@ -14869,54 +14869,54 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 -$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } -if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } +if ${ac_cv_cflags__Wpacked_not_aligned+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-packed-not-aligned" +CFLAGS="$CFLAGS -Wpacked-not-aligned" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_packed_not_aligned=yes + ac_cv_cflags__Wpacked_not_aligned=yes else - ac_cv_cflags__Wno_packed_not_aligned=no + ac_cv_cflags__Wpacked_not_aligned=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 -$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } -if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpacked_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wpacked_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wpacked_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 -$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } -if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wpragma-pack... " >&6; } +if ${ac_cv_cflags__Wpragma_pack+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-pragma-pack" +CFLAGS="$CFLAGS -Wpragma-pack" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_pragma_pack=yes + ac_cv_cflags__Wpragma_pack=yes else - ac_cv_cflags__Wno_pragma_pack=no + ac_cv_cflags__Wpragma_pack=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 -$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } -if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wpragma_pack" >&6; } +if test "x$ac_cv_cflags__Wpragma_pack" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index db0785e..7c8d02f 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,8 +1841,8 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) - WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) - WINE_TRY_CFLAGS([-Wno-pragma-pack]) + WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) + WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Jacek Caban : kernel32: Don' t initialize Information of passed OVERLAPPED struct in ReadFile.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: c47c74e5d3705705ffe7be332e7d17d2b6356923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47c74e5d3705705ffe7be33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:51:50 2018 +0100 kernel32: Don't initialize Information of passed OVERLAPPED struct in ReadFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 45b4365..86e5431 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -442,8 +442,8 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, io_status = (PIO_STATUS_BLOCK)overlapped; if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } + else io_status->Information = 0; io_status->u.Status = STATUS_PENDING; - io_status->Information = 0; status = NtReadFile(hFile, hEvent, NULL, cvalue, io_status, buffer, bytesToRead, poffset, NULL); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 23e7649..c4beb19 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -755,7 +755,6 @@ static void test_ReadFile(void) ok(!res && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile returned %x(%u)\n", res, GetLastError()); ok(size == 0, "size = %u\n", size); ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); - todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); CloseHandle(server); @@ -2628,7 +2627,6 @@ static void test_readfileex_pending(void) ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); -todo_wine ok(overlapped.InternalHigh == -1, "expected -1, got %lu\n", overlapped.InternalHigh); wait = WaitForSingleObject(event, 100);

1 0

Jacek Caban : kernel32: Don' t initialize Information of passed OVERLAPPED struct in WriteFile.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 72f3fa9e2dd7afd0f2e41331a9e94febcccce7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f3fa9e2dd7afd0f2e41331… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 15:52:05 2018 +0100 kernel32: Don't initialize Information of passed OVERLAPPED struct in WriteFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a0cd5f9..7196aff 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -565,8 +565,8 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, piosb = (PIO_STATUS_BLOCK)overlapped; if (((ULONG_PTR)hEvent & 1) == 0) cvalue = overlapped; } + else piosb->Information = 0; piosb->u.Status = STATUS_PENDING; - piosb->Information = 0; status = NtWriteFile(hFile, hEvent, NULL, cvalue, piosb, buffer, bytesToWrite, poffset, NULL); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e0b8713..22d120f 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -757,6 +757,14 @@ static void test_ReadFile(void) ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.InternalHigh = 0xdeadbeef; + res = WriteFile(server, buf, 1, &size, &overlapped); + ok(!res && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile returned %x(%u)\n", res, GetLastError()); + ok(size == 0, "size = %u\n", size); + ok(overlapped.Internal == STATUS_PENDING, "Internal = %lx\n", overlapped.Internal); + ok(overlapped.InternalHigh == 0xdeadbeef, "InternalHigh = %lx\n", overlapped.InternalHigh); + CloseHandle(server); CloseHandle(client); }

1 0

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4:: _Internal_finish_clear implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 7c34dda603ff687588af464ea1c6594e49f6efc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c34dda603ff687588af464e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:03:22 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4::_Internal_finish_clear implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c5c0a4f..32d9e29 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1235,6 +1235,13 @@ typedef struct } _Concurrent_queue_base_v4; extern const vtable_ptr MSVCP__Concurrent_queue_base_v4_vtable; +#if _MSVCP_VER == 100 +#define call__Concurrent_queue_base_v4__Deallocate_page(this, page) CALL_VTBL_FUNC(this, \ + 16, void, (_Concurrent_queue_base_v4*,_Page*), (this,page)) +#else +#define call__Concurrent_queue_base_v4__Deallocate_page(this, page) CALL_VTBL_FUNC(this, \ + 20, void, (_Concurrent_queue_base_v4*,_Page*), (this,page)) +#endif /* ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ */ /* ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ */ @@ -1306,7 +1313,15 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_finish_clear, 4) void __thiscall _Concurrent_queue_base_v4__Internal_finish_clear( _Concurrent_queue_base_v4 *this) { - FIXME("(%p) stub\n", this); + int i; + + TRACE("(%p)\n", this); + + for(i=0; i<QUEUES_NO; i++) + { + if(this->data->queues[i].tail) + call__Concurrent_queue_base_v4__Deallocate_page(this, this->data->queues[i].tail); + } } /* ?_Internal_empty(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBE_NXZ */

1 0

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4:: _Internal_throw_exception implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 0771b2e7a807a48fd9b289180396e915c7641f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0771b2e7a807a48fd9b28918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:02:49 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4::_Internal_throw_exception implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 776bc36..c7fd041 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1240,7 +1240,8 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_throw_exception, 4) void __thiscall _Concurrent_queue_base_v4__Internal_throw_exception( const _Concurrent_queue_base_v4 *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); } /* ??0_Concurrent_queue_base_v4(a)details@Concurrency@@IAE(a)I@Z */

1 0