September 2010 - Wine-Commits

Henri Verbeet : wined3d: Move base vertex state to wined3d_state.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 98a91e84bc8191260615d8e8dd79f0984f6e64e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a91e84bc8191260615d8e8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:24 2010 +0200 wined3d: Move base vertex state to wined3d_state. --- dlls/wined3d/device.c | 33 ++++++++++++++++++--------------- dlls/wined3d/drawprim.c | 16 ++++++++-------- dlls/wined3d/state.c | 40 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 5 ++--- 5 files changed, 52 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98a91e84bc8191260615d…

1 0

Alexandre Julliard : configure: Make sure the rules files are rebuilt when doing make depend.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 4e9e38ee4f9e4b8fb3d35743d941c2ecf56789fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9e38ee4f9e4b8fb3d35743d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 20:23:25 2010 +0200 configure: Make sure the rules files are rebuilt when doing make depend. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b48296f..af6b03c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -175,7 +175,7 @@ $[1]/Makefile: $[1]/Makefile.in Make.vars.in config.status $[2] @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend depend: $[1]/__depend__ .PHONY: $[1]/__depend__ -$[1]/__depend__: \$(MAKEDEP) dummy +$[1]/__depend__: $[2] dummy @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend" } diff --git a/configure b/configure index dcca4e6..58093b5 100755 --- a/configure +++ b/configure @@ -14131,7 +14131,7 @@ $1/Makefile: $1/Makefile.in Make.vars.in config.status $2 @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend depend: $1/__depend__ .PHONY: $1/__depend__ -$1/__depend__: \$(MAKEDEP) dummy +$1/__depend__: $2 dummy @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend" }

1 0

Henri Verbeet : wined3d: Move stream state to wined3d_state.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 153d8d43aa475cd955599d07081e9b3a6c0ef1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=153d8d43aa475cd955599d070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:22 2010 +0200 wined3d: Move stream state to wined3d_state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 56 ++++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 29 ++++++++++---------- dlls/wined3d/state.c | 16 +++++----- dlls/wined3d/stateblock.c | 40 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 6 +--- 6 files changed, 76 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=153d8d43aa475cd955599…

1 0

Jacek Caban : urlmon: Make protocol_start IUri-based.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: ef9283328c914fff76d18109a5eb849124663c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9283328c914fff76d18109a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 20:00:52 2010 +0200 urlmon: Make protocol_start IUri-based. --- dlls/urlmon/ftp.c | 20 +++++++++- dlls/urlmon/gopher.c | 20 +++++++++- dlls/urlmon/http.c | 85 +++++++++++++++++++++++++++----------------- dlls/urlmon/protocol.c | 4 +- dlls/urlmon/urlmon_main.h | 4 +- 5 files changed, 92 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef9283328c914fff76d18…

1 0

