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

Francois Gouget : wsdapi: Remove WINAPI on static functions where not needed.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 47c90af8d465a39ef05781747428066898271cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c90af8d465a39ef05781747… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:24:14 2017 +0200 wsdapi: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/msgparams.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/msgparams.c b/dlls/wsdapi/msgparams.c index e5ec8b1..dd07a5b 100644 --- a/dlls/wsdapi/msgparams.c +++ b/dlls/wsdapi/msgparams.c @@ -53,7 +53,7 @@ static inline IWSDUdpMessageParametersImpl *impl_from_IWSDUdpMessageParameters(I /* IWSDMessageParameters implementation */ -static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) +static ULONG IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *iface) { IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -62,7 +62,7 @@ static ULONG WINAPI IWSDMessageParametersImpl_AddRef(IWSDMessageParameters *ifac return ref; } -static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) +static ULONG IWSDMessageParametersImpl_Release(IWSDMessageParameters *iface) { IWSDMessageParametersImpl *This = impl_from_IWSDMessageParameters(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -87,7 +87,7 @@ static ULONG WINAPI IWSDMessageParametersImpl_Release(IWSDMessageParameters *ifa return ref; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +static HRESULT IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -109,7 +109,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_GetLocalAddress(IWSDMessageParam return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +static HRESULT IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -131,7 +131,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetLocalAddress(IWSDMessageParam return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) +static HRESULT IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessageParameters *This, IWSDAddress **ppAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -153,7 +153,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_GetRemoteAddress(IWSDMessagePara return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) +static HRESULT IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessageParameters *This, IWSDAddress *pAddress) { IWSDMessageParametersImpl *impl = impl_from_IWSDMessageParameters(This); @@ -175,7 +175,7 @@ static HRESULT WINAPI IWSDMessageParametersImpl_SetRemoteAddress(IWSDMessagePara return S_OK; } -static HRESULT WINAPI IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) +static HRESULT IWSDMessageParametersImpl_GetLowerParameters(IWSDMessageParameters *This, IWSDMessageParameters **ppTxParams) { FIXME("(%p, %p)\n", This, ppTxParams); return E_NOTIMPL;

1 0

Alistair Leslie-Hughes : dwrite/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 136d9928b6a5bc1f260b9511560202e7557849a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136d9928b6a5bc1f260b95115… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:37:15 2017 +0000 dwrite/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 35be12e..997e9be 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3946,7 +3946,7 @@ static void test_CreateStreamFromKey(void) writetime = 0; hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(writetime != 0, "got %08x%08x\n", (UINT)(writetime >> 32), (UINT)writetime); + ok(writetime != 0, "got %s\n", wine_dbgstr_longlong(writetime)); IDWriteFontFileStream_Release(stream); IDWriteFontFile_Release(file);

1 0

Alistair Leslie-Hughes : qmgr/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: d11a6e6c04361ef75c0ce67e35ddf5641afb9925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11a6e6c04361ef75c0ce67e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 06:13:19 2017 +0000 qmgr/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/file.c | 8 ++++---- dlls/qmgr/tests/job.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index 5e6eb34..9fdf08c 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -175,10 +175,10 @@ static void test_GetProgress_PreTransfer(void) hres = IBackgroundCopyFile_GetProgress(test_file, &progress); ok(hres == S_OK, "GetProgress failed: %08x\n", hres); - ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %x%08x\n", - (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n", - (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); + ok(progress.BytesTotal == BG_SIZE_UNKNOWN, "Got incorrect total size: %s\n", + wine_dbgstr_longlong(progress.BytesTotal)); + ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %s\n", + wine_dbgstr_longlong(progress.BytesTransferred)); ok(progress.Completed == FALSE, "Got incorrect completion status\n"); } diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 83134e5..6d8185a 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -261,10 +261,10 @@ static void test_GetProgress_preTransfer(void) hres = IBackgroundCopyJob_GetProgress(test_job, &progress); ok(hres == S_OK, "GetProgress failed: 0x%08x\n", hres); - ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %x%08x\n", - (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); - ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %x%08x\n", - (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); + ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %s\n", + wine_dbgstr_longlong(progress.BytesTotal)); + ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %s\n", + wine_dbgstr_longlong(progress.BytesTransferred)); ok(progress.FilesTotal == 0, "Incorrect FilesTotal: %u\n", progress.FilesTotal); ok(progress.FilesTransferred == 0, "Incorrect FilesTransferred %u\n", progress.FilesTransferred); }

1 0

Francois Gouget : advapi32/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 6e082ea86a4adb618b38309f55ec8994fcb16bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e082ea86a4adb618b38309f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:52 2017 +0200 advapi32/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3c68205..f71d45f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4034,7 +4034,7 @@ static void test_GetNamedSecurityInfoA(void) if (bret) admins_ace_id = i; } ok(users_ace_id != -1 || broken(users_ace_id == -1) /* win2k */, - "Bultin Users ACE not found.\n"); + "Builtin Users ACE not found.\n"); if (users_ace_id != -1) { bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); @@ -4051,7 +4051,7 @@ static void test_GetNamedSecurityInfoA(void) "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ); } - ok(admins_ace_id != -1, "Bultin Admins ACE not found.\n"); + ok(admins_ace_id != -1, "Builtin Admins ACE not found.\n"); if (admins_ace_id != -1) { bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace);

1 0

Paul Gofman : d3dx9/tests: Add tests for array of samplers.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 4e2c0444121d341bac9bc841ab6662fceeb42c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2c0444121d341bac9bc841a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:24 2017 +0300 d3dx9/tests: Add tests for array of samplers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 541 +++++++++++++++++++++++++++---------------- 1 file changed, 347 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e2c0444121d341bac9bc…

1 0

Paul Gofman : d3dx9: Support arrays of samplers.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 8f9bbdf9ad38985f499943eafe81764579c16778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9bbdf9ad38985f499943eaf… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:23 2017 +0300 d3dx9: Support arrays of samplers. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e9b139e..c3647d3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2928,15 +2928,20 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) { struct d3dx_sampler *sampler; + unsigned int sampler_idx; - sampler = (struct d3dx_sampler *)params[i]->data; - TRACE("sampler %s, register index %u, state count %u.\n", debugstr_a(params[i]->name), - cdesc[i].RegisterIndex, sampler->state_count); - for (j = 0; j < sampler->state_count; ++j) + for (sampler_idx = 0; sampler_idx < cdesc[i].RegisterCount; ++sampler_idx) { - if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[j], - cdesc[i].RegisterIndex + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0), update_all))) - ret = hr; + sampler = params[i]->element_count ? params[i]->members[sampler_idx].data : params[i]->data; + TRACE("sampler %s, register index %u, state count %u.\n", debugstr_a(params[i]->name), + cdesc[i].RegisterIndex, sampler->state_count); + for (j = 0; j < sampler->state_count; ++j) + { + if (FAILED(hr = d3dx9_apply_state(effect, pass, &sampler->states[j], + cdesc[i].RegisterIndex + sampler_idx + (vs ? D3DVERTEXTEXTURESAMPLER0 : 0), + update_all))) + ret = hr; + } } } } @@ -4000,12 +4005,17 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { struct d3dx_sampler *sampler; + unsigned int sampler_idx; + unsigned int samplers_count = max(param->element_count, 1); - sampler = (struct d3dx_sampler *)param->data; - for (i = 0; i < sampler->state_count; ++i) + for (sampler_idx = 0; sampler_idx < samplers_count; ++sampler_idx) { - if (walk_state_dep(&sampler->states[i], param_func, data)) - return TRUE; + sampler = param->element_count ? param->members[sampler_idx].data : param->data; + for (i = 0; i < sampler->state_count; ++i) + { + if (walk_state_dep(&sampler->states[i], param_func, data)) + return TRUE; + } } return FALSE; }

