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

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetSamplers().
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 06d3244d2404e8f99329bf1b365db4aee02a75de URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d3244d2404e8f99329bf1b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:31 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetSamplers(). 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0a432be..f4e540c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2078,8 +2078,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_hs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d10: Validate SDK version.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 1a86bc9d758c6d0c7c14ad8b152ae8ab4aded38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a86bc9d758c6d0c7c14ad8b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 11:59:23 2017 +0200 d3d10: Validate SDK version. 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/d3d10/d3d10_main.c | 30 ++++++++++++++++++------------ dlls/d3d10/tests/device.c | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index c9d5531..52585f0 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -33,16 +33,22 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver IDXGIFactory *factory; HRESULT hr; - TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p\n", + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %#x, device %p.\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, device); + if (sdk_version != D3D10_SDK_VERSION) + { + WARN("Invalid SDK version %#x.\n", sdk_version); + return E_INVALIDARG; + } + if (adapter) { IDXGIAdapter_AddRef(adapter); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to get dxgi factory, returning %#x\n", hr); + WARN("Failed to get dxgi factory, returning %#x.\n", hr); return hr; } } @@ -51,18 +57,18 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to create dxgi factory, returning %#x\n", hr); + WARN("Failed to create dxgi factory, returning %#x.\n", hr); return hr; } - switch(driver_type) + switch (driver_type) { case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (FAILED(hr)) { - WARN("No adapters found, returning %#x\n", hr); + WARN("No adapters found, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -70,14 +76,14 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } case D3D10_DRIVER_TYPE_NULL: - FIXME("NULL device not implemented, falling back to refrast\n"); + FIXME("NULL device not implemented, falling back to refrast.\n"); /* fall through, for now */ case D3D10_DRIVER_TYPE_REFERENCE: { HMODULE refrast = LoadLibraryA("d3d10ref.dll"); if (!refrast) { - WARN("Failed to load refrast, returning E_FAIL\n"); + WARN("Failed to load refrast, returning E_FAIL.\n"); IDXGIFactory_Release(factory); return E_FAIL; } @@ -85,7 +91,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x\n", hr); + WARN("Failed to create a software adapter, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -96,14 +102,14 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver { if (!swrast) { - WARN("Software device requested, but NULL swrast passed, returning E_FAIL\n"); + WARN("Software device requested, but NULL swrast passed, returning E_FAIL.\n"); IDXGIFactory_Release(factory); return E_FAIL; } hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x\n", hr); + WARN("Failed to create a software adapter, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -122,11 +128,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, returning %#x\n", hr); + WARN("Failed to create a device, returning %#x.\n", hr); return hr; } - TRACE("Created ID3D10Device %p\n", *device); + TRACE("Created ID3D10Device %p.\n", *device); return hr; } diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index fa8f708..3e2731d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -21,6 +21,28 @@ #include "d3d10.h" #include "wine/test.h" +static void test_create_device(void) +{ + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + { + skip("Failed to create HAL device.\n"); + return; + } + ID3D10Device_Release(device); + + for (i = 0; i < 100; ++i) + { + if (i == D3D10_SDK_VERSION) + continue; + hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + } +} + static void test_stateblock_mask(void) { static const struct @@ -181,5 +203,6 @@ static void test_stateblock_mask(void) START_TEST(device) { + test_create_device(); test_stateblock_mask(); }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHMultiply4() .
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 201090bef8d913e6d6f8828451ea6e9be737e688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201090bef8d913e6d6f882845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 00:03:57 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHMultiply4(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 53 +++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5675476..1e10b1f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3294,23 +3294,29 @@ static void test_D3DXSHMultiply3(void) static void test_D3DXSHMultiply4(void) { + float a[20], b[20], c[20]; unsigned int i; - FLOAT a[20], b[20], c[20]; - /* D3DXSHMultiply4 only modifies the first 16 elements of the array */ - const FLOAT expected[] = - { /* c, a, b */ - 14.182599f, 2.615703f, 12.828601f, 9.820596f, 3.039696f, 4.530442f, - 5.820584f, 12.249846f, 2.194346f, 3.900152f, 5.416609f, 5.601813f, - 0.959982f, 7.037550f, 3.625230f, 0.463601f, 16.0f, 17.0f, 18.0f, 19.0f, - /* c, c, b */ - -211441.265625f, -2529.157715f, -10023.393555f, -441.277191f, -163.994385f, - -526.305115f, 29636.187500f, -3931.830811f, -13577.111328f, -3978.973877f, - -10330.341797f, -13779.787109f, -16685.109375f, -44981.375000f, -73269.742188f, - -95237.335938f, 16.0f, 17.0f, 18.0f, 19.0f, - /* c, c, c */ - 0.236682f, -0.717649f, -0.180500f, -0.077124f, 0.144831f, 0.573286f, - -0.337959f, 0.055694f, -0.442100f, 0.147702f, -0.055157f, 0.084337f, - 0.179877f, 0.009099f, 0.232200f, 0.074142f, 1.6f, 1.7f, 1.8f, 1.9f, }; + BOOL equal; + + /* D3DXSHMultiply4() only modifies the first 16 elements of the array. */ + static const float expected[] = + { + /* c, a, b */ + 1.41825991e+01f, 2.61570334e+00f, 1.28286009e+01f, 9.82059574e+00f, 3.03969646e+00f, 4.53044176e+00f, + 5.82058382e+00f, 1.22498465e+01f, 2.19434643e+00f, 3.90015244e+00f, 5.41660881e+00f, 5.60181284e+00f, + 9.59981740e-01f, 7.03754997e+00f, 3.62523031e+00f, 4.63601470e-01f, 1.60000000e+01f, 1.70000000e+01f, + 1.80000000e+01f, 1.90000000e+01f, + /* c, c, b */ + -2.11441266e+05f, -2.52915771e+03f, -1.00233936e+04f, -4.41277191e+02f, -1.63994385e+02f, -5.26305115e+02f, + 2.96361875e+04f, -3.93183081e+03f, -1.35771113e+04f, -3.97897388e+03f, -1.03303418e+04f, -1.37797871e+04f, + -1.66851094e+04f, -4.49813750e+04f, -7.32697422e+04f, -9.52373359e+04f, 1.60000000e+01f, 1.70000000e+01f, + 1.80000000e+01f, 1.90000000e+01f, + /* c, c, c */ + 2.36682415e-01f, -7.17648506e-01f, -1.80499524e-01f, -7.71235973e-02f, 1.44830629e-01f, 5.73285699e-01f, + -3.37959230e-01f, 5.56938872e-02f, -4.42100227e-01f, 1.47701755e-01f, -5.51566519e-02f, 8.43374059e-02f, + 1.79876596e-01f, 9.09878965e-03f, 2.32199892e-01f, 7.41420984e-02f, 1.60000002e+00f, 1.70000005e+00f, + 1.80000007e+00f, 1.89999998e+00f, + }; for (i = 0; i < 20; i++) { @@ -3321,7 +3327,10 @@ static void test_D3DXSHMultiply4(void) D3DXSHMultiply4(c, a, b); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); + { + equal = compare_float(c[i], expected[i], 16); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); + } for (i = 0; i < 20; i++) { @@ -3331,14 +3340,20 @@ static void test_D3DXSHMultiply4(void) D3DXSHMultiply4(c, c, b); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[20 + i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[20 + i], c[i]); + { + equal = compare_float(c[i], expected[20 + i], 32); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[20 + i], c[i]); + } for (i = 0; i < 20; i++) c[i] = 0.1f * i; D3DXSHMultiply4(c, c, c); for (i = 0; i < 20; i++) - ok(relative_error(c[i], expected[40 + i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[40 + i], c[i]); + { + equal = compare_float(c[i], expected[40 + i], 8); + ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[40 + i], c[i]); + } } static void test_D3DXSHRotate(void)

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHRotate().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: c48dd628c5c159bcff54dd9747e6222a0410b9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48dd628c5c159bcff54dd974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:06:02 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHRotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 96 +++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1e10b1f..0014ee2 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3358,48 +3358,54 @@ static void test_D3DXSHMultiply4(void) static void test_D3DXSHRotate(void) { - D3DXMATRIX m[4]; - FLOAT expected, in[49], out[49], *out_temp, *received_ptr; - static const FLOAT table[]= - { /* Rotation around X-axis Pi/2 */ - 1.01f, -3.01f, 2.01f, 4.01f, -8.01f, -6.01f, - -11.307890f, 5.01f, -1.565839f, 1.093598f, -11.01f, 19.833414f, - -15.268191f, -19.004118f, -3.364889f, -9.562627f, 12.099654f, -0.272131f, - 30.241013f, 26.919991f, 39.236877f, -22.632446f, 6.707388f, -11.768282f, - 3.443672f, -6.07445f, 11.61839f, 1.527561f, 37.89633f, -56.9012f, - 47.42289f, 50.39153f, 10.61819f, 25.50101f, 0.049241f, 16.98330f, - - 1.01f, -3.01f, -3.01f, 4.01f, -8.01f, -6.01f, -11.307889f, -8.01f, 14.297919f, - /* Rotation around X-axis -Pi/2 */ - 1.01f, 3.01f, -2.01f, 4.01f, 8.01f, -6.01f, - -11.307890f, -5.01f, -1.565839f, -1.093598f, -11.01f, -19.833414f, - 15.268191f, -19.004118f, 3.364889f, -9.562627f, -12.099654f, -0.272131f, - -30.241013f, 26.919991f, 39.236877f, 22.632446f, 6.707388f, 11.768282f, - 3.443672f, 6.07445f, 11.61839f, -1.527561f, 37.89633f, 56.9012f, - -47.42289f, 50.39153f, -10.61819f, 25.50101f, -0.049248f, 16.98330f, - - 1.01f, 3.01f, -3.01f, 4.01f, 8.01f, -6.01f, -11.307890f, -8.01f, 14.297919f, - /* Yaw Pi/3, Pitch Pi/4, Roll Pi/5 */ - 1.01f, 4.944899f, 1.442301f, 1.627281f, 0.219220f, 10.540824f, - -9.136903f, 2.763750f, -7.30904f, -5.875721f, 5.303124f, -8.682154f, - -25.683384f, 1.680279f, -18.808388f, 7.653656f, 16.939133f, -17.328018f, - 14.629795f, -54.467102f, -12.231035f, -4.089857f, -9.444222f, 3.056035f, - 0.179257f, -10.041875f, 23.090092f, -23.188709f, 11.727098f, -65.183090f, - 48.671577f, -15.073209f, 38.793171f, -26.039536f, 6.192769f, -17.672247f, - - 1.01f, 4.944899f, -0.891142f, 4.607695f, 0.219218f, 10.773325f, - -8.204769f, 13.563829f, -12.007767f, - /* Rotation around Z-axis Pi/6 */ - 1.01f, 3.745711f, 3.01f, 2.467762f, 10.307889f, 9.209813f, - 7.01f, 3.931864f, 0.166212f, 16.01f, 18.504042f, 17.405966f, - 13.01f, 6.128016f, -2.029941f, -10.01f, 13.154292f, 24.01f, - 29.432245f, 28.334167f, 21.01f, 9.056221f, -4.958143f, -18.01f, - -27.236094f, -4.520332f, 16.814543f, 34.01f, 43.092495f, 41.994423f, - 31.01f, 12.716471f, -8.618400f, -28.01f, -40.896347f, -44.190571, - - 1.01f, 3.745711f, 3.01f, 1.599906f, 10.307889f, 9.209813f, - 7.01f, 2.331957f, -4.421894f, }; + float expected, in[49], out[49], *out_temp, *received_ptr; unsigned int i, j, l, order; + D3DXMATRIX m[4]; + BOOL equal; + + static const float table[]= + { + /* Rotation around the x-axis, π/2. */ + 1.00999999e+00f, -3.00999999e+00f, 2.00999975e+00f, 4.01000023e+00f, -8.01000023e+00f, -6.00999928e+00f, + -1.13078899e+01f, 5.00999975e+00f, -1.56583869e+00f, 1.09359801e+00f, -1.10099983e+01f, 1.98334141e+01f, + -1.52681913e+01f, -1.90041180e+01f, -3.36488891e+00f, -9.56262684e+00f, 1.20996542e+01f, -2.72131383e-01f, + 3.02410126e+01f, 2.69199905e+01f, 3.92368774e+01f, -2.26324463e+01f, 6.70738792e+00f, -1.17682819e+01f, + 3.44367194e+00f, -6.07445812e+00f, 1.16183939e+01f, 1.52756083e+00f, 3.78963356e+01f, -5.69012184e+01f, + 4.74228935e+01f, 5.03915329e+01f, 1.06181908e+01f, 2.55010109e+01f, 4.92456071e-02f, 1.69833069e+01f, + + 1.00999999e+00f, -3.00999999e+00f, -3.01000023e+00f, 4.01000023e+00f, -8.01000023e+00f, -6.00999928e+00f, + -1.13078890e+01f, -8.01000023e+00f, 1.42979193e+01f, + /* Rotation around the x-axis, -π/2. */ + 1.00999999e+00f, 3.00999999e+00f, -2.01000023e+00f, 4.01000023e+00f, 8.01000023e+00f, -6.01000118e+00f, + -1.13078880e+01f, -5.01000071e+00f, -1.56583774e+00f, -1.09359753e+00f, -1.10100021e+01f, -1.98334103e+01f, + 1.52681961e+01f, -1.90041142e+01f, 3.36489248e+00f, -9.56262398e+00f, -1.20996523e+01f, -2.72129118e-01f, + -3.02410049e+01f, 2.69200020e+01f, 3.92368736e+01f, 2.26324520e+01f, 6.70738268e+00f, 1.17682877e+01f, + 3.44367099e+00f, 6.07445717e+00f, 1.16183996e+01f, -1.52756333e+00f, 3.78963509e+01f, 5.69011993e+01f, + -4.74229126e+01f, 5.03915253e+01f, -1.06182041e+01f, 2.55009995e+01f, -4.92481887e-02f, 1.69833050e+01f, + + 1.00999999e+00f, 3.00999999e+00f, -3.01000023e+00f, 4.01000023e+00f, 8.01000023e+00f, -6.01000118e+00f, + -1.13078899e+01f, -8.01000023e+00f, 1.42979193e+01f, + /* Yaw π/3, pitch π/4, roll π/5. */ + 1.00999999e+00f, 4.94489908e+00f, 1.44230127e+00f, 1.62728095e+00f, 2.19220325e-01f, 1.05408239e+01f, + -9.13690281e+00f, 2.76374960e+00f, -7.30904531e+00f, -5.87572050e+00f, 5.30312395e+00f, -8.68215370e+00f, + -2.56833839e+01f, 1.68027866e+00f, -1.88083878e+01f, 7.65365601e+00f, 1.69391327e+01f, -1.73280182e+01f, + 1.46297951e+01f, -5.44671021e+01f, -1.22310352e+01f, -4.08985710e+00f, -9.44422245e+00f, 3.05603528e+00f, + 1.79257303e-01f, -1.00418749e+01f, 2.30900917e+01f, -2.31887093e+01f, 1.17270985e+01f, -6.51830902e+01f, + 4.86715775e+01f, -1.50732088e+01f, 3.87931709e+01f, -2.60395355e+01f, 6.19276857e+00f, -1.76722469e+01f, + + 1.00999999e+00f, 4.94489908e+00f, -8.91142070e-01f, 4.60769463e+00f, 2.19218358e-01f, 1.07733250e+01f, + -8.20476913e+00f, 1.35638294e+01f, -1.20077667e+01f, + /* Rotation around the z-axis, π/6. */ + 1.00999999e+00f, 3.74571109e+00f, 3.00999999e+00f, 2.46776199e+00f, 1.03078890e+01f, 9.20981312e+00f, + 7.01000023e+00f, 3.93186355e+00f, 1.66212186e-01f, 1.60099983e+01f, 1.85040417e+01f, 1.74059658e+01f, + 1.30100002e+01f, 6.12801647e+00f, -2.02994061e+00f, -1.00100012e+01f, 1.31542921e+01f, 2.40099964e+01f, + 2.94322453e+01f, 2.83341675e+01f, 2.10100021e+01f, 9.05622101e+00f, -4.95814323e+00f, -1.80100002e+01f, + -2.72360935e+01f, -4.52033186e+00f, 1.68145428e+01f, 3.40099945e+01f, 4.30924950e+01f, 4.19944229e+01f, + 3.10100002e+01f, 1.27164707e+01f, -8.61839962e+00f, -2.80100021e+01f, -4.08963470e+01f, -4.41905708e+01f, + + 1.00999999e+00f, 3.74571109e+00f, 3.00999999e+00f, 1.59990644e+00f, 1.03078890e+01f, 9.20981312e+00f, + 7.01000023e+00f, 2.33195710e+00f, -4.42189360e+00f, + }; D3DXMatrixRotationX(&m[0], -D3DX_PI / 2.0f); D3DXMatrixRotationX(&m[1], D3DX_PI / 2.0f); @@ -3424,7 +3430,8 @@ static void test_D3DXSHRotate(void) } received_ptr = D3DXSHRotate(out_temp, order, &m[j], in); - ok(received_ptr == out_temp, "Order %u, expected %p, received %p\n", order, out, received_ptr); + ok(received_ptr == out_temp, "Order %u, expected %p, received %p.\n", + order, out, received_ptr); for (i = 0; i < 49; i++) { @@ -3439,8 +3446,9 @@ static void test_D3DXSHRotate(void) expected = table[45 * j + i]; else expected = table[45 * j + 36 +i]; - ok(relative_error(out_temp[i], expected) < admitted_error, - "Order %u index %u, expected %f, received %f\n", order, i, expected, out_temp[i]); + equal = compare_float(out_temp[i], expected, 4096); + ok(equal, "Order %u index %u, expected %.8e, received %.8e.\n", + order, i, expected, out_temp[i]); } } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHRotateZ().
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 10db51d5c26f0a71956989ecff83da90f4d94fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db51d5c26f0a71956989ecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 4 12:06:03 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHRotateZ(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 140 ++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10db51d5c26f0a7195698…

1 0

Daniel Lehman : include: Remove references to SPARC.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 1fdebb77ecb8dcd1d1565457b6f86de36dea39cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdebb77ecb8dcd1d1565457b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 3 23:16:17 2017 -0700 include: Remove references to SPARC. SPARC support removed in 2013. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetsd.h | 6 +----- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index f855352..96ea3f0 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -36,7 +36,7 @@ extern "C" { * 64-bit. */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif @@ -277,10 +277,6 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # define ALLOW_UNALIGNED_ACCESS -#elif defined(__sparc__) -# define WORDS_BIGENDIAN -# define BITFIELDS_BIGENDIAN -# undef ALLOW_UNALIGNED_ACCESS #elif defined(__powerpc__) # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index dde5ea1..8aed64c 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index 1e54fcb..e77b1ca 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif

1 0

Daniel Lehman : dbghelp: Add support for char16_t type.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: b316ac1897f427b16338af157c8d787fbb950137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b316ac1897f427b16338af157… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 3 23:16:40 2017 -0700 dbghelp: Add support for char16_t type. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 4 ++++ include/cvconst.h | 1 + include/wine/mscvpdb.h | 12 +++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f17d91e..5c474d8 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -169,6 +169,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_REAL80] = &symt_new_basic(module, btFloat, "long double", 10)->symt; cv_basic_types[T_RCHAR] = &symt_new_basic(module, btInt, "signed char", 1)->symt; cv_basic_types[T_WCHAR] = &symt_new_basic(module, btWChar, "wchar_t", 2)->symt; + cv_basic_types[T_CHAR16] = &symt_new_basic(module, btChar16,"char16_t", 2)->symt; cv_basic_types[T_INT2] = &symt_new_basic(module, btInt, "INT2", 2)->symt; cv_basic_types[T_UINT2] = &symt_new_basic(module, btUInt, "UINT2", 2)->symt; cv_basic_types[T_INT4] = &symt_new_basic(module, btInt, "INT4", 4)->symt; @@ -195,6 +196,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], 4)->symt; cv_basic_types[T_32PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], 4)->symt; cv_basic_types[T_32PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 4)->symt; + cv_basic_types[T_32PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 4)->symt; cv_basic_types[T_32PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 4)->symt; cv_basic_types[T_32PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 4)->symt; cv_basic_types[T_32PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 4)->symt; @@ -221,6 +223,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_64PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], 8)->symt; cv_basic_types[T_64PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], 8)->symt; cv_basic_types[T_64PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 8)->symt; + cv_basic_types[T_64PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 8)->symt; cv_basic_types[T_64PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 8)->symt; cv_basic_types[T_64PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 8)->symt; cv_basic_types[T_64PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 8)->symt; @@ -247,6 +250,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], sizeof(void*))->symt; cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], sizeof(void*))->symt; cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], sizeof(void*))->symt; + cv_basic_types[T_PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], sizeof(void*))->symt; cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], sizeof(void*))->symt; cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], sizeof(void*))->symt; cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], sizeof(void*))->symt; diff --git a/include/cvconst.h b/include/cvconst.h index 83b529d..5580258 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -78,6 +78,7 @@ enum BasicType btBit = 29, btBSTR = 30, btHresult = 31, + btChar16 = 32 }; /* kind of UDT */ diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 7e06a49..d053b69 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -871,7 +871,7 @@ union codeview_fieldtype #define T_UINT4 0x0075 /* unsigned int */ #define T_INT8 0x0076 /* 64-bit signed int */ #define T_UINT8 0x0077 /* 64-bit unsigned int */ - +#define T_CHAR16 0x007a /* 16-bit unicode char */ /* near pointers to basic types */ #define T_PVOID 0x0103 /* near pointer to void */ @@ -904,7 +904,7 @@ union codeview_fieldtype #define T_PUINT4 0x0175 /* Near pointer to 32-bit unsigned int */ #define T_PINT8 0x0176 /* Near pointer to 64-bit signed int */ #define T_PUINT8 0x0177 /* Near pointer to 64-bit unsigned int */ - +#define T_PCHAR16 0x017a /* Near pointer to 16-bit unicode char */ /* far pointers to basic types */ #define T_PFVOID 0x0203 /* Far pointer to void */ @@ -937,7 +937,7 @@ union codeview_fieldtype #define T_PFUINT4 0x0275 /* Far pointer to 32-bit unsigned int */ #define T_PFINT8 0x0276 /* Far pointer to 64-bit signed int */ #define T_PFUINT8 0x0277 /* Far pointer to 64-bit unsigned int */ - +#define T_PFCHAR16 0x027a /* Far pointer to 16-bit unicode char */ /* huge pointers to basic types */ #define T_PHVOID 0x0303 /* Huge pointer to void */ @@ -970,7 +970,7 @@ union codeview_fieldtype #define T_PHUINT4 0x0375 /* Huge pointer to 32-bit unsigned int */ #define T_PHINT8 0x0376 /* Huge pointer to 64-bit signed int */ #define T_PHUINT8 0x0377 /* Huge pointer to 64-bit unsigned int */ - +#define T_PHCHAR16 0x037a /* Huge pointer to 16-bit unicode char */ /* 32-bit near pointers to basic types */ #define T_32PVOID 0x0403 /* 32-bit near pointer to void */ @@ -1004,7 +1004,7 @@ union codeview_fieldtype #define T_32PUINT4 0x0475 /* 16:32 near pointer to 32-bit unsigned int */ #define T_32PINT8 0x0476 /* 16:32 near pointer to 64-bit signed int */ #define T_32PUINT8 0x0477 /* 16:32 near pointer to 64-bit unsigned int */ - +#define T_32PCHAR16 0x047a /* 16:32 near pointer to 16-bit unicode char */ /* 32-bit far pointers to basic types */ #define T_32PFVOID 0x0503 /* 32-bit far pointer to void */ @@ -1038,6 +1038,7 @@ union codeview_fieldtype #define T_32PFUINT4 0x0575 /* 16:32 far pointer to 32-bit unsigned int */ #define T_32PFINT8 0x0576 /* 16:32 far pointer to 64-bit signed int */ #define T_32PFUINT8 0x0577 /* 16:32 far pointer to 64-bit unsigned int */ +#define T_32PFCHAR16 0x057a /* 16:32 far pointer to 16-bit unicode char */ /* 64-bit near pointers to basic types */ #define T_64PVOID 0x0603 /* 64-bit near pointer to void */ @@ -1071,6 +1072,7 @@ union codeview_fieldtype #define T_64PUINT4 0x0675 /* 64 near pointer to 32-bit unsigned int */ #define T_64PINT8 0x0676 /* 64 near pointer to 64-bit signed int */ #define T_64PUINT8 0x0677 /* 64 near pointer to 64-bit unsigned int */ +#define T_64PCHAR16 0x067a /* 64 near pointer to 16-bit unicode char */ /* counts, bit masks, and shift values needed to access various parts of the built-in type numbers */ #define T_MAXPREDEFINEDTYPE 0x0580 /* maximum type index for all built-in types */