Alexandre Julliard : shell32: Map the x86 version of the folder to the appropriate path depending on Wow64 mode .
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: c15b376a159e174f4fe5a0069a40a2f6ca91ff79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15b376a159e174f4fe5a0069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 13:36:17 2010 +0200 shell32: Map the x86 version of the folder to the appropriate path depending on Wow64 mode. --- dlls/shell32/shellpath.c | 39 ++++++++++++++++- dlls/shell32/tests/shlfolder.c | 91 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e0228ee..54d7efa 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); + /* ########## Combining and Constructing paths ########## */ @@ -1634,6 +1636,25 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) if (!pszPath) return E_INVALIDARG; + if (!is_win64) + { + BOOL is_wow64; + + switch (folder) + { + case CSIDL_PROGRAM_FILES: + case CSIDL_PROGRAM_FILESX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILESX86 : CSIDL_PROGRAM_FILES; + break; + case CSIDL_PROGRAM_FILES_COMMON: + case CSIDL_PROGRAM_FILES_COMMONX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILES_COMMONX86 : CSIDL_PROGRAM_FILES_COMMON; + break; + } + } + if (CSIDL_Data[folder].szDefaultPath && IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) { @@ -1719,8 +1740,22 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, { hr = _SHGetDefaultValue(folder, pszPath); dwType = REG_EXPAND_SZ; - RegSetValueExW(hKey, CSIDL_Data[folder].szValueName, 0, dwType, - (LPBYTE)pszPath, (strlenW(pszPath)+1)*sizeof(WCHAR)); + switch (folder) + { + case CSIDL_PROGRAM_FILESX86: + case CSIDL_PROGRAM_FILES_COMMONX86: + /* these two should never be set on 32-bit setups */ + if (!is_win64) + { + BOOL is_wow64; + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + if (!is_wow64) break; + } + /* fall through */ + default: + RegSetValueExW(hKey, CSIDL_Data[folder].szValueName, 0, dwType, + (LPBYTE)pszPath, (strlenW(pszPath)+1)*sizeof(WCHAR)); + } } else { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e766adf..639b092 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -68,6 +68,7 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static int strcmp_wa(LPCWSTR strw, const char *stra) { @@ -143,6 +144,8 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); + pIsWow64Process = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); } @@ -1658,6 +1661,93 @@ static void test_ITEMIDLIST_format(void) { IShellFolder_Release(psfPersonal); } +static void test_SHGetFolderPathA(void) +{ + static const BOOL is_win64 = sizeof(void *) > sizeof(int); + BOOL is_wow64; + char path[MAX_PATH]; + char path_x86[MAX_PATH]; + char path_key[MAX_PATH]; + HRESULT hr; + HKEY key; + + if (!pSHGetFolderPathA) + { + win_skip("SHGetFolderPathA not present\n"); + return; + } + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + if (hr == E_FAIL) + { + win_skip( "Program Files (x86) not supported\n" ); + return; + } + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + if (is_win64) + { + ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); + ok( strstr( path, "x86" ) == NULL, "64-bit path '%s' contains x86\n", path ); + ok( strstr( path_x86, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path_x86 ); + } + else + { + ok( !lstrcmpiA( path, path_x86 ), "paths differ '%s' != '%s'\n", path, path_x86 ); + if (is_wow64) + ok( strstr( path, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path ); + else + ok( strstr( path, "x86" ) == NULL, "32-bit path '%s' contains x86\n", path ); + } + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key )) + { + DWORD type, count = sizeof(path_x86); + if (!RegQueryValueExA( key, "ProgramFilesDir (x86)", NULL, &type, (BYTE *)path_key, &count )) + { + ok( is_win64 || is_wow64, "ProgramFilesDir (x86) exists on 32-bit setup\n" ); + ok( !lstrcmpiA( path_key, path_x86 ), "paths differ '%s' != '%s'\n", path_key, path_x86 ); + } + else ok( !is_win64 && !is_wow64, "ProgramFilesDir (x86) should exist on 64-bit setup\n" ); + RegCloseKey( key ); + } + + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + if (hr == E_FAIL) + { + win_skip( "Common Files (x86) not supported\n" ); + return; + } + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + if (is_win64) + { + ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); + ok( strstr( path, "x86" ) == NULL, "64-bit path '%s' contains x86\n", path ); + ok( strstr( path_x86, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path_x86 ); + } + else + { + ok( !lstrcmpiA( path, path_x86 ), "paths differ '%s' != '%s'\n", path, path_x86 ); + if (is_wow64) + ok( strstr( path, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path ); + else + ok( strstr( path, "x86" ) == NULL, "32-bit path '%s' contains x86\n", path ); + } + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key )) + { + DWORD type, count = sizeof(path_x86); + if (!RegQueryValueExA( key, "CommonFilesDir (x86)", NULL, &type, (BYTE *)path_key, &count )) + { + ok( is_win64 || is_wow64, "CommonFilesDir (x86) exists on 32-bit setup\n" ); + ok( !lstrcmpiA( path_key, path_x86 ), "paths differ '%s' != '%s'\n", path_key, path_x86 ); + } + else ok( !is_win64 && !is_wow64, "CommonFilesDir (x86) should exist on 64-bit setup\n" ); + } +} + static void test_SHGetFolderPathAndSubDirA(void) { HRESULT ret; @@ -4062,6 +4152,7 @@ START_TEST(shlfolder) test_CallForAttributes(); test_FolderShortcut(); test_ITEMIDLIST_format(); + test_SHGetFolderPathA(); test_SHGetFolderPathAndSubDirA(); test_LocalizedNames(); test_SHCreateShellItem();

1 0

Alexandre Julliard : wine.inf: Create the x86 program files key in Wow64 mode too.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 09be7dd83dd08361960375b771ba9ab55aeca716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09be7dd83dd08361960375b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 14:13:42 2010 +0200 wine.inf: Create the x86 program files key in Wow64 mode too. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 429934e..44e36a7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -114,6 +114,7 @@ WineFakeDlls=FakeDllsWin32,FakeDllsWow64 CopyFiles=(a)l_intl.nls AddReg=\ CurrentVersion,\ + CurrentVersionWow64,\ Debugger,\ DirectX,\ Dotnet,\

1 0

Jacek Caban : include: Added D3DVECTOR_DEFINED guard.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: f6f6affb299cf500e940f0b9b31a71edc111632c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f6affb299cf500e940f0b9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 16:01:49 2010 +0200 include: Added D3DVECTOR_DEFINED guard. --- include/d3d8types.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 3d0d7cb..745f248 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -1053,11 +1053,14 @@ typedef struct _D3DINDEXBUFFER_DESC { UINT Size; } D3DINDEXBUFFER_DESC; +#ifndef D3DVECTOR_DEFINED typedef struct _D3DVECTOR { float x; float y; float z; } D3DVECTOR; +#define D3DVECTOR_DEFINED +#endif typedef struct _D3DLIGHT8 { D3DLIGHTTYPE Type;

1 0

Michael Mc Donnell : shell32/tests: SHBrowseForFolder should return new folder pidl.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: a862b95b4ca05a0ac239e1b3e347c6b55796927f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a862b95b4ca05a0ac239e1b3e… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Sun Sep 19 12:12:06 2010 +0200 shell32/tests: SHBrowseForFolder should return new folder pidl. --- dlls/shell32/tests/brsfolder.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 0aebb74..e9a6e2c 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -86,6 +86,19 @@ static void CALLBACK make_new_folder_timer_callback(HWND hwnd, UINT uMsg, SetFocus(hwnd); break; case 2: + /* + * The test does not trigger the correct state on Windows. This results + * in the new folder pidl not being returned. The result is as + * expected if the same steps are done manually. + * Sending the down key selects the new folder again which sets the + * correct state. This ensures that the correct pidl is returned. + */ + keybd_event(VK_DOWN, 0, 0, 0); + break; + case 3: + keybd_event(VK_DOWN, 0, KEYEVENTF_KEYUP, 0); + break; + case 4: KillTimer(hwnd, idEvent); /* Close dialog box */ SendMessage(hwnd, WM_COMMAND, IDOK, 0); @@ -141,6 +154,7 @@ static void test_click_make_new_folder_button(void) char test_folder_path[MAX_PATH]; WCHAR test_folder_pathW[MAX_PATH]; CHAR new_folder_path[MAX_PATH]; + CHAR new_folder_pidl_path[MAX_PATH]; char selected_folder[MAX_PATH]; const CHAR title[] = "test_click_make_new_folder_button"; int number_of_folders = -1; @@ -204,6 +218,14 @@ static void test_click_make_new_folder_button(void) || broken(!does_folder_or_file_exist(new_folder_path)) /* W95, W98, XP, W2K3 */, "The new folder did not get the name %s\n", new_folder_name); + /* Dialog should return a pidl pointing to the new folder */ + ok(SHGetPathFromIDListA(pidl, new_folder_pidl_path), + "SHGetPathFromIDList failed for new folder.\n"); + todo_wine ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 + || broken(strcmp(new_folder_path, new_folder_pidl_path) != 0) /* earlier than Vista */, + "SHBrowseForFolder did not return the pidl for the new folder. " + "Expected '%s' got '%s'\n", new_folder_path, new_folder_pidl_path); + /* Remove test folder and any subfolders created in this test */ shfileop.hwnd = NULL; shfileop.wFunc = FO_DELETE;