1 0

Hugh McMaster : regedit: Do not import the line if a hex data type has a " 0x" prefix.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: b811b166945185d9dd2c47143a01cb943017eacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b811b166945185d9dd2c47143… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 5 13:33:12 2017 +0000 regedit: Do not import the line if a hex data type has a "0x" prefix. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e94d14e..cddebf7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -363,7 +363,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) WCHAR *end; DWORD val; - if (!**line) + if (!**line || tolowerW((*line)[1]) == 'x') return FALSE; /* "hex(xx):" is special */ diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 5e127de..2b33bc9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -467,7 +467,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); - todo_wine verify_reg_nonexist(hkey, "Wine13j"); + verify_reg_nonexist(hkey, "Wine13j"); verify_reg_nonexist(hkey, "Wine13k"); exec_import_str("REGEDIT4\n\n"

1 0

Alistair Leslie-Hughes : d2d1/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 4fc2dbb14a17ef61b1cb6832fb0cd00e071e9150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc2dbb14a17ef61b1cb6832f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:37:05 2017 +0000 d2d1/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0adeef4..e0318ce 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1111,9 +1111,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1129,9 +1128,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1153,9 +1151,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1174,9 +1171,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1200,9 +1196,8 @@ static void test_state_block(void) ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2); - ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform); ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", @@ -1218,9 +1213,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21, @@ -1241,9 +1235,8 @@ static void test_state_block(void) "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode); ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE, "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode); - ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %08x%08x:%08x%08x.\n", - (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1), - (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2)); + ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %s:%s.\n", + wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2)); ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)), "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,

1 0

Paul Gofman : d3dx9: Check type and register count for sampler constants.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: a7ea12c94374c7657630168b1e8d6cb800c71cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ea12c94374c7657630168b1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 28 14:28:22 2017 +0300 d3dx9: Check type and register count for sampler constants. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 911ca79..2fb14ab 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -654,10 +654,28 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab if (FAILED(hr = get_ctab_constant_desc(ctab, hc, &cdesc[i]))) goto err_out; inputs_param[i] = get_parameter_by_name(base, NULL, cdesc[i].Name); + if (!inputs_param[i]) + { + WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); + continue; + } if (cdesc[i].Class == D3DXPC_OBJECT) + { TRACE("Object %s, parameter %p.\n", cdesc[i].Name, inputs_param[i]); - else if (!inputs_param[i]) - WARN("Could not find parameter %s in effect.\n", cdesc[i].Name); + if (cdesc[i].RegisterSet != D3DXRS_SAMPLER || inputs_param[i]->class != D3DXPC_OBJECT + || !is_param_type_sampler(inputs_param[i]->type)) + { + WARN("Unexpected object type, constant %s.\n", debugstr_a(cdesc[i].Name)); + hr = D3DERR_INVALIDCALL; + goto err_out; + } + if (max(inputs_param[i]->element_count, 1) < cdesc[i].RegisterCount) + { + WARN("Register count exceeds parameter size, constant %s.\n", debugstr_a(cdesc[i].Name)); + hr = D3DERR_INVALIDCALL; + goto err_out; + } + } } out->input_count = desc.Constants; out->inputs = cdesc;

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard July 5, 2017

July 5, 2017

Module: wine Branch: master Commit: 759dd5517c877490d4aae402926008eca20ecbad URL: http://source.winehq.org/git/wine.git/?a=commit;h=759dd5517c877490d4aae4029… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jul 5 17:35:40 2017 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 316 ++++++++++++++++++++++----------------------------------------- 1 file changed, 108 insertions(+), 208 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=759dd5517c877490d4aae…

1 0