February 2017 - Wine-Commits

Huw Davies : gdi32: Update biSizeImage when uncompressing the RLE bitmap.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 8c2374ab08bd4869f91d03069ee025600ceca64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2374ab08bd4869f91d03069… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:00 2017 +0000 gdi32: Update biSizeImage when uncompressing the RLE bitmap. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0d558b0..f071bbf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -316,7 +316,7 @@ static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) return (char *)bits + y * get_dib_stride( width, bpp ) + x * bpp / 8; } -static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) +static BOOL build_rle_bitmap( BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) { DWORD i = 0; int left, right; @@ -449,6 +449,7 @@ done: bits->ptr = out_bits; bits->is_copy = TRUE; bits->free = free_heap_bits; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); return TRUE;

1 0

Huw Davies : gdi32/tests: Test blitting from a D3DKMT bitmap to a regular bitmap.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: be908f2f269bae42e089f49b9b7a7e796913ae43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be908f2f269bae42e089f49b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:05 2017 +0000 gdi32/tests: Test blitting from a D3DKMT bitmap to a regular bitmap. Based on a patch by Henri Verbeet. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 1c1db17..a4002c8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5663,8 +5663,10 @@ static void test_D3DKMTCreateDCFromMemory( void ) HGDIOBJ *bitmap; DIBSECTION dib; BOOL fail, ret; - DWORD type; + DWORD type, pixel; int size; + HDC bmp_dc; + HBITMAP bmp; static const struct { @@ -5859,6 +5861,15 @@ static void test_D3DKMTCreateDCFromMemory( void ) ret = BitBlt( create_desc.hDc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS ); ok(ret, "Failed to blit.\n"); + /* Also test blitting to a regular bitmap */ + bmp_dc = CreateCompatibleDC( create_desc.hDeviceDc ); + ok(bmp_dc != NULL, "failed to create DC\n"); + bmp = CreateCompatibleBitmap( bmp_dc, create_desc.Width, create_desc.Height ); + ok(bmp != NULL, "failed to create bmp\n"); + bmp = SelectObject( bmp_dc, bmp ); + ret = BitBlt( bmp_dc, 0, 0, create_desc.Width, create_desc.Height, create_desc.hDc, 0, 0, SRCCOPY ); + ok(ret, "Failed to blit.\n"); + destroy_desc.hDc = create_desc.hDc; destroy_desc.hBitmap = create_desc.hBitmap; @@ -5891,8 +5902,25 @@ static void test_D3DKMTCreateDCFromMemory( void ) test_data[i].name, colour, x, y, expected); if (colour != expected) fail = TRUE; + + /* 'Xn' or 'An' formats don't successfully blit to the regular bmp */ + if (test_data[i].format == D3DDDIFMT_R8G8B8 || test_data[i].format == D3DDDIFMT_R5G6B5) + { + pixel = GetPixel( bmp_dc, x, y ); + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + expected = 0x00ffffff; + else if (x < create_desc.Width && y < create_desc.Height) + expected = 0x00000000; + else + expected = CLR_INVALID; + ok(pixel == expected, "%s: got 0x%08x at %u, %u, expect 0x%08x\n", test_data[i].name, + pixel, x, y, expected); + } } } + + DeleteObject( SelectObject( bmp_dc, bmp ) ); + DeleteDC( bmp_dc ); } }

1 0

