June 2008 - Wine-commits - list.winehq.org

Paul Vriens : comdlg32/tests: Use GetModuleHandle instead of LoadLibrary.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 5777a3d6cfd4cef045895f56f13cc0efc338de3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5777a3d6cfd4cef045895f56f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 9 09:16:56 2008 +0200 comdlg32/tests: Use GetModuleHandle instead of LoadLibrary. --- dlls/comdlg32/tests/printdlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 31e57cf..fef274d 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -51,8 +51,7 @@ static LPCSTR load_functions(void) LPCSTR ptr; ptr = "comdlg32.dll"; - hcomdlg32 = LoadLibraryA(ptr); - if (!hcomdlg32) return ptr; + hcomdlg32 = GetModuleHandleA(ptr); ptr = "PrintDlgExA"; pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr);

1 0

Alexandre Julliard : winetest: Don' t rely on the tools being present in the home page directory.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: tools Branch: master Commit: 611eee104fd0e1c403f3e2fb4f6cd6de7f3b03e4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=611eee104fd0e1c403f3e2fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 21:11:54 2008 +0200 winetest: Don't rely on the tools being present in the home page directory. --- winetest/winetest.cron | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index da41a7c..09edd1a 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -3,14 +3,18 @@ # Cron job for generating winetest reports. Use it like # */5 * * * * apache winetest.cron +tools=/home/winehq/opt/git-tools/winetest +workdir=/home/winehq/opt/winetest lock=/tmp/winetest.lock + if [ ! -f $lock ]; then touch $lock - while perl dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done - while perl gather; do true; done - perl build-index + cd $workdir + while $tools/dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done + while $tools/gather; do true; done + $tools/build-index - # and archive 6-month old results + # archive 6-month old results (cd old-data && for i in `find . -maxdepth 1 -mtime +180 -type d -print` do tar cfj $i.tar.bz2 $i && rm -rf $i

1 0

Alexandre Julliard : winetest: Add a link to the index page from the summary.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: tools Branch: master Commit: b13490923d6b3013a8f7adf0a296799f89e99b2f URL: http://source.winehq.org/git/tools.git/?a=commit;h=b13490923d6b3013a8f7adf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 9 20:01:34 2008 +0200 winetest: Add a link to the index page from the summary. Use the common look for the summary navigation bar. --- winetest/gather | 16 ++++------------ winetest/summary.css | 4 ++-- winetest/summary.js | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8ea31c7..28431ed 100755 --- a/winetest/gather +++ b/winetest/gather @@ -408,18 +408,10 @@ print OUT <<"EOF"; <body> <div class="navbar"> -<table class="navbar"> - <tr> - <td class="left"> - <a href="/site?testing=prev&current=$build">Previous build</a> - </td> - <td><script type="text/javascript" src="/summary.js"></script - ><noscript><p>JavaScript support missing</p></noscript></td> - <td class="right"> - <a href="/site?testing=next&current=$build">Next build</a> - </td> - </tr> -</table> +<a href="/site?testing=prev&current=$build">prev</a> + | <a href="/site?testing=next&current=$build">next</a> + | <a href="..">index</a> +<script type="text/javascript" src="/summary.js"></script> </div> <div class="legend"> <h3>Legend</h3> diff --git a/winetest/summary.css b/winetest/summary.css index bd0f749..9ce7f77 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -39,8 +39,8 @@ div.main, div.group { div.navbar { padding: 0; width: 100%; - text-align: center; - margin: 10px 0 0 0; + text-align: left; + margin: 10px 0 10px 0; background-color: #e2e2e2; } div.legend { diff --git a/winetest/summary.js b/winetest/summary.js index 44690e3..372c99e 100644 --- a/winetest/summary.js +++ b/winetest/summary.js @@ -1,5 +1,5 @@ result_window = null; -document.writeln ('<a href="#" onClick="open_popup(); return false;">Open popup</a>'); +document.writeln (' | <a href="#" onClick="open_popup(); return false;">open popup</a>'); function open_popup () { result_window = window.open("/resultform.html","results","width=240,height=240,resizable,scrollbars=no");

1 0

