wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Marcus Meissner : quartz: Make sure cookie* are not uninitialized ( Coverity 760).
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 5fdf50f76dca05fa0f8c38753d81eedeea90b4c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fdf50f76dca05fa0f8c38753… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 4 18:50:58 2009 +0200 quartz: Make sure cookie* are not uninitialized (Coverity 760). --- dlls/quartz/tests/filtergraph.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f6d61cd..26a72be 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1460,7 +1460,7 @@ static HRESULT get_connected_filter_name(TestFilterImpl *pFilter, char *FilterNa static void test_render_filter_priority(void) { /* Tests filter choice priorities in Render(). */ - DWORD cookie1, cookie2, cookie3; + DWORD cookie1 = 0, cookie2 = 0, cookie3 = 0; HRESULT hr; IFilterGraph2* pgraph2 = NULL; IFilterMapper2 *pMapper2 = NULL; @@ -1758,12 +1758,15 @@ static void test_render_filter_priority(void) hr = CoRegisterClassObject(Filter1ClassFactory.clsid, (IUnknown *)&Filter1ClassFactory, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie1); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); + if (FAILED(hr)) goto out; hr = CoRegisterClassObject(Filter2ClassFactory.clsid, (IUnknown *)&Filter2ClassFactory, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie2); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); + if (FAILED(hr)) goto out; hr = CoRegisterClassObject(Filter3ClassFactory.clsid, (IUnknown *)&Filter3ClassFactory, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie3); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); + if (FAILED(hr)) goto out; rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY;

1 0

