March 2017 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Don't read modifiers for opcodes with " read_opcode_func" set (AFL).
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 11fb78d9bde296fbd1731ab2e0c857c3874583e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fb78d9bde296fbd1731ab2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:05 2017 +0100 wined3d: Don't read modifiers for opcodes with "read_opcode_func" set (AFL). Otherwise "len" would be inconsistent with "p". This assumes opcodes with "read_opcode_func" either don't have modifiers or handle them themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8986d35..ef68754 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1570,10 +1570,6 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi p = *ptr; *ptr += len; - previous_token = opcode_token; - while (previous_token & WINED3D_SM4_INSTRUCTION_MODIFIER) - shader_sm4_read_instruction_modifier(previous_token = *p++, ins); - if (opcode_info->read_opcode_func) { opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, priv); @@ -1582,6 +1578,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi { enum wined3d_shader_dst_modifier instruction_dst_modifier = WINED3DSPDM_NONE; + previous_token = opcode_token; + while (previous_token & WINED3D_SM4_INSTRUCTION_MODIFIER && p != *ptr) + shader_sm4_read_instruction_modifier(previous_token = *p++, ins); + ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE)

1 0

Alexandre Julliard : gdi32: Map the black and white entries to the DIB color table after dithering.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 059170208af8c822e812dc1e58d60c3c5f1c7ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=059170208af8c822e812dc1e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 12:30:20 2017 +0100 gdi32: Map the black and white entries to the DIB color table after dithering. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 14 +++++++++----- dlls/gdi32/tests/dib.c | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index e740ef8..a99fcab 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -2141,12 +2141,16 @@ static DWORD rgb_to_pixel_mono(const dib_info *dib, BOOL dither, int x, int y, { DWORD ret; - if (dither) - ret = ((30 * r + 59 * g + 11 * b) / 100 + bayer_16x16[y % 16][x % 16]) > 255; - else if (dib->color_table_size == 1) - ret = (src_pixel == bg_pixel); - else + if (dib->color_table_size != 1) + { + if (dither) + { + if (((30 * r + 59 * g + 11 * b) / 100 + bayer_16x16[y % 16][x % 16]) > 255) r = g = b = 255; + else r = g = b = 0; + } ret = rgb_to_pixel_colortable( dib, r, g, b ); + } + else ret = (src_pixel == bg_pixel); /* only match raw pixel value */ return ret ? 0xff : 0; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 188001e..4bf64aa 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1880,7 +1880,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) if (bmi->bmiHeader.biBitCount == 8 && bmi->bmiHeader.biClrUsed == 256) /* 8-bpp grayscale broken on NT4 */ compare_hash_broken_todo(hdc, bmi, bits, "bottom-up 8888 dib brush patblt", 1, FALSE); else - compare_hash_broken_todo(hdc, bmi, bits, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + compare_hash_broken_todo(hdc, bmi, bits, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 2 : 0, FALSE); SelectObject(hdc, orig_brush); DeleteObject(dib_brush); @@ -1910,7 +1910,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) if (bmi->bmiHeader.biBitCount == 8 && bmi->bmiHeader.biClrUsed == 256) /* 8-bpp grayscale broken on NT4 */ compare_hash_broken_todo(hdc, bmi, bits, "top-down 24 bpp brush patblt", 1, FALSE); else - compare_hash_broken_todo(hdc, bmi, bits, "top-down 24 bpp brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + compare_hash_broken_todo(hdc, bmi, bits, "top-down 24 bpp brush patblt", dib_is_1bpp ? 2 : 0, FALSE); SelectObject(hdc, orig_brush); DeleteObject(dib_brush);

1 0

Alexandre Julliard : gdi32/tests: Remove workarounds for old Windows versions in the DIB tests.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 57aa60689d87c57467e856d0ca628611797ffb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57aa60689d87c57467e856d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 13:28:32 2017 +0100 gdi32/tests: Remove workarounds for old Windows versions in the DIB tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dib.c | 302 +++++++------------------------------------------ 1 file changed, 43 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57aa60689d87c57467e85…

1 0

Stefan Dösinger : ddraw/tests: Rewrite SrcColorKey32BlitTest.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: c3521cd6739924c645f0ca7e954b97a4702091e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3521cd6739924c645f0ca7e9… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Mar 8 19:29:00 2017 +0000 ddraw/tests: Rewrite SrcColorKey32BlitTest. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 + dlls/ddraw/tests/ddraw1.c | 482 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 496 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 468 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 468 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 510 -------------------------------------------- 6 files changed, 1920 insertions(+), 510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3521cd6739924c645f0c…

1 0

Matteo Bruni : ddraw: Keep a ddraw object reference in d3d7 vertex buffers.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 2568fd2e0091d7f74d4ab4765b4bd229f4969fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2568fd2e0091d7f74d4ab4765… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:44 2017 +0100 ddraw: Keep a ddraw object reference in d3d7 vertex buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 515c86e..07f1257 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -81,25 +81,27 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) TRACE("%p decreasing refcount to %u.\n", buffer, ref); - if (ref == 0) + if (!ref) { - struct wined3d_buffer *curVB = NULL; + struct wined3d_buffer *vb = NULL; UINT offset, stride; - /* D3D7 Vertex buffers don't stay bound in the device, they are passed - * as a parameter to drawPrimitiveVB. DrawPrimitiveVB sets them as the - * stream source in wined3d, and they should get unset there before + /* D3D7 vertex buffers don't stay bound in the device, they are passed + * as a parameter to DrawPrimitiveVB. DrawPrimitiveVB sets them as the + * stream source in wined3d and they should get unset there before * they are destroyed. */ wined3d_mutex_lock(); - wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, - 0, &curVB, &offset, &stride); - if (curVB == buffer->wined3d_buffer) + wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, 0, &vb, &offset, &stride); + if (vb == buffer->wined3d_buffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wined3d_declaration); wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); + if (buffer->version == 7) + IDirectDraw7_Release(&buffer->ddraw->IDirectDraw7_iface); + HeapFree(GetProcessHeap(), 0, buffer); } @@ -451,7 +453,8 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, buffer->IDirect3DVertexBuffer7_iface.lpVtbl = &d3d_vertex_buffer7_vtbl; buffer->ref = 1; buffer->version = ddraw->d3dversion; - + if (buffer->version == 7) + IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); buffer->ddraw = ddraw; buffer->Caps = desc->dwCaps; buffer->fvf = desc->dwFVF;

