October 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d10_device_CreateBlendState1().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8c6faa29a534d9b15a6653128ca9e073a9777681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6faa29a534d9b15a6653128… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:43 2015 +0200 d3d11: Implement d3d10_device_CreateBlendState1(). 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 | 62 +++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e0f5f4d..e031e24 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3566,47 +3566,57 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, - const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, + const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); ID3D11BlendState *d3d11_blend_state; - D3D11_BLEND_DESC d3d11_desc; - unsigned int i; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc, + &d3d11_blend_state))) + return hr; + + hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state); + ID3D11BlendState_Release(d3d11_blend_state); + return hr; +} + +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, + const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) +{ + D3D10_BLEND_DESC1 d3d10_1_desc; + unsigned int i; + + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (!desc) return E_INVALIDARG; - d3d11_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; - d3d11_desc.IndependentBlendEnable = FALSE; + d3d10_1_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + d3d10_1_desc.IndependentBlendEnable = FALSE; for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) { if (desc->BlendEnable[i] != desc->BlendEnable[i + 1] || desc->RenderTargetWriteMask[i] != desc->RenderTargetWriteMask[i + 1]) - d3d11_desc.IndependentBlendEnable = TRUE; + d3d10_1_desc.IndependentBlendEnable = TRUE; } - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { - d3d11_desc.RenderTarget[i].BlendEnable = desc->BlendEnable[i]; - d3d11_desc.RenderTarget[i].SrcBlend = desc->SrcBlend; - d3d11_desc.RenderTarget[i].DestBlend = desc->DestBlend; - d3d11_desc.RenderTarget[i].BlendOp = desc->BlendOp; - d3d11_desc.RenderTarget[i].SrcBlendAlpha = desc->SrcBlendAlpha; - d3d11_desc.RenderTarget[i].DestBlendAlpha = desc->DestBlendAlpha; - d3d11_desc.RenderTarget[i].BlendOpAlpha = desc->BlendOpAlpha; - d3d11_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTargetWriteMask[i]; + d3d10_1_desc.RenderTarget[i].BlendEnable = desc->BlendEnable[i]; + d3d10_1_desc.RenderTarget[i].SrcBlend = desc->SrcBlend; + d3d10_1_desc.RenderTarget[i].DestBlend = desc->DestBlend; + d3d10_1_desc.RenderTarget[i].BlendOp = desc->BlendOp; + d3d10_1_desc.RenderTarget[i].SrcBlendAlpha = desc->SrcBlendAlpha; + d3d10_1_desc.RenderTarget[i].DestBlendAlpha = desc->DestBlendAlpha; + d3d10_1_desc.RenderTarget[i].BlendOpAlpha = desc->BlendOpAlpha; + d3d10_1_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTargetWriteMask[i]; } - if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, &d3d11_desc, &d3d11_blend_state))) - return hr; - - hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState, (void **)blend_state); - ID3D11BlendState_Release(d3d11_blend_state); - return hr; + return d3d10_device_CreateBlendState1(iface, &d3d10_1_desc, (ID3D10BlendState1 **)blend_state); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device1 *iface, @@ -3793,14 +3803,6 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, - const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) -{ - FIXME("iface %p, desc %p, blend_state %p stub!\n", iface, desc, blend_state); - - return E_NOTIMPL; -} - static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { FIXME("iface %p stub!\n", iface);

1 0

Józef Kucia : d3d10core/tests: Check that blend states implement ID3D10BlendState1.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: dcdef7effcb664e4e869a5836e5959bcbdb22c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdef7effcb664e4e869a5836… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:44 2015 +0200 d3d10core/tests: Check that blend states implement ID3D10BlendState1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index dadf113..de9eee1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1435,6 +1435,7 @@ static void test_create_blend_state(void) D3D10_BLEND_DESC blend_desc; ID3D11Device *d3d11_device; ID3D10Device *device, *tmp; + IUnknown *iface; unsigned int i; HRESULT hr; @@ -1476,6 +1477,11 @@ static void test_create_blend_state(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d11_device); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Device should implement ID3D11Device.\n");

1 0

Józef Kucia : d3d11/tests: Check that blend states implement ID3D10BlendState.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 5323dd88364cd11281dee304a776a3d3a74688b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5323dd88364cd11281dee304a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:45 2015 +0200 d3d11/tests: Check that blend states implement ID3D10BlendState. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a9d12d..bd9ad64 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1874,6 +1874,7 @@ static void test_create_blend_state(void) ULONG refcount, expected_refcount; ID3D11Device *device, *tmp; unsigned int i, j; + IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -1946,6 +1947,15 @@ static void test_create_blend_state(void) obtained_desc.RenderTarget[0].RenderTargetWriteMask, i); } + hr = ID3D11BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + refcount = ID3D11BlendState_Release(blend_state1); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11BlendState_Release(blend_state2);

