August 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : vcomp120: Prefer builtin version.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: a62bd2039043df1cd9fb15ea3f41c523f025c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62bd2039043df1cd9fb15ea3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:32:11 2016 +0200 vcomp120: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp120/Makefile.in | 3 --- dlls/vcomp120/main.c | 47 ----------------------------------------------- 2 files changed, 50 deletions(-) diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index 833cd67..e3a2c8d 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,4 +1 @@ MODULE = vcomp120.dll - -C_SRCS = \ - main.c diff --git a/dlls/vcomp120/main.c b/dlls/vcomp120/main.c deleted file mode 100644 index f2f8b31..0000000 --- a/dlls/vcomp120/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * - * vcomp120 implementation - * - * Copyright 2012 André Hentschel - * Copyright 2015 Daniel Lehman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vcomp120); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Józef Kucia : d3d11/tests: Add test for line antialiasing blending.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: f1214f222ece129abe0535cdfea9ee5467ef457a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1214f222ece129abe0535cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:23 2016 +0200 d3d11/tests: Add test for line antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 276f58f..34baea7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10165,6 +10165,88 @@ static void test_face_culling(void) release_test_context(&test_context); } +static void test_line_antialiasing_blending(void) +{ + ID3D11RasterizerState *rasterizer_state; + struct d3d11_test_context test_context; + D3D11_RASTERIZER_DESC rasterizer_desc; + ID3D11BlendState *blend_state; + ID3D11DeviceContext *context; + D3D11_BLEND_DESC blend_desc; + ID3D11Device *device; + HRESULT hr; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 0.8f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 0.5f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.IndependentBlendEnable = FALSE; + blend_desc.RenderTarget[0].BlendEnable = TRUE; + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.FrontCounterClockwise = FALSE; + rasterizer_desc.DepthBias = 0; + rasterizer_desc.DepthBiasClamp = 0.0f; + rasterizer_desc.SlopeScaledDepthBias = 0.0f; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = FALSE; + rasterizer_desc.MultisampleEnable = FALSE; + rasterizer_desc.AntialiasedLineEnable = TRUE; + + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + todo_wine check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + ID3D11RasterizerState_Release(rasterizer_state); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -10220,4 +10302,5 @@ START_TEST(d3d11) test_uint_shader_instructions(); test_index_buffer_offset(); test_face_culling(); + test_line_antialiasing_blending(); }

1 0

