August 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add ftype tests.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 74566422c732d4f0631658629a0048482586400d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74566422c732d4f0631658629… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:19 2011 +0200 cmd/tests: Add ftype tests. --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 +++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 9dd2b60..b975d38 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1113,6 +1113,48 @@ type baz echo *** cd .. & rd /s/q foobar +echo ------------ Testing ftype -------------- +rem FIXME Can't test error messages in the current test system, so we have to use some kludges +rem FIXME Revise once || conditional execution is fixed +mkdir foobar & cd foobar +echo ...setting association +ftype footype> baz +type baz +echo *** + +ftype footype=foo_opencmd +assoc .foo=footype +ftype footype + +rem association set system-wide +echo @echo off> tmp.cmd +echo echo +++>> tmp.cmd +echo ftype footype>> tmp.cmd +cmd /c tmp.cmd + +echo ...resetting association +assoc .foo= + +rem Removing a file type association doesn't work on XP due to a bug, so a workaround is needed +setlocal EnableDelayedExpansion +set FOO=original value +ftype footype= +ftype footype > baz +for /F %%i in ('type baz') do (set FOO=buggyXP) +rem Resetting actually works on wine/NT4, but is reported as failing due to the peculiar test (and non-support for EnabledDelayedExpansion) +rem FIXME Revisit once a grep-like program like ftype is implemented +rem (e.g. to check baz's size using dir /b instead) +echo !FOO! + +rem cleanup registry +echo REGEDIT4> regCleanup.reg +echo.>> regCleanup.reg +echo [-HKEY_CLASSES_ROOT\footype]>> regCleanup.reg +regedit /s regCleanup.reg +set FOO= +endlocal +cd .. & rd /s/q foobar + echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 296f9b8..5419476 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -665,6 +665,16 @@ file created in read-only dir *** +++ *** +------------ Testing ftype -------------- +...setting association +*** +footype=foo_opencmd +.foo=footype +footype=foo_opencmd ++++ +footype=foo_opencmd +...resetting association +(a)todo_wine@original value(a)or_broken@buggyXP(a)or_broken@!FOO! ------------ Testing CALL -------------- foo(a)space@ foo 8

1 0

Jacek Caban : vbscript: Added IActiveScript::SetScriptSite implementation.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 9f907f63513950b433527f213eaa853f7e4f7b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f907f63513950b433527f213… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 11:36:23 2011 +0200 vbscript: Added IActiveScript::SetScriptSite implementation. --- dlls/vbscript/vbscript.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 4 ++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f0da4ed..74cc745 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -89,8 +89,11 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); - if(!ref) + if(!ref) { + if(This->site) + IActiveScriptSite_Release(This->site); heap_free(This); + } return ref; } @@ -98,7 +101,27 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%p)\n", This, pass); + LCID lcid; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pass); + + if(!pass) + return E_POINTER; + + if(This->site) + return E_UNEXPECTED; + + if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) + return E_UNEXPECTED; + + This->site = pass; + IActiveScriptSite_AddRef(This->site); + + hres = IActiveScriptSite_GetLCID(This->site, &lcid); + if(hres == S_OK) + This->lcid = lcid; + return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cd97e09..cec9a04 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -24,6 +24,10 @@ struct VBScript { IActiveScriptParse IActiveScriptParse_iface; LONG ref; + + IActiveScriptSite *site; + LONG thread_id; + LCID lcid; }; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : vbscript: Moved VBScript declaration to vbscript.c.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: fe0f2f631e331676586417f8904fbb8f30cfee9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0f2f631e331676586417f89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 11:36:56 2011 +0200 vbscript: Moved VBScript declaration to vbscript.c. --- dlls/vbscript/vbscript.c | 11 +++++++++++ dlls/vbscript/vbscript.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 74cc745..b04fe0c 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -44,6 +44,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #endif +struct VBScript { + IActiveScript IActiveScript_iface; + IActiveScriptParse IActiveScriptParse_iface; + + LONG ref; + + IActiveScriptSite *site; + LONG thread_id; + LCID lcid; +}; + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cec9a04..30aaf1e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -19,17 +19,6 @@ #include "activscp.h" #include "vbscript_classes.h" -struct VBScript { - IActiveScript IActiveScript_iface; - IActiveScriptParse IActiveScriptParse_iface; - - LONG ref; - - IActiveScriptSite *site; - LONG thread_id; - LCID lcid; -}; - HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); static inline void *heap_alloc(size_t len)