1 0

Józef Kucia : d3d10_1/tests: Port test_create_blend_state() from d3d11.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: fe0b2e131a6d796d5fb4be0886b8680f22f8932a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0b2e131a6d796d5fb4be088… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:46 2015 +0200 d3d10_1/tests: Port test_create_blend_state() from d3d11. 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_1/tests/d3d10_1.c | 231 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe0b2e131a6d796d5fb4b…

1 0

Michael Stefaniuc : gdiplus/tests: Test the return of GdipImageSelectActiveFrame().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 3708d5337391b4da0686757a81bfadb2a280d45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3708d5337391b4da0686757a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 20 09:50:08 2015 +0200 gdiplus/tests: Test the return of GdipImageSelectActiveFrame(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 51b99a3..6fc208e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2700,6 +2700,7 @@ static void test_multiframegif(void) expect(0, color); stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + expect(Ok, stat); stat = GdipBitmapGetPixel(bmp, 2, 0, &color); expect(Ok, stat); ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color);

1 0

Dmitry Timoshkov : comctl32: Always call BeginPaint/ EndPaint when handling a WM_PAINT message for the button.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 59cca65ce0edd88b65a55a847468761e11dfab0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cca65ce0edd88b65a55a847… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 20 21:56:15 2015 +0800 comctl32: Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/theme_button.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 327c76b..edb31e6 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -319,9 +319,6 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if(!paint) - return FALSE; - if(IsWindowEnabled(hwnd)) { if(state & BST_PUSHED) drawState = STATE_PRESSED; @@ -332,7 +329,7 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); + if (paint) paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }

1 0