Alexandre Julliard : ntdll: Don' t pretend that the whole address space is reserved on non-i386.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 61dcca5dbf4d0021f420dc87248b39a1dc1542db URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dcca5dbf4d0021f420dc872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 12:07:33 2009 +0200 ntdll: Don't pretend that the whole address space is reserved on non-i386. --- dlls/ntdll/virtual.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 90eabc5..9d46764 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2089,10 +2089,18 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, if (!wine_mmap_enum_reserved_areas( get_free_mem_state_callback, info, 0 )) { /* not in a reserved area at all, pretend it's allocated */ +#ifdef __i386__ info->State = MEM_RESERVE; info->Protect = PAGE_NOACCESS; info->AllocationProtect = PAGE_NOACCESS; info->Type = MEM_PRIVATE; +#else + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; +#endif } } else

1 0

Detlef Riekenberg : wininet/tests: Fix a test with IE8.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: a558365ac3df3c2e1a1589f6ec74ff4b4894d9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a558365ac3df3c2e1a1589f6e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 5 17:29:30 2009 +0200 wininet/tests: Fix a test with IE8. --- dlls/wininet/tests/internet.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8fa4823..0ec7242 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -732,7 +732,9 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(com, gmail_com); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + ok(error == ERROR_SXS_KEY_NOT_FOUND || + error == 0xdeadbeef, /* up to IE7 */ + "got %u expected ERROR_SXS_KEY_NOT_FOUND or 0xdeadbeef\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); @@ -741,7 +743,11 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + ok(error == ERROR_SXS_KEY_NOT_FOUND || /* IE8 on XP */ + error == ERROR_FILE_NOT_FOUND || /* IE8 on Vista */ + error == 0xdeadbeef, /* up to IE7 */ + "got %u expected ERROR_SXS_KEY_NOT_FOUND, ERROR_FILE_NOT_FOUND or " + "0xdeadbeef\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n");

1 0

Nicolas Le Cam : shell32/tests: Fix crash when launched from drive root dir .
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 4955fabbd46b62a89f9bccf146b29b65e740e127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4955fabbd46b62a89f9bccf14… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Apr 5 23:01:35 2009 +0200 shell32/tests: Fix crash when launched from drive root dir. --- dlls/shell32/tests/shlfolder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 60df9e6..8c5f1dc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -818,8 +818,8 @@ static void test_GetAttributesOf(void) win_skip("GetCurrentDirectoryA returned empty string. Skipping test_GetAttributesOf\n"); return; } - if(cCurrDirA[len-1] == '\\') - cCurrDirA[len-1] = 0; + if (len > 3 && cCurrDirA[len-1] == '\\') + cCurrDirA[len-1] = 0; /* create test directory */ CreateFilesFolders(); @@ -862,7 +862,7 @@ static void test_GetAttributesOf(void) hr = IShellFolder_GetAttributesOf(IDesktopFolder, 1, (LPCITEMIDLIST*)&newPIDL, &dwFlags); ok (SUCCEEDED(hr), "Desktop->GetAttributesOf() failed! hr = %08x\n", hr); ok ((dwFlags&SFGAO_FOLDER), "Wrong directory attribute for absolute PIDL: %08x\n", dwFlags); - + /* free memory */ IMalloc_Free(ppM, newPIDL); @@ -871,7 +871,7 @@ static void test_GetAttributesOf(void) Cleanup(); IShellFolder_Release(IDesktopFolder); -} +} static void test_SHGetPathFromIDList(void) {

1 0

Nicolas Le Cam : shell32/tests: Fix GetAttributesOf tests on Win2k and below.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: bf7fa5b69072042eb17695a1b7009cc009d173f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7fa5b69072042eb17695a1b… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Apr 5 22:59:12 2009 +0200 shell32/tests: Fix GetAttributesOf tests on Win2k and below. --- dlls/shell32/tests/shlfolder.c | 77 ++++++++++++++++++++++++++++++--------- 1 files changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7c33867..60df9e6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -695,12 +695,31 @@ static void test_GetAttributesOf(void) LPCITEMIDLIST pidlEmpty = (LPCITEMIDLIST)&emptyitem; LPITEMIDLIST pidlMyComputer; DWORD dwFlags; - static const DWORD dwDesktopFlags = /* As observed on WinXP SP2 */ - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; - static const DWORD dwMyComputerFlags = /* As observed on WinXP SP2 */ - SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | - SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + static const DWORD desktopFlags[] = { + /* WinXP */ + SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, + /* Win2k */ + SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_STREAM | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER, + /* WinMe, Win9x, WinNT*/ + SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER + }; + static const DWORD myComputerFlags[] = { + /* WinXP */ + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, + /* Win2k */ + SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_STREAM | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, + /* WinMe, Win9x, WinNT */ + SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_HASSUBFOLDER, + /* Win95, WinNT when queried directly */ + SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | + SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER + }; WCHAR wszMyComputer[] = { ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-', 'A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}',0 }; @@ -709,7 +728,8 @@ static void test_GetAttributesOf(void) static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; - int len; + int len, i; + BOOL foundFlagsMatch; hr = SHGetDesktopFolder(&psfDesktop); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08x\n", hr); @@ -719,15 +739,25 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, &pidlEmpty, &dwFlags); ok (SUCCEEDED(hr), "Desktop->GetAttributesOf(empty pidl) failed! hr = %08x\n", hr); - ok (dwFlags == dwDesktopFlags, "Wrong Desktop attributes: %08x, expected: %08x\n", - dwFlags, dwDesktopFlags); + for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && + i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) + { + if (desktopFlags[i] == dwFlags) + foundFlagsMatch = TRUE; + } + ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); /* .. or with no itemidlist at all. */ dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 0, NULL, &dwFlags); ok (SUCCEEDED(hr), "Desktop->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - ok (dwFlags == dwDesktopFlags, "Wrong Desktop attributes: %08x, expected: %08x\n", - dwFlags, dwDesktopFlags); + for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && + i < sizeof(desktopFlags) / sizeof(desktopFlags[0]); i++) + { + if (desktopFlags[i] == dwFlags) + foundFlagsMatch = TRUE; + } + ok (foundFlagsMatch, "Wrong Desktop attributes: %08x\n", dwFlags); /* Testing the attributes of the MyComputer shellfolder */ hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyComputer, NULL, &pidlMyComputer, NULL); @@ -737,7 +767,7 @@ static void test_GetAttributesOf(void) return; } - /* WinXP SP2 sets the SFGAO_CANLINK flag, when MyComputer is queried via the Desktop + /* Windows sets the SFGAO_CANLINK flag, when MyComputer is queried via the Desktop * folder object. It doesn't do this, if MyComputer is queried directly (see below). * SFGAO_CANLINK is the same as DROPEFFECT_LINK, which MSDN says means: "Drag source * should create a link to the original data". You can't create links on MyComputer on @@ -747,8 +777,13 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); ok (SUCCEEDED(hr), "Desktop->GetAttributesOf(MyComputer) failed! hr = %08x\n", hr); - ok ((dwFlags & ~(DWORD)SFGAO_CANLINK) == dwMyComputerFlags, - "Wrong MyComputer attributes: %08x, expected: %08x\n", dwFlags, dwMyComputerFlags); + for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && + i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) + { + if (myComputerFlags[i] == (dwFlags & ~(DWORD)SFGAO_CANLINK)) + foundFlagsMatch = TRUE; + } + ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer); ok (SUCCEEDED(hr), "Desktop failed to bind to MyComputer object! hr = %08x\n", hr); @@ -765,8 +800,14 @@ static void test_GetAttributesOf(void) dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags); ok (SUCCEEDED(hr), "MyComputer->GetAttributesOf(NULL) failed! hr = %08x\n", hr); - todo_wine { ok (dwFlags == dwMyComputerFlags, - "Wrong MyComputer attributes: %08x, expected: %08x\n", dwFlags, dwMyComputerFlags); } + for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && + i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) + { + if (myComputerFlags[i] == dwFlags) + foundFlagsMatch = TRUE; + } + todo_wine + ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); IShellFolder_Release(psfMyComputer); @@ -774,8 +815,8 @@ static void test_GetAttributesOf(void) len = lstrlenA(cCurrDirA); if (len == 0) { - win_skip("GetCurrentDirectoryA returned empty string. Skipping test_GetAttributesOf\n"); - return; + win_skip("GetCurrentDirectoryA returned empty string. Skipping test_GetAttributesOf\n"); + return; } if(cCurrDirA[len-1] == '\\') cCurrDirA[len-1] = 0;

1 0

Aurimas Fischer : msacm32: Add Lithuanian translation.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 4645cfb9afc32360e9da3e945b422b3ebfbcc824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4645cfb9afc32360e9da3e945… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Apr 5 23:52:12 2009 +0300 msacm32: Add Lithuanian translation. --- dlls/msacm32/msacm.rc | 1 + dlls/msacm32/msacm_Lt.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc index a0ea53c..ffc1485 100644 --- a/dlls/msacm32/msacm.rc +++ b/dlls/msacm32/msacm.rc @@ -33,6 +33,7 @@ #include "msacm_It.rc" #include "msacm_Ja.rc" #include "msacm_Ko.rc" +#include "msacm_Lt.rc" #include "msacm_Nl.rc" #include "msacm_No.rc" #include "msacm_Pl.rc" diff --git a/dlls/msacm32/msacm_Lt.rc b/dlls/msacm32/msacm_Lt.rc new file mode 100644 index 0000000..8decd59 --- /dev/null +++ b/dlls/msacm32/msacm_Lt.rc @@ -0,0 +1,61 @@ +/* + * Lithuanian resource file for MS ACM + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Garso parinkimas" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Pavadinimas:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 100, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "Išsaugoti k&aip...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 110, 14, 60, 14 + PUSHBUTTON "Pa&šalinti", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Formatas:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "A&tributai:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "Gerai", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Atsisakyti", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Žinynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +#pragma code_page(default)

1 0

Nikolay Sivov : comctl32/tab: Draw hottracked tab button properly.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: 483083e30646cbbb73798864afa7cc32d277f69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=483083e30646cbbb73798864a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 5 09:39:36 2009 -0400 comctl32/tab: Draw hottracked tab button properly. --- dlls/comctl32/tab.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1830b2d..a7e925f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1482,7 +1482,10 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect { FillRect(hdc, drawRect, hbr); if (iItem == infoPtr->iHotTracked) - DrawEdge(hdc, drawRect, EDGE_RAISED, BF_SOFT|BF_RECT); + { + DrawEdge(hdc, drawRect, EDGE_RAISED, BF_SOFT|BF_TOPLEFT); + DrawEdge(hdc, drawRect, EDGE_RAISED, BF_FLAT|BF_BOTTOMRIGHT); + } } else FillRect(hdc, &rTemp, hbr);

1 0

Roderick Colenbrander : wined3d: Update NVidia pci ids.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: a932fdcb2fc51528f7e3e24c52e017025339da28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a932fdcb2fc51528f7e3e24c5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 5 17:19:19 2009 +0200 wined3d: Update NVidia pci ids. --- dlls/wined3d/directx.c | 46 +++++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_gl.h | 5 ++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3294fff..70322e6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1088,13 +1088,29 @@ static 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)) { - /* Geforce GTX - highend */ - if(strstr(gl_info->gl_renderer, "GTX 280")) { + /* Geforce 200 - highend */ + if(strstr(gl_info->gl_renderer, "GTX 280") || + strstr(gl_info->gl_renderer, "GTX 285") || + strstr(gl_info->gl_renderer, "GTX 295")) + { gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX280; vidmem = 1024; } - /* Geforce9 - highend */ - else if(strstr(gl_info->gl_renderer, "9800")) { + /* Geforce 200 - midend high */ + if(strstr(gl_info->gl_renderer, "GTX 275")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX275; + vidmem = 896; + } + /* Geforce 200 - midend */ + if(strstr(gl_info->gl_renderer, "GTX 260")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX260; + vidmem = 1024; + } + /* Geforce9 - highend / Geforce 200 - midend (GTS 150/250 are based on the same core) */ + else if(strstr(gl_info->gl_renderer, "9800") || + strstr(gl_info->gl_renderer, "GTS 150") || + strstr(gl_info->gl_renderer, "GTS 250")) + { gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800GT; vidmem = 512; } @@ -1103,6 +1119,28 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_9600GT; vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */ } + /* Geforce9 - midend low / Geforce 200 - low*/ + else if(strstr(gl_info->gl_renderer, "9500") || + strstr(gl_info->gl_renderer, "GT 120") || + strstr(gl_info->gl_renderer, "GT 130")) + { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_9500GT; + vidmem = 256; /* The 9500GT has 256-1024MB */ + } + /* Geforce9 - lowend */ + else if(strstr(gl_info->gl_renderer, "9400")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_9400GT; + vidmem = 256; /* The 9400GT has 256-1024MB */ + } + /* Geforce9 - lowend low */ + else if(strstr(gl_info->gl_renderer, "9100") || + strstr(gl_info->gl_renderer, "9200") || + strstr(gl_info->gl_renderer, "9300") || + strstr(gl_info->gl_renderer, "G 100")) + { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_9200; + vidmem = 256; /* The 9100-9300 cards have 256MB */ + } /* Geforce8 - highend */ else if (strstr(gl_info->gl_renderer, "8800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2b5cbab..6fc02dd 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3320,8 +3320,13 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_8600GT = 0x0402, CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, + CARD_NVIDIA_GEFORCE_9200 = 0x086d, + CARD_NVIDIA_GEFORCE_9400GT = 0x042c, + CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, + CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, + CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_INTEL_845G = 0x2562,

1 0

Roderick Colenbrander : opengl32: Update with the latest OpenGL extensions.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: ef385d2e7a41256aee61887a863284cd33ab6b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef385d2e7a41256aee61887a8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 5 16:26:54 2009 +0200 opengl32: Update with the latest OpenGL extensions. --- dlls/opengl32/opengl_ext.c | 434 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 415 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef385d2e7a41256aee618…

1 0

Marcus Meissner : wininet: Fixed memory corruption in urlcache.
by Alexandre Julliard 06 Apr '09

06 Apr '09

Module: wine Branch: master Commit: cb80692cf86ef133a75d47b569568b43caee59a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb80692cf86ef133a75d47b56… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 5 13:55:21 2009 +0200 wininet: Fixed memory corruption in urlcache. --- dlls/wininet/urlcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index bf67fec..b4feba3 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -995,11 +995,13 @@ static DWORD URLCache_CopyEntry( /* FIXME: is source url optional? */ if (*lpdwBufferSize >= dwRequiredSize) { - lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; + DWORD lenUrlBytes = (lenUrl+1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrlBytes; if (bUnicode) MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize))

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009