1 0

Daniel Lehman : dbghelp: Add support for char32_t type.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: 8d6cf80026c7bcd2e04ea20c20e82a5730d45ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6cf80026c7bcd2e04ea20c2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 3 23:16:41 2017 -0700 dbghelp: Add support for char32_t type. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 4 ++++ include/cvconst.h | 3 ++- include/wine/mscvpdb.h | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5c474d8..eba2649 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -170,6 +170,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_RCHAR] = &symt_new_basic(module, btInt, "signed char", 1)->symt; cv_basic_types[T_WCHAR] = &symt_new_basic(module, btWChar, "wchar_t", 2)->symt; cv_basic_types[T_CHAR16] = &symt_new_basic(module, btChar16,"char16_t", 2)->symt; + cv_basic_types[T_CHAR32] = &symt_new_basic(module, btChar32,"char32_t", 4)->symt; cv_basic_types[T_INT2] = &symt_new_basic(module, btInt, "INT2", 2)->symt; cv_basic_types[T_UINT2] = &symt_new_basic(module, btUInt, "UINT2", 2)->symt; cv_basic_types[T_INT4] = &symt_new_basic(module, btInt, "INT4", 4)->symt; @@ -197,6 +198,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], 4)->symt; cv_basic_types[T_32PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 4)->symt; cv_basic_types[T_32PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 4)->symt; + cv_basic_types[T_32PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], 4)->symt; cv_basic_types[T_32PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 4)->symt; cv_basic_types[T_32PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 4)->symt; cv_basic_types[T_32PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 4)->symt; @@ -224,6 +226,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_64PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], 8)->symt; cv_basic_types[T_64PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], 8)->symt; cv_basic_types[T_64PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], 8)->symt; + cv_basic_types[T_64PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], 8)->symt; cv_basic_types[T_64PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], 8)->symt; cv_basic_types[T_64PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], 8)->symt; cv_basic_types[T_64PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], 8)->symt; @@ -251,6 +254,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], sizeof(void*))->symt; cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], sizeof(void*))->symt; cv_basic_types[T_PCHAR16] = &symt_new_pointer(module, cv_basic_types[T_CHAR16], sizeof(void*))->symt; + cv_basic_types[T_PCHAR32] = &symt_new_pointer(module, cv_basic_types[T_CHAR32], sizeof(void*))->symt; cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], sizeof(void*))->symt; cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], sizeof(void*))->symt; cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], sizeof(void*))->symt; diff --git a/include/cvconst.h b/include/cvconst.h index 5580258..80b8e44 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -78,7 +78,8 @@ enum BasicType btBit = 29, btBSTR = 30, btHresult = 31, - btChar16 = 32 + btChar16 = 32, + btChar32 = 33 }; /* kind of UDT */ diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index d053b69..2f0b479 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -872,6 +872,7 @@ union codeview_fieldtype #define T_INT8 0x0076 /* 64-bit signed int */ #define T_UINT8 0x0077 /* 64-bit unsigned int */ #define T_CHAR16 0x007a /* 16-bit unicode char */ +#define T_CHAR32 0x007b /* 32-bit unicode char */ /* near pointers to basic types */ #define T_PVOID 0x0103 /* near pointer to void */ @@ -905,6 +906,7 @@ union codeview_fieldtype #define T_PINT8 0x0176 /* Near pointer to 64-bit signed int */ #define T_PUINT8 0x0177 /* Near pointer to 64-bit unsigned int */ #define T_PCHAR16 0x017a /* Near pointer to 16-bit unicode char */ +#define T_PCHAR32 0x017b /* Near pointer to 32-bit unicode char */ /* far pointers to basic types */ #define T_PFVOID 0x0203 /* Far pointer to void */ @@ -938,6 +940,7 @@ union codeview_fieldtype #define T_PFINT8 0x0276 /* Far pointer to 64-bit signed int */ #define T_PFUINT8 0x0277 /* Far pointer to 64-bit unsigned int */ #define T_PFCHAR16 0x027a /* Far pointer to 16-bit unicode char */ +#define T_PFCHAR32 0x027b /* Far pointer to 32-bit unicode char */ /* huge pointers to basic types */ #define T_PHVOID 0x0303 /* Huge pointer to void */ @@ -971,6 +974,7 @@ union codeview_fieldtype #define T_PHINT8 0x0376 /* Huge pointer to 64-bit signed int */ #define T_PHUINT8 0x0377 /* Huge pointer to 64-bit unsigned int */ #define T_PHCHAR16 0x037a /* Huge pointer to 16-bit unicode char */ +#define T_PHCHAR32 0x037b /* Huge pointer to 32-bit unicode char */ /* 32-bit near pointers to basic types */ #define T_32PVOID 0x0403 /* 32-bit near pointer to void */ @@ -1005,6 +1009,7 @@ union codeview_fieldtype #define T_32PINT8 0x0476 /* 16:32 near pointer to 64-bit signed int */ #define T_32PUINT8 0x0477 /* 16:32 near pointer to 64-bit unsigned int */ #define T_32PCHAR16 0x047a /* 16:32 near pointer to 16-bit unicode char */ +#define T_32PCHAR32 0x047b /* 16:32 near pointer to 32-bit unicode char */ /* 32-bit far pointers to basic types */ #define T_32PFVOID 0x0503 /* 32-bit far pointer to void */ @@ -1039,6 +1044,7 @@ union codeview_fieldtype #define T_32PFINT8 0x0576 /* 16:32 far pointer to 64-bit signed int */ #define T_32PFUINT8 0x0577 /* 16:32 far pointer to 64-bit unsigned int */ #define T_32PFCHAR16 0x057a /* 16:32 far pointer to 16-bit unicode char */ +#define T_32PFCHAR32 0x057b /* 16:32 far pointer to 32-bit unicode char */ /* 64-bit near pointers to basic types */ #define T_64PVOID 0x0603 /* 64-bit near pointer to void */ @@ -1073,6 +1079,7 @@ union codeview_fieldtype #define T_64PINT8 0x0676 /* 64 near pointer to 64-bit signed int */ #define T_64PUINT8 0x0677 /* 64 near pointer to 64-bit unsigned int */ #define T_64PCHAR16 0x067a /* 64 near pointer to 16-bit unicode char */ +#define T_64PCHAR32 0x067b /* 64 near pointer to 32-bit unicode char */ /* counts, bit masks, and shift values needed to access various parts of the built-in type numbers */ #define T_MAXPREDEFINEDTYPE 0x0580 /* maximum type index for all built-in types */

