July 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: f7538bfe4734761f1090d079a9d55cef4c33463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7538bfe4734761f1090d079a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:38:39 2015 +0200 wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR. --- dlls/wininet/internet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 74f44b0..ee04f40 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2765,6 +2765,15 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); collect_connections(COLLECT_CONNECTIONS); return ERROR_SUCCESS; + + case INTERNET_OPTION_SUPPRESS_BEHAVIOR: + FIXME("INTERNET_OPTION_SUPPRESS_BEHAVIOR stub\n"); + + if(size != sizeof(ULONG)) + return ERROR_INTERNET_BAD_OPTION_LENGTH; + + FIXME("%08x\n", *(ULONG*)buf); + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION;

1 0

Henri Verbeet : d2d1: Validate bitmap formats.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 1b3574ebc0adb2fb05413fe6ed11607455a7aabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3574ebc0adb2fb05413fe6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:18 2015 +0200 d2d1: Validate bitmap formats. --- dlls/d2d1/bitmap.c | 40 +++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index ccc8d75..2439d79 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -165,8 +165,48 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; + BOOL supported = FALSE; + unsigned int i; HRESULT hr; + static const D2D1_PIXEL_FORMAT supported_formats[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R16G16B16A16_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R16G16B16A16_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, + {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_B8G8R8X8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, + }; + + for (i = 0; i < sizeof(supported_formats) / sizeof(*supported_formats); ++i) + { + if (supported_formats[i].format == desc->pixelFormat.format + && supported_formats[i].alphaMode == desc->pixelFormat.alphaMode) + { + supported = TRUE; + break; + } + } + + if (!supported) + { + WARN("Tried to create bitmap with unsupported format {%#x / %#x}.\n", + desc->pixelFormat.format, desc->pixelFormat.alphaMode); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + FIXME("Ignoring bitmap properties.\n"); bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f8ebecc..4d83154 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1530,6 +1530,85 @@ static void test_path_geometry(void) DestroyWindow(window); } +static void test_bitmap_formats(void) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + D2D1_SIZE_U size = {4, 4}; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Bitmap *bitmap; + unsigned int i, j; + HWND window; + HRESULT hr; + + static const struct + { + DXGI_FORMAT format; + DWORD mask; + } + bitmap_formats[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, 0x8a}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 0x8a}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 0x8a}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 0x00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 0x0a}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0x8a}, + {DXGI_FORMAT_R8G8B8A8_UINT, 0x00}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 0x00}, + {DXGI_FORMAT_R8G8B8A8_SINT, 0x00}, + {DXGI_FORMAT_A8_UNORM, 0x06}, + {DXGI_FORMAT_B8G8R8A8_UNORM, 0x0a}, + {DXGI_FORMAT_B8G8R8X8_UNORM, 0x88}, + {DXGI_FORMAT_B8G8R8A8_TYPELESS, 0x00}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, 0x8a}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + { + for (j = 0; j < 4; ++j) + { + if ((bitmap_formats[i].mask & (0x80 | (1u << j))) == (0x80 | (1u << j))) + continue; + + bitmap_desc.pixelFormat.format = bitmap_formats[i].format; + bitmap_desc.pixelFormat.alphaMode = j; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + if (bitmap_formats[i].mask & (1u << j)) + ok(hr == S_OK, "Got unexpected hr %#x, for format %#x/%#x.\n", + hr, bitmap_formats[i].format, j); + else + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x, for format %#x/%#x.\n", + hr, bitmap_formats[i].format, j); + if (SUCCEEDED(hr)) + ID2D1Bitmap_Release(bitmap); + } + } + + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -1537,4 +1616,5 @@ START_TEST(d2d1) test_color_brush(); test_bitmap_brush(); test_path_geometry(); + test_bitmap_formats(); }

1 0

Nikolay Sivov : dwrite: Implement parameter validation for CreateAlphaTexture().
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 5137aaa9c9b372ee6b5380eaf4a85d6bf500d0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5137aaa9c9b372ee6b5380eaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 29 12:00:26 2015 +0300 dwrite: Implement parameter validation for CreateAlphaTexture(). --- dlls/dwrite/font.c | 109 +++++++++++++++++++++++++----------- dlls/dwrite/tests/font.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5137aaa9c9b372ee6b538…

1 0

Henri Verbeet : d2d1: Force alpha to 1.0f for clears.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 230785dc328a373627b242d47250cf5ee5d01540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230785dc328a373627b242d47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:22 2015 +0200 d2d1: Force alpha to 1.0f for clears. --- dlls/d2d1/render_target.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ead6b29..6c533f2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1133,6 +1133,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1Rend static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color) { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + D2D1_COLOR_F c = {0.0f, 0.0f, 0.0f, 0.0f}; D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; @@ -1162,8 +1163,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - buffer_desc.ByteWidth = sizeof(*color); - buffer_data.pSysMem = color; + if (color) + c = *color; + c.a = 1.0f; + buffer_desc.ByteWidth = sizeof(c); + buffer_data.pSysMem = &c; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) {

1 0

Matteo Bruni : d3d9/tests: Don' t call SetVertexShaderConstantF if vertex shaders aren't supported.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 68e2503965fca947330b3c5dcec21784dfb6770a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e2503965fca947330b3c5dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 28 23:14:36 2015 +0200 d3d9/tests: Don't call SetVertexShaderConstantF if vertex shaders aren't supported. Also slightly change attenuation factors to try to stay away from the (possible) implementation max size of 64. --- dlls/d3d9/tests/visual.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index df29221..13cc27c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10143,7 +10143,7 @@ static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) static void pointsize_test(void) { - static const float a = 0.5f, b = 0.5f, c = 0.5f; + static const float a = 1.0f, b = 1.0f, c = 1.0f; float ptsize, ptsizemax_orig, ptsizemin_orig; IDirect3DSurface9 *rt, *backbuffer; IDirect3DTexture9 *tex1, *tex2; @@ -10315,17 +10315,17 @@ static void pointsize_test(void) } test_setups[] = { - {&novs, &nops, D3DFVF_XYZ, 32, 62, FALSE, FALSE}, + {&novs, &nops, D3DFVF_XYZ, 32, 45, FALSE, FALSE}, {&vs1, &ps1, D3DFVF_XYZ, 32, 32, FALSE, FALSE}, - {&novs, &ps1, D3DFVF_XYZ, 32, 62, FALSE, FALSE}, + {&novs, &ps1, D3DFVF_XYZ, 32, 45, FALSE, FALSE}, {&vs1, &nops, D3DFVF_XYZ, 32, 32, FALSE, FALSE}, - {&novs, &ps2, D3DFVF_XYZ, 32, 62, FALSE, TRUE}, - {&novs, &ps2_zw, D3DFVF_XYZ, 32, 62, TRUE, FALSE}, + {&novs, &ps2, D3DFVF_XYZ, 32, 45, FALSE, TRUE}, + {&novs, &ps2_zw, D3DFVF_XYZ, 32, 45, TRUE, FALSE}, {&vs1, &ps2, D3DFVF_XYZ, 32, 32, FALSE, TRUE}, {&vs1, &ps2_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, {&vs3, &ps3, D3DFVF_XYZ, 32, 32, FALSE, TRUE}, {&vs3, &ps3_zw, D3DFVF_XYZ, 32, 32, TRUE, FALSE}, - {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 48, FALSE, FALSE}, + {&novs, &nops, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 33, FALSE, FALSE}, {&vs1_psize, &ps1, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, FALSE}, {&vs3_psize, &ps3, D3DFVF_XYZ | D3DFVF_PSIZE, 48, 24, FALSE, TRUE}, }; @@ -10564,8 +10564,11 @@ static void pointsize_test(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c); ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); - ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); + ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#x.\n", hr); + } if (caps.MaxPointSize < 63.0f) {