Józef Kucia : d3d10core/tests: Mark sRGB RTV clear test as broken on Nvidia drivers.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 0dd6771b623f0cb9929f1aad1747097065ab1c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd6771b623f0cb9929f1aad1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:37 2017 +0100 d3d10core/tests: Mark sRGB RTV clear test as broken on Nvidia drivers. 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 | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 20a383c..4e19727 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -844,6 +844,17 @@ static BOOL is_amd_device(ID3D10Device *device) return adapter_desc.VendorId == 0x1002; } +static BOOL is_nvidia_device(ID3D10Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x10de; +} + static BOOL is_d3d11_interface_available(ID3D10Device *device) { ID3D11Device *d3d11_device; @@ -8130,7 +8141,9 @@ static void test_clear_render_target_view(void) ID3D10RenderTargetView *rtv, *srgb_rtv; D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; ID3D10Device *device; + unsigned int i, j; HRESULT hr; if (!init_test_context(&test_context)) @@ -8203,15 +8216,20 @@ static void test_clear_render_target_view(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (!is_warp_device(device)) - { - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); - todo_wine check_texture_color(texture, expected_srgb_color, 1); - } - else + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + get_texture_readback(texture, 0, &rb); + for (i = 0; i < 4; ++i) { - win_skip("sRGB clears are broken on WARP.\n"); + for (j = 0; j < 4; ++j) + { + BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); + DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + todo_wine ok(compare_color(color, expected_srgb_color, 1) + || broken(compare_color(color, expected_color, 1) && broken_device), + "Got unexpected color 0x%08x.\n", color); + } } + release_resource_readback(&rb); ID3D10RenderTargetView_Release(srgb_rtv); ID3D10RenderTargetView_Release(rtv);

1 0

Józef Kucia : d3d8: Do not decrease swapchain surface refcount when it is already 0.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 2b921fed4bf2e8006af0198bc8856006d5758c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b921fed4bf2e8006af0198bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:36 2017 +0100 d3d8: Do not decrease swapchain surface refcount when it is already 0. 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/d3d8/surface.c | 6 ++++++ dlls/d3d8/tests/device.c | 28 +++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 56f9282..5cdb5e5 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -90,6 +90,12 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface) return IDirect3DBaseTexture8_Release(&surface->texture->IDirect3DBaseTexture8_iface); } + if (!surface->resource.refcount) + { + WARN("Surface does not have any references.\n"); + return 0; + } + refcount = InterlockedDecrement(&surface->resource.refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 45969fe..6b34ff1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -515,10 +515,10 @@ static void test_refcount(void) */ hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - if(pRenderTarget) + if (pRenderTarget) { CHECK_SURFACE_CONTAINER(pRenderTarget, IID_IDirect3DDevice8, device); - CHECK_REFCOUNT( pRenderTarget, 1); + CHECK_REFCOUNT(pRenderTarget, 1); CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); CHECK_REFCOUNT(device, refcount); @@ -527,7 +527,7 @@ static void test_refcount(void) hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget); CHECK_CALL(hr, "GetRenderTarget", device, refcount); - CHECK_REFCOUNT( pRenderTarget, 2); + CHECK_REFCOUNT(pRenderTarget, 2); CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); @@ -537,26 +537,30 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); } /* Render target and back buffer are identical. */ hr = IDirect3DDevice8_GetBackBuffer(device, 0, 0, &pBackBuffer); CHECK_CALL(hr, "GetBackBuffer", device, ++refcount); - if(pBackBuffer) + if (pBackBuffer) { CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", - pRenderTarget, pBackBuffer); + pRenderTarget, pBackBuffer); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT(device, --refcount); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &pStencilSurface); CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount); - if(pStencilSurface) + if (pStencilSurface) { CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice8, device); - CHECK_REFCOUNT( pStencilSurface, 1); + CHECK_REFCOUNT(pStencilSurface, 1); CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); CHECK_REFCOUNT(device, refcount); @@ -571,6 +575,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); pStencilSurface = NULL; } @@ -729,6 +735,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT( pSwapChain, 1); @@ -752,12 +760,14 @@ static void test_refcount(void) * Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/ hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget2); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - if(pRenderTarget2) + if (pRenderTarget2) { CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n", - pRenderTarget, pRenderTarget2); + pRenderTarget, pRenderTarget2); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); pRenderTarget2 = NULL; } pRenderTarget = NULL;

1 0