Jacek Caban : shdocvw: Fixed DISPID_ONTOOLBAR test on IE7.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 54ef871161d92ece58de2cadae91e2166e4999a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ef871161d92ece58de2cada… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 8 21:33:27 2008 +0200 shdocvw: Fixed DISPID_ONTOOLBAR test on IE7. --- dlls/shdocvw/tests/webbrowser.c | 26 +++++++++++++++----------- dlls/shdocvw/webbrowser.c | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2989076..da92600 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -422,14 +422,18 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID return E_NOINTERFACE; } -#define test_invoke_bool(p) _test_invoke_bool(__LINE__,p) -static void _test_invoke_bool(unsigned line, const DISPPARAMS *params) +#define test_invoke_bool(p,s) _test_invoke_bool(__LINE__,p,s) +static void _test_invoke_bool(unsigned line, const DISPPARAMS *params, BOOL strict) { ok_(__FILE__,line) (params->rgvarg != NULL, "rgvarg == NULL\n"); ok_(__FILE__,line) (params->cArgs == 1, "cArgs=%d, expected 1\n", params->cArgs); ok_(__FILE__,line) (V_VT(params->rgvarg) == VT_BOOL, "V_VT(arg)=%d\n", V_VT(params->rgvarg)); - ok_(__FILE__,line) (V_BOOL(params->rgvarg) == exvb, "V_VT(arg)=%x, expected %x\n", - V_BOOL(params->rgvarg), exvb); + if(strict) + ok_(__FILE__,line) (V_BOOL(params->rgvarg) == exvb, "V_VT(arg)=%x, expected %x\n", + V_BOOL(params->rgvarg), exvb); + else + ok_(__FILE__,line) (!V_BOOL(params->rgvarg) == !exvb, "V_VT(arg)=%x, expected %x\n", + V_BOOL(params->rgvarg), exvb); } static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const VARIANT *flags, @@ -598,37 +602,37 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe case DISPID_ONMENUBAR: CHECK_EXPECT(Invoke_ONMENUBAR); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; case DISPID_ONADDRESSBAR: CHECK_EXPECT(Invoke_ONADDRESSBAR); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; case DISPID_ONSTATUSBAR: CHECK_EXPECT(Invoke_ONSTATUSBAR); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; case DISPID_ONTOOLBAR: CHECK_EXPECT(Invoke_ONTOOLBAR); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, FALSE); break; case DISPID_ONFULLSCREEN: CHECK_EXPECT(Invoke_ONFULLSCREEN); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; case DISPID_ONTHEATERMODE: CHECK_EXPECT(Invoke_ONTHEATERMODE); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; case DISPID_WINDOWSETRESIZABLE: CHECK_EXPECT(Invoke_WINDOWSETRESIZABLE); - test_invoke_bool(pDispParams); + test_invoke_bool(pDispParams, TRUE); break; default: diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 1d1ca36..50c3b34 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -627,7 +627,7 @@ static HRESULT WINAPI WebBrowser_put_ToolBar(IWebBrowser2 *iface, int Value) * inform the embedder about the tool bar change. */ V_VT(&arg) = VT_BOOL; - V_BOOL(&arg) = Value; + V_BOOL(&arg) = This->tool_bar; call_sink(This->doc_host.cps.wbe2, DISPID_ONTOOLBAR, &dispparams); return S_OK;

1 0

David Adam : Revert "amstream: Fix the condition of existence of the IMediaStream interface."
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: c41a9039690b3850b260c683a0650fdfa4d1f436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41a9039690b3850b260c683a… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Jun 9 12:55:54 2008 +0200 Revert "amstream: Fix the condition of existence of the IMediaStream interface." This reverts commit 653c7e7dcaf7ebee2cfc8a6e356779dc8974aac6. --- dlls/amstream/mediastream.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 3d15731..2cb7ce6 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -71,8 +71,7 @@ static HRESULT WINAPI IMediaStreamImpl_QueryInterface(IMediaStream* iface, REFII TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IAMMultiMediaStream) || - IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) + IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { IClassFactory_AddRef(iface); *ppvObject = This;

1 0

Alexandre Julliard : rpcrt4: Properly handle the case of a client having disconnected in rpcrt4_conn_listen_pipe .
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 853db9a79dd9fff15a608b7d2b702a15ebc15bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853db9a79dd9fff15a608b7d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 9 12:56:42 2008 +0200 rpcrt4: Properly handle the case of a client having disconnected in rpcrt4_conn_listen_pipe. --- dlls/rpcrt4/rpc_transport.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8bca0fe..86c4e4f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -118,20 +118,29 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) return RPC_S_OK; npc->listening = TRUE; - if (ConnectNamedPipe(npc->pipe, &npc->ovl)) - return RPC_S_OK; + for (;;) + { + if (ConnectNamedPipe(npc->pipe, &npc->ovl)) + return RPC_S_OK; - if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(npc->ovl.hEvent); - return RPC_S_OK; - } - if (GetLastError() == ERROR_IO_PENDING) { - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; + switch(GetLastError()) + { + case ERROR_PIPE_CONNECTED: + SetEvent(npc->ovl.hEvent); + return RPC_S_OK; + case ERROR_IO_PENDING: + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; + case ERROR_NO_DATA_DETECTED: + /* client has disconnected, retry */ + DisconnectNamedPipe( npc->pipe ); + break; + default: + npc->listening = FALSE; + WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } } - npc->listening = FALSE; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname)