Alexandre Julliard : wineconsole: Accept a too large font if we can' t find one that fits the screen.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8e77d6a24da3823fca7c718e4a104242d4cb351f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e77d6a24da3823fca7c718e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 20 16:47:35 2015 +0900 wineconsole: Accept a too large font if we can't find one that fits the screen. --- programs/wineconsole/dialog.c | 4 ++-- programs/wineconsole/user.c | 16 +++++++++++----- programs/wineconsole/winecon_user.h | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 493990d..4f73a3a 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -300,7 +300,7 @@ static int CALLBACK font_enum_size2(const LOGFONTW* lf, const TEXTMETRICW* tm, struct dialog_info* di = (struct dialog_info*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(di->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) { di->nFont++; } @@ -372,7 +372,7 @@ static int CALLBACK font_enum_size(const LOGFONTW* lf, const TEXTMETRICW* tm, return 0; } - if (WCUSER_ValidateFontMetric(di->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(di->data, tm, FontType, TRUE)) { int idx = 0; diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 879529c..e723745 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -333,7 +333,8 @@ static BOOL WCUSER_AreFontsEqual(const struct config_data* config, const LOGFONT struct font_chooser { struct inner_data* data; - int done; + BOOL check_screen_size; + BOOL done; }; /****************************************************************** @@ -341,11 +342,12 @@ struct font_chooser * * Returns true if the font described in tm is usable as a font for the renderer */ -BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, DWORD fontType) +BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, + DWORD type, BOOL check_screen_size) { BOOL ret = TRUE; - if (fontType & RASTER_FONTTYPE) + if (check_screen_size && (type & RASTER_FONTTYPE)) ret = (tm->tmMaxCharWidth * data->curcfg.win_width < GetSystemMetrics(SM_CXSCREEN) && tm->tmHeight * data->curcfg.win_height < GetSystemMetrics(SM_CYSCREEN)); return ret && !tm->tmItalic && !tm->tmUnderlined && !tm->tmStruckOut && @@ -377,7 +379,7 @@ static int CALLBACK get_first_font_enum_2(const LOGFONTW* lf, const TEXTMETRICW* struct font_chooser* fc = (struct font_chooser*)lParam; WCUSER_DumpTextMetric(tm, FontType); - if (WCUSER_ValidateFontMetric(fc->data, tm, FontType)) + if (WCUSER_ValidateFontMetric(fc->data, tm, FontType, fc->check_screen_size)) { LOGFONTW mlf = *lf; @@ -535,7 +537,11 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, /* try to find an acceptable font */ WINE_WARN("Couldn't match the font from registry... trying to find one\n"); fc.data = data; - fc.done = 0; + fc.check_screen_size = TRUE; + fc.done = FALSE; + EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); + if (fc.done) return; + fc.check_screen_size = FALSE; EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (!fc.done) WINECON_Fatal("Couldn't find a decent font, aborting\n"); } diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index 73a7701..7c5174f 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -46,8 +46,8 @@ struct inner_data_user { extern const COLORREF WCUSER_ColorMap[16]; extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf); -extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, - const TEXTMETRICW* tm, DWORD fontType); +extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, const TEXTMETRICW* tm, + DWORD type, BOOL check_screen_size); extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, LONG* el); extern void WCUSER_FillLogFont(LOGFONTW* lf, const WCHAR* name,

1 0

Dmitry Timoshkov : ole32: PropVariantCopy should return DISP_E_BADVARTYPE in case of bad source variant type.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: f9bc636d357221dfc036aacf84858257f045a1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bc636d357221dfc036aacf8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 10:28:10 2015 +0800 ole32: PropVariantCopy should return DISP_E_BADVARTYPE in case of bad source variant type. In some rare (notably for some VT_VECTOR) cases Windows implementation returns STG_E_INVALIDPARAMETER, but returning DISP_E_BADVARTYPE should cover most of cases. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/propvariant.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 09cbccf..40f7238 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -3041,7 +3041,7 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ hr = PROPVARIANT_ValidateType(pvarSrc->vt); if (FAILED(hr)) - return hr; + return DISP_E_BADVARTYPE; /* this will deal with most cases */ *pvarDest = *pvarSrc; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index c45ca2a..0786a8e 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -130,7 +130,7 @@ static const char* wine_vtypes[VT_CLSID+1] = }; -static void expect(HRESULT hr, VARTYPE vt, BOOL copy) +static void expect(HRESULT hr, VARTYPE vt, BOOL copy, int line) { int idx = vt & VT_TYPEMASK; BYTE flags; @@ -158,7 +158,12 @@ static void expect(HRESULT hr, VARTYPE vt, BOOL copy) } if(flags == PROP_INV) - ok(hr == copy ? DISP_E_BADVARTYPE : STG_E_INVALIDPARAMETER, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); + { + if (copy && (vt & VT_VECTOR)) + ok(hr == DISP_E_BADVARTYPE || hr == STG_E_INVALIDPARAMETER, "%s (%s): got %08x (line %d)\n", wine_vtypes[idx], modifier, hr, line); + else + ok(hr == (copy ? DISP_E_BADVARTYPE : STG_E_INVALIDPARAMETER), "%s (%s): got %08x (line %d)\n", wine_vtypes[idx], modifier, hr, line); + } else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); else if(flags & PROP_TODO) @@ -210,7 +215,7 @@ static void test_validtypes(void) vt = propvar.vt = i; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -224,7 +229,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -234,7 +239,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_ARRAY; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -247,7 +252,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -258,7 +263,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_VECTOR; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -271,7 +276,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -281,7 +286,7 @@ static void test_validtypes(void) vt = propvar.vt = i | VT_BYREF; memset(&copy, 0x77, sizeof(copy)); hr = PropVariantCopy(&copy, &propvar); - expect(hr, vt, TRUE); + expect(hr, vt, TRUE, __LINE__); if (hr == S_OK) { ok(copy.vt == propvar.vt, "expected %d, got %d\n", propvar.vt, copy.vt); @@ -295,7 +300,7 @@ static void test_validtypes(void) ok(!ret || broken(ret) /* win2000 */, "%d: copy should stay unchanged\n", i); } hr = PropVariantClear(&propvar); - expect(hr, vt, FALSE); + expect(hr, vt, FALSE, __LINE__); ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart);

1 0

Dmitry Timoshkov : gdi32: Fix heap corruption.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: d774442e8d65dc8ef1ad3d9a677fd0da623ff174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d774442e8d65dc8ef1ad3d9a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 20 12:25:54 2015 +0800 gdi32: Fix heap corruption. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 95df22a..9f2a9fb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5189,7 +5189,7 @@ static void fill_fileinfo_from_face( GdiFont *font, Face *face ) strcpyW(font->fileinfo->path, face->file); } else - memset(&font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); + memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); } /*************************************************************

1 0

Nikolay Sivov : shell32: Remove another recurring return code check ( PVS-Studio).
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 95ecc29a50ae47107f59b35ce9d4702f620b4bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ecc29a50ae47107f59b35ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 13:59:37 2015 +0300 shell32: Remove another recurring return code check (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9440563..cb79d6f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5589,10 +5589,7 @@ static HRESULT register_folder(const KNOWNFOLDERID *rfid, const KNOWNFOLDER_DEFI } if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL && pKFD->pszRelativePath) - { - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); - } + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); RegCloseKey(hKey);

1 0