1 0

Matteo Bruni : d3d9/tests: Skip test_vshader_input() if PS 3.0 isn' t supported.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 101159309f1a0b1dcdabd9ce1ae09068269e2265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101159309f1a0b1dcdabd9ce1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:47 2017 +0100 d3d9/tests: Skip test_vshader_input() if PS 3.0 isn't supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c8cab8c..e012d1b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7828,6 +7828,12 @@ static void test_vshader_input(void) IDirect3DDevice9_Release(device); goto done; } + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("No ps_3_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Fix pixel shader version check in test_pointsize().
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 7b34f460d8164f622b0de3b5eb36226726a156c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b34f460d8164f622b0de3b5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:48 2017 +0100 d3d9/tests: Fix pixel shader version check in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e012d1b..41a883d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10588,7 +10588,7 @@ static void test_pointsize(void) ps2 = {D3DPS_VERSION(2, 0), pshader2_code}, ps2_zw = {D3DPS_VERSION(2, 0), pshader2_zw_code}, ps3 = {D3DPS_VERSION(3, 0), pshader3_code}, - ps3_zw = {D3DVS_VERSION(3, 0), pshader3_zw_code}; + ps3_zw = {D3DPS_VERSION(3, 0), pshader3_zw_code}; static const struct { const struct test_shader *vs;

1 0

Józef Kucia : d3d11/tests: Add test for unbinding shader resource view.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 1c8cb5974370629d7fb70f502f866a50a5581cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8cb5974370629d7fb70f502… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 9 10:03:03 2017 +0100 d3d11/tests: Add test for unbinding shader resource view. 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2060ab6..94a5a8f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12248,6 +12248,95 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_unbind_shader_resource_view(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + ID3D11ShaderResourceView *srv, *srv2; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t0; + Texture2D t1; + SamplerState s; + + float4 main() : SV_Target + { + return min(t0.Sample(s, float2(0, 0)) + t1.Sample(s, float2(0, 0)), 1.0f); + } +#endif + 0x43425844, 0x698dc0cb, 0x0bf322b8, 0xee127418, 0xfe9214ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, + 0x0c000045, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0c000045, 0x001000f2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, + 0x07000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a000033, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + srv2 = NULL; + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv2); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv2); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D11PixelShader_Release(ps); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_stencil_separate(void) { struct d3d11_test_context test_context; @@ -15734,6 +15823,7 @@ START_TEST(d3d11) run_for_each_9_x_feature_level(test_fl9_draw); test_ddy(); test_shader_input_registers_limits(); + test_unbind_shader_resource_view(); test_stencil_separate(); test_uav_load(); test_cs_uav_store();

1 0

Sebastian Lackner : schedsvc: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: be0e05604a5560e26757d161708c2c3dae717834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e05604a5560e26757d1617… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 16:12:10 2017 +0100 schedsvc: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 18 ++++++++---------- dlls/schedsvc/svc_main.c | 6 ++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 3abce07..b426078 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,26 +23,24 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return MIDL_user_allocate(size); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - void *ptr = MIDL_user_allocate(size); - if (ptr) memset(ptr, 0, size); - return ptr; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void heap_free(void *ptr) +static inline BOOL heap_free(void *mem) { - MIDL_user_free(ptr); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *heap_strdupW(const WCHAR *src) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 45496c9..bd8a29d 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -27,6 +27,8 @@ #include "schrpc.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; @@ -200,10 +202,10 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { - return HeapAlloc(GetProcessHeap(), 0, len); + return heap_alloc(len); } void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + heap_free(ptr); }

1 0

Sebastian Lackner : webservices: Don' t set is_addressed when an error occurred.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 0a3dbf0eb0ab539029d7a43341254098012c3771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3dbf0eb0ab539029d7a4334… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 01:06:50 2017 +0100 webservices: Don't set is_addressed when an error occurred. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 74c3a42..5e425ee 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -404,7 +404,7 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * } } - msg->is_addressed = TRUE; + if (hr == S_OK) msg->is_addressed = TRUE; LeaveCriticalSection( &msg->cs ); return hr;

1 0