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

Iván Matellanes : msvcirt: Initialize do_lock on ios copy constructor.
by Alexandre Julliard 09 Aug '16

09 Aug '16

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/tests: Add some more tests of ostream constructors.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: b7c19e1e3ea965785a2b036abbb2db0ee1d6011e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c19e1e3ea965785a2b036ab… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:30 2016 +0100 msvcirt/tests: Add some more tests of ostream constructors. 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/tests/msvcirt.c | 98 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c19e1e3ea965785a2b0…

1 0

Daniel Lehman : msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 57c60d9c431c65d6a1b4c3a5b04b7f58fa011231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c60d9c431c65d6a1b4c3a5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 15:28:49 2016 -0700 msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 2a3e5a9..22c302e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3621,17 +3621,17 @@ @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod @ stub _Close_dir -@ cdecl _Cnd_broadcast(ptr) msvcp110._Cnd_broadcast -@ cdecl _Cnd_destroy(ptr) msvcp110._Cnd_destroy +@ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast +@ cdecl _Cnd_destroy(ptr) _Cnd_destroy @ stub _Cnd_destroy_in_situ @ stub _Cnd_do_broadcast_at_thread_exit -@ cdecl _Cnd_init(ptr) msvcp110._Cnd_init +@ cdecl _Cnd_init(ptr) _Cnd_init @ stub _Cnd_init_in_situ @ stub _Cnd_register_at_thread_exit -@ cdecl _Cnd_signal(ptr) msvcp110._Cnd_signal -@ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp110._Cnd_timedwait +@ cdecl _Cnd_signal(ptr) _Cnd_signal +@ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait @ stub _Cnd_unregister_at_thread_exit -@ cdecl _Cnd_wait(ptr ptr) msvcp110._Cnd_wait +@ cdecl _Cnd_wait(ptr ptr) _Cnd_wait @ stub _Copy_file @ stub _Cosh @ stub _Current_get @@ -3673,7 +3673,7 @@ @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @ stub _Mtx_clear_owner -@ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) _Mtx_current_owns @ cdecl _Mtx_destroy(ptr) _Mtx_destroy @ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs

1 0

Józef Kucia : d3d11/tests: Add test for line antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

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

Józef Kucia : d3d10core/tests: Add test for line antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: afff447a0ac91405ea73dc27e2c5a6f3871301d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afff447a0ac91405ea73dc27e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:24 2016 +0200 d3d10core/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/d3d10core/tests/device.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e574005..deed580 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9256,6 +9256,85 @@ static void test_face_culling(void) release_test_context(&test_context); } +static void test_line_antialiasing_blending(void) +{ + struct d3d10core_test_context test_context; + ID3D10RasterizerState *rasterizer_state; + D3D10_RASTERIZER_DESC rasterizer_desc; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + ID3D10Device *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)) + return; + + device = test_context.device; + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.BlendEnable[0] = TRUE; + blend_desc.SrcBlend = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlend = D3D10_BLEND_DEST_ALPHA; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlendAlpha = D3D10_BLEND_DEST_ALPHA; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10BlendState_Release(blend_state); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + rasterizer_desc.FillMode = D3D10_FILL_SOLID; + rasterizer_desc.CullMode = D3D10_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 = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D10Device_RSSetState(device, rasterizer_state); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + todo_wine check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + ID3D10RasterizerState_Release(rasterizer_state); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9306,4 +9385,5 @@ START_TEST(device) test_uint_shader_instructions(); test_index_buffer_offset(); test_face_culling(); + test_line_antialiasing_blending(); }

1 0