1 0

Michael Karcher : gdi32: Respect DIB_PAL_COLORS in every case.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 5333923253819ecf8dbbf7aaeec412c300b8a4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5333923253819ecf8dbbf7aae… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jun 8 01:44:10 2008 +0200 gdi32: Respect DIB_PAL_COLORS in every case. --- dlls/gdi32/dib.c | 33 +++++++++++++++++---------------- dlls/gdi32/tests/bitmap.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ffd6f31..46be0f0 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -701,7 +701,11 @@ INT WINAPI GetDIBits( } } else { - if(bpp >= bmp->bitmap.bmBitsPixel) { + if (coloruse == DIB_PAL_COLORS) { + for (i = 0; i < (1 << bpp); i++) + ((WORD *)colorPtr)[i] = (WORD)i; + } + else if(bpp >= bmp->bitmap.bmBitsPixel) { /* Generate the color map from the selected palette */ PALETTEENTRY palEntry[256]; @@ -713,22 +717,19 @@ INT WINAPI GetDIBits( return 0; } for (i = 0; i < (1 << bmp->bitmap.bmBitsPixel); i++) { - if (coloruse == DIB_RGB_COLORS) { - if (core_header) - { - rgbTriples[i].rgbtRed = palEntry[i].peRed; - rgbTriples[i].rgbtGreen = palEntry[i].peGreen; - rgbTriples[i].rgbtBlue = palEntry[i].peBlue; - } - else - { - rgbQuads[i].rgbRed = palEntry[i].peRed; - rgbQuads[i].rgbGreen = palEntry[i].peGreen; - rgbQuads[i].rgbBlue = palEntry[i].peBlue; - rgbQuads[i].rgbReserved = 0; - } + if (core_header) + { + rgbTriples[i].rgbtRed = palEntry[i].peRed; + rgbTriples[i].rgbtGreen = palEntry[i].peGreen; + rgbTriples[i].rgbtBlue = palEntry[i].peBlue; + } + else + { + rgbQuads[i].rgbRed = palEntry[i].peRed; + rgbQuads[i].rgbGreen = palEntry[i].peGreen; + rgbQuads[i].rgbBlue = palEntry[i].peBlue; + rgbQuads[i].rgbReserved = 0; } - else ((WORD *)colorPtr)[i] = (WORD)i; } } else { switch (bpp) { diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 05f57e6..79f6003 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1315,6 +1315,28 @@ static void test_GetDIBits_selected_DDB(BOOL monochrome) } ok(equalContents, "GetDIBits with DDB selected in DC: Got different DIB bits\n"); + /* Test the palette */ + equalContents = TRUE; + if (info2->bmiHeader.biBitCount <= 8) + { + WORD *colors = (WORD*)info2->bmiColors; + + /* Get the palette indices */ + res = GetDIBits(dc, ddb, 0, 0, NULL, info2, DIB_PAL_COLORS); + ok(res, "GetDIBits failed\n"); + + for (i=0;i < 1 << info->bmiHeader.biSizeImage; i++) + { + if (colors[i] != i) + { + equalContents = FALSE; + break; + } + } + } + + ok(equalContents, "GetDIBits with DDB selected in DC: non 1:1 palette indices\n"); + HeapFree(GetProcessHeap(), 0, bits2); HeapFree(GetProcessHeap(), 0, bits); DeleteDC(dc); @@ -1496,6 +1518,16 @@ todo_wine todo_wine ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + /* Test the palette indices */ + memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); + SetLastError(0xdeadbeef); + lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); + + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + for (i = 2; i < 256; i++) + ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[1]); + /* retrieve 24-bit DIB data */ memset(bi, 0, sizeof(*bi)); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1596,6 +1628,16 @@ todo_wine todo_wine ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + /* Test the palette indices */ + memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); + SetLastError(0xdeadbeef); + lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); + + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + for (i = 2; i < 256; i++) + ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]); + /* retrieve 24-bit DIB data */ memset(bi, 0, sizeof(*bi)); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

Paul Vriens : kernel32/tests: Add a skip message for win95.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: fe5b8ada647cf9272d209a8dd45c7a63eb0c91b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5b8ada647cf9272d209a8dd… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jun 8 14:09:37 2008 +0200 kernel32/tests: Add a skip message for win95. --- dlls/kernel32/tests/timer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index 3441890..3608ef8 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -38,11 +38,17 @@ static void test_timer(void) pCreateWaitableTimerA = (fnCreateWaitableTimerA) GetProcAddress( hker, "CreateWaitableTimerA"); if( !pCreateWaitableTimerA ) + { + skip("CreateWaitableTimerA is not available\n"); return; + } pSetWaitableTimer = (fnSetWaitableTimer) GetProcAddress( hker, "SetWaitableTimer"); if( !pSetWaitableTimer ) + { + skip("SetWaitableTimer is not available\n"); return; + } /* try once with a positive number */ handle = pCreateWaitableTimerA( NULL, 0, NULL );