Iván Matellanes : msvcirt: Initialize do_lock on ios copy constructor.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: a29ff2caca970ae53ff8454d2850ce3705734f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29ff2caca970ae53ff8454d2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:29 2016 +0100 msvcirt: Initialize do_lock on ios copy constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 1 + dlls/msvcirt/tests/msvcirt.c | 52 +++++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 23fd668..576c612 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1745,6 +1745,7 @@ ios* __thiscall ios_copy_ctor(ios *this, const ios *copy) this->vtable = &MSVCP_ios_vtable; this->sb = NULL; this->delbuf = 0; + this->do_lock = -1; InitializeCriticalSection(&this->lock); return ios_assign(this, copy); } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 61de0b6..fa373d3 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2646,22 +2646,38 @@ static void test_ios(void) call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); - ios_obj.state = 0x8; + memset(&ios_obj, 0xab, sizeof(ios)); call_func2(p_ios_sb_ctor, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == IOSTATE_goodbit, "expected %x got %x\n", IOSTATE_goodbit, ios_obj.state); + ok(ios_obj.special[0] == 0, "expected 0 got %d\n", ios_obj.special[0]); + ok(ios_obj.special[1] == 0, "expected 0 got %d\n", ios_obj.special[1]); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == NULL, "expected %p got %p\n", NULL, ios_obj.tie); + ok(ios_obj.flags == 0, "expected 0 got %x\n", ios_obj.flags); + ok(ios_obj.precision == 6, "expected 6 got %d\n", ios_obj.precision); + ok(ios_obj.fill == ' ', "expected ' ' got %d\n", ios_obj.fill); + ok(ios_obj.width == 0, "expected 0 got %d\n", ios_obj.width); + ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); ios_obj.state = 0x8; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); - ios_obj.sb = psb; - ios_obj.state = 0x8; + memset(&ios_obj, 0xab, sizeof(ios)); call_func1(p_ios_ctor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(ios_obj.special[0] == 0, "expected 0 got %d\n", ios_obj.special[0]); + ok(ios_obj.special[1] == 0, "expected 0 got %d\n", ios_obj.special[1]); + ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == NULL, "expected %p got %p\n", NULL, ios_obj.tie); + ok(ios_obj.flags == 0, "expected 0 got %x\n", ios_obj.flags); + ok(ios_obj.precision == 6, "expected 6 got %d\n", ios_obj.precision); + ok(ios_obj.fill == ' ', "expected ' ' got %d\n", ios_obj.fill); + ok(ios_obj.width == 0, "expected 0 got %d\n", ios_obj.width); + ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* init */ @@ -2680,9 +2696,11 @@ static void test_ios(void) call_func1(p_ios_dtor, &ios_obj); /* copy constructor */ + memset(&ios_obj, 0xcd, sizeof(ios)); call_func2(p_ios_copy_ctor, &ios_obj, &ios_obj2); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); - ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); + ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", + ios_obj2.state|IOSTATE_badbit, ios_obj.state); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); @@ -2693,24 +2711,25 @@ static void test_ios(void) ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* assignment */ - ios_obj.state = 0x8; - ios_obj.delbuf = 2; - ios_obj.tie = NULL; - ios_obj.flags = 0; - ios_obj.precision = 6; - ios_obj.fill = ' '; - ios_obj.width = 0; - ios_obj.do_lock = 2; + ios_obj.state = 0xcdcdcdcd; + ios_obj.delbuf = 0xcdcdcdcd; + ios_obj.tie = (ostream*) 0xcdcdcdcd; + ios_obj.flags = 0xcdcdcdcd; + ios_obj.precision = 0xcdcdcdcd; + ios_obj.fill = 0xcd; + ios_obj.width = 0xcdcdcdcd; + ios_obj.do_lock = 0xcdcdcdcd; call_func2(p_ios_assign, &ios_obj, &ios_obj2); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); - ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); - ok(ios_obj.delbuf == 2, "expected 2 got %d\n", ios_obj.delbuf); + ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", + ios_obj2.state|IOSTATE_badbit, ios_obj.state); + ok(ios_obj.delbuf == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios_obj.delbuf); ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); ok(ios_obj.precision == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.precision); ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); - ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); + ok(ios_obj.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios_obj.do_lock); /* locking */ ios_obj.sb = psb; @@ -3665,7 +3684,6 @@ static void test_ostream_withassign(void) ok(osa1.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.precision); ok(osa1.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.fill); ok(osa1.base_ios.width == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.width); -todo_wine ok(osa1.base_ios.do_lock == -1, "expected -1 got %d\n", osa1.base_ios.do_lock); call_func1(p_ostream_withassign_vbase_dtor, &osa1); osa1.unknown = 0xabababab; @@ -3699,7 +3717,6 @@ todo_wine ok(osa1.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.precision); ok(osa1.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.fill); ok(osa1.base_ios.width == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.width); -todo_wine ok(osa1.base_ios.do_lock == -1, "expected -1 got %d\n", osa1.base_ios.do_lock); call_func1(p_ostream_withassign_vbase_dtor, &osa1); osa1.unknown = 0xabababab; @@ -5579,7 +5596,6 @@ static void test_istream_withassign(void) ok(isa2.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.precision); ok(isa2.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.fill); ok(isa2.base_ios.width == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.width); -todo_wine ok(isa2.base_ios.do_lock == -1, "expected -1 got %d\n", isa2.base_ios.do_lock); call_func1(p_istream_withassign_vbase_dtor, &isa2); isa1.base_ios.sb = NULL;

1 0