Nikolay Sivov : wordpad: Clean up IRichEditOleCallback implementation.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: e492a0d68b297481f9958f451050522d20339c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e492a0d68b297481f9958f451… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:07 2017 +0300 wordpad: Clean up IRichEditOleCallback implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/olecallback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c index 8b279ad..dcfef58 100644 --- a/programs/wordpad/olecallback.c +++ b/programs/wordpad/olecallback.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wordpad); struct IRichEditOleCallbackImpl { - const IRichEditOleCallbackVtbl *vtbl; + IRichEditOleCallback IRichEditOleCallback_iface; IStorage *stg; int item_num; }; @@ -196,7 +196,7 @@ struct IRichEditOleCallbackVtbl olecallbackVtbl = { }; struct IRichEditOleCallbackImpl olecallback = { - &olecallbackVtbl, NULL, 0 + { &olecallbackVtbl }, NULL, 0 }; HRESULT setup_richedit_olecallback(HWND hEditorWnd) @@ -205,6 +205,6 @@ HRESULT setup_richedit_olecallback(HWND hEditorWnd) STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &olecallback.stg); - SendMessageW(hEditorWnd, EM_SETOLECALLBACK, 0, (LPARAM)&olecallback); + SendMessageW(hEditorWnd, EM_SETOLECALLBACK, 0, (LPARAM)&olecallback.IRichEditOleCallback_iface); return hr; }

1 0

Józef Kucia : wined3d: Fix bind count for shader resource views.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 94fab4cf1ac7d8a0311ee6284b41949eb7591e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fab4cf1ac7d8a0311ee6284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:33 2017 +0100 wined3d: Fix bind count for shader resource views. 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/wined3d/cs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1d2870e..3a46a3c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1039,8 +1039,16 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_shader_resource_view *op = data; + struct wined3d_shader_resource_view *prev; + prev = cs->state.shader_resource_view[op->type][op->view_idx]; cs->state.shader_resource_view[op->type][op->view_idx] = op->view; + + if (op->view) + InterlockedIncrement(&op->view->resource->bind_count); + if (prev) + InterlockedDecrement(&prev->resource->bind_count); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); }

1 0

Józef Kucia : d3d9: Do not decrease swapchain surface refcount when it is already 0.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: d39630fc396b0f732b49e9bbc29669c62338248f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39630fc396b0f732b49e9bbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:34 2017 +0100 d3d9: Do not decrease swapchain surface refcount when it is already 0. Based on a patch by Henri Verbeet. 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/d3d9/surface.c | 6 ++++++ dlls/d3d9/tests/device.c | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 07eaf7b..976a7fa 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -91,6 +91,12 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface); } + if (!surface->resource.refcount) + { + WARN("Surface does not have any references.\n"); + return 0; + } + refcount = InterlockedDecrement(&surface->resource.refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index feb1efc..27f3a1d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1464,16 +1464,20 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); } /* Render target and back buffer are identical. */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, 0, &pBackBuffer); CHECK_CALL(hr, "GetBackBuffer", device, ++refcount); - if(pBackBuffer) + if (pBackBuffer) { CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", - pRenderTarget, pBackBuffer); + pRenderTarget, pBackBuffer); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT(device, --refcount); @@ -1481,7 +1485,7 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetDepthStencilSurface(device, &pStencilSurface); CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount); CHECK_REFCOUNT( pSwapChain, 1); - if(pStencilSurface) + if (pStencilSurface) { CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice9, device); CHECK_REFCOUNT( pStencilSurface, 1); @@ -1491,7 +1495,7 @@ static void test_refcount(void) CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); CHECK_REFCOUNT(device, refcount); - CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); /* The stencil surface is released with the device, so AddRef with refcount=0 is fine here. */ @@ -1499,6 +1503,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); pStencilSurface = NULL; } @@ -1653,6 +1659,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT( pSwapChain, 1); @@ -1669,12 +1677,14 @@ static void test_refcount(void) * Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/ hr = IDirect3DDevice9_GetRenderTarget(device, 0, &pRenderTarget2); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - if(pRenderTarget2) + if (pRenderTarget2) { CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n", - pRenderTarget, pRenderTarget2); + pRenderTarget, pRenderTarget2); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); pRenderTarget2 = NULL; } pRenderTarget = NULL;

1 0

