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

Caron Wills : wined3d: Add Nvidia GeForce 820M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 4141d3ecbe13e1ad890a380f2c7102e0b364ba51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4141d3ecbe13e1ad890a380f2… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 6 14:06:54 2016 +0000 wined3d: Add Nvidia GeForce 820M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9ecc547c6a91f3fdfe4cddf99690d4613865992b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7c4563..e3ff8e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1278,6 +1278,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1733,6 +1734,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ @@ -2098,6 +2100,7 @@ cards_nvidia_mesa[] = {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, + {"NVD7", CARD_NVIDIA_GEFORCE_820M}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5a00c8..34165ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1623,6 +1623,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 830M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: daa7448a75621b3c301d0ec1cf521262f595e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa7448a75621b3c301d0ec1c… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 14 18:23:11 2016 +0000 wined3d: Add Nvidia GeForce 830M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e184b81ce264d243c44bff3428149c21e838bf40) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e3ff8e7..97c5a16 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1279,6 +1279,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1734,6 +1735,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34165ea..228e093 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1624,6 +1624,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, + CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 840M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 2e0448428a184fd5397e79d9236593273a90dc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0448428a184fd5397e79d92… Author: Caron Wills <caron(a)codeweavers.com> Date: Fri Apr 15 18:10:42 2016 +0000 wined3d: Add Nvidia GeForce 840M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8d6eee32a612443d460c34b24c27ab7646da811) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97c5a16..5ce9937 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1280,6 +1280,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1735,6 +1736,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ @@ -2094,6 +2096,7 @@ cards_nvidia_mesa[] = { /* Maxwell */ {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, + {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 228e093..a64e6e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1625,6 +1625,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, + CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce 845M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: ceeec7c34299a0e29586931fc81049b5e14b0467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceeec7c34299a0e29586931fc… Author: Caron Wills <caron(a)codeweavers.com> Date: Mon Apr 18 16:17:41 2016 +0000 wined3d: Add Nvidia GeForce 845M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43da2217a260e8100695d81853fa49c8fe34e3e2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ce9937..6a0cfbf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1281,6 +1281,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1736,6 +1737,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a64e6e7..70e8af0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1626,6 +1626,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, + CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Kim Malmo : wined3d: Add Nvidia 9700M GT.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: e44f66a77bddd966c7b84a6f4b0d8ea22f84d95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f66a77bddd966c7b84a6f4… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Apr 19 18:34:10 2016 +0200 wined3d: Add Nvidia 9700M GT. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f4c496480d2b07711e37185de616b4d8304e4e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a0cfbf..2edfb7c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1223,6 +1223,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, @@ -1806,6 +1807,7 @@ cards_nvidia_binary[] = {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ + {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70e8af0..381de33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1568,6 +1568,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9700MGT = 0x064a, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20,

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 850M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: b4ee32929c077567ef10f322d06bd9d1762e9168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ee32929c077567ef10f322d… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Apr 19 19:33:49 2016 +0000 wined3d: Add Nvidia GeForce GTX 850M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e44e6b2244154c9e00f48179737c2b5d1e328201) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2edfb7c..55a5b68 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1283,6 +1283,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1738,6 +1739,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 381de33..de7256a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1628,6 +1628,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_845M = 0x1344, + CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 870M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 834ea8938677e36359df1206ca512f2bc8b52d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=834ea8938677e36359df1206c… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 20 16:15:18 2016 +0000 wined3d: Add Nvidia GeForce GTX 870M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c18fe17c76efd7d7a2b2648c48e5990c2ae780a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 55a5b68..a053f98 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1285,6 +1285,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1738,6 +1739,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de7256a..3e857f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1630,6 +1630,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ + CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 880M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 7a8f5472ec1cdb9562c19e55a5f2b3a5b74304ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f5472ec1cdb9562c19e55a… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 21 18:06:05 2016 +0000 wined3d: Add Nvidia GeForce GTX 880M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f52accf86de3f3be387090cf5f1516a693213331) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a053f98..6b1ccc0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1286,6 +1286,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1739,6 +1740,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e857f7..ddbb355 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1631,6 +1631,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, + CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Alistair Leslie-Hughes : wined3d: Add detection for NVIDIA GTX TITAN Series.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 50433e7f3ad7dcaae4e9671fccd2982132755113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50433e7f3ad7dcaae4e9671fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 22 09:16:19 2016 +0000 wined3d: Add detection for NVIDIA GTX TITAN Series. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bb1824e7e82df1d12a93444dc19573e84050e4f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b1ccc0..2f85b08 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1278,7 +1278,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANB, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANX, "NVIDIA GeForce GTX TITAN X", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANZ, "NVIDIA GeForce GTX TITAN Z", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1736,6 +1739,7 @@ cards_nvidia_binary[] = {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX TITAN X", CARD_NVIDIA_GEFORCE_GTXTITANX}, /* Geforce 900 - highend */ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ @@ -1749,7 +1753,9 @@ cards_nvidia_binary[] = {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ - {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITANB}, /* Geforce 700 - highend */ + {"GTX TITAN Z", CARD_NVIDIA_GEFORCE_GTXTITANZ}, /* Geforce 700 - highend */ + {"GTX TITAN", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddbb355..18cdcd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1623,7 +1623,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, - CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITAN = 0x1005, + CARD_NVIDIA_GEFORCE_GTXTITANB = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITANX = 0x17c2, + CARD_NVIDIA_GEFORCE_GTXTITANZ = 0x1001, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341,

1 0

Ken Thomases : user32: Call the EnumDisplayMonitors callback using a wrapper.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 28082a8901b256c9688bb69690655658718494ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=28082a8901b256c9688bb6969… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 23 21:46:32 2016 -0500 user32: Call the EnumDisplayMonitors callback using a wrapper. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 474196c746e95cf84137a85512d01a0e622c5c15) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 33016a1..6b1b5ed 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -466,11 +468,46 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) return ret; } +#ifdef __i386__ +/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, + * so we need a small assembly wrapper to call it. + */ +struct enumdisplaymonitors_lparam +{ + MONITORENUMPROC proc; + LPARAM lparam; +}; + +extern BOOL CALLBACK enumdisplaymonitors_callback_wrapper(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam); +__ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $8,%esp\n\t" + "movl 20(%ebp),%eax\n\t" /* struct enumdisplaymonitors_lparam *orig = (struct enumdisplaymonitors_lparam*)lparam */ + "pushl 4(%eax)\n\t" /* push orig->lparam */ + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call *(%eax)\n\t" /* call orig->proc */ + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) +#endif /* __i386__ */ + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { +#ifdef __i386__ + struct enumdisplaymonitors_lparam orig = { proc, lp }; + proc = enumdisplaymonitors_callback_wrapper; + lp = (LPARAM)&orig; +#endif return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }

1 0