1 0

Roderick Colenbrander : wined3d: Update nvidia GPUs.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 38a98f67892fd29b946d5ff52f2a109113c1e0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a98f67892fd29b946d5ff52… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jun 8 15:37:20 2008 +0000 wined3d: Update nvidia GPUs. --- dlls/wined3d/directx.c | 10 ++++++++++ include/wine/wined3d_gl.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 51013eb..7df23d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1069,6 +1069,16 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) { + /* Geforce9 - highend */ + if(strstr(gl_info->gl_renderer, "9800")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800GT; + vidmem = 512; + } + /* Geforce9 - midend */ + else if(strstr(gl_info->gl_renderer, "9600")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_9600GT; + vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */ + } /* Geforce8 - highend */ if (strstr(gl_info->gl_renderer, "8800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 86be618..45531b1 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3243,6 +3243,8 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_8600GT = 0x0402, CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, + CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Roderick Colenbrander : wined3d: Update ATI GPUs.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: b73b2eca471ec04f95689126861c25cba9fed322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73b2eca471ec04f956891268… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jun 8 16:35:14 2008 +0000 wined3d: Update ATI GPUs. --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++++++++-------- include/wine/wined3d_gl.h | 1 + 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7df23d4..e759332 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1211,23 +1211,41 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { break; case VENDOR_ATI: if(WINE_D3D9_CAPABLE(gl_info)) { - /* Radeon R6xx HD2900 - highend */ - if (strstr(gl_info->gl_renderer, "HD 2900")) { + /* Radeon R6xx HD2900/HD3800 - highend */ + if (strstr(gl_info->gl_renderer, "HD 2900") || + strstr(gl_info->gl_renderer, "HD 3870") || + strstr(gl_info->gl_renderer, "HD 3850")) + { gl_info->gl_card = CARD_ATI_RADEON_HD2900; - vidmem = 512; /* HD2900 uses 512-1024MB */ + vidmem = 512; /* HD2900/HD3800 uses 256-1024MB */ } - /* Radeon R6xx HD2600- midend */ - else if (strstr(gl_info->gl_renderer, "HD 2600")) { + /* Radeon R6xx HD2600/HD3600 - midend; HD3830 is China-only midend */ + else if (strstr(gl_info->gl_renderer, "HD 2600") || + strstr(gl_info->gl_renderer, "HD 3830") || + strstr(gl_info->gl_renderer, "HD 3690") || + strstr(gl_info->gl_renderer, "HD 3650")) + { gl_info->gl_card = CARD_ATI_RADEON_HD2600; - vidmem = 256; /* HD2600 uses 256-512MB */ + vidmem = 256; /* HD2600/HD3600 uses 256-512MB */ } - /* Radeon R6xx HD2300/HD2400 - lowend */ + /* Radeon R6xx HD2300/HD2400/HD3400 - lowend */ else if (strstr(gl_info->gl_renderer, "HD 2300") || - strstr(gl_info->gl_renderer, "HD 2400")) + strstr(gl_info->gl_renderer, "HD 2400") || + strstr(gl_info->gl_renderer, "HD 3470") || + strstr(gl_info->gl_renderer, "HD 3450") || + strstr(gl_info->gl_renderer, "HD 3430")) { gl_info->gl_card = CARD_ATI_RADEON_HD2300; vidmem = 128; /* HD2300 uses at least 128MB, HD2400 uses 256MB */ } + /* Radeon R6xx/R7xx integrated */ + else if (strstr(gl_info->gl_renderer, "HD 3100") || + strstr(gl_info->gl_renderer, "HD 3200") || + strstr(gl_info->gl_renderer, "HD 3300")) + { + gl_info->gl_card = CARD_ATI_RADEON_HD3200; + vidmem = 128; /* 128MB */ + } /* Radeon R5xx */ else if (strstr(gl_info->gl_renderer, "X1600") || strstr(gl_info->gl_renderer, "X1650") || diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 45531b1..6ff1df9 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3219,6 +3219,7 @@ typedef enum _GL_Cards { CARD_ATI_RADEON_HD2300 = 0x7210, CARD_ATI_RADEON_HD2600 = 0x9581, CARD_ATI_RADEON_HD2900 = 0x9400, + CARD_ATI_RADEON_HD3200 = 0x9620, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0