1 0

Frédéric Delanoy : cmd: Add help for ASSOC command.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 49073440d77d44818695f09348da8c777d8a388e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49073440d77d44818695f0934… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:13 2011 +0200 cmd: Add help for ASSOC command. --- po/ar.po | 91 ++++++++++++++++++++++++++------------------- po/bg.po | 91 ++++++++++++++++++++++++++------------------- po/ca.po | 91 ++++++++++++++++++++++++++------------------- po/cs.po | 91 ++++++++++++++++++++++++++------------------- po/da.po | 91 ++++++++++++++++++++++++++------------------- po/de.po | 92 ++++++++++++++++++++++++++------------------- po/el.po | 91 ++++++++++++++++++++++++++------------------- po/en.po | 92 ++++++++++++++++++++++++++------------------- po/en_US.po | 100 ++++++++++++++++++++++++++++++------------------- po/eo.po | 91 ++++++++++++++++++++++++++------------------- po/es.po | 91 ++++++++++++++++++++++++++------------------- po/fa.po | 91 ++++++++++++++++++++++++++------------------- po/fi.po | 91 ++++++++++++++++++++++++++------------------- po/fr.po | 92 ++++++++++++++++++++++++++------------------- po/he.po | 92 ++++++++++++++++++++++++++------------------- po/hi.po | 91 ++++++++++++++++++++++++++------------------- po/hu.po | 91 ++++++++++++++++++++++++++------------------- po/it.po | 91 ++++++++++++++++++++++++++------------------- po/ja.po | 91 ++++++++++++++++++++++++++------------------- po/ko.po | 92 ++++++++++++++++++++++++++------------------- po/lt.po | 92 ++++++++++++++++++++++++++------------------- po/ml.po | 91 ++++++++++++++++++++++++++------------------- po/nb_NO.po | 91 ++++++++++++++++++++++++++------------------- po/nl.po | 91 ++++++++++++++++++++++++++------------------- po/or.po | 91 ++++++++++++++++++++++++++------------------- po/pa.po | 91 ++++++++++++++++++++++++++------------------- po/pl.po | 91 ++++++++++++++++++++++++++------------------- po/pt_BR.po | 91 ++++++++++++++++++++++++++------------------- po/pt_PT.po | 91 ++++++++++++++++++++++++++------------------- po/rm.po | 91 ++++++++++++++++++++++++++------------------- po/ro.po | 91 ++++++++++++++++++++++++++------------------- po/ru.po | 91 ++++++++++++++++++++++++++------------------- po/sk.po | 91 ++++++++++++++++++++++++++------------------- po/sl.po | 91 ++++++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 91 ++++++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 91 ++++++++++++++++++++++++++------------------- po/sv.po | 91 ++++++++++++++++++++++++++------------------- po/te.po | 91 ++++++++++++++++++++++++++------------------- po/th.po | 91 ++++++++++++++++++++++++++------------------- po/tr.po | 91 ++++++++++++++++++++++++++------------------- po/uk.po | 91 ++++++++++++++++++++++++++------------------- po/wa.po | 91 ++++++++++++++++++++++++++------------------- po/wine.pot | 91 ++++++++++++++++++++++++++------------------- po/zh_CN.po | 91 ++++++++++++++++++++++++++------------------- po/zh_TW.po | 91 ++++++++++++++++++++++++++------------------- programs/cmd/cmd.rc | 9 ++++ 46 files changed, 2364 insertions(+), 1755 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49073440d77d44818695f…

1 0