1 0

Owen Rudge : wsdapi: Implement WSD LinkedMemory functions.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: e8f37c7a5084d570b0e21ec4afa7e6d4f32d05c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f37c7a5084d570b0e21ec4a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:22 2017 +0100 wsdapi: Implement WSD LinkedMemory functions. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 3 +- dlls/wsdapi/memory.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/tests/Makefile.in | 3 +- dlls/wsdapi/tests/memory.c | 74 +++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 8 +- include/Makefile.in | 1 + include/wsdapi.h | 1 + include/wsdutil.h | 27 +++++++ 8 files changed, 277 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 56912ee..7d63fe2 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -4,4 +4,5 @@ IMPORTS = kernel32 C_SRCS = \ discovery.c \ - main.c + main.c \ + memory.c diff --git a/dlls/wsdapi/memory.c b/dlls/wsdapi/memory.c new file mode 100644 index 0000000..89a6d2d --- /dev/null +++ b/dlls/wsdapi/memory.c @@ -0,0 +1,166 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +#define MEMORY_ALLOCATION_MAGIC 0xB10C5EED + +#define ALIGNMENT (2 * sizeof(void*)) +#define ROUND_TO_ALIGNMENT(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT - 1)) +#define MEMORY_ALLOCATION_SIZE ROUND_TO_ALIGNMENT(sizeof(struct memory_allocation)) + +struct memory_allocation +{ + int magic; + struct list entry; + + struct list children; +}; + +static struct memory_allocation *find_allocation(void *ptr) +{ + struct memory_allocation *allocation; + + if (ptr == NULL) + { + return NULL; + } + + allocation = (struct memory_allocation *)((char *)ptr - MEMORY_ALLOCATION_SIZE); + + if (allocation->magic != MEMORY_ALLOCATION_MAGIC) + { + return NULL; + } + + return allocation; +} + +static void free_allocation(struct memory_allocation *item) +{ + struct memory_allocation *child, *cursor; + + LIST_FOR_EACH_ENTRY_SAFE(child, cursor, &item->children, struct memory_allocation, entry) + { + free_allocation(child); + } + + list_remove(&item->entry); + item->magic = 0; + HeapFree(GetProcessHeap(), 0, item); +} + +void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize) +{ + struct memory_allocation *allocation, *parent; + void *ptr; + + TRACE("(%p, %lu)\n", pParent, cbSize); + + ptr = HeapAlloc(GetProcessHeap(), 0, MEMORY_ALLOCATION_SIZE + cbSize); + + if (ptr == NULL) + { + return NULL; + } + + allocation = ptr; + allocation->magic = MEMORY_ALLOCATION_MAGIC; + + list_init(&allocation->children); + + /* See if we have a parent */ + parent = find_allocation(pParent); + + if (parent != NULL) + { + list_add_tail(&parent->children, &allocation->entry); + } + else + { + list_init(&allocation->entry); + } + + return (char *)ptr + MEMORY_ALLOCATION_SIZE; +} + +void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild) +{ + struct memory_allocation *parent, *child; + + TRACE("(%p, %p)\n", pParent, pChild); + + child = find_allocation(pChild); + parent = find_allocation(pParent); + + TRACE("child: %p, parent: %p\n", child, parent); + + if ((child == NULL) || (parent == NULL)) + { + return; + } + + list_remove(&child->entry); + list_add_tail(&parent->children, &child->entry); +} + +void WINAPI WSDDetachLinkedMemory(void *pVoid) +{ + struct memory_allocation *allocation; + + TRACE("(%p)\n", pVoid); + + allocation = find_allocation(pVoid); + + if (allocation == NULL) + { + TRACE("Memory allocation not found\n"); + return; + } + + list_remove(&allocation->entry); +} + +void WINAPI WSDFreeLinkedMemory(void *pVoid) +{ + struct memory_allocation *allocation; + + TRACE("(%p)\n", pVoid); + + allocation = find_allocation(pVoid); + + if (allocation == NULL) + { + TRACE("Memory allocation not found\n"); + return; + } + + free_allocation(allocation); +} diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index c351d10..2b20c63 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 user32 C_SRCS = \ - discovery.c + discovery.c \ + memory.c diff --git a/dlls/wsdapi/tests/memory.c b/dlls/wsdapi/tests/memory.c new file mode 100644 index 0000000..9fb1a25 --- /dev/null +++ b/dlls/wsdapi/tests/memory.c @@ -0,0 +1,74 @@ +/* + * Web Services on Devices + * Memory tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "wsdapi.h" + +#define ALIGNMENT (2 * sizeof(void*)) +#define NUM_ITERATIONS 100 + +static void AllocateLinkedMemory_tests(void) +{ + void *alloc1; + void *alloc2; + void *alloc_ptrs[NUM_ITERATIONS]; + int i; + + /* Test a parentless allocation */ + alloc1 = WSDAllocateLinkedMemory(NULL, 1024); + ok(alloc1 != NULL, "WSDAllocateLinkedMemory with null parent failed\n"); + + WSDFreeLinkedMemory(alloc1); + + /* Test a parented allocation */ + alloc1 = WSDAllocateLinkedMemory(NULL, 1024); + ok(alloc1 != NULL, "WSDAllocateLinkedMemory with null parent failed\n"); + + alloc2 = WSDAllocateLinkedMemory(alloc1, 1024); + ok(alloc2 != NULL, "WSDAllocateLinkedMemory with parent failed\n"); + + WSDFreeLinkedMemory(alloc1); + + /* Try allocating against the freed parent */ + alloc2 = WSDAllocateLinkedMemory(alloc1, 1024); + ok(alloc2 != NULL, "WSDAllocateLinkedMemory with parent failed\n"); + + /* Test that the returned pointers are aligned as expected */ + for (i = 0; i < NUM_ITERATIONS; i++) + { + alloc_ptrs[i] = WSDAllocateLinkedMemory(NULL, i); + ok(((UINT_PTR)alloc_ptrs[i] % ALIGNMENT) == 0, "WSDAllocateLinkedMemory returned pointer not aligned (size = %d).\n", i); + } + + for (i = 0; i < NUM_ITERATIONS; i++) + { + WSDFreeLinkedMemory(alloc_ptrs[i]); + } +} + +START_TEST(memory) +{ + AllocateLinkedMemory_tests(); +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 3e1d2b6..7145f7d 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -4,8 +4,8 @@ @ stub WSDNotifyNetworkChange @ stub WSDRemoveFirewallCheck @ stub WSDXMLCompareNames -@ stub WSDAllocateLinkedMemory -@ stub WSDAttachLinkedMemory +@ stdcall WSDAllocateLinkedMemory(ptr long) +@ stdcall WSDAttachLinkedMemory(ptr ptr) @ stub WSDCompareEndpoints @ stub WSDCopyEndpoint @ stub WSDCreateDeviceHost2 @@ -26,8 +26,8 @@ @ stub WSDCreateUdpAddress @ stub WSDCreateUdpMessageParameters @ stub WSDCreateUdpTransport -@ stub WSDDetachLinkedMemory -@ stub WSDFreeLinkedMemory +@ stdcall WSDDetachLinkedMemory(ptr) +@ stdcall WSDFreeLinkedMemory(ptr) @ stub WSDGenerateFault @ stub WSDGenerateFaultEx @ stub WSDGenerateRandomDelay diff --git a/include/Makefile.in b/include/Makefile.in index 6f53728..497c76f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -693,6 +693,7 @@ HEADER_SRCS = \ ws2tcpip.h \ wsdapi.h \ wsdtypes.h \ + wsdutil.h \ wsdxmldom.h \ wshisotp.h \ wsipx.h \ diff --git a/include/wsdapi.h b/include/wsdapi.h index dec0954..d71721e 100644 --- a/include/wsdapi.h +++ b/include/wsdapi.h @@ -24,5 +24,6 @@ #include <wsdxmldom.h> #include <wsdtypes.h> #include <wsddisco.h> +#include <wsdutil.h> #endif diff --git a/include/wsdutil.h b/include/wsdutil.h new file mode 100644 index 0000000..8a89eb1 --- /dev/null +++ b/include/wsdutil.h @@ -0,0 +1,27 @@ +/* + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef WSDUTIL_H +#define WSDUTIL_H + +void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize); +void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); +void WINAPI WSDDetachLinkedMemory(void *pVoid); +void WINAPI WSDFreeLinkedMemory(void *pVoid); + +#endif

