winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2017
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
632 discussions
Start a n
N
ew thread
Francois Gouget : advapi32/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard
06 Jul '17
06 Jul '17
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
0
0
Francois Gouget : wsdapi: Remove WINAPI on static functions where not needed.
by Alexandre Julliard
06 Jul '17
06 Jul '17
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
0
0
Alistair Leslie-Hughes : qmgr/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard
06 Jul '17
06 Jul '17
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
0
0
Alistair Leslie-Hughes : dwrite/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard
06 Jul '17
06 Jul '17
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
0
0
Paul Gofman : d3dx9/tests: Add tests for array of samplers.
by Alexandre Julliard
05 Jul '17
05 Jul '17
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
0
0
Paul Gofman : d3dx9: Support arrays of samplers.
by Alexandre Julliard
05 Jul '17
05 Jul '17
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
0
0
Paul Gofman : d3dx9: Check type and register count for sampler constants.
by Alexandre Julliard
05 Jul '17
05 Jul '17
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
0
0
Alexandre Julliard : user32: Scale cursor sizes with the screen DPI.
by Alexandre Julliard
05 Jul '17
05 Jul '17
Module: wine Branch: master Commit: d4654e5799ffb02c025b0f41ccbf617e595186d0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d4654e5799ffb02c025b0f41c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 5 20:20:05 2017 +0200 user32: Scale cursor sizes with the screen DPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 6 ++++++ dlls/user32/tests/sysparams.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bec4d66..97f6b57 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2413,6 +2413,12 @@ INT WINAPI GetSystemMetrics( INT index ) return ret; case SM_CXCURSOR: case SM_CYCURSOR: + if (IsProcessDPIAware()) + { + ret = MulDiv( 32, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + if (ret >= 64) return 64; + if (ret >= 48) return 48; + } return 32; case SM_CYMENU: return GetSystemMetrics(SM_CYMENUSIZE) + 1; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b5ab784..fa473c1 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2696,6 +2696,14 @@ static BOOL is_font_enumerated(const char *name) return ret; } +static int get_cursor_size( int size ) +{ + /* only certain sizes are allowed for cursors */ + if (size >= 64) return 64; + if (size >= 48) return 48; + return 32; +} + static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; @@ -2774,8 +2782,8 @@ static void test_GetSystemMetrics( void) /* These don't depend on the Shell Icon Size registry value */ ok_gsm( SM_CXICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); ok_gsm( SM_CYICON, MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ) ); - /* SM_CXCURSOR */ - /* SM_CYCURSOR */ + ok_gsm( SM_CXCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); + ok_gsm( SM_CYCURSOR, get_cursor_size( MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ))); ok_gsm( SM_CYMENU, ncm.iMenuHeight + 1); ok_gsm( SM_CXFULLSCREEN, GetSystemMetrics( SM_CXMAXIMIZED) - 2 * GetSystemMetrics( SM_CXFRAME));
1
0
0
0
Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard
05 Jul '17
05 Jul '17
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
0
0
Hugh McMaster : regedit: Do not import the line if a hex data type has a " 0x" prefix.
by Alexandre Julliard
05 Jul '17
05 Jul '17
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
0
0
← Newer
1
...
53
54
55
56
57
58
59
...
64
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
Results per page:
10
25
50
100
200