February 2017 - Wine-commits

Tag wine-1.8.7 : Alexandre Julliard : Release 1.8.7
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: refs/tags/wine-1.8.7 Tag: 5c026ecb04c80a7ab470ffbd5718c14ee4a634ef URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c026ecb04c80a7ab470ffbd5718… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 10:43:41 2017 +0100 Release 1.8.7

1 0

Carlos Rodriguez : wined3d: Recognize Geforce GTX 1050.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 8ef749d25989601f9d3f3448c163443c0e63f144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef749d25989601f9d3f3448c… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Tue Nov 29 15:34:54 2016 -0200 wined3d: Recognize Geforce GTX 1050. Signed-off-by: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f80fc6bba75e40c39887a6d868363289ab56b73) 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 e4b1028..97db8a0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1309,6 +1309,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1787,6 +1788,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 316b6ea..e7f9823 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,6 +1654,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Henri Verbeet : wined3d: Add GPU information for AMD TONGA.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 3719a543cb95a75ba3ae7e75b5511f832990e7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3719a543cb95a75ba3ae7e75b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 13:48:35 2017 +0100 wined3d: Add GPU information for AMD TONGA. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 332a6ff9169a852a1b5cc432dabba4bd98783a4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97db8a0..ed8fead 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1356,7 +1356,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -2104,8 +2105,10 @@ cards_amd_mesa[] = /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, + /* Volcanic Islands */ + {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ - {"HAWAII", CARD_AMD_RADEON_R9 }, + {"HAWAII", CARD_AMD_RADEON_R9_290}, {"KAVERI", CARD_AMD_RADEON_R7 }, {"KABINI", CARD_AMD_RADEON_R3 }, {"BONAIRE", CARD_AMD_RADEON_HD8770}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7f9823..d4c320d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1535,7 +1535,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD8770 = 0x665c, CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, - CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_R9_285 = 0x6939, + CARD_AMD_RADEON_R9_290 = 0x67b1, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Jarkko Korpi : wined3d: Add Amd Rx 480 binary driver.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 9245f1db5982a0a93e0a81f9543beb883296588b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9245f1db5982a0a93e0a81f95… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Mon Dec 26 07:31:44 2016 +0200 wined3d: Add Amd Rx 480 binary driver. Signed-off-by: Jarkko Korpi <jarkko_korpi(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 7912563f7f3f3bb0d13f225bd570aa289eb67d65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed8fead..2c13d54 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1949,6 +1949,7 @@ cards_nvidia_binary[] = * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ cards_amd_binary[] = { + {"RX 480", CARD_AMD_RADEON_RX_480}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, {"HD 7800", CARD_AMD_RADEON_HD7800},

1 0

Adam Bolte : wined3d: Add GPU information for AMD FIJI.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a05b9512e83be885f1b1529fa814f16eefcbd388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b9512e83be885f1b1529fa… Author: Adam Bolte <abolte(a)systemsaviour.com> Date: Sat Jan 21 21:14:32 2017 +1100 wined3d: Add GPU information for AMD FIJI. Signed-off-by: Adam Bolte <abolte(a)systemsaviour.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3312b4b51cf8b54c498a62918834cc73d713e534) 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 2c13d54..97b2a4f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1358,6 +1358,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -1950,6 +1951,7 @@ cards_nvidia_binary[] = cards_amd_binary[] = { {"RX 480", CARD_AMD_RADEON_RX_480}, + {"R9 Fury Series", CARD_AMD_RADEON_R9_FURY}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, {"HD 7800", CARD_AMD_RADEON_HD7800}, @@ -2107,6 +2109,7 @@ cards_amd_mesa[] = {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, /* Volcanic Islands */ + {"FIJI", CARD_AMD_RADEON_R9_FURY}, {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ {"HAWAII", CARD_AMD_RADEON_R9_290}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4c320d..5967a60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1537,6 +1537,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R7 = 0x130f, CARD_AMD_RADEON_R9_285 = 0x6939, CARD_AMD_RADEON_R9_290 = 0x67b1, + CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Michael Cronenworth : wined3d: Add Iris Haswell PCI ids and descriptions.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: b2b35a686a6fc91bdc039fb0e4d755a1fe1cc06a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b35a686a6fc91bdc039fb0e… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Fri Jan 13 07:06:45 2017 -0600 wined3d: Add Iris Haswell PCI ids and descriptions. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58056728cdf5697e2bbbe8636b498f001131cfe4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97b2a4f..a89709a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1402,6 +1402,15 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_I5100_4, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_1, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_2, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_3, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_4, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IP5200_5, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, @@ -2050,6 +2059,8 @@ cards_intel[] = {"Iris 6100", CARD_INTEL_I6100}, {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ /* Haswell */ + {"Iris Pro 5200", CARD_INTEL_IP5200_1}, + {"Iris 5100", CARD_INTEL_I5100_1}, {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5967a60..86f5480 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1699,6 +1699,15 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_I5100_1 = 0x0a22, + CARD_INTEL_I5100_2 = 0x0a2a, + CARD_INTEL_I5100_3 = 0x0a2b, + CARD_INTEL_I5100_4 = 0x0a2e, + CARD_INTEL_IP5200_1 = 0x0d22, + CARD_INTEL_IP5200_2 = 0x0d26, + CARD_INTEL_IP5200_3 = 0x0d2a, + CARD_INTEL_IP5200_4 = 0x0d2b, + CARD_INTEL_IP5200_5 = 0x0d2e, CARD_INTEL_HD5300 = 0x161e, CARD_INTEL_HD5500 = 0x1616, CARD_INTEL_HD5600 = 0x1612,

1 0

Nikolay Sivov : comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 0a7e342d0370df6be26c4ec12c92bba8e5ca9612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7e342d0370df6be26c4ec12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 13 14:25:54 2017 +0300 comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d404ddac6e4f789b7ee417f4bedd3cb49e411e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/tests/propsheet.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ed5f7d4..05cbc8a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -639,7 +639,7 @@ static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) */ resSize = SizeofResource(COMCTL32_hModule, hRes); - temp = Alloc(resSize); + temp = Alloc(2 * resSize); if (!temp) return -1; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 6594298..592ad15 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -55,6 +55,21 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) { + case PSCB_PRECREATE: + { + HMODULE module = GetModuleHandleA("comctl32.dll"); + DWORD size, buffer_size; + HRSRC hrsrc; + + hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), + (LPSTR)RT_DIALOG); + size = SizeofResource(module, hrsrc); + ok(size != 0, "Failed to get size of propsheet dialog resource\n"); + buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); + ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", + buffer_size, size); + break; + } case PSCB_INITIALIZED: { char caption[256];

1 0

Stefan Dösinger : d3d8/tests: Test invalid locks with textures.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 875901e54e62626723a1530b680bf2001a5048c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875901e54e62626723a1530b6… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:06 2016 +0000 d3d8/tests: Test invalid locks with textures. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e6cf8ba609f33a528f7fddbcb6e1ad681e69feca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 300 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 245 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875901e54e62626723a15…

1 0

Józef Kucia : d3d8/tests: Add more tests for UnlockRect().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: abfcb496ad9ffa1b785a3ea9248b70da3dcabc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfcb496ad9ffa1b785a3ea92… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:44 2017 +0100 d3d8/tests: Add more tests for UnlockRect(). Signed-off-by: Józef Kucia <jkucia(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 16df0ea08afeb3970729d82176b51c0795559f48) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 18ea559..7b14068 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4637,12 +4637,12 @@ static void test_lockrect_invalid(void) IDirect3DCubeTexture8 *cube_texture; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; + HRESULT hr, expected_hr; IDirect3D8 *d3d8; unsigned int i, r; ULONG refcount; HWND window; BYTE *base; - HRESULT hr; unsigned int offset, expected_offset; static const struct { @@ -4704,11 +4704,16 @@ static void test_lockrect_invalid(void) default: break; } + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, type %s.\n", hr, resources[r].name); base = locked_rect.pBits; hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); + expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; + hr = IDirect3DSurface8_UnlockRect(surface); + todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) + ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) { @@ -4852,6 +4857,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DTexture8_UnlockRect(texture, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d], type %s.\n", @@ -4887,6 +4894,8 @@ static void test_lockrect_invalid(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); + hr = IDirect3DCubeTexture8_UnlockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DCubeTexture8_LockRect(cube_texture, D3DCUBEMAP_FACE_NEGATIVE_X, 0, &locked_rect, &valid[0], 0);

1 0

Józef Kucia : d3d8: Return D3D_OK from UnlockRect() for not locked textures.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 72dc44f8a3de83fb034a423802506cd23e9261fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=72dc44f8a3de83fb034a42380… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:46 2017 +0100 d3d8: Return D3D_OK from UnlockRect() for not locked textures. Signed-off-by: Józef Kucia <jkucia(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 8f8c2a8ade8d8b2c61c5f1614aa477900d6ab449) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/surface.c | 11 ++++++++--- dlls/d3d8/tests/device.c | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index ec263b1..5348841 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,11 +273,16 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); - switch(hr) + if (hr == WINEDDERR_NOTLOCKED) { - case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL; - default: return hr; + D3DRESOURCETYPE type; + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + hr = type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; } + return hr; } static const IDirect3DSurface8Vtbl d3d8_surface_vtbl = diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7b14068..0d85d3e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4712,7 +4712,6 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x, type %s.\n", hr, resources[r].name); expected_hr = resources[r].type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL; hr = IDirect3DSurface8_UnlockRect(surface); - todo_wine_if(resources[r].type == D3DRTYPE_TEXTURE) ok(hr == expected_hr, "Got hr %#x, expected %#x, type %s.\n", hr, expected_hr, resources[r].name); for (i = 0; i < (sizeof(valid) / sizeof(*valid)); ++i) @@ -4858,7 +4857,7 @@ static void test_lockrect_invalid(void) hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_UnlockRect(texture, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); + ok(hr == D3D_OK, "Got unexpected hr %#x, type %s.\n", hr, resources[r].name); hr = IDirect3DTexture8_LockRect(texture, 0, &locked_rect, &valid[0], 0); ok(hr == D3D_OK, "Got unexpected hr %#x for rect [%d, %d]->[%d, %d], type %s.\n",

1 0