1 0

Łukasz Wojniłowicz : ipconfig: Add the Polish translation.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: deb7197451df88930d1c59c93ed3aadeac6dbf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb7197451df88930d1c59c93… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 19 11:11:38 2010 +0200 ipconfig: Add the Polish translation. --- programs/ipconfig/Makefile.in | 1 + programs/ipconfig/Pl.rc | 46 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 5135a13..2355217 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Pl.rc \ Si.rc \ Sv.rc \ Uk.rc diff --git a/programs/ipconfig/Pl.rc b/programs/ipconfig/Pl.rc new file mode 100644 index 0000000..25cce09 --- /dev/null +++ b/programs/ipconfig/Pl.rc @@ -0,0 +1,46 @@ +/* + * IP configuration utility + * + * Copyright 2010 �ukasz Wojni�owicz + * + * 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 + */ + +#include "ipconfig.h" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Spos�b u�ycia: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "B��d: Nierozpoznany lub niepe�ny wiersz polecenia\n" + STRING_ADAPTER_FRIENDLY, "%s karta %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Nieznane" + STRING_CONN_DNS_SUFFIX, "Sufiks DNS konkretnego po��czenia" + STRING_IP_ADDRESS, "Adres IP" + STRING_HOSTNAME, "Nazwa hosta" + STRING_NODE_TYPE, "Typ w�z�a" + STRING_BROADCAST, "Nadawca" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Mieszane" + STRING_HYBRID, "Hybrydowe" + STRING_IP_ROUTING, "Przekierowywanie IP w��czone" + STRING_DESCRIPTION, "Opis" + STRING_PHYS_ADDR, "Adres fizyczny" + STRING_DHCP_ENABLED, "DHCP w��czone" + STRING_YES, "Tak" + STRING_NO, "Nie" +}

