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

Nikolay Sivov : dwrite/tests: Remove unnecessary font face creation.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: badccd8c7c637a75b2c7d0fd974c8ea7761a79c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badccd8c7c637a75b2c7d0fd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 13:47:18 2016 +0300 dwrite/tests: Remove unnecessary font face creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3067ea2..7f9be00 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6303,7 +6303,6 @@ static void test_GetFontSignature(void) for (i = 0; i < count; i++) { FONTSIGNATURE expected_signature; IDWriteLocalizedStrings *names; - IDWriteFontFace *fontface; IDWriteFontFamily *family; IDWriteFont *font; WCHAR nameW[256]; @@ -6315,9 +6314,6 @@ static void test_GetFontSignature(void) DWRITE_FONT_STYLE_NORMAL, &font); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFamily_GetFamilyNames(family, &names); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -6345,7 +6341,6 @@ static void test_GetFontSignature(void) fontsig.fsCsb[1], expected_signature.fsCsb[1]); IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); }

1 0

Józef Kucia : d3d8/tests: Prefer higher resolutions in test_reset().
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 4bc4e431c852ce3589b6f8c262b92e5f6ab22348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc4e431c852ce3589b6f8c26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:34:19 2016 +0200 d3d8/tests: Prefer higher resolutions in test_reset(). 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/tests/device.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2f9c267..530ef00 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -22,6 +22,7 @@ */ #define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ +#include <stdlib.h> #define COBJMACROS #include <initguid.h> #include <d3d8.h> @@ -1269,6 +1270,21 @@ static void test_display_modes(void) IDirect3D8_Release(d3d); } +struct mode +{ + unsigned int w; + unsigned int h; +}; + +static int compare_mode(const void *a, const void *b) +{ + const struct mode *mode_a = a; + const struct mode *mode_b = b; + unsigned int w = mode_a->w - mode_b->w; + unsigned int h = mode_b->h - mode_b->h; + return abs(w) >= abs(h) ? -w : -h; +} + static void test_reset(void) { UINT width, orig_width = GetSystemMetrics(SM_CXSCREEN); @@ -1303,11 +1319,7 @@ static void test_reset(void) D3DVSD_END(), }; - struct - { - UINT w; - UINT h; - } *modes = NULL; + struct mode *modes = NULL; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); @@ -1358,6 +1370,9 @@ static void test_reset(void) goto cleanup; } + /* Prefer higher resolutions. */ + qsort(modes, mode_count, sizeof(*modes), compare_mode); + i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i;

1 0

Piotr Caban : ntdll: Don' t incorrectly overwrite orig_context in call_stack_handlers.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 67f2a1eaf94435735cbfc7ab31656d5c7c96a93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f2a1eaf94435735cbfc7ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 11:24:09 2016 +0200 ntdll: Don't incorrectly overwrite orig_context in call_stack_handlers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6d3aedb..f33fe4c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2400,7 +2400,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: break; @@ -2431,7 +2430,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex { case ExceptionContinueExecution: if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: break;

1 0

Józef Kucia : wined3d: Optionally use closest matching mode in wined3d_swapchain_resize_target() .
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: bd10362667f04d6ea82144d1871ce143549a6bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd10362667f04d6ea82144d18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:56 2016 +0200 wined3d: Optionally use closest matching mode in wined3d_swapchain_resize_target(). 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/dxgi/tests/device.c | 5 ++-- dlls/wined3d/swapchain.c | 60 ++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 41a4d85..d9cedff 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -2215,10 +2215,9 @@ static void test_inexact_modes(void) swapchain_desc.BufferDesc.Width = sizes[i].width; swapchain_desc.BufferDesc.Height = sizes[i].height; hr = IDXGISwapChain_ResizeTarget(swapchain, &swapchain_desc.BufferDesc); - todo_wine ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - check_swapchain_fullscreen_state(swapchain, &expected_state); + check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fdfe337..695d409 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1397,20 +1397,44 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha return WINED3D_OK; } +static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swapchain, + struct wined3d_display_mode *mode) +{ + struct wined3d_device *device = swapchain->device; + HRESULT hr; + + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) + { + if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, + device->adapter->ordinal, mode))) + { + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + } + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + + return WINED3D_OK; +} + HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { struct wined3d_device *device = swapchain->device; - struct wined3d_display_mode current_mode; + struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); - SetRect(&window_rect, 0, 0, mode->width, mode->height); - if (swapchain->desc.windowed) { + SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); @@ -1421,22 +1445,21 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + return hr; + SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else { if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &current_mode, NULL))) + &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - SetRect(&window_rect, 0, 0, current_mode.width, current_mode.height); + SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, @@ -1477,21 +1500,8 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha } } - if (swapchain->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE) - { - if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(device->wined3d, - device->adapter->ordinal, &actual_mode))) - { - WARN("Failed to find closest matching mode, hr %#x.\n", hr); - } - } - - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, - device->adapter->ordinal, &actual_mode))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + return hr; } else {

1 0

Hans Leidekker : webservices/tests: Add a test for WsWriteText.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 1687e1bfb820db4bc37a1be97fbc2d1e7bfab0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1687e1bfb820db4bc37a1be97… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 25 20:02:50 2016 +0200 webservices/tests: Add a test for WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d2573e3..d9c3fb1 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2195,6 +2195,27 @@ static void test_field_flags(void) WsFreeWriter( writer ); } +static void test_WsWriteText(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_UTF8_TEXT utf8; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)"test"; + utf8.value.length = 4; + hr = WsWriteText( writer, &utf8.text, NULL ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -2222,4 +2243,5 @@ START_TEST(writer) test_text_types(); test_double(); test_field_flags(); + test_WsWriteText(); }