Hugh McMaster : wineconsole: Add 'ColorTable' support to the registry.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 1602eff3b8c5f4d3550ee8628d48ff6632c7e343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1602eff3b8c5f4d3550ee8628… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:08:29 2016 +0000 wineconsole: Add 'ColorTable' support to the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 46 ++++++++++++++++++++++++++++++---- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/wineconsole.c | 1 + 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index c1d04c1..f5fa433 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -26,10 +26,12 @@ #include "winreg.h" #include "winecon_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wineconsole); +static const WCHAR wszColorTable[] = {'C','o','l','o','r','T','a','b','l','e',0}; static const WCHAR wszConsole[] = {'C','o','n','s','o','l','e',0}; static const WCHAR wszCursorSize[] = {'C','u','r','s','o','r','S','i','z','e',0}; static const WCHAR wszCursorVisible[] = {'C','u','r','s','o','r','V','i','s','i','b','l','e',0}; @@ -47,6 +49,10 @@ static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f' static const WCHAR wszScreenColors[] = {'S','c','r','e','e','n','C','o','l','o','r','s',0}; static const WCHAR wszWindowSize[] = {'W','i','n','d','o','w','S','i','z','e',0}; +static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; + +#define NUM_COLORS 16 + void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", @@ -84,9 +90,17 @@ static LPWSTR WINECON_CreateKeyName(LPCWSTR kn) */ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) { - DWORD type; - DWORD count; - DWORD val; + int i; + DWORD type, count, val; + WCHAR color_name[13]; + + for (i = 0; i < NUM_COLORS; i++) + { + sprintfW(color_name, color_name_fmt, wszColorTable, i); + count = sizeof(val); + if (!RegQueryValueExW(hConKey, color_name, 0, &type, (LPBYTE)&val, &count)) + cfg->color_map[i] = val; + } count = sizeof(val); if (!RegQueryValueExW(hConKey, wszCursorSize, 0, &type, (LPBYTE)&val, &count)) @@ -166,11 +180,24 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) */ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) { - HKEY hConKey; + static const COLORREF color_map[NUM_COLORS] = + { + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), + RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), + RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), + RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), + }; + + int i; + HKEY hConKey; WINE_TRACE("loading %s registry settings.\n", appname ? wine_dbgstr_w(appname) : "default"); /* first set default values */ + for (i = 0; i < NUM_COLORS; i++) + { + cfg->color_map[i] = color_map[i]; + } cfg->cursor_size = 25; cfg->cursor_visible = 1; cfg->exit_on_die = 1; @@ -221,10 +248,19 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) */ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) { - DWORD val; + int i; + DWORD val; + WCHAR color_name[13]; WINECON_DumpConfig("save", cfg); + for (i = 0; i < NUM_COLORS; i++) + { + sprintfW(color_name, color_name_fmt, wszColorTable, i); + val = cfg->color_map[i]; + RegSetValueExW(hConKey, color_name, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + } + val = cfg->cursor_size; RegSetValueExW(hConKey, wszCursorSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 5608f99..7236879 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -27,6 +27,7 @@ /* this is the configuration stored & loaded into the registry */ struct config_data { + DWORD color_map[16]; /* console color table */ unsigned cell_width; /* width in pixels of a character */ unsigned cell_height; /* height in pixels of a character */ int cursor_size; /* in % of cell height */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index f9027a4..e5e2823 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -703,6 +703,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* fall through */ case init_success: WINECON_GetServerConfig(data); + memcpy(data->curcfg.color_map, cfg.color_map, sizeof(data->curcfg.color_map)); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n");

1 0