1 0

Piotr Caban : msvcr100: Add _invalid_parameter_noinfo_noreturn implementation.
by Alexandre Julliard 04 May '17

04 May '17

Module: wine Branch: master Commit: e76ea27ef681cd88996fa7b760875f1197f0d7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76ea27ef681cd88996fa7b76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 4 14:36:33 2017 +0200 msvcr100: Add _invalid_parameter_noinfo_noreturn implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/errno.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 57c5ecf..e9382cd 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -57,7 +57,7 @@ @ cdecl _initterm(ptr ptr) ucrtbase._initterm @ cdecl _initterm_e(ptr ptr) ucrtbase._initterm_e @ cdecl _invalid_parameter_noinfo() ucrtbase._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() ucrtbase._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type @ cdecl _register_onexit_function(ptr ptr) ucrtbase._register_onexit_function diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 99bffe0..2f5bc4b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -939,7 +939,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cb7a043..7bd7f75 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c2477e2..0c7e84d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 443eac8..520ef22 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1188,7 +1188,7 @@ @ cdecl _initterm_e(ptr ptr) msvcr120._initterm_e @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcr120._invalid_parameter @ cdecl _invalid_parameter_noinfo() msvcr120._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() msvcr120._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ extern _iob msvcr120._iob @ cdecl _isalnum_l(long ptr) msvcr120._isalnum_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 893ed7b..45bc194 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -487,6 +487,15 @@ void CDECL _invalid_parameter_noinfo(void) } /********************************************************************* + * _invalid_parameter_noinfo_noreturn (MSVCR100.@) + */ +void CDECL _invalid_parameter_noinfo_noreturn(void) +{ + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT__exit( STATUS_INVALID_CRUNTIME_PARAMETER ); +} + +/********************************************************************* * _get_invalid_parameter_handler (MSVCR80.@) */ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dbc418c..78ae7d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -424,7 +424,7 @@ @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ stub _is_exception_typeof @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l

1 0