1 0

Alexandre Julliard : Wine release 1.7.48
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: website Branch: master Commit: 74430085ee7632ad99b8ffa13f113cc4f0865744 URL: http://source.winehq.org/git/website.git/?a=commit;h=74430085ee7632ad99b8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:30:11 2015 +0200 Wine release 1.7.48 --- news/en/2015072801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015072801.xml b/news/en/2015072801.xml new file mode 100644 index 0000000..a5c1254 --- /dev/null +++ b/news/en/2015072801.xml @@ -0,0 +1,16 @@ +<news> +<date>July 28, 2015</date> +<title>Wine 1.7.48 Released</title> +<body> + The Wine development release 1.7.48 is now available. + <a href="{$root}/announce/1.7.48">What's new</a> in this release: +<ul> + <li>Fleshed out OpenMP implementation.</li> + <li>I/O stream support in the MSVCIRT C++ runtime.</li> + <li>Support for pixel snapping in DirectWrite.</li> + <li>More support for OpenGL core contexts.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.48.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Daniel Lehman : gdi32: Check for NULL pointer in GetOutlineTextMetrics.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 22c51eeabf6f7dcdcdcb6f41d51b1faa8072aead URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c51eeabf6f7dcdcdcb6f41d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jul 20 16:38:05 2015 -0700 gdi32: Check for NULL pointer in GetOutlineTextMetrics. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a7a3d7..1187598 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7722,7 +7722,7 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX if (physdev->font->potm || get_outline_text_metrics( physdev->font )) { - if(cbSize >= physdev->font->potm->otmSize) + if(potm && cbSize >= physdev->font->potm->otmSize) { memcpy(potm, physdev->font->potm, physdev->font->potm->otmSize); scale_outline_font_metrics(physdev->font, potm); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cce4a1f..8595a4a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2147,6 +2147,11 @@ static void test_GetOutlineTextMetrics(void) } ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); + /* check handling of NULL pointer */ + SetLastError(0xdeadbeef); + ret = GetOutlineTextMetricsA(hdc, otm_size, NULL); + ok(ret == otm_size, "expected %u, got %u, error %d\n", otm_size, ret, GetLastError()); + HeapFree(GetProcessHeap(), 0, otm); SelectObject(hdc, hfont_old);