1 0

Lauri Kenttä : wined3d: Use the same card selection for both Intel Mesa and binary drivers.
by Alexandre Julliard Sept. 20, 2010

Sept. 20, 2010

Module: wine Branch: master Commit: 602486bdb4b1aeabc9ab36d90922cd80e6be6239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602486bdb4b1aeabc9ab36d90… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 16 18:16:54 2010 +0300 wined3d: Use the same card selection for both Intel Mesa and binary drivers. --- dlls/wined3d/directx.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9f1b3be..ff41438 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1826,7 +1826,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in return CARD_ATI_RAGE_128PRO; } -static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, +static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { if (strstr(gl_renderer, "X3100")) @@ -2046,13 +2046,6 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return CARD_NVIDIA_RIVA_128; } -static enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) -{ - FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n"); - return CARD_INTEL_I915G; -} - struct vendor_card_selection { @@ -2067,12 +2060,12 @@ static const struct vendor_card_selection vendor_card_select_table[] = {GL_VENDOR_NVIDIA, HW_VENDOR_NVIDIA, "Nvidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_NVIDIA, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_ATI, "Apple OSX AMD/ATI binary driver", select_card_ati_binary}, - {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel_binary}, + {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel}, {GL_VENDOR_FGLRX, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_MESA, HW_VENDOR_ATI, "Mesa AMD/ATI driver", select_card_ati_mesa}, {GL_VENDOR_MESA, HW_VENDOR_NVIDIA, "Mesa Nouveau driver", select_card_nvidia_mesa}, - {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa}, - {GL_VENDOR_INTEL, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} + {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, + {GL_VENDOR_INTEL, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel} };

1 0