André Hentschel : iphlpapi/tests: Add tests for GetUnicastIpAddressEntry.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: eaa5450ccd2abfb1b2946bb668cbfe45b7a50945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa5450ccd2abfb1b2946bb66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:31:36 2017 +0100 iphlpapi/tests: Add tests for GetUnicastIpAddressEntry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e4a5864..e0701a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -75,6 +75,7 @@ static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); @@ -123,6 +124,7 @@ static void loadIPHlpApi(void) pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); @@ -1965,6 +1967,116 @@ static void test_GetIfTable2(void) pFreeMibTable( table ); } +static void test_GetUnicastIpAddressEntry(void) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + MIB_UNICASTIPADDRESS_ROW row; + DWORD ret, size; + + if (!pGetUnicastIpAddressEntry) + { + win_skip( "GetUnicastIpAddressEntry not available\n" ); + return; + } + + ret = pGetUnicastIpAddressEntry( NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = get_interface_index(); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + + for (aa = ptr; !ret && aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + ua = aa->FirstUnicastAddress; + while (ua) + { + /* test with luid */ + memset( &row, 0, sizeof(row) ); + memcpy(&row.InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + + /* test with index */ + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = S(U(*aa)).IfIndex; + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + if (ret == NO_ERROR) + { + ok(row.InterfaceLuid.Info.Reserved == aa->Luid.Info.Reserved, "Expected %d, got %d\n", + aa->Luid.Info.Reserved, row.InterfaceLuid.Info.Reserved); + ok(row.InterfaceLuid.Info.NetLuidIndex == aa->Luid.Info.NetLuidIndex, "Expected %d, got %d\n", + aa->Luid.Info.NetLuidIndex, row.InterfaceLuid.Info.NetLuidIndex); + ok(row.InterfaceLuid.Info.IfType == aa->Luid.Info.IfType, "Expected %d, got %d\n", + aa->Luid.Info.IfType, row.InterfaceLuid.Info.IfType); + ok(row.InterfaceIndex == S(U(*aa)).IfIndex, "Expected %d, got %d\n", + S(U(*aa)).IfIndex, row.InterfaceIndex); + ok(row.PrefixOrigin == ua->PrefixOrigin, "Expected %d, got %d\n", + ua->PrefixOrigin, row.PrefixOrigin); + ok(row.SuffixOrigin == ua->SuffixOrigin, "Expected %d, got %d\n", + ua->SuffixOrigin, row.SuffixOrigin); + ok(row.ValidLifetime == ua->ValidLifetime, "Expected %d, got %d\n", + ua->ValidLifetime, row.ValidLifetime); + ok(row.PreferredLifetime == ua->PreferredLifetime, "Expected %d, got %d\n", + ua->PreferredLifetime, row.PreferredLifetime); + ok(row.OnLinkPrefixLength == ua->OnLinkPrefixLength, "Expected %d, got %d\n", + ua->OnLinkPrefixLength, row.OnLinkPrefixLength); + ok(row.SkipAsSource == 0, "Expected 0, got %d\n", row.SkipAsSource); + ok(row.DadState == ua->DadState, "Expected %d, got %d\n", ua->DadState, row.DadState); + if (row.Address.si_family == AF_INET6) + ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", + row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); + else + ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); + ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); +} + START_TEST(iphlpapi) { @@ -1989,6 +2101,7 @@ START_TEST(iphlpapi) test_interface_identifier_conversion(); test_GetIfEntry2(); test_GetIfTable2(); + test_GetUnicastIpAddressEntry(); freeIPHlpApi(); } }

1 0

Gerald Pfeifer : services/tests: Add #include <stdarg.h> to service.c.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: f353e42561ad8dc984cf6d636aee6b0f3b17729b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f353e42561ad8dc984cf6d636… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Feb 10 21:57:18 2017 +0100 services/tests: Add #include <stdarg.h> to service.c. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 0e9bcd7..9841949 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include <windef.h> #include <winsvc.h> #include <stdio.h>

1 0

Alistair Leslie-Hughes : dpnet: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 2a8a052bf79b3a8734a1a04e65e19f994c78052f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a052bf79b3a8734a1a04e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 13 08:17:45 2017 +0000 dpnet: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 256e3f4..49c3495 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -154,12 +154,12 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void *heap_alloc( size_t len ) +static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) { return HeapAlloc( GetProcessHeap(), 0, len ); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) { return HeapReAlloc( GetProcessHeap(), 0, mem, len); }

1 0