May 2012 - Wine-commits - list.winehq.org

Hans Leidekker : fusion: Add a "v4.0_" prefix to version 4. 0 assembly directories.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 0b82e284013dafd20f14377dda38820f5645a9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b82e284013dafd20f14377dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 09:14:58 2012 +0200 fusion: Add a "v4.0_" prefix to version 4.0 assembly directories. --- dlls/fusion/asmcache.c | 10 ++++++++-- dlls/fusion/asmenum.c | 29 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 93047d4..1cba6f6 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -375,7 +375,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format[] = + {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format_v40[] = + {'%','s','\\','%','s','\\','v','4','.','0','_','%','s','_','_','%','s','\\',0}; static const WCHAR ext_exe[] = {'.','e','x','e',0}; static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); @@ -430,7 +433,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, architecture = assembly_get_architecture(assembly); get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); - sprintfW(path, format, asmdir, name, version, token); + if (!strcmp(clr_version, "v4.0.30319")) + sprintfW(path, format_v40, asmdir, name, version, token); + else + sprintfW(path, format, asmdir, name, version, token); create_full_path(path); diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index f4da88a..641ed2f 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -291,17 +291,6 @@ static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, int depth, LPWSTR path) { - WIN32_FIND_DATAW ffd; - WCHAR buf[MAX_PATH]; - WCHAR disp[MAX_PATH]; - WCHAR asmpath[MAX_PATH]; - ASMNAME *asmname; - HANDLE hfind; - LPWSTR ptr; - HRESULT hr = S_OK; - - static WCHAR parent[MAX_PATH]; - static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; static const WCHAR search_fmt[] = {'%','s','\\','*',0}; @@ -311,6 +300,14 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR v40[] = {'v','4','.','0','_'}; + WIN32_FIND_DATAW ffd; + WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH]; + static WCHAR parent[MAX_PATH]; + ASMNAME *asmname; + HANDLE hfind; + WCHAR *ptr; + HRESULT hr = S_OK; if (name) parse_name(name, depth, path, buf); @@ -337,13 +334,19 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } else if (depth == 1) { + unsigned int prefix_len = sizeof(v40)/sizeof(WCHAR); + const WCHAR *token, *version = ffd.cFileName; + sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; - ptr += 2; + token = ptr + 2; + + if (strlenW(ffd.cFileName) >= prefix_len && + !memcmp(ffd.cFileName, v40, sizeof(v40))) version += prefix_len; - sprintfW(disp, fmt, parent, ffd.cFileName, ptr); + sprintfW(disp, fmt, parent, version, token); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname)

1 0

Hans Leidekker : fusion: Handle DWORD-sized blob indices when loading the public key.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 7c06862c52683dc230dd0f372eaf8fb6a5d3284a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c06862c52683dc230dd0f372… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 13:05:14 2012 +0200 fusion: Handle DWORD-sized blob indices when loading the public key. --- dlls/fusion/assembly.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 46c4db4..b655df1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -825,23 +825,22 @@ PEKIND assembly_get_architecture(ASSEMBLY *assembly) return peI386; /* x86 assembly */ } -static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) +static BYTE *assembly_get_blob(ASSEMBLY *assembly, DWORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); } HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { - ASSEMBLYTABLE *asmtbl; ULONG i, size; LONG offset; - BYTE *hashdata; + BYTE *hashdata, *pubkey, *ptr; HCRYPTPROV crypt; HCRYPTHASH hash; - BYTE *pubkey; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; + DWORD idx; *token = NULL; @@ -849,11 +848,17 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) if (offset == -1) return E_FAIL; - asmtbl = assembly_data_offset(assembly, offset); - if (!asmtbl) + ptr = assembly_data_offset(assembly, offset); + if (!ptr) return E_FAIL; - pubkey = assembly_get_blob(assembly, asmtbl->PublicKey, &size); + ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey); + if (assembly->blobsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + pubkey = assembly_get_blob(assembly, idx, &size); if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))

1 0