Iván Matellanes : msvcirt: Implement istream_withassign copy constructor.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 4b603251b2ce8d7d23ac60b92cc6f41e25d7a94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b603251b2ce8d7d23ac60b92… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:27 2016 +0100 msvcirt: Implement istream_withassign copy constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 33 ++++++++- dlls/msvcirt/tests/msvcirt.c | 167 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b603251b2ce8d7d23ac6…

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class istream_withassign.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 3ecb295e4289f724cd4d962d7e7176d45f349cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecb295e4289f724cd4d962d7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:26 2016 +0100 msvcirt: Add a partial implementation of class istream_withassign. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 40 +++++++++++++++++++------------------- dlls/msvcrt20/msvcrt20.spec | 40 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 40 +++++++++++++++++++------------------- 4 files changed, 107 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ecb295e4289f724cd4d9…

1 0

Huw Davies : ucrtbase: Add support for natural string widths.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 10eb6fa7180e4d762bb55603a987ee142021aa0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10eb6fa7180e4d762bb55603a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 8 13:43:04 2016 +0100 ucrtbase: Add support for natural string widths. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 11 +++++++---- dlls/ucrtbase/tests/printf.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ce7a70e..6c9eeeb 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -35,7 +35,7 @@ typedef struct FUNC_NAME(pf_flags_t) APICHAR Sign, LeftAlign, Alternate, PadZero; int FieldLength, Precision; APICHAR IntegerLength, IntegerDouble, IntegerNative; - APICHAR WideString; + APICHAR WideString, NaturalString; APICHAR Format; } FUNC_NAME(pf_flags); @@ -208,7 +208,8 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts, static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const void *str, int len, FUNC_NAME(pf_flags) *flags, MSVCRT_pthreadlocinfo locinfo, BOOL legacy_wide) { - BOOL complement_is_narrow = legacy_wide ? (sizeof(APICHAR)==sizeof(MSVCRT_wchar_t)) : FALSE; + BOOL api_is_wide = sizeof(APICHAR) == sizeof(MSVCRT_wchar_t); + BOOL complement_is_narrow = legacy_wide ? api_is_wide : FALSE; #ifdef PRINTF_WIDE static const MSVCRT_wchar_t nullW[] = {'(','n','u','l','l',')',0}; @@ -219,9 +220,9 @@ static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void return FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, "(null)", 6, flags, locinfo); #endif - if(flags->WideString || flags->IntegerLength=='l') + if((flags->NaturalString && api_is_wide) || flags->WideString || flags->IntegerLength=='l') return FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, str, len, flags, locinfo); - if(flags->IntegerLength == 'h') + if((flags->NaturalString && !api_is_wide) || flags->IntegerLength == 'h') return FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, str, len, flags, locinfo); if((flags->Format=='S' || flags->Format=='C') == complement_is_narrow) @@ -476,6 +477,8 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API #if _MSVCR_VER >= 140 else if(*p == 'z') flags.IntegerNative = *p++; + else if(*p == 'T') + flags.NaturalString = *p++; #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 973217e..ae5ce8a 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -660,6 +660,24 @@ static void test_printf_c99(void) } } +static void test_printf_natural_string(void) +{ + const wchar_t wide[] = {'A','B','C','D',0}; + const char narrow[] = "abcd"; + const char narrow_fmt[] = "%s %Ts"; + const char narrow_out[] = "abcd abcd"; + const wchar_t wide_fmt[] = {'%','s',' ','%','T','s',0}; + const wchar_t wide_out[] = {'a','b','c','d',' ','A','B','C','D',0}; + char buffer[20]; + wchar_t wbuffer[20]; + + vsprintf_wrapper(0, buffer, sizeof(buffer), narrow_fmt, narrow, narrow); + ok(!strcmp(buffer, narrow_out), "buffer wrong, got=%s\n", buffer); + + vswprintf_wrapper(0, wbuffer, sizeof(wbuffer), wide_fmt, narrow, wide); + ok(!lstrcmpW(wbuffer, wide_out), "buffer wrong, got=%s\n", wine_dbgstr_w(wbuffer)); +} + START_TEST(printf) { if (!init()) return; @@ -674,4 +692,5 @@ START_TEST(printf) test_printf_legacy_msvcrt(); test_printf_legacy_three_digit_exp(); test_printf_c99(); + test_printf_natural_string(); }

1 0

Austin English : ntdll: Add NtSuspendProcess stub.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: bd6f749c169ff682f8d11542f66dcd7c354b0aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f749c169ff682f8d11542f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 22 03:00:47 2016 -0500 ntdll: Add NtSuspendProcess stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 717067f..7a3edfa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -361,7 +361,7 @@ @ stdcall NtSignalAndWaitForSingleObject(long long long ptr) @ stub NtStartProfile @ stub NtStopProfile -# @ stub NtSuspendProcess +@ stdcall NtSuspendProcess(long) @ stdcall NtSuspendThread(long ptr) @ stdcall NtSystemDebugControl(long ptr long ptr long ptr) @ stdcall NtTerminateJobObject(long long) @@ -1286,7 +1286,7 @@ @ stdcall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile -# @ stub ZwSuspendProcess +@ stdcall ZwSuspendProcess(long) NtSuspendProcess @ stdcall ZwSuspendThread(long ptr) NtSuspendThread @ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @ stdcall ZwTerminateJobObject(long long) NtTerminateJobObject diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a93b8fb..54f8168 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -642,3 +642,13 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, SERVER_END_REQ; return status; } + +/****************************************************************************** + * NtSuspendProcess + * ZwSuspendProcess + */ +NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) +{ + FIXME("stub: %p\n", handle); + return STATUS_NOT_IMPLEMENTED; +}

1 0

Daniel Lehman : vcomp140: Add vcomp140 stub.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 71bb4a13c0ccf19430558c6934813bfbe150a747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bb4a13c0ccf19430558c693… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 19:56:29 2016 -0700 vcomp140: Add vcomp140 stub. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vcomp140/Makefile.in | 1 + dlls/vcomp140/vcomp140.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 118 insertions(+) diff --git a/configure b/configure index 56f1bae..b8eedc5 100755 --- a/configure +++ b/configure @@ -1357,6 +1357,7 @@ enable_vcomp enable_vcomp100 enable_vcomp110 enable_vcomp120 +enable_vcomp140 enable_vcomp90 enable_vcruntime140 enable_vdmdbg @@ -18086,6 +18087,7 @@ wine_fn_config_test dlls/vcomp/tests vcomp_test wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vcomp110 enable_vcomp110 wine_fn_config_dll vcomp120 enable_vcomp120 +wine_fn_config_dll vcomp140 enable_vcomp140 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vcruntime140 enable_vcruntime140 wine_fn_config_dll vdhcp.vxd enable_win16 diff --git a/configure.ac b/configure.ac index bfb479b..f5dde04 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) WINE_CONFIG_DLL(vcomp120) +WINE_CONFIG_DLL(vcomp140) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vcruntime140) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in new file mode 100644 index 0000000..75e37c9 --- /dev/null +++ b/dlls/vcomp140/Makefile.in @@ -0,0 +1 @@ +MODULE = vcomp140.dll diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec new file mode 100644 index 0000000..bb8c007 --- /dev/null +++ b/dlls/vcomp140/vcomp140.spec @@ -0,0 +1,113 @@ +@ stub C2VectParallel +@ cdecl _vcomp_atomic_add_i1(ptr long) vcomp._vcomp_atomic_add_i1 +@ cdecl _vcomp_atomic_add_i2(ptr long) vcomp._vcomp_atomic_add_i2 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 +@ cdecl _vcomp_atomic_add_i8(ptr int64) vcomp._vcomp_atomic_add_i8 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_and_i1(ptr long) vcomp._vcomp_atomic_and_i1 +@ cdecl _vcomp_atomic_and_i2(ptr long) vcomp._vcomp_atomic_and_i2 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 +@ cdecl _vcomp_atomic_and_i8(ptr int64) vcomp._vcomp_atomic_and_i8 +@ cdecl _vcomp_atomic_div_i1(ptr long) vcomp._vcomp_atomic_div_i1 +@ cdecl _vcomp_atomic_div_i2(ptr long) vcomp._vcomp_atomic_div_i2 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 +@ cdecl _vcomp_atomic_div_i8(ptr int64) vcomp._vcomp_atomic_div_i8 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_ui1(ptr long) vcomp._vcomp_atomic_div_ui1 +@ cdecl _vcomp_atomic_div_ui2(ptr long) vcomp._vcomp_atomic_div_ui2 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 +@ cdecl _vcomp_atomic_div_ui8(ptr int64) vcomp._vcomp_atomic_div_ui8 +@ cdecl _vcomp_atomic_mul_i1(ptr long) vcomp._vcomp_atomic_mul_i1 +@ cdecl _vcomp_atomic_mul_i2(ptr long) vcomp._vcomp_atomic_mul_i2 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 +@ cdecl _vcomp_atomic_mul_i8(ptr int64) vcomp._vcomp_atomic_mul_i8 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_or_i1(ptr long) vcomp._vcomp_atomic_or_i1 +@ cdecl _vcomp_atomic_or_i2(ptr long) vcomp._vcomp_atomic_or_i2 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 +@ cdecl _vcomp_atomic_or_i8(ptr int64) vcomp._vcomp_atomic_or_i8 +@ cdecl _vcomp_atomic_shl_i1(ptr long) vcomp._vcomp_atomic_shl_i1 +@ cdecl _vcomp_atomic_shl_i2(ptr long) vcomp._vcomp_atomic_shl_i2 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 +@ cdecl _vcomp_atomic_shl_i8(ptr long) vcomp._vcomp_atomic_shl_i8 +@ cdecl _vcomp_atomic_shr_i1(ptr long) vcomp._vcomp_atomic_shr_i1 +@ cdecl _vcomp_atomic_shr_i2(ptr long) vcomp._vcomp_atomic_shr_i2 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 +@ cdecl _vcomp_atomic_shr_i8(ptr long) vcomp._vcomp_atomic_shr_i8 +@ cdecl _vcomp_atomic_shr_ui1(ptr long) vcomp._vcomp_atomic_shr_ui1 +@ cdecl _vcomp_atomic_shr_ui2(ptr long) vcomp._vcomp_atomic_shr_ui2 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 +@ cdecl _vcomp_atomic_shr_ui8(ptr long) vcomp._vcomp_atomic_shr_ui8 +@ cdecl _vcomp_atomic_sub_i1(ptr long) vcomp._vcomp_atomic_sub_i1 +@ cdecl _vcomp_atomic_sub_i2(ptr long) vcomp._vcomp_atomic_sub_i2 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 +@ cdecl _vcomp_atomic_sub_i8(ptr int64) vcomp._vcomp_atomic_sub_i8 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_xor_i1(ptr long) vcomp._vcomp_atomic_xor_i1 +@ cdecl _vcomp_atomic_xor_i2(ptr long) vcomp._vcomp_atomic_xor_i2 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 +@ cdecl _vcomp_atomic_xor_i8(ptr int64) vcomp._vcomp_atomic_xor_i8 +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect +@ cdecl _vcomp_flush() vcomp._vcomp_flush +@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ cdecl omp_in_parallel() vcomp.omp_in_parallel +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index 44090cd..a965210 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -100,6 +100,7 @@ my @dll_groups = ], [ "vcomp", + "vcomp140", "vcomp120", "vcomp110", "vcomp100",

1 0

Nikolay Sivov : winmm/tests: Fixed a buffer leak (Valgrind).
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: 7deec68fd371aceecdfb4fa9f04fb4e4505441c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deec68fd371aceecdfb4fa9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 12:43:02 2016 +0300 winmm/tests: Fixed a buffer leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2fe8bb..d6019f9 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1596,6 +1596,7 @@ static void test_fragmentsize(void) rc = waveOutClose(wout); ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + HeapFree(GetProcessHeap(), 0, hdr[0].lpData); CloseHandle(hevent); }

1 0

Sebastian Lackner : vcomp: Prefer builtin version.
by Alexandre Julliard Aug. 9, 2016

Aug. 9, 2016

Module: wine Branch: master Commit: de1ba602eff0a83a2b51ade0deafded0c73d5e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1ba602eff0a83a2b51ade0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 9 11:31:53 2016 +0200 vcomp: Prefer builtin version. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8612c9f..61f84be 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1427,9 +1427,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: { SYSTEM_INFO sysinfo;

1 0