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
October 2006
----- 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
3 participants
1032 discussions
Start a n
N
ew thread
Jacek Caban : urlmon: Update winehq.org IP.
by Alexandre Julliard
30 Oct '06
30 Oct '06
Module: wine Branch: master Commit: ee5a4400303bf77c653c6ee179aff64696cf9c50 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee5a4400303bf77c653c6ee17…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 28 14:18:37 2006 +0200 urlmon: Update
winehq.org
IP. --- dlls/urlmon/tests/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 53c5bc4..84050dc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -249,7 +249,7 @@ static HRESULT WINAPI ProtocolSink_Repor static const WCHAR host[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszWineHQIP[] = - {'2','0','9','.','3','2','.','1','4','1','.','3',0}; + {'2','0','9','.','4','6','.','2','5','.','1','3','4',0}; /* I'm not sure if it's a good idea to hardcode here the IP address... */ switch(ulStatusCode) {
1
0
0
0
Markus Amsler : wined3d: Respect ARB_VERTEX_BUFFER_OBJECT in loadVertexData .
by Alexandre Julliard
30 Oct '06
30 Oct '06
Module: wine Branch: master Commit: 9497e89d89691f27c53554f4a726b49ba8d94f17 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9497e89d89691f27c53554f4a…
Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Sat Oct 28 04:06:03 2006 +0200 wined3d: Respect ARB_VERTEX_BUFFER_OBJECT in loadVertexData. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f880aad..b632f65 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -867,7 +867,7 @@ static void loadVertexData(IWineD3DDevic unsigned int textureNo = 0; unsigned int texture_idx = 0; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint curVBO = -1; + GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; TRACE("Using fast vertex array code\n"); /* Blend Data ---------------------------------------------- */
1
0
0
0
Peter Oberndorfer : dmusic: Do not write outside of array bounds.
by Alexandre Julliard
30 Oct '06
30 Oct '06
Module: wine Branch: master Commit: 62c6d61ddf3073cabe540325836137180b1f1d39 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=62c6d61ddf3073cabe5403258…
Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Fri Oct 27 18:47:25 2006 +0200 dmusic: Do not write outside of array bounds. --- dlls/dmusic/dmusic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index daa489b..675430a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusic8Impl_ This->nrofports++; if (!This->ppPorts) This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); - This->ppPorts[This->nrofports] = pNewPort; + This->ppPorts[This->nrofports - 1] = pNewPort; *ppPort = (LPDIRECTMUSICPORT) pNewPort; return S_OK; }
1
0
0
0
Huw Davies : user32: The hiword of the return value from LB_ITEMFROMPOINT should be
by Alexandre Julliard
30 Oct '06
30 Oct '06
Module: wine Branch: master Commit: 0d0bfa4cce3c76b003748aa327fc18bb8d6f4b41 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0d0bfa4cce3c76b003748aa32…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 27 16:22:02 2006 +0100 user32: The hiword of the return value from LB_ITEMFROMPOINT should be a hittest on the item that's returned and not a hittest on the client area as MSDN states. --- dlls/user/listbox.c | 38 ++++++++++++++++++----- dlls/user/tests/listbox.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/user/listbox.c b/dlls/user/listbox.c index ae9a8e3..59c4f29 100644 --- a/dlls/user/listbox.c +++ b/dlls/user/listbox.c @@ -2731,16 +2731,38 @@ static LRESULT WINAPI ListBoxWndProc_com { POINT pt; RECT rect; + int index; + BOOL hit = TRUE; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - rect.left = 0; - rect.top = 0; - rect.right = descr->width; - rect.bottom = descr->height; + /* The hiword of the return value is not a client area + hittest as suggested by MSDN, but rather a hittest on + the returned listbox item. */ - return MAKELONG( LISTBOX_GetItemFromPoint(descr, pt.x, pt.y), - !PtInRect( &rect, pt ) ); + if(descr->nb_items == 0) + return 0x1ffff; /* win9x returns 0x10000, we copy winnt */ + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + + SetRect(&rect, 0, 0, descr->width, descr->height); + + if(!PtInRect(&rect, pt)) + { + pt.x = min(pt.x, rect.right - 1); + pt.x = max(pt.x, 0); + pt.y = min(pt.y, rect.bottom - 1); + pt.y = max(pt.y, 0); + hit = FALSE; + } + + index = LISTBOX_GetItemFromPoint(descr, pt.x, pt.y); + + if(index == -1) + { + index = descr->nb_items - 1; + hit = FALSE; + } + return MAKELONG(index, hit ? 0 : 1); } case LB_SETCARETINDEX16: diff --git a/dlls/user/tests/listbox.c b/dlls/user/tests/listbox.c index 7bbec60..435dc91 100644 --- a/dlls/user/tests/listbox.c +++ b/dlls/user/tests/listbox.c @@ -429,6 +429,79 @@ static void test_listbox_height(void) DestroyWindow( hList ); } +static void test_itemfrompoint(void) +{ + HWND hList = CreateWindow( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + LONG r, id; + RECT rc; + + /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000 */ + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); + ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); + ok( r == 0x1ffff || r == 0x10000, "ret %x\n", r ); + + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi1"); + ok( id == 1, "item id wrong\n"); + + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + ok( r == 0x1, "ret %x\n", r ); + + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 37 )); + ok( r == 0x10001, "ret %x\n", r ); + + + + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); + ok( id == 2, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi3"); + ok( id == 3, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi4"); + ok( id == 4, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi5"); + ok( id == 5, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi6"); + ok( id == 6, "item id wrong\n"); + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi7"); + ok( id == 7, "item id wrong\n"); + + /* Set the listbox up so that id 1 is at the top, this leaves 5 + partially visible at the bottom and 6, 7 are invisible */ + + SendMessage( hList, LB_SETTOPINDEX, 1, 0); + r = SendMessage( hList, LB_GETTOPINDEX, 0, 0); + ok( r == 1, "top %d\n", r); + + r = SendMessage( hList, LB_GETITEMRECT, 5, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = SendMessage( hList, LB_GETITEMRECT, 6, (LPARAM)&rc); + ok( r == 0, "ret %x\n", r); + + r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(/* x */ 10, /* y */ 10) ); + ok( r == 1, "ret %x\n", r); + + r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); + ok( r == 0x10001, "ret %x\n", r ); + + r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); + ok( r == 0x10005, "item %x\n", r ); + + r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); + ok( r == 0x10005, "item %x\n", r ); + + DestroyWindow( hList ); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -503,4 +576,5 @@ START_TEST(listbox) test_ownerdraw(); test_selection(); test_listbox_height(); + test_itemfrompoint(); }
1
0
0
0
Stephen R. Veit : iphlpapi: Fix GetAdaptersInfo return value for IpMask.
by Alexandre Julliard
30 Oct '06
30 Oct '06
Module: wine Branch: master Commit: 5731967d2d72e06451df33679cc43528e12009ab URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5731967d2d72e06451df33679…
Author: Stephen R. Veit <sveit(a)tradeharbor.com> Date: Fri Oct 27 09:03:06 2006 -0500 iphlpapi: Fix GetAdaptersInfo return value for IpMask. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 831c94d..e408547 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -722,7 +722,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER if (firstIPAddr) { toIPAddressString(ipAddrTable->table[i].dwAddr, ptr->IpAddressList.IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwBCastAddr, + toIPAddressString(ipAddrTable->table[i].dwMask, ptr->IpAddressList.IpMask.String); firstIPAddr = FALSE; } @@ -731,7 +731,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER currentIPAddr = nextIPAddr; toIPAddressString(ipAddrTable->table[i].dwAddr, currentIPAddr->IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwBCastAddr, + toIPAddressString(ipAddrTable->table[i].dwMask, currentIPAddr->IpMask.String); nextIPAddr++; }
1
0
0
0
lostwages/include winehq.conf
by Alexandre Julliard
27 Oct '06
27 Oct '06
ChangeSet ID: 29323 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/10/27 11:18:03 Modified files: include : winehq.conf Log message: Release 0.9.24 Patch:
http://cvs.winehq.org/patch.py?id=29323
Old revision New revision Changes Path 1.46 1.47 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.46 lostwages/include/winehq.conf:1.47 --- lostwages/include/winehq.conf:1.46 27 Oct 2006 16:18: 3 -0000 +++ lostwages/include/winehq.conf 27 Oct 2006 16:18: 3 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.23 +snapshot_date: 0.9.24 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2
1
0
0
0
Tag wine-0.9.24 : Alexandre Julliard : Release 0.9.24
by Alexandre Julliard
27 Oct '06
27 Oct '06
Module: wine Branch: refs/tags/wine-0.9.24 Tag: 3099ff0333d75192c04b1163be74ee823e46b155 URL:
http://source.winehq.org/git/wine.git/?a=tag;h=3099ff0333d75192c04b1163be74…
Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 17:20:14 2006 +0200 Release 0.9.24
1
0
0
0
Alexandre Julliard : Release 0.9.24.
by Alexandre Julliard
27 Oct '06
27 Oct '06
Module: wine Branch: master Commit: b3aae21232539bf9e10bb29e4f962c75696eb30d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b3aae21232539bf9e10bb29e4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 17:20:13 2006 +0200 Release 0.9.24. --- ANNOUNCE | 1129 ++++++++++++++++---------------------- ChangeLog | 1845 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2326 insertions(+), 668 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3aae21232539bf9e10bb…
1
0
0
0
Alexandre Julliard : wined3d: Simplify some uses of the WineD3D_Context object.
by Alexandre Julliard
27 Oct '06
27 Oct '06
Module: wine Branch: master Commit: b4f42c94a748efee190324e1e198482823f03574 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b4f42c94a748efee190324e1e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 15:03:07 2006 +0200 wined3d: Simplify some uses of the WineD3D_Context object. --- dlls/wined3d/directx.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 779dee8..00c95cd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -69,7 +69,6 @@ DWORD minMipLookup[WINED3DTEXF_ANISOTROP typedef struct _WineD3D_GLContext { GLXContext glCtx; Display* display; - Drawable drawable; LONG ref; } WineD3D_Context; @@ -92,10 +91,11 @@ static WineD3D_Context* WineD3D_CreateFa BOOL failed = FALSE; int num; XVisualInfo *visInfo; + Drawable drawable; XWindowAttributes win_attr; TRACE_(d3d_caps)("Creating Fake GL Context\n"); - ctx.drawable = (Drawable) GetPropA(GetDesktopWindow(), "__wine_x11_whole_window"); + drawable = (Drawable) GetPropA(GetDesktopWindow(), "__wine_x11_whole_window"); /* Get the display */ device_context = GetDC(0); @@ -104,7 +104,7 @@ static WineD3D_Context* WineD3D_CreateFa /* Get the X visual */ ENTER_GL(); - if (XGetWindowAttributes(ctx.display, ctx.drawable, &win_attr)) { + if (XGetWindowAttributes(ctx.display, drawable, &win_attr)) { visual = win_attr.visual; } else { visual = DefaultVisual(ctx.display, DefaultScreen(ctx.display)); @@ -130,7 +130,7 @@ static WineD3D_Context* WineD3D_CreateFa } /* Make it the current GL context */ - if (!failed && glXMakeCurrent(ctx.display, ctx.drawable, ctx.glCtx) == False) { + if (!failed && glXMakeCurrent(ctx.display, drawable, ctx.glCtx) == False) { glXDestroyContext(ctx.display, ctx.glCtx); LEAVE_GL(); WARN_(d3d_caps)("Error setting default context as current for capabilities initialization\n"); @@ -1342,17 +1342,17 @@ static HRESULT WINAPI IWineD3DImpl_GetAd return WINED3D_OK; } -static BOOL IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(WineD3D_Context* ctx, GLXFBConfig cfgs, WINED3DFORMAT Format) { +static BOOL IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(Display *display, GLXFBConfig cfgs, WINED3DFORMAT Format) { #if 0 /* This code performs a strict test between the format and the current X11 buffer depth, which may give the best performance */ int gl_test; int rb, gb, bb, ab, type, buf_sz; - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_RED_SIZE, &rb); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_GREEN_SIZE, &gb); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_BLUE_SIZE, &bb); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_ALPHA_SIZE, &ab); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_RENDER_TYPE, &type); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_BUFFER_SIZE, &buf_sz); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_RED_SIZE, &rb); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_GREEN_SIZE, &gb); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_BLUE_SIZE, &bb); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_ALPHA_SIZE, &ab); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_RENDER_TYPE, &type); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_BUFFER_SIZE, &buf_sz); switch (Format) { case WINED3DFMT_X8R8G8B8: @@ -1412,13 +1412,13 @@ return FALSE; #endif } -static BOOL IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(WineD3D_Context* ctx, GLXFBConfig cfgs, WINED3DFORMAT Format) { +static BOOL IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(Display *display, GLXFBConfig cfgs, WINED3DFORMAT Format) { #if 0/* This code performs a strict test between the format and the current X11 buffer depth, which may give the best performance */ int gl_test; int db, sb; - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_DEPTH_SIZE, &db); - gl_test = glXGetFBConfigAttrib(ctx->display, cfgs, GLX_STENCIL_SIZE, &sb); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_DEPTH_SIZE, &db); + gl_test = glXGetFBConfigAttrib(display, cfgs, GLX_STENCIL_SIZE, &sb); switch (Format) { case WINED3DFMT_D16: @@ -1503,8 +1503,8 @@ static HRESULT WINAPI IWineD3DImpl_Check if (NULL != cfgs) { for (it = 0; it < nCfgs; ++it) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx, cfgs[it], RenderTargetFormat)) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(ctx, cfgs[it], DepthStencilFormat)) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], RenderTargetFormat)) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithDepthFmt(ctx->display, cfgs[it], DepthStencilFormat)) { hr = WINED3D_OK; break ; } @@ -1584,7 +1584,7 @@ static HRESULT WINAPI IWineD3DImpl_Check if (NULL != ctx) { cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs); for (it = 0; it < nCfgs; ++it) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx, cfgs[it], DisplayFormat)) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], DisplayFormat)) { hr = WINED3D_OK; break ; }
1
0
0
0
Alexandre Julliard : wined3d: The WineD3D_GLContext structure doesn' t need to be exported.
by Alexandre Julliard
27 Oct '06
27 Oct '06
Module: wine Branch: master Commit: 6afcf77889ba6f7600e51d1c03f226dd313aa624 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6afcf77889ba6f7600e51d1c0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 14:42:17 2006 +0200 wined3d: The WineD3D_GLContext structure doesn't need to be exported. --- dlls/wined3d/directx.c | 7 +++++++ include/wine/wined3d_gl.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2ef2fd7..779dee8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -66,6 +66,13 @@ DWORD *stateLookup[MAX_LOOKUPS]; DWORD minMipLookup[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; +typedef struct _WineD3D_GLContext { + GLXContext glCtx; + Display* display; + Drawable drawable; + LONG ref; +} WineD3D_Context; + /** * Note: GL seems to trap if GetDeviceCaps is called before any HWND's created diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 8f29816..dbe5214 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1795,13 +1795,6 @@ typedef struct _WineD3D_GL_Info { } WineD3D_GL_Info; #undef USE_GL_FUNC -typedef struct _WineD3D_GLContext { - GLXContext glCtx; - Display* display; - Drawable drawable; - LONG ref; -} WineD3D_Context; - #endif /* HAVE_OPENGL */ #endif /* __WINE_WINED3D_GL */
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
104
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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
Results per page:
10
25
50
100
200