Alexandre Julliard : gdi32: Use a rop_mask_bits object to store the brush bits.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 524aef660e3e2edf60fb5c30d5865644948c896a URL: http://source.winehq.org/git/wine.git/?a=commit;h=524aef660e3e2edf60fb5c30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:47:30 2012 +0200 gdi32: Use a rop_mask_bits object to store the brush bits. --- dlls/gdi32/dibdrv/dibdrv.h | 3 +-- dlls/gdi32/dibdrv/objects.c | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f72cbdb..209b237 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -76,8 +76,7 @@ typedef struct dib_brush INT rop; /* rop2 last used to create the brush bits */ COLORREF colorref; dib_info dib; - void *and_bits; - void *xor_bits; + rop_mask_bits masks; struct brush_pattern pattern; BOOL (*rects)(struct dibdrv_physdev *pdev, struct dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3351875..5fe2f45 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1734,10 +1734,10 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static void free_pattern_brush_bits( dib_brush *brush ) { - HeapFree(GetProcessHeap(), 0, brush->and_bits); - HeapFree(GetProcessHeap(), 0, brush->xor_bits); - brush->and_bits = NULL; - brush->xor_bits = NULL; + HeapFree(GetProcessHeap(), 0, brush->masks.and); + HeapFree(GetProcessHeap(), 0, brush->masks.xor); + brush->masks.and = NULL; + brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) @@ -1752,13 +1752,13 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); assert(brush->dib.stride > 0); - and_bits = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); if(!and_bits || !xor_bits) { @@ -1790,12 +1790,11 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - rop_mask_bits mask_bits; DWORD size; BOOL ret; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from @@ -1812,10 +1811,10 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL size = brush->dib.height * brush->dib.stride; - mask_bits.and = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - mask_bits.xor = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - if(!mask_bits.and || !mask_bits.xor) + if (!brush->masks.and || !brush->masks.xor) { ERR("Failed to create pattern brush bits\n"); free_pattern_brush_bits( brush ); @@ -1841,7 +1840,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL if (GetBkMode(pdev->dev.hdc) != TRANSPARENT && (GetBkColor(pdev->dev.hdc) & (1 << 24))) *needs_reselect = TRUE; - ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &mask_bits ); + ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); if(!ret) free_pattern_brush_bits( brush ); return ret; @@ -1966,7 +1965,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, brush->rop = rop; } - if(brush->and_bits == NULL) + if(brush->masks.and == NULL) { switch(brush->style) { @@ -1990,7 +1989,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, GetBrushOrgEx(pdev->dev.hdc, &origin); - dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->and_bits, brush->xor_bits ); + dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->masks.and, brush->masks.xor ); if (needs_reselect) free_pattern_brush( brush ); return TRUE;

1 0

Alexandre Julliard : gdi32: Pass a rop_mask_bits object to the pattern_rects primitive.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: b708b40105807461cf1d51469979733812792569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b708b40105807461cf1d51469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:52:44 2012 +0200 gdi32: Pass a rop_mask_bits object to the pattern_rects primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 62 ++++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b708b40105807461cf1d5…

1 0