1 0

Tag wine-1.7.48 : Alexandre Julliard : Release 1.7.48
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: refs/tags/wine-1.7.48 Tag: 6682264780a6c13adcc221ab3708c2192444e4c0 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6682264780a6c13adcc221ab3708… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:21:18 2015 +0200 Release 1.7.48

1 0

Alexandre Julliard : Release 1.7.48.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 797c037bff2f7621f5b3d632bd899349529d6b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=797c037bff2f7621f5b3d632b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:21:18 2015 +0200 Release 1.7.48. --- ANNOUNCE | 774 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 358 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=797c037bff2f7621f5b3d…

1 0

Sebastian Lackner : vcomp/tests: Add tests for atomic float functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: c14db31b9be37fb1b6d5384a0812384249c5f3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14db31b9be37fb1b6d5384a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:28 2015 +0200 vcomp/tests: Add tests for atomic float functions. --- dlls/vcomp/tests/vcomp.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4974831..5be6965 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -32,15 +32,19 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_div_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_for_static_end)(void); @@ -187,15 +191,19 @@ static BOOL init_vcomp(void) } VCOMP_GET_PROC(_vcomp_atomic_add_i4); + VCOMP_GET_PROC(_vcomp_atomic_add_r4); VCOMP_GET_PROC(_vcomp_atomic_and_i4); VCOMP_GET_PROC(_vcomp_atomic_div_i4); + VCOMP_GET_PROC(_vcomp_atomic_div_r4); VCOMP_GET_PROC(_vcomp_atomic_div_ui4); VCOMP_GET_PROC(_vcomp_atomic_mul_i4); + VCOMP_GET_PROC(_vcomp_atomic_mul_r4); VCOMP_GET_PROC(_vcomp_atomic_or_i4); VCOMP_GET_PROC(_vcomp_atomic_shl_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); VCOMP_GET_PROC(_vcomp_atomic_sub_i4); + VCOMP_GET_PROC(_vcomp_atomic_sub_r4); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_for_static_end); @@ -925,6 +933,31 @@ static void test_atomic_integer32(void) } } +static void test_atomic_float(void) +{ + struct + { + void (CDECL *func)(float *, float); + float v1, v2, expected; + } + tests[] = + { + { p_vcomp_atomic_add_r4, 42.0, 17.0, 42.0 + 17.0 }, + { p_vcomp_atomic_div_r4, 42.0, 17.0, 42.0 / 17.0 }, + { p_vcomp_atomic_mul_r4, 42.0, 17.0, 42.0 * 17.0 }, + { p_vcomp_atomic_sub_r4, 42.0, 17.0, 42.0 - 17.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + float val = tests[i].v1; + tests[i].func(&val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -937,6 +970,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_atomic_integer32(); + test_atomic_float(); release_vcomp(); }

1 0