1 0

Nikolay Sivov : oleaut32: Added PSTypeComp to DllGetClassObject.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 9d1876f4621f50f803d5ef629710bf4f64cfdd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1876f4621f50f803d5ef629… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 20:57:17 2016 +0300 oleaut32: Added PSTypeComp to DllGetClassObject. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 742e63f..f9734e6 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -871,7 +871,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return S_OK; /*FALLTHROUGH*/ } - if (IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || + if (IsEqualCLSID(rclsid, &CLSID_PSTypeComp) || + IsEqualCLSID(rclsid, &CLSID_PSTypeInfo) || IsEqualCLSID(rclsid, &CLSID_PSTypeLib) || IsEqualCLSID(rclsid, &CLSID_PSDispatch) || IsEqualCLSID(rclsid, &CLSID_PSEnumVariant))

1 0

Józef Kucia : dxgi/tests: Add test for IDXGIOutput_FindClosestMatchingMode().
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 09a4957401d49dfaf56cbb153c41b86466eeb8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a4957401d49dfaf56cbb153… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 25 12:22:53 2016 +0200 dxgi/tests: Add test for IDXGIOutput_FindClosestMatchingMode(). 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/dxgi/tests/device.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09a4957401d49dfaf56cb…

1 0

Bruno Jesus : dinput: Fix saturation range on condition effects.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 7027e9b268e30b64ee9fe336dca19a1b1e1794bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7027e9b268e30b64ee9fe336d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 25 17:39:03 2016 -0300 dinput: Fix saturation range on condition effects. Based on ideas by Elias Vanderstuyft. The saturation is unsigned short, so the limit is 0xffff, not 0x7fff. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 82e5bb5..1015105 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -680,8 +680,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( cond[i].center = (int)(factor[i] * (tsp[j].lOffset / 10) * 32); cond[i].right_coeff = (int)(factor[i] * (tsp[j].lPositiveCoefficient / 10) * 32); cond[i].left_coeff = (int)(factor[i] * (tsp[j].lNegativeCoefficient / 10) * 32); - cond[i].right_saturation = (int)(factor[i] * (tsp[j].dwPositiveSaturation / 10) * 32); - cond[i].left_saturation = (int)(factor[i] * (tsp[j].dwNegativeSaturation / 10) * 32); + cond[i].right_saturation = (int)(factor[i] * (tsp[j].dwPositiveSaturation / 10) * 65); + cond[i].left_saturation = (int)(factor[i] * (tsp[j].dwNegativeSaturation / 10) * 65); cond[i].deadband = (int)(factor[i] * (tsp[j].lDeadBand / 10) * 32); if (sources == 2) j++;

1 0

Bruno Jesus : dinput: Simplify condition effect translation.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 4712c65f5bf4cb93569318bf8f185b02aaa8173f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4712c65f5bf4cb93569318bf8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 25 17:39:02 2016 -0300 dinput: Simplify condition effect translation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 78 ++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index e2e75c7..82e5bb5 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -649,43 +649,49 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( tsp = peff->lpvTypeSpecificParams; This->effect.u.ramp.start_level = (tsp->lStart / 10) * 32; This->effect.u.ramp.end_level = (tsp->lEnd / 10) * 32; - } else if (type == DIEFT_CONDITION) { - LPCDICONDITION tsp = peff->lpvTypeSpecificParams; - if (peff->cbTypeSpecificParams == sizeof(DICONDITION)) { - /* One condition block. This needs to be rotated to direction, - * and expanded to separate x and y conditions. */ - int i; - double factor[2], angle; - /* rotate so 0 points right */ - angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); - factor[0] = sin(angle); - factor[1] = -cos(angle); - for (i = 0; i < 2; ++i) { - This->effect.u.condition[i].center = (int)(factor[i] * (tsp->lOffset / 10) * 32); - This->effect.u.condition[i].right_coeff = (int)(factor[i] * (tsp->lPositiveCoefficient / 10) * 32); - This->effect.u.condition[i].left_coeff = (int)(factor[i] * (tsp->lNegativeCoefficient / 10) * 32); - This->effect.u.condition[i].right_saturation = (int)(factor[i] * (tsp->dwPositiveSaturation / 10) * 32); - This->effect.u.condition[i].left_saturation = (int)(factor[i] * (tsp->dwNegativeSaturation / 10) * 32); - This->effect.u.condition[i].deadband = (int)(factor[i] * (tsp->lDeadBand / 10) * 32); - } - } else if (peff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { - /* Two condition blocks. Direct parameter copy. */ - int i; - for (i = 0; i < 2; ++i) { - This->effect.u.condition[i].center = (tsp[i].lOffset / 10) * 32; - This->effect.u.condition[i].right_coeff = (tsp[i].lPositiveCoefficient / 10) * 32; - This->effect.u.condition[i].left_coeff = (tsp[i].lNegativeCoefficient / 10) * 32; - This->effect.u.condition[i].right_saturation = (tsp[i].dwPositiveSaturation / 10) * 32; - This->effect.u.condition[i].left_saturation = (tsp[i].dwNegativeSaturation / 10) * 32; - This->effect.u.condition[i].deadband = (tsp[i].lDeadBand / 10) * 32; - } - } else { + } + else if (type == DIEFT_CONDITION) + { + DICONDITION *tsp = peff->lpvTypeSpecificParams; + struct ff_condition_effect *cond = This->effect.u.condition; + int i, j, sources; + double factor[2]; + + if (peff->cbTypeSpecificParams == sizeof(DICONDITION)) + { + /* One condition block. This needs to be rotated to direction, + * and expanded to separate x and y conditions. Ensures 0 points right */ + double angle = ff_effect_direction_to_rad(This->effect.direction + 0xc000); + factor[0] = sin(angle); + factor[1] = -cos(angle); + sources = 1; + } + else if (peff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) + { + /* Direct parameter copy without changes */ + factor[0] = factor[1] = 1; + sources = 2; + } + else return DIERR_INVALIDPARAM; - } - } else { - FIXME("Custom force types are not supported\n"); - return DIERR_INVALIDPARAM; - } + + for (i = j = 0; i < 2; ++i) + { + cond[i].center = (int)(factor[i] * (tsp[j].lOffset / 10) * 32); + cond[i].right_coeff = (int)(factor[i] * (tsp[j].lPositiveCoefficient / 10) * 32); + cond[i].left_coeff = (int)(factor[i] * (tsp[j].lNegativeCoefficient / 10) * 32); + cond[i].right_saturation = (int)(factor[i] * (tsp[j].dwPositiveSaturation / 10) * 32); + cond[i].left_saturation = (int)(factor[i] * (tsp[j].dwNegativeSaturation / 10) * 32); + cond[i].deadband = (int)(factor[i] * (tsp[j].lDeadBand / 10) * 32); + if (sources == 2) + j++; + } + } + else + { + FIXME("Custom force types are not supported\n"); + return DIERR_INVALIDPARAM; + } } if (!(dwFlags & DIEP_NODOWNLOAD))

1 0

Nikolay Sivov : mscoree: Return pointer to interface, not implementation.
by Alexandre Julliard Aug. 26, 2016

Aug. 26, 2016

Module: wine Branch: master Commit: 086a230629ce4cbd4f520f161b42c2734aec8071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a230629ce4cbd4f520f161… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 22:04:26 2016 +0300 mscoree: Return pointer to interface, not implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/cordebug.c | 4 ++-- dlls/mscoree/metadata.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 1a62e14..22424c6 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -434,7 +434,7 @@ static HRESULT CorDebugProcess_Create(CorDebug *cordebug, IUnknown** ppUnk, LPPR if(This->cordebug) ICorDebug_AddRef(&This->cordebug->ICorDebug_iface); - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->ICorDebugProcess_iface; return S_OK; } @@ -780,7 +780,7 @@ HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) if(This->runtimehost) ICLRRuntimeHost_AddRef(This->runtimehost); - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->ICorDebug_iface; return S_OK; } diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 9ca0d93..457f756 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -199,7 +199,7 @@ HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) This->IMetaDataDispenserEx_iface.lpVtbl = &MetaDataDispenserVtbl; This->ref = 1; - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->IMetaDataDispenserEx_iface; return S_OK; }

1 0