Alexandre Julliard : gdi32: Add a helper function to allocate the brush bits.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 574a07e4c96da2541b44f2f2b0a29d0ab5262b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a07e4c96da2541b44f2f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 22:03:18 2012 +0200 gdi32: Add a helper function to allocate the brush bits. --- dlls/gdi32/dibdrv/objects.c | 57 ++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce0b4a2..f5b4c05 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1732,17 +1732,28 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, return TRUE; } -static void free_pattern_brush_bits( dib_brush *brush ) +static BOOL alloc_brush_mask_bits( dib_brush *brush ) +{ + DWORD size = brush->dib.height * abs(brush->dib.stride); + + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); + assert(brush->dib.stride > 0); + + if (!(brush->masks.and = HeapAlloc(GetProcessHeap(), 0, 2 * size))) return FALSE; + brush->masks.xor = (char *)brush->masks.and + size; + return TRUE; +} + +static void free_brush_mask_bits( dib_brush *brush ) { HeapFree(GetProcessHeap(), 0, brush->masks.and); - HeapFree(GetProcessHeap(), 0, brush->masks.xor); - brush->masks.and = NULL; - brush->masks.xor = NULL; + brush->masks.and = brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); free_dib_info( &brush->dib ); } @@ -1752,20 +1763,10 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - - assert(brush->dib.stride > 0); - - and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); + if (!alloc_brush_mask_bits( brush )) return FALSE; - if(!and_bits || !xor_bits) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + and_bits = brush->masks.and; + xor_bits = brush->masks.xor; while(size) { @@ -1790,12 +1791,8 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - DWORD size; BOOL ret; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from the hatch patterns. */ @@ -1809,17 +1806,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.rect.right = 8; brush->dib.rect.bottom = 8; - size = brush->dib.height * brush->dib.stride; - - brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - - if (!brush->masks.and || !brush->masks.xor) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + if (!alloc_brush_mask_bits( brush )) return FALSE; hatch.bit_count = 1; hatch.height = hatch.width = 8; @@ -1841,7 +1828,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL *needs_reselect = TRUE; ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); - if(!ret) free_pattern_brush_bits( brush ); + if(!ret) free_brush_mask_bits( brush ); return ret; } @@ -1961,7 +1948,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, if (rop != brush->rop) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); brush->rop = rop; }

1 0

Alexandre Julliard : gdi32: Simplify creation of hatch masks and avoid endianness issues.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: b8e4cd81abac4b82aff5b648114eaefb605b8b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e4cd81abac4b82aff5b6481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:24:18 2012 +0200 gdi32: Simplify creation of hatch masks and avoid endianness issues. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 22 +---- dlls/gdi32/dibdrv/primitives.c | 192 ++++++++++++++++++---------------------- 3 files changed, 90 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e4cd81abac4b82aff5b…

1 0

Henri Verbeet : wined3d: Store user clip planes as 4-component float vectors.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: e3ecfa5974da9be707e38bc45445fa4c81438543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ecfa5974da9be707e38bc45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:06 2012 +0200 wined3d: Store user clip planes as 4-component float vectors. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 14 ++++++-------- dlls/ddraw/device.c | 4 ++-- dlls/wined3d/device.c | 21 +++++++-------------- dlls/wined3d/state.c | 13 ++++++++----- dlls/wined3d/stateblock.c | 12 +++--------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 14 ++++++++++++-- 8 files changed, 41 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3ecfa5974da9be707e38…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DVertexBuffer8Impl.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 1993727ee73ebec02e01858166ccbea0b1ea5711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1993727ee73ebec02e0185816… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:07 2012 +0200 d3d8: Get rid of IDirect3DVertexBuffer8Impl. --- dlls/d3d8/buffer.c | 72 +++++++++++++++++++++++----------------------- dlls/d3d8/d3d8_private.h | 20 ++++--------- dlls/d3d8/device.c | 12 ++++---- 3 files changed, 48 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1993727ee73ebec02e018…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DSwapChain8Impl.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 584053d0ee0a9c888ec8594758f2fba003f48833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584053d0ee0a9c888ec859475… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 22 18:01:08 2012 +0200 d3d8: Get rid of IDirect3DSwapChain8Impl. --- dlls/d3d8/d3d8_private.h | 17 ++------ dlls/d3d8/device.c | 4 +- dlls/d3d8/swapchain.c | 93 +++++++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=584053d0ee0a9c888ec85…

1 0

Karsten Elfenbein : wined3d: Add Nvidia GTX 670.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 9d7a39656ae7931d7695120e9b33cd9d29c55078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7a39656ae7931d7695120e9… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Mon May 21 20:54:49 2012 +0200 wined3d: Add Nvidia GTX 670. --- 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 bd7f7d4..7810d7b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1124,6 +1124,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1516,6 +1517,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63b7161..051b04e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1405,6 +1405,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0