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
April 2014
----- 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
500 discussions
Start a n
N
ew thread
Stefan Dösinger : ddraw/tests: Skip the ddraw7 primary palette test if 8 bpp mode doesn't work.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 8d1b66bee477ea5f18af1fd1b3ebfd475f81b187 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8d1b66bee477ea5f18af1fd1b…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 28 15:21:55 2014 +0200 ddraw/tests: Skip the ddraw7 primary palette test if 8 bpp mode doesn't work. --- dlls/ddraw/tests/ddraw7.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index a64f18a..bed5cb8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5598,7 +5598,13 @@ static void test_primary_palette(void) 0, 0, 640, 480, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0); + if (FAILED(hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0))) + { + win_skip("Failed to set 8 bpp display mode, skipping test.\n"); + IDirectDraw7_Release(ddraw); + DestroyWindow(window); + return; + } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
1
0
0
0
Stefan Dösinger : ddraw/tests: Test P8 to RGB blits.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 71786757410150b1bafe43b1fb0b883416bddaf3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=71786757410150b1bafe43b1f…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 28 15:21:54 2014 +0200 ddraw/tests: Test P8 to RGB blits. --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=71786757410150b1bafe4…
1
0
0
0
Piotr Caban : msvcrt: Add _wcsupr_l implementation.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 277eb987396881fb3efa297965b505e63b027748 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=277eb987396881fb3efa29796…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 29 14:49:38 2014 +0200 msvcrt: Add _wcsupr_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9c20f28..72cf6f3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1516,7 +1516,7 @@ @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wcsupr_l +@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ stub _wcsxfrm_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0034b2f..3d24b0f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1875,7 +1875,7 @@ @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wcsupr_l +@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ stub _wcsxfrm_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1caa7e0..ef70cf1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1195,7 +1195,7 @@ @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wcsupr_l +@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ stub _wcsxfrm_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b624bd0..161d224 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1171,7 +1171,7 @@ @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wcsupr_l +@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ stub _wcsxfrm_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 739914a..a7d1a97 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1131,7 +1131,7 @@ @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr -# stub _wcsupr_l(wstr ptr) +@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l # stub _wcsxfrm_l(ptr wstr long ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 37ca3fb..60a24a5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -226,6 +226,15 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /****************************************************************** + * _wcsupr_l (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT__wcsupr_l( MSVCRT_wchar_t *str, MSVCRT__locale_t locale ) +{ + MSVCRT__wcsupr_s_l( str, -1, locale); + return str; +} + +/****************************************************************** * _wcslwr_s (MSVCRT.@) */ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n )
1
0
0
0
Jacek Caban : vbscript: Forward Invoke call to InvokeEx.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: d297cecc0793c3b053589bd458adf46fab5dd801 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d297cecc0793c3b053589bd45…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 29 14:47:58 2014 +0200 vbscript: Forward Invoke call to InvokeEx. --- dlls/vbscript/tests/run.c | 12 ++++++++++++ dlls/vbscript/vbdisp.c | 8 +++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 2676a37..fe611ff 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -308,6 +308,12 @@ static void test_disp(IDispatch *disp) ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_Invoke(dispex, public_prop_id, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); + + dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); @@ -388,6 +394,12 @@ static void test_disp(IDispatch *disp) ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_Invoke(dispex, public_func_id, &IID_NULL, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index df072da..e8fb107 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -340,12 +340,14 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { vbdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)
1
0
0
0
Huw Davies : include: Add a few missing out-precision and clip-precision defines.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 806895a0c2f56d46dd8764acade3fbcdc95155a0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=806895a0c2f56d46dd8764aca…
Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 29 13:16:30 2014 +0100 include: Add a few missing out-precision and clip-precision defines. --- include/wingdi.h | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index fd3458f..0137ebd 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -776,31 +776,34 @@ typedef struct tagXFORM #define FS_SYMBOL __MSABI_LONG(0x80000000) /* lfOutPrecision values */ -#define OUT_DEFAULT_PRECIS 0 -#define OUT_STRING_PRECIS 1 -#define OUT_CHARACTER_PRECIS 2 -#define OUT_STROKE_PRECIS 3 -#define OUT_TT_PRECIS 4 -#define OUT_DEVICE_PRECIS 5 -#define OUT_RASTER_PRECIS 6 -#define OUT_TT_ONLY_PRECIS 7 -#define OUT_OUTLINE_PRECIS 8 +#define OUT_DEFAULT_PRECIS 0 +#define OUT_STRING_PRECIS 1 +#define OUT_CHARACTER_PRECIS 2 +#define OUT_STROKE_PRECIS 3 +#define OUT_TT_PRECIS 4 +#define OUT_DEVICE_PRECIS 5 +#define OUT_RASTER_PRECIS 6 +#define OUT_TT_ONLY_PRECIS 7 +#define OUT_OUTLINE_PRECIS 8 +#define OUT_SCREEN_OUTLINE_PRECIS 9 +#define OUT_PS_ONLY_PRECIS 10 /* lfClipPrecision values */ #define CLIP_DEFAULT_PRECIS 0x00 #define CLIP_CHARACTER_PRECIS 0x01 #define CLIP_STROKE_PRECIS 0x02 -#define CLIP_MASK 0x0F -#define CLIP_LH_ANGLES 0x10 -#define CLIP_TT_ALWAYS 0x20 -#define CLIP_EMBEDDED 0x80 +#define CLIP_MASK 0x0F +#define CLIP_LH_ANGLES 0x10 +#define CLIP_TT_ALWAYS 0x20 +#define CLIP_DFA_DISABLE 0x40 +#define CLIP_EMBEDDED 0x80 /* lfQuality values */ -#define DEFAULT_QUALITY 0 -#define DRAFT_QUALITY 1 -#define PROOF_QUALITY 2 -#define NONANTIALIASED_QUALITY 3 -#define ANTIALIASED_QUALITY 4 +#define DEFAULT_QUALITY 0 +#define DRAFT_QUALITY 1 +#define PROOF_QUALITY 2 +#define NONANTIALIASED_QUALITY 3 +#define ANTIALIASED_QUALITY 4 #define CLEARTYPE_QUALITY 5 #define CLEARTYPE_NATURAL_QUALITY 6
1
0
0
0
Jacek Caban : iexplore: Mark iexplore.exe as large address aware.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 788cd0b4c6603d47da510532182a57188836507d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=788cd0b4c6603d47da5105321…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 29 10:53:59 2014 +0200 iexplore: Mark iexplore.exe as large address aware. --- programs/iexplore/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 7769e7e..f3fd4c2 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,5 +1,5 @@ MODULE = iexplore.exe -APPMODE = -mwindows -municode +APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe DELAYIMPORTS = advpack version
1
0
0
0
Alexandre Julliard : winegcc: Only pass large-address-aware option for i386 builds.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 1b02177a5557943cb63dc80a87c3a6778bf21bde URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1b02177a5557943cb63dc80a8…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 16:02:25 2014 +0200 winegcc: Only pass large-address-aware option for i386 builds. --- tools/winegcc/winegcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e051d61..72e2e69 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -926,7 +926,8 @@ static void build(struct options* opts) if (opts->image_base) strarray_add(link_args, strmake("-Wl,--image-base,%s", opts->image_base)); - if (opts->large_address_aware) strarray_add( link_args, "-Wl,--large-address-aware" ); + if (opts->large_address_aware && opts->target_cpu == CPU_x86) + strarray_add( link_args, "-Wl,--large-address-aware" ); if (opts->unicode_app && !opts->shared) strarray_add(link_args, mingw_unicode_hack(opts));
1
0
0
0
Henri Verbeet : ddraw: Don' t return an error when setting a 0 material handle in d3d_device3_SetLightState ().
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 56d7e3b9a759014ec911895cd64fdfe4f19f2b3c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=56d7e3b9a759014ec911895cd…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:06 2014 +0200 ddraw: Don't return an error when setting a 0 material handle in d3d_device3_SetLightState(). --- dlls/ddraw/device.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e6f40a0..88142a9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2945,16 +2945,19 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, wined3d_mutex_lock(); if (state == D3DLIGHTSTATE_MATERIAL) { - struct d3d_material *m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL); - if (!m) + if (value) { - WARN("Invalid material handle.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } + struct d3d_material *m; - TRACE(" activating material %p.\n", m); - material_activate(m); + if (!(m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL))) + { + WARN("Invalid material handle.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + + material_activate(m); + } device->material = value; }
1
0
0
0
Henri Verbeet : ddraw: Cleanup d3d_execute_buffer_QueryInterface().
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: 77da84b06a22c52135658542fdf5b018718fec0e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=77da84b06a22c52135658542f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:05 2014 +0200 ddraw: Cleanup d3d_execute_buffer_QueryInterface(). --- dlls/ddraw/executebuffer.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 83755c2..4e9baad 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -420,45 +420,24 @@ static inline struct d3d_execute_buffer *impl_from_IDirect3DExecuteBuffer(IDirec return CONTAINING_RECORD(iface, struct d3d_execute_buffer, IDirect3DExecuteBuffer_iface); } -/***************************************************************************** - * IDirect3DExecuteBuffer::QueryInterface - * - * Well, a usual QueryInterface function. Don't know fur sure which - * interfaces it can Query. - * - * Params: - * riid: The interface ID queried for - * obj: Address to return the interface pointer at - * - * Returns: - * D3D_OK in case of a success (S_OK? Think it's the same) - * OLE_E_ENUM_NOMORE if the interface wasn't found. - * (E_NOINTERFACE?? Don't know what I really need) - * - *****************************************************************************/ -static HRESULT WINAPI d3d_execute_buffer_QueryInterface(IDirect3DExecuteBuffer *iface, REFIID riid, void **obj) +static HRESULT WINAPI d3d_execute_buffer_QueryInterface(IDirect3DExecuteBuffer *iface, REFIID iid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - *obj = NULL; - - if ( IsEqualGUID( &IID_IUnknown, riid ) ) { - IDirect3DExecuteBuffer_AddRef(iface); - *obj = iface; - TRACE(" Creating IUnknown interface at %p.\n", *obj); - return S_OK; - } - if ( IsEqualGUID( &IID_IDirect3DExecuteBuffer, riid ) ) { + if (IsEqualGUID(&IID_IDirect3DExecuteBuffer, iid) + || IsEqualGUID(&IID_IUnknown, iid)) + { IDirect3DExecuteBuffer_AddRef(iface); - *obj = iface; - TRACE(" Creating IDirect3DExecuteBuffer interface %p\n", *obj); - return S_OK; + *out = iface; + return S_OK; } - FIXME("(%p): interface for IID %s NOT found!\n", iface, debugstr_guid(riid)); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; return E_NOINTERFACE; } - /***************************************************************************** * IDirect3DExecuteBuffer::AddRef *
1
0
0
0
Henri Verbeet : ddraw: Cleanup the D3DOP_PROCESSVERTICES implementation a bit.
by Alexandre Julliard
29 Apr '14
29 Apr '14
Module: wine Branch: master Commit: b2e2b42b73e7e17acab7cc737874d2c6aa92b701 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b2e2b42b73e7e17acab7cc737…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:04 2014 +0200 ddraw: Cleanup the D3DOP_PROCESSVERTICES implementation a bit. --- dlls/ddraw/executebuffer.c | 227 +++++++++++++++++--------------------------- 1 file changed, 88 insertions(+), 139 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2e2b42b73e7e17acab7c…
1
0
0
0
← Newer
1
2
3
4
5
6
...
50
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
Results per page:
10
25
50
100
200