Hugh McMaster : wineconsole: Replace hard-coded WCUSER_ColorMap with registry color_map.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: b1e6d4c1751fe0a69be87ba2cf9c167b3b1d7ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e6d4c1751fe0a69be87ba2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 8 03:08:39 2016 +0000 wineconsole: Replace hard-coded WCUSER_ColorMap with registry color_map. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/dialog.c | 25 ++++++++++++++++++------- programs/wineconsole/user.c | 15 +++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 04edfd1..9a14184 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -147,6 +147,14 @@ static INT_PTR WINAPI WCUSER_OptionDlgProc(HWND hDlg, UINT msg, WPARAM wParam, L return TRUE; } +static COLORREF get_color(struct dialog_info *di, unsigned int idc) +{ + LONG_PTR index; + + index = GetWindowLongPtrW(GetDlgItem(di->hDlg, idc), 0); + return di->config.color_map[index]; +} + /****************************************************************** * WCUSER_FontPreviewProc * @@ -196,10 +204,10 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, int len; hOldFont = SelectObject(ps.hdc, hFont); - bkcolor = WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]; + bkcolor = get_color(di, IDC_FNT_COLOR_BK); FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); SetBkColor(ps.hdc, bkcolor); - SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]); + SetTextColor(ps.hdc, get_color(di, IDC_FNT_COLOR_FG)); len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, sizeof(buf) / sizeof(buf[0])); if (len) @@ -228,22 +236,25 @@ static LRESULT WINAPI WCUSER_ColorPreviewProc(HWND hWnd, UINT msg, WPARAM wParam { case WM_PAINT: { - PAINTSTRUCT ps; - int i, step; - RECT client, r; - HBRUSH hbr; + PAINTSTRUCT ps; + int i, step; + RECT client, r; + struct dialog_info *di; + HBRUSH hbr; BeginPaint(hWnd, &ps); GetClientRect(hWnd, &client); step = client.right / 8; + di = (struct dialog_info *)GetWindowLongPtrW(GetParent(hWnd), DWLP_USER); + for (i = 0; i < 16; i++) { r.top = (i / 8) * (client.bottom / 2); r.bottom = r.top + client.bottom / 2; r.left = (i & 7) * step; r.right = r.left + step; - hbr = CreateSolidBrush(WCUSER_ColorMap[i]); + hbr = CreateSolidBrush(di->config.color_map[i]); FillRect(ps.hdc, &r, hbr); DeleteObject(hbr); if (GetWindowLongW(hWnd, 0) == i) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 40a0757..eb68373 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -30,15 +30,6 @@ WINE_DECLARE_DEBUG_CHANNEL(wc_font); UINT g_uiDefaultCharset; -/* mapping console colors to RGB values */ -const COLORREF WCUSER_ColorMap[16] = -{ - RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), - RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), - RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), - RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), -}; - static BOOL WCUSER_SetFont(struct inner_data* data, const LOGFONTW* font); /****************************************************************** @@ -76,8 +67,8 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ for (i = 0; i < data->curcfg.sb_width; i++) { attr = cell[i].Attributes; - SetBkColor(PRIVATE(data)->hMemDC, WCUSER_ColorMap[(attr>>4)&0x0F]); - SetTextColor(PRIVATE(data)->hMemDC, WCUSER_ColorMap[attr&0x0F]); + SetBkColor(PRIVATE(data)->hMemDC, data->curcfg.color_map[(attr >> 4) & 0x0F]); + SetTextColor(PRIVATE(data)->hMemDC, data->curcfg.color_map[attr & 0x0F]); for (k = i; k < data->curcfg.sb_width && cell[k].Attributes == attr; k++) { line[k - i] = cell[k].Char.UnicodeChar; @@ -86,7 +77,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ ExtTextOutW( PRIVATE(data)->hMemDC, i * data->curcfg.cell_width, j * data->curcfg.cell_height, 0, NULL, line, k - i, dx ); if (PRIVATE(data)->ext_leading && - (hbr = CreateSolidBrush(WCUSER_ColorMap[(attr>>4)&0x0F]))) + (hbr = CreateSolidBrush(data->curcfg.color_map[(attr >> 4) & 0x0F]))) { r.left = i * data->curcfg.cell_width; r.top = (j + 1) * data->curcfg.cell_height - PRIVATE(data)->ext_leading;

1 0

Aric Stewart : include: Add declaration for ObReferenceObjectByName.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: c75751ed54e3aeb5f986e417749bf74f71314a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75751ed54e3aeb5f986e4177… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 8 15:34:53 2016 +0200 include: Add declaration for ObReferenceObjectByName. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6ad4bb3..242eb70 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1252,6 +1252,7 @@ void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); +NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID);

1 0

Alexander Morozov : ntoskrnl.exe: Add stub for ObDereferenceObject.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 2898df50e64ec73be954cba0c0b06d35af01de6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2898df50e64ec73be954cba0c… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 8 15:35:18 2016 +0200 ntoskrnl.exe: Add stub for ObDereferenceObject. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d812692..d9ebc40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2141,6 +2141,15 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, /*********************************************************************** + * ObDereferenceObject (NTOSKRNL.EXE.@) + */ +void WINAPI ObDereferenceObject( void *obj ) +{ + TRACE( "(%p): stub\n", obj ); +} + + +/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT @@ -2164,7 +2173,7 @@ void WINAPI __regs_ObfDereferenceObject( void *obj ) void WINAPI ObfDereferenceObject( void *obj ) #endif { - FIXME( "(%p): stub\n", obj ); + ObDereferenceObject( obj ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40fff1b..fd820a7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -798,7 +798,7 @@ @ stub ObCloseHandle @ stub ObCreateObject @ stub ObCreateObjectType -@ stub ObDereferenceObject +@ stdcall ObDereferenceObject(ptr) @ stub ObDereferenceSecurityDescriptor @ stub ObFindHandleForObject @ stub ObGetObjectSecurity diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 242eb70..5eda82d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1251,6 +1251,7 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);

1 0

Aric Stewart : winedevice: Remove static driver_obj variable.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 92ce6e6bab595c710c465792083f92e4bea3ff67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ce6e6bab595c710c4657920… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 8 15:35:49 2016 +0200 winedevice: Remove static driver_obj variable. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e31318c..771a0c1 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -42,7 +42,6 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -static DRIVER_OBJECT *driver_obj; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) @@ -225,7 +224,6 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING if (!module) return STATUS_DLL_INIT_FAILED; - driver_obj = driver_object; driver_object->DriverSection = find_ldr_module( module ); nt = RtlImageNtHeader( module ); @@ -272,9 +270,10 @@ static void unload_driver( DRIVER_OBJECT *driver_obj ) FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); + ObDereferenceObject( driver_obj ); } -static NTSTATUS create_driver(const WCHAR *driver_name) +static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_obj) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; UNICODE_STRING drv_name; @@ -288,6 +287,16 @@ static NTSTATUS create_driver(const WCHAR *driver_name) status = IoCreateDriver( &drv_name, init_driver ); + if (status == STATUS_SUCCESS) + { + status = ObReferenceObjectByName( &drv_name, OBJ_CASE_INSENSITIVE, NULL, + 0, NULL, KernelMode, NULL, (void **)driver_obj ); + if (status != STATUS_SUCCESS) + { + ERR("Failed to locate loaded driver (%s)\n", wine_dbgstr_w(driver_name)); + } + } + RtlFreeUnicodeString( &drv_name ); return status; } @@ -326,6 +335,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; const WCHAR *driver_name = argv[0]; + DRIVER_OBJECT *driver_obj; WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); @@ -344,7 +354,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) status.dwWaitHint = 10000; SetServiceStatus( service_handle, &status ); - if (create_driver( driver_name ) == STATUS_SUCCESS) + if (create_driver( driver_name, &driver_obj ) == STATUS_SUCCESS) { status.dwCurrentState = SERVICE_RUNNING; status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;

1 0