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
May 2009
----- 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
4 participants
793 discussions
Start a n
N
ew thread
Alexandre Julliard : msvfw32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 75ba56f066b0a5a808d289a5e4381179918a172e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=75ba56f066b0a5a808d289a5e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:25:09 2009 +0200 msvfw32: Fix a pointer conversion warning on 64-bit. --- dlls/msvfw32/drawdib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 902f0ca..9877e62 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -72,7 +72,7 @@ static WINE_HDD* MSVIDEO_GetHddPtr(HDRAWDIB hd) return hdd; } -static DWORD HDD_HandleRef = 1; +static UINT_PTR HDD_HandleRef = 1; /*********************************************************************** * DrawDibOpen [MSVFW32.@]
1
0
0
0
Alexandre Julliard : msacm32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 1fc2cebf5e1b48f4aea1cc0ded6a9e5f6f4b04f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1fc2cebf5e1b48f4aea1cc0de…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:25:04 2009 +0200 msacm32: Fix a pointer conversion warning on 64-bit. --- dlls/msacm32/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 1b20ce0..a6f7fbd 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -475,7 +475,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, continue; hdrvr = OpenDriver(padid->pszFileName,0,0); - SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(DWORD)&adfs,(fdwEnum & 0x000000FFL)); + SendDriverMessage(hdrvr,ACMDM_FORMAT_SUGGEST,(LPARAM)&adfs,(fdwEnum & 0x000000FFL)); if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_FORMAT) != MMSYSERR_NOERROR) continue;
1
0
0
0
Alexandre Julliard : sane.ds: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 9008daed922dbf7f30b0da5dc4b96f2008c85238 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9008daed922dbf7f30b0da5dc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:58 2009 +0200 sane.ds: Fix a pointer conversion warning on 64-bit. --- dlls/sane.ds/ds_image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 4777040..4945e55 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -563,7 +563,7 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, psane_cancel (activeDS.deviceHandle); activeDS.sane_started = FALSE; - *pHandle = (TW_UINT32)hDIB; + *pHandle = (UINT_PTR)hDIB; twRC = TWRC_XFERDONE; activeDS.twCC = TWCC_SUCCESS; activeDS.currentState = 7;
1
0
0
0
Alexandre Julliard : gphoto2.ds: Fix a pointer conversion warning on 64-bit .
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 49159aebf123f6c27e98ede0ce848e8f82f271b0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49159aebf123f6c27e98ede0c…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:54 2009 +0200 gphoto2.ds: Fix a pointer conversion warning on 64-bit. --- dlls/gphoto2.ds/ds_image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index ae6e115..ec29eff 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -460,7 +460,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, gp_file_unref (activeDS.file); activeDS.file = NULL; ReleaseDC (activeDS.hwndOwner, dc); - *pHandle = (TW_UINT32)hDIB; + *pHandle = (UINT_PTR)hDIB; activeDS.twCC = TWCC_SUCCESS; activeDS.currentState = 7; return TWRC_XFERDONE;
1
0
0
0
Alexandre Julliard : user32/tests: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 83cb24f9b43fd0ccc08da8c7227e5eb4c5b0f92c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=83cb24f9b43fd0ccc08da8c72…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:31 2009 +0200 user32/tests: Fix some pointer conversion warnings on 64-bit. --- dlls/user32/tests/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 75059ea..0948f69 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -571,7 +571,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) : 0) + arrowwidth + MOD_avec + (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) : 0) + (text && hastab ? /* TAB space */ MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + @@ -588,7 +588,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cy + 2 : GetSystemMetrics( SM_CYMENUSIZE) + 2) : 0)));
1
0
0
0
Alexandre Julliard : ole32: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: fb640601eaccbe81814488ff02403878264e7b84 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fb640601eaccbe81814488ff0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:25 2009 +0200 ole32: Fix some pointer conversion warnings on 64-bit. --- dlls/ole32/tests/clipboard.c | 2 +- dlls/ole32/tests/usrmarshal.c | 2 +- dlls/ole32/usrmarshal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index f06a482..a6229a1 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -735,7 +735,7 @@ static void test_cf_dataobject(IDataObject *data) DVTARGETDEVICE *target; ok(fmt_ptr->fmt.ptd != NULL, "target device offset zero\n"); - target = (DVTARGETDEVICE*)((char*)priv + (DWORD)fmt_ptr->fmt.ptd); + target = (DVTARGETDEVICE*)((char*)priv + (DWORD_PTR)fmt_ptr->fmt.ptd); ok(!memcmp(target, fmt.ptd, fmt.ptd->tdSize), "target devices differ\n"); CoTaskMemFree(fmt.ptd); } diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 2b7103c..fde0034 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -145,7 +145,7 @@ static void test_marshal_HWND(void) HWND_UserMarshal(&umcb.Flags, buffer, &hwnd); wirehwnd = (wireHWND)buffer; ok(wirehwnd->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehwnd->fContext); - ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %p\n", hwnd, (HANDLE)wirehwnd->u.hRemote); + ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %x\n", hwnd, wirehwnd->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); HWND_UserUnmarshal(&umcb.Flags, buffer, &hwnd2); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 46fba8b..f180f42 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -307,7 +307,7 @@ static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffe RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (remhandle->fContext != WDT_INPROC_CALL) RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - *handle = (HANDLE)remhandle->u.hInproc; + *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; return pBuffer + sizeof(RemotableHandle); }
1
0
0
0
Alexandre Julliard : comctl32/tests: Replace a listview macro by an explicit SendMessage.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 448d48c3f494f7b0b10d176e987d9b2f9494adc0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=448d48c3f494f7b0b10d176e9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:24:04 2009 +0200 comctl32/tests: Replace a listview macro by an explicit SendMessage. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 793717c..4c4022d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1745,7 +1745,7 @@ todo_wine item.stateMask = LVIS_SELECTED; r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - ListView_SetSelectionMark(hwnd, -1); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED;
1
0
0
0
Alexandre Julliard : winedump: Fix a printf format warning on 64-bit.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 23fd37528ca0b639c69a110e042c721c58c39ec7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=23fd37528ca0b639c69a110e0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:23:24 2009 +0200 winedump: Fix a printf format warning on 64-bit. --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bbe4d56..5ff8a16 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -669,7 +669,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) } if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) printf( " handler %08x data at %08x\n", handler_data->handler, - function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info ); + (ULONG)(function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info )); } static void dump_dir_exceptions(void)
1
0
0
0
Alexandre Julliard : opengl32: Generate the correct trace arguments for UINT64 types.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 926681fead6cf38d4868937445a54f487c74d766 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=926681fead6cf38d486893744…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 15:23:10 2009 +0200 opengl32: Generate the correct trace arguments for UINT64 types. --- dlls/opengl32/make_opengl | 56 ++++++++++++++++++++++++++++++------------- dlls/opengl32/opengl_ext.c | 4 +- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7235b28..752ac87 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -88,17 +88,24 @@ my %cat_1_0 = ( "display-list" => 1, "pixel-op" => 1, "pixel-rw" => 1, "state-req" => 1, - "xform" => 1 ); + "xform" => 1, + "VERSION_1_0" => 1, + "VERSION_1_0_DEPRECATED" => 1 ); my %cat_1_1 = ( %cat_1_0, - "1_1" => 1 ); + "VERSION_1_1" => 1, + "VERSION_1_1_DEPRECATED" => 1 ); my %cat_1_2 = ( %cat_1_1, - "VERSION_1_2" => 1 ); + "VERSION_1_2" => 1, + "VERSION_1_2_DEPRECATED" => 1 ); my %cat_1_3 = ( %cat_1_2, - "VERSION_1_3" => 1 ); + "VERSION_1_3" => 1, + "VERSION_1_3_DEPRECATED" => 1 ); my %cat_1_4 = ( %cat_1_3, - "VERSION_1_4" => 1 ); + "VERSION_1_4" => 1, + "VERSION_1_4_DEPRECATED" => 1 ); my %cat_1_5 = ( %cat_1_4, - "VERSION_1_5" => 1 ); + "VERSION_1_5" => 1, + "VERSION_1_5_DEPRECATED" => 1 ); my %norm_categories = (); @@ -130,7 +137,9 @@ my %debug_conv = "GLhandleARB" => "%d", "GLcharARB" => "%c", "GLvoid" => "(void)", - "_GLfuncptr" => "%p"); + "_GLfuncptr" => "%p", + "UINT64" => "%s,wine_dbgstr_longlong(%s)" + ); # # This hash table gives the conversion between OpenGL types and what @@ -215,6 +224,7 @@ sub GenerateThunk($$$$$) my ($func_ref, $comment, $prefix, $thread_safe, $local_var) = @_; my $ret = ""; my $call_arg = ""; + my $trace_call_arg = ""; my $trace_arg = ""; return "" if $func_ref->[0] eq "glGetString"; @@ -235,20 +245,32 @@ sub GenerateThunk($$$$$) ## print $func_ref->[2]->[$i]->[1] . "\n"; my $type = $func_ref->[2]->[$i]->[0]; my $name = ConvertVarName($func_ref->[2]->[$i]->[1]); - $ret = $ret . ConvertType($type) . " $name"; - $call_arg = "$call_arg$name"; + $ret .= ConvertType($type) . " $name"; + $call_arg .= $name; if ($type =~ /\*/) { - $trace_arg = "$trace_arg\%p"; + $trace_arg .= "%p"; + $trace_call_arg .= $name; } else { - $trace_arg = "$trace_arg$debug_conv{$type}"; + if ($debug_conv{$type} =~ /(.*),(.*)/) + { + $trace_arg .= $1; + $trace_call_arg .= sprintf $2, $name; + } + else + { + $trace_arg .= $debug_conv{$type}; + $trace_call_arg .= $name; + } } if ($i+1 < @{$func_ref->[2]}) { - $ret = "$ret, "; - $call_arg = "$call_arg, "; - $trace_arg = "$trace_arg, "; + $ret .= ", "; + $call_arg .= ", "; + $trace_call_arg .= ", "; + $trace_arg .= ", "; } else { - $ret = "$ret "; - $call_arg = "$call_arg "; + $ret .= " "; + $call_arg .= " "; + $trace_call_arg .= " "; } } $ret .= 'void ' if (!@{$func_ref->[2]}); @@ -260,7 +282,7 @@ sub GenerateThunk($$$$$) if ($gen_traces) { $ret = "$ret TRACE(\"($trace_arg)\\n\""; if ($trace_arg ne "") { - $ret = "$ret, $call_arg"; + $ret .= ", $trace_call_arg"; } $ret = "$ret);\n"; } diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index ae12241..81cc1d2 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -8730,7 +8730,7 @@ static void WINAPI wine_glPolygonOffsetEXT( GLfloat factor, GLfloat bias ) { static void WINAPI wine_glPresentFrameDualFillNV( GLuint video_slot, UINT64 minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3 ) { void (*func_glPresentFrameDualFillNV)( GLuint, UINT64, GLuint, GLuint, GLenum, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint ) = extension_funcs[EXT_glPresentFrameDualFillNV]; - TRACE("(%d, %lld, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); + TRACE("(%d, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, wine_dbgstr_longlong(minPresentTime), beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); ENTER_GL(); func_glPresentFrameDualFillNV( video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3 ); LEAVE_GL(); @@ -8738,7 +8738,7 @@ static void WINAPI wine_glPresentFrameDualFillNV( GLuint video_slot, UINT64 minP static void WINAPI wine_glPresentFrameKeyedNV( GLuint video_slot, UINT64 minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1 ) { void (*func_glPresentFrameKeyedNV)( GLuint, UINT64, GLuint, GLuint, GLenum, GLenum, GLuint, GLuint, GLenum, GLuint, GLuint ) = extension_funcs[EXT_glPresentFrameKeyedNV]; - TRACE("(%d, %lld, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); + TRACE("(%d, %s, %d, %d, %d, %d, %d, %d, %d, %d, %d)\n", video_slot, wine_dbgstr_longlong(minPresentTime), beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); ENTER_GL(); func_glPresentFrameKeyedNV( video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1 ); LEAVE_GL();
1
0
0
0
Louis Lenders : wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE.
by Alexandre Julliard
28 May '09
28 May '09
Module: wine Branch: master Commit: 06936f04c04869b611bd91b335a94fd9e2ae7157 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=06936f04c04869b611bd91b33…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed May 27 17:29:46 2009 +0000 wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE. --- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/directx.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 22f4234..f1d3595 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -173,12 +173,12 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); cleanup: if (pD3d) IUnknown_Release( pD3d ); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6bad91e..eb78782 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1915,7 +1915,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U /* TODO: handle Windowed, add more quality levels */ - if (WINED3DMULTISAMPLE_NONE == MultiSampleType) return WINED3D_OK; + if (WINED3DMULTISAMPLE_NONE == MultiSampleType) { + if(pQualityLevels) *pQualityLevels = 1; + return WINED3D_OK; + } /* By default multisampling is disabled right now as it causes issues * on some Nvidia driver versions and it doesn't work well in combination
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
80
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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
Results per page:
10
25
50
100
200