Frédéric Delanoy : cmd: Add WCMD_output_asis_stderr function.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: c1c76d279ea825c4f7bf917d2229141ca24fbbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c76d279ea825c4f7bf917d2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:14 2011 +0200 cmd: Add WCMD_output_asis_stderr function. --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 37 ++++++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 885add4..27d9d9a 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -72,6 +72,7 @@ void WCMD_more (WCHAR *); void WCMD_move (void); void WCMD_output (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); +void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b282e99..ce07111 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -240,13 +240,15 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, } /******************************************************************* - * WCMD_output_asis - send output to current standard output device. - * without formatting eg. when message contains '%' + * WCMD_output_asis_handle + * + * Send output to specified handle without formatting e.g. when message contains '%' */ -void WCMD_output_asis (const WCHAR *message) { +static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { DWORD count; const WCHAR* ptr; WCHAR string[1024]; + HANDLE handle = GetStdHandle(std_handle); if (paged_mode) { do { @@ -256,25 +258,42 @@ void WCMD_output_asis (const WCHAR *message) { ptr++; }; if (*ptr == '\n') ptr++; - WCMD_output_asis_len(message, (ptr) ? ptr - message : strlenW(message), - GetStdHandle(STD_OUTPUT_HANDLE)); + WCMD_output_asis_len(message, (ptr) ? ptr - message : strlenW(message), handle); if (ptr) { numChars = 0; if (++line_count >= max_height - 1) { line_count = 0; - WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), - GetStdHandle(STD_OUTPUT_HANDLE)); + WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count, NULL); } } } while (((message = ptr) != NULL) && (*ptr)); } else { - WCMD_output_asis_len(message, lstrlenW(message), - GetStdHandle(STD_OUTPUT_HANDLE)); + WCMD_output_asis_len(message, lstrlenW(message), handle); } } +/******************************************************************* + * WCMD_output_asis + * + * Send output to current standard output device, without formatting + * e.g. when message contains '%' + */ +void WCMD_output_asis (const WCHAR *message) { + WCMD_output_asis_handle(STD_OUTPUT_HANDLE, message); +} + +/******************************************************************* + * WCMD_output_asis_stderr + * + * Send output to current standard error device, without formatting + * e.g. when message contains '%' + */ +void WCMD_output_asis_stderr (const WCHAR *message) { + WCMD_output_asis_handle(STD_ERROR_HANDLE, message); +} + /**************************************************************************** * WCMD_print_error *

1 0

Frédéric Delanoy : cmd: Ensure WCMD_assoc error messages are sent to stderr instead of stdout.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 18ac6e1a2c557ee28125f9a5af4abf93b15aa4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ac6e1a2c557ee28125f9a5a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:15 2011 +0200 cmd: Ensure WCMD_assoc error messages are sent to stderr instead of stdout. --- programs/cmd/builtins.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a2c5eec..42e7635 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2892,7 +2892,7 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); } wsprintfW(outbuffer, msgbuffer, keyValue); - WCMD_output_asis(outbuffer); + WCMD_output_asis_stderr(outbuffer); errorlevel = 2; } @@ -2933,7 +2933,7 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { sizeof(msgbuffer)/sizeof(WCHAR)); } wsprintfW(outbuffer, msgbuffer, keyValue); - WCMD_output_asis(outbuffer); + WCMD_output_asis_stderr(outbuffer); errorlevel = 2; }

1 0

Michael Stefaniuc : ole32: COM cleanup in compositemoniker.c.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 43a31b6200ee3bbb843547accdc880f366e7a6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a31b6200ee3bbb843547acc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 30 00:39:16 2011 +0200 ole32: COM cleanup in compositemoniker.c. --- dlls/ole32/compositemoniker.c | 168 +++++++++++++++++++---------------------- 1 files changed, 78 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43a31b6200ee3bbb84354…

1 0

Francois Gouget : net: Remove an untranslatable string from the resources.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 16d77d2a0cd9644602bde1ddaf348dd34a36687d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d77d2a0cd9644602bde1dda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 20:30:46 2011 +0200 net: Remove an untranslatable string from the resources. Add some output_xxx() functions so we can print strings that don't come from resources. Also protect against buffer overflows in output_vprintf() and constify the output_xxx() functions. --- po/ar.po | 22 +++++++++------------- po/bg.po | 22 +++++++++------------- po/ca.po | 22 +++++++++------------- po/cs.po | 22 +++++++++------------- po/da.po | 22 +++++++++------------- po/de.po | 22 +++++++++------------- po/el.po | 22 +++++++++------------- po/en.po | 22 +++++++++------------- po/en_US.po | 22 +++++++++------------- po/eo.po | 22 +++++++++------------- po/es.po | 22 +++++++++------------- po/fa.po | 22 +++++++++------------- po/fi.po | 22 +++++++++------------- po/fr.po | 22 +++++++++------------- po/he.po | 22 +++++++++------------- po/hi.po | 22 +++++++++------------- po/hu.po | 22 +++++++++------------- po/it.po | 22 +++++++++------------- po/ja.po | 22 +++++++++------------- po/ko.po | 22 +++++++++------------- po/lt.po | 22 +++++++++------------- po/ml.po | 22 +++++++++------------- po/nb_NO.po | 22 +++++++++------------- po/nl.po | 22 +++++++++------------- po/or.po | 22 +++++++++------------- po/pa.po | 22 +++++++++------------- po/pl.po | 22 +++++++++------------- po/pt_BR.po | 22 +++++++++------------- po/pt_PT.po | 22 +++++++++------------- po/rm.po | 22 +++++++++------------- po/ro.po | 22 +++++++++------------- po/ru.po | 22 +++++++++------------- po/sk.po | 22 +++++++++------------- po/sl.po | 22 +++++++++------------- po/sr_RS(a)cyrillic.po | 22 +++++++++------------- po/sr_RS(a)latin.po | 22 +++++++++------------- po/sv.po | 22 +++++++++------------- po/te.po | 22 +++++++++------------- po/th.po | 22 +++++++++------------- po/tr.po | 22 +++++++++------------- po/uk.po | 22 +++++++++------------- po/wa.po | 22 +++++++++------------- po/wine.pot | 22 +++++++++------------- po/zh_CN.po | 22 +++++++++------------- po/zh_TW.po | 22 +++++++++------------- programs/net/net.c | 33 +++++++++++++++++++++++++++------ programs/net/net.rc | 1 - programs/net/resources.h | 1 - 48 files changed, 432 insertions(+), 593 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16d77d2a0cd9644602bde…

1 0

Jérôme Gardou : rpcrt4: Properly unmarshall EMUM16 discriminant.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 67f7a02fed8b54667957acdf671a82a2b062b4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f7a02fed8b54667957acdf6… Author: Jérôme Gardou <jerome.gardou(a)laposte.net> Date: Mon Aug 29 01:05:19 2011 +0200 rpcrt4: Properly unmarshall EMUM16 discriminant. --- dlls/rpcrt4/ndr_marshall.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 85d0a3c..f0482e6 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6159,6 +6159,7 @@ static LONG unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: { USHORT d; align_pointer(&pStubMsg->Buffer, sizeof(USHORT));

1 0

Maxime Lombard : wined3d: Add support for Nvidia GTX 460M.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: ef604e3826f741effea7e586bbb1d804ec79666a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef604e3826f741effea7e586b… Author: Maxime Lombard <berillions(a)gmail.com> Date: Sun Aug 28 19:46:45 2011 +0000 wined3d: Add support for Nvidia GTX 460M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ba2e970..8064e9a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1112,6 +1112,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460M, "NVIDIA GeForce GTX 460M", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, @@ -1486,6 +1487,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ + {"GTX 460M", CARD_NVIDIA_GEFORCE_GTX460M}, /* Geforce 400 - highend mobile */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 516e14c..a474c33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,6 +1394,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, + CARD_NVIDIA_GEFORCE_GTX460M = 0x0dd1, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0