October 2006 - Wine-Commits

Huw Davies : user32: The hiword of the return value from LB_ITEMFROMPOINT should be
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

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

Peter Oberndorfer : dmusic: Do not write outside of array bounds.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

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

Markus Amsler : wined3d: Respect ARB_VERTEX_BUFFER_OBJECT in loadVertexData .
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

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

Jacek Caban : wininet: Fixed declaration of INTERNET_STATUS_CALLBACK.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: cdbab7ddf2b4c4615e635b168a84038042eb762d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbab7ddf2b4c4615e635b168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 28 14:14:52 2006 +0200 wininet: Fixed declaration of INTERNET_STATUS_CALLBACK. --- dlls/wininet/tests/http.c | 38 +++++++++++++++++++------------------- include/wininet.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a49a65..ab9f6fe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -37,7 +37,7 @@ static HANDLE hCompleteEvent; static VOID WINAPI callback( HINTERNET hInternet, - DWORD dwContext, + DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInformation, DWORD dwStatusInformationLength @@ -46,27 +46,27 @@ static VOID WINAPI callback( switch (dwInternetStatus) { case INTERNET_STATUS_RESOLVING_NAME: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_NAME_RESOLVED: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CONNECTING_TO_SERVER: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CONNECTED_TO_SERVER: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_SENDING_REQUEST: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_SENDING_REQUEST %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_SENDING_REQUEST %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); break; @@ -74,12 +74,12 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(DWORD), "info length should be sizeof(DWORD) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%x INTERNET_STATUS_REQUEST_SENT 0x%x %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_SENT 0x%x %d\n", GetCurrentThreadId(), hInternet, dwContext, *(DWORD *)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_RECEIVING_RESPONSE: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); break; @@ -87,27 +87,27 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(DWORD), "info length should be sizeof(DWORD) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%x INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", GetCurrentThreadId(), hInternet, dwContext, *(DWORD *)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CTL_RESPONSE_RECEIVED: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", GetCurrentThreadId(), hInternet,dwContext, lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_PREFETCH: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_PREFETCH %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_PREFETCH %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CLOSING_CONNECTION: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_CLOSING_CONNECTION %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CLOSING_CONNECTION %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CONNECTION_CLOSED: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTION_CLOSED %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTION_CLOSED %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation,dwStatusInformationLength); break; @@ -115,7 +115,7 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(HINTERNET), "info length should be sizeof(HINTERNET) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%x INTERNET_STATUS_HANDLE_CREATED %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); break; @@ -123,7 +123,7 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(HINTERNET), "info length should be sizeof(HINTERNET) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%x INTERNET_STATUS_HANDLE_CLOSING %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); break; @@ -133,24 +133,24 @@ static VOID WINAPI callback( ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%x INTERNET_STATUS_REQUEST_COMPLETE {%d,%d} %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%d,%d} %d\n", GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); SetEvent(hCompleteEvent); break; } case INTERNET_STATUS_REDIRECT: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_REDIRECT \"%s\" %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REDIRECT \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation, dwStatusInformationLength); break; case INTERNET_STATUS_INTERMEDIATE_RESPONSE: - trace("%04x:Callback %p 0x%x INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", GetCurrentThreadId(), hInternet, dwContext, lpvStatusInformation, dwStatusInformationLength); break; default: - trace("%04x:Callback %p 0x%x %d %p %d\n", + trace("%04x:Callback %p 0x%lx %d %p %d\n", GetCurrentThreadId(), hInternet, dwContext, dwInternetStatus, lpvStatusInformation, dwStatusInformationLength); } diff --git a/include/wininet.h b/include/wininet.h index 14daf5f..56973d7 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -557,7 +557,7 @@ BOOLAPI InternetGetLastResponseInfoA(LPD BOOLAPI InternetGetLastResponseInfoW(LPDWORD ,LPWSTR lpszBuffer ,LPDWORD); #define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo) -typedef VOID (CALLBACK *INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD ,DWORD , +typedef VOID (CALLBACK *INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD_PTR ,DWORD , LPVOID lpvStatusInformation ,DWORD); typedef INTERNET_STATUS_CALLBACK * LPINTERNET_STATUS_CALLBACK;

1 0

Stephen R. Veit : iphlpapi: Fix GetAdaptersInfo return value for IpMask.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

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

lostwages/include winehq.conf
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

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

Tag wine-0.9.24 : Alexandre Julliard : Release 0.9.24
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

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

Alexandre Julliard : Release 0.9.24.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

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

Alexandre Julliard : wined3d: Simplify some uses of the WineD3D_Context object.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

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

Alexandre Julliard : wined3d: The WineD3D_GLContext structure doesn' t need to be exported.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

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