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

Nikolay Sivov : ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio).
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 24dce2b2295ed660d6c3408aedaf44183369eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dce2b2295ed660d6c3408ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:47:55 2015 +0300 ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio). --- dlls/ole32/compositemoniker.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 40d3568..faadca1 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -778,9 +778,16 @@ CompositeMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /* This method returns a composite moniker that consists of the inverses of each of the components */ /* of the original composite, stored in reverse order */ + *ppmk = NULL; + res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + if (FAILED(res)) + return res; + + res=IMoniker_ComposeWith(iface,antiMk,FALSE,&tempMk); IMoniker_Release(antiMk); + if (FAILED(res)) + return res; if (tempMk==NULL)

1 0

Stefan Dösinger : d3d8/tests: oFog is not initialized on r200.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: b003cefe9e9d7cd397817224c45c1bc2e799b130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b003cefe9e9d7cd397817224c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:18 2015 +0100 d3d8/tests: oFog is not initialized on r200. --- dlls/d3d8/tests/visual.c | 65 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ffbfe3c..d8382f7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -774,122 +774,123 @@ static void fog_with_shader_test(void) int pshader; D3DFOGMODE vfog; D3DFOGMODE tfog; + BOOL uninitialized_reg; unsigned int color[11]; } test_data[] = { /* Only pixel shader */ - {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, + {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, + {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Vertex shader */ - {1, 0, D3DFOG_NONE, D3DFOG_NONE, + {1, 0, D3DFOG_NONE, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, + {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, + {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, + {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, + {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Vertex shader and pixel shader */ /* The next 4 tests would read the fog coord output, but it isn't available. * The result is a fully fogged quad, no matter what the Z coord is. */ - {1, 1, D3DFOG_NONE, D3DFOG_NONE, + {1, 1, D3DFOG_NONE, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {1, 1, D3DFOG_LINEAR, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP, D3DFOG_NONE, + {1, 1, D3DFOG_EXP, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP2, D3DFOG_NONE, + {1, 1, D3DFOG_EXP2, D3DFOG_NONE, TRUE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, /* These use the Z coordinate with linear table fog */ - {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, + {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, + {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, + {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* Non-linear table fog without fog coord */ - {1, 1, D3DFOG_NONE, D3DFOG_EXP, + {1, 1, D3DFOG_NONE, D3DFOG_EXP, FALSE, {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, - {1, 1, D3DFOG_NONE, D3DFOG_EXP2, + {1, 1, D3DFOG_NONE, D3DFOG_EXP2, FALSE, {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, /* These tests fail on older Nvidia drivers */ /* Foggy vertex shader */ - {2, 0, D3DFOG_NONE, D3DFOG_NONE, + {2, 0, D3DFOG_NONE, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_EXP, D3DFOG_NONE, + {2, 0, D3DFOG_EXP, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_EXP2, D3DFOG_NONE, + {2, 0, D3DFOG_EXP2, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, + {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, /* Foggy vertex shader and pixel shader. First 4 tests with vertex fog, * all using the fixed fog-coord linear fog */ - {2, 1, D3DFOG_NONE, D3DFOG_NONE, + {2, 1, D3DFOG_NONE, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_EXP, D3DFOG_NONE, + {2, 1, D3DFOG_EXP, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_EXP2, D3DFOG_NONE, + {2, 1, D3DFOG_EXP2, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, + {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, FALSE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, /* These use table fog. Here the shader-provided fog coordinate is * ignored and the z coordinate used instead */ - {2, 1, D3DFOG_NONE, D3DFOG_EXP, + {2, 1, D3DFOG_NONE, D3DFOG_EXP, FALSE, {0x00ff0000, 0x00e71800, 0x00d12e00, 0x00bd4200, 0x00ab5400, 0x009b6400, 0x008d7200, 0x007f8000, 0x00738c00, 0x00689700, 0x005ea100}}, - {2, 1, D3DFOG_NONE, D3DFOG_EXP2, + {2, 1, D3DFOG_NONE, D3DFOG_EXP2, FALSE, {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, - {2, 1, D3DFOG_NONE, D3DFOG_LINEAR, + {2, 1, D3DFOG_NONE, D3DFOG_LINEAR, FALSE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, }; @@ -996,7 +997,7 @@ static void fog_with_shader_test(void) /* As the red and green component are the result of blending use 5% tolerance on the expected value */ color = getPixelColor(device, 128, 240); - ok(color_match(color, test_data[i].color[j], 13), + ok(color_match(color, test_data[i].color[j], 13) || broken(test_data[i].uninitialized_reg), "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]);

1 0

Nikolay Sivov : ole32: Check ComposeWith() return value too (PVS-Studio).
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 46914d8794ec98b8d96d46f6713a6a6221dfb39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46914d8794ec98b8d96d46f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:32:47 2015 +0300 ole32: Check ComposeWith() return value too (PVS-Studio). --- dlls/ole32/compositemoniker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 3e6788e..40d3568 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -722,6 +722,8 @@ CompositeMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IRunningObjectTable* rot; res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); + if (FAILED(res)) + return res; res = IBindCtx_GetRunningObjectTable(pbc,&rot); if (FAILED(res))

1 0

Stefan Dösinger : d3d9/tests: Relax the fog range test a bit.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: c5fdc1670b46dd4c1836b296559abe60e5dab1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fdc1670b46dd4c1836b2965… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 12 10:55:17 2015 +0100 d3d9/tests: Relax the fog range test a bit. --- dlls/d3d9/tests/visual.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 34ba3da..a345af1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1009,10 +1009,10 @@ static void fog_test(void) }, untransformed_3[] = { - {-1.0f, -1.0f, 0.4999f, 0xffff0000, 0xff000000}, - {-1.0f, 1.0f, 0.4999f, 0xffff0000, 0xff000000}, - { 1.0f, -1.0f, 0.4999f, 0xffff0000, 0xff000000}, - { 1.0f, 1.0f, 0.4999f, 0xffff0000, 0xff000000}, + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 0.5f, 0xffff0000, 0xff000000}, + { 1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + { 1.0f, 1.0f, 0.5f, 0xffff0000, 0xff000000}, }, far_quad1[] = { @@ -1429,15 +1429,12 @@ static void fog_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); - /* z=0.4999, set the fogstart to 0.5 and fogend slightly higher. If range fog - * is not used, the fog coordinate will be equal to fogstart and the quad not - * fogged. If range fog is used the fog coordinate will be slightly higher and - * the fog coordinate will be > fogend, so we get a fully fogged quad. The fog - * is calculated per vertex and interpolated, so even the center of the screen - * where the difference doesn't matter will be fogged, but check the corners in - * case a d3d/gl implementation decides to calculate the fog factor per fragment */ - start = 0.5f; - end = 0.50001f; + /* z=0.5, x = +/- 1.0, y = +/- 1.0. In case of z fog the fog coordinate is + * 0.5. With range fog it is sqrt(x*x + y*y + z*z) = 1.5 for all vertices. + * Note that the fog coordinate is interpolated linearly across the vertices, + * so the different eye distance at the screen center should not matter. */ + start = 0.75f; + end = 0.75001f; hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end));

1 0

Sebastian Lackner : slc: Implement SLGetWindowsInformationDWORD.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 731007886034dfd46dba3a006cd0c7790d091dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731007886034dfd46dba3a006… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 20:27:07 2014 +0100 slc: Implement SLGetWindowsInformationDWORD. --- dlls/slc/slc.c | 24 ++++++++++++++++++++++-- dlls/slc/tests/slc.c | 6 ------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 1b02c9b..a0d8999 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -19,8 +19,11 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "slpublic.h" @@ -37,9 +40,26 @@ HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) { - FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); + UNICODE_STRING nameW; + NTSTATUS status; + ULONG type, len; - return SL_E_RIGHT_NOT_GRANTED; + TRACE("(%s)\n", debugstr_w(lpszValueName) ); + + if (!lpszValueName || !pdwValue) + return E_INVALIDARG; + if (!lpszValueName[0]) + return SL_E_RIGHT_NOT_GRANTED; + + RtlInitUnicodeString( &nameW, lpszValueName ); + status = NtQueryLicenseValue( &nameW, &type, pdwValue, sizeof(DWORD), &len ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + return SL_E_VALUE_NOT_FOUND; + if ((!status || status == STATUS_BUFFER_TOO_SMALL) && (type != REG_DWORD)) + return SL_E_DATATYPE_MISMATCHED; + + return status ? E_FAIL : S_OK; } /*********************************************************************** diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c index 723cd4c..b9296b2 100644 --- a/dlls/slc/tests/slc.c +++ b/dlls/slc/tests/slc.c @@ -40,16 +40,13 @@ static void test_SLGetWindowsInformationDWORD(void) HRESULT res; res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); - todo_wine ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); res = SLGetWindowsInformationDWORD(NULL, &value); - todo_wine ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); - todo_wine ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); @@ -61,15 +58,12 @@ static void test_SLGetWindowsInformationDWORD(void) value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); - todo_wine ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); - todo_wine ok(res == S_OK, "expected S_OK, got %u\n", res); - todo_wine ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); }

1 0

Jacek Caban : user32: Allow making window visible by WM_SETREDRAW message.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: da72de967b4fab1a823229f525e5739aed76516d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da72de967b4fab1a823229f52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 5 14:20:51 2015 +0100 user32: Allow making window visible by WM_SETREDRAW message. --- dlls/user32/win.c | 7 ++----- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0516193..8ff3ebd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -774,10 +774,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) { - /* Some apps try to make their window visible through WM_SETREDRAW. - * Only do that if the window was never explicitly hidden, - * because Steam messes with WM_SETREDRAW after hiding its windows. */ - made_visible = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + made_visible = (style.styleNew & WS_VISIBLE) != 0; invalidate_dce( win, NULL ); } WIN_ReleasePtr( win ); @@ -2499,7 +2496,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - made_visible = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); + made_visible = (wndPtr->dwStyle & WS_VISIBLE) != 0; invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index a19ebe9..a182778 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -76,7 +76,6 @@ typedef struct tagWND #define WIN_ISUNICODE 0x0010 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ -#define WIN_HIDDEN 0x0080 /* hidden by an explicit SWP_HIDEWINDOW (as opposed to WM_SETREDRAW) */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 12d3ffa..f92a3dc 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1923,9 +1923,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) parent = GetAncestor( winpos->hwnd, GA_PARENT ); if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; - if (winpos->flags & SWP_HIDEWINDOW) wndPtr->flags |= WIN_HIDDEN; - else if (winpos->flags & SWP_SHOWWINDOW) wndPtr->flags &= ~WIN_HIDDEN; - if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW; else {

1 0

Francois Gouget : wshom.ocx: Make enum_thread_wnd_proc() static.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: ef9d3f1181e6963ea3ad0aac42695a5af99bacd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9d3f1181e6963ea3ad0aac4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:49:45 2015 +0100 wshom.ocx: Make enum_thread_wnd_proc() static. --- dlls/wshom.ocx/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 97781a5..826e290 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -254,7 +254,7 @@ static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) return E_NOTIMPL; } -BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) +static BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) { INT *count = (INT*)lParam;

1 0

Francois Gouget : winecoreaudio.drv: The drv_keyW variable is unused so remove it.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 04a260faa258ff8e74d9a5714a2ee50f1e048e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a260faa258ff8e74d9a5714… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:35:47 2015 +0100 winecoreaudio.drv: The drv_keyW variable is unused so remove it. --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8ca7b7..60ff3d9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -192,9 +192,6 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v',0}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0};

1 0

Francois Gouget : mshtml: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: ff983cc36a23e5c4149e7122f5d7867130a4e3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff983cc36a23e5c4149e7122f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:10 2015 +0100 mshtml: Remove unneeded NONAMELESSXXX directives. --- dlls/mshtml/navigate.c | 1 - dlls/mshtml/persist.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 39e2733..e1516d2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 1263f43..20f3191 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -22,8 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Nikolay Sivov : dwrite: Store vertical orientation property.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 8a46a01008cd890276b993410cecc4d2597f90c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a46a01008cd890276b993410… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:58:32 2015 +0300 dwrite: Store vertical orientation property. --- dlls/dwrite/layout.c | 39 +++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d26751e..26d84a3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -47,6 +47,7 @@ struct dwrite_textformat_data { DWRITE_TEXT_ALIGNMENT textalignment; DWRITE_FLOW_DIRECTION flow; DWRITE_LINE_SPACING_METHOD spacingmethod; + DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; FLOAT spacing; FLOAT baseline; @@ -1821,15 +1822,21 @@ static HRESULT WINAPI dwritetextlayout2_GetMetrics(IDWriteTextLayout2 *iface, DW static HRESULT WINAPI dwritetextlayout2_SetVerticalGlyphOrientation(IDWriteTextLayout2 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d): stub\n", This, orientation); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, orientation); + + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + This->format.vertical_orientation = orientation; + return S_OK; } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGlyphOrientation(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p): stub\n", This); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("(%p)\n", This); + return This->format.vertical_orientation; } static HRESULT WINAPI dwritetextlayout2_SetLastLineWrapping(IDWriteTextLayout2 *iface, BOOL lastline_wrapping_enabled) @@ -2174,6 +2181,7 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = { static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) { + IDWriteTextFormat1 *format1; UINT32 len; HRESULT hr; @@ -2217,6 +2225,14 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I return hr; layout->format.family_len = len; + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); + if (hr == S_OK) { + layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + IDWriteTextFormat1_Release(format1); + } + else + layout->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -2674,15 +2690,21 @@ static HRESULT WINAPI dwritetextformat_GetLocaleName(IDWriteTextFormat1 *iface, static HRESULT WINAPI dwritetextformat1_SetVerticalGlyphOrientation(IDWriteTextFormat1 *iface, DWRITE_VERTICAL_GLYPH_ORIENTATION orientation) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, orientation); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, orientation); + + if ((UINT32)orientation > DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED) + return E_INVALIDARG; + + This->format.vertical_orientation = orientation; + return S_OK; } static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGlyphOrientation(IDWriteTextFormat1 *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + TRACE("(%p)\n", This); + return This->format.vertical_orientation; } static HRESULT WINAPI dwritetextformat1_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled) @@ -2792,6 +2814,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.readingdir = DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; This->format.flow = DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; This->format.spacingmethod = DWRITE_LINE_SPACING_METHOD_DEFAULT; + This->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; This->format.spacing = 0.0; This->format.baseline = 0.0; This->format.trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c796c12..eb00e53 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1089,6 +1089,40 @@ if (0) { /* crashes on native */ IDWriteTextLayout1_Release(layout1); } +static void test_SetVerticalGlyphOrientation(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_VERTICAL_GLYPH_ORIENTATION orientation; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("SetVerticalGlyphOrientation() is not supported.\n"); + return; + } + + orientation = IDWriteTextLayout2_GetVerticalGlyphOrientation(layout2); + ok(orientation == DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT, "got %d\n", orientation); + + hr = IDWriteTextLayout2_SetVerticalGlyphOrientation(layout2, DWRITE_VERTICAL_GLYPH_ORIENTATION_STACKED+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDWriteTextLayout2_Release(layout2); +} + START_TEST(layout) { HRESULT hr; @@ -1116,6 +1150,7 @@ START_TEST(layout) test_GetClusterMetrics(); test_SetLocaleName(); test_SetPairKerning(); + test_SetVerticalGlyphOrientation(); IDWriteFactory_Release(factory); }

1 0