April 2017 - Wine-commits - list.winehq.org

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: da598486ae25a597aff342fc773a38e667d82e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da598486ae25a597aff342fc7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:43:57 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9333f6e3300bb29a8012815433c0075ab1072bb2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 5e03199..4109090 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -12,11 +12,10 @@ lisenssistä on englanniksi tiedostossa LICENSE. 2. PIKAOPAS -Kun Wine käännetään lähdekoodeistaan, on suositeltavaa käyttää Winen omaa -asennusohjelmaa, joka ajetaan seuraavalla komennolla Winen lähdekoodin -juurihakemistosta: +Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: -./tools/wineinstall +./configure +make Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä @@ -81,8 +80,7 @@ Valinnaisia tukikirjastoja: 4. KÄÄNTÄMINEN -Aiemmin mainitun wineinstall-skriptin sijaan Winen voi kääntää myös -seuraavilla komennoilla: +Winen voi kääntää seuraavilla komennoilla: ./configure make @@ -95,6 +93,8 @@ kääntämiseen Unixissa. Komento './configure --help' näyttää asetuksia ja valintoja, joita käännösprosessiin voi lisätä. +Lisätietoja on osoitteessa https://wiki.winehq.org/Building_Wine + 5. ASENNUS Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 9bb1904fccb0577d6735d234b2cfffa82d8fa85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb1904fccb0577d6735d234b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 2 16:44:11 2017 +0200 readme: Update Swedish translation. The actual updates concern the removal of wineinstall. Use the opportunity to convert to UTF-8 as well. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50a047b1bb370bb02ffbbe945454236f24d0ac7c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.sv | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb1904fccb0577d6735d…

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: b0953061fd7762ed966a6c0daa035f45b3817ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0953061fd7762ed966a6c0da… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 17:15:07 2017 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2f677212a4b417fcb97cde2119f22b6b9ee423b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0953061fd7762ed966a6…

1 0

Julian Rüger : readme: Fix typo in German translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 40b29f57b06e0dbfe5f31ed77c627d84ad4a0eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b29f57b06e0dbfe5f31ed77… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 8 15:58:41 2017 +0100 readme: Fix typo in German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8082a634d9eaedda94e498fec3c971f30b5c31d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 4467e9f..9e65e97 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -97,8 +97,8 @@ Um Wine zu kompilieren, führen Sie aus: make Damit werden das Programm "wine" und diverse unterstützende Bibliotheken und -Binärdateienerschiedener erstellt. Das Programm "wine" lädt ausführbare -Windows-Dateien und führt diese aus. +Binärdateien erstellt. Das Programm "wine" lädt ausführbare Windows-Dateien +und führt diese aus. Die Bibliothek "libwine" ("Winelib") kann benutzt werden, um Windows-Quelltexte unter Unix zu kompilieren und zu verlinken.

1 0

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

20 Apr '17

Module: wine Branch: stable Commit: 8e06319a2c71999bb4b8e0b54d83e74e4ba144b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e06319a2c71999bb4b8e0b54… 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 6247404..c8b4756 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1376,6 +1376,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}, @@ -1977,6 +1978,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}, @@ -2136,6 +2138,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 6b28a3e..271c605 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1907,6 +1907,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

Bruno Jesus : wined3d: Recognize Geforce GT 525M.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: b51c4e5c7e568c170cbe9ca3d4babb207fe99617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51c4e5c7e568c170cbe9ca3d… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 12:02:19 2017 -0300 wined3d: Recognize Geforce GT 525M. Signed-off-by: Bruno Jesus <bjesus(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 3a81311870648c341b8bd76ea653c6f95e4867e3) 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 c8b4756..f0f1bfb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,6 +1272,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE8, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE8, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT520, "NVIDIA GeForce GT 520", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT525M, "NVIDIA GeForce GT 525M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1873,6 +1874,7 @@ cards_nvidia_binary[] = {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ + {"GT 525M", CARD_NVIDIA_GEFORCE_GT525M}, /* Geforce 500 - lowend mobile */ {"GT 520", CARD_NVIDIA_GEFORCE_GT520}, /* Geforce 500 - lowend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 271c605..983d9f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1971,6 +1971,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GT520 = 0x1040, + CARD_NVIDIA_GEFORCE_GT525M = 0x0dec, CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8,

1 0

Bruno Jesus : winemp3.acm: Fixes compilation for older mpg123 library versions.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 54c22b0864abaf8bb379c827614f0d9f4646e2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c22b0864abaf8bb379c8276… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 22:16:18 2017 -0300 winemp3.acm: Fixes compilation for older mpg123 library versions. Thanks to Sebastian Lackner for the correct approach. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bb036ae502f7012af17a4a5eefcb43e294ab502f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 28a1998..cc6008d 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -249,12 +249,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Akihiro Sagawa : d3d9/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 5ea7b85664f023ea1c966172f90ef5aa1f6995cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea7b85664f023ea1c966172f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:53 2017 +0900 d3d9/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(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 87fe9779ec91937211dc26c3a30c8ac93b8a0720) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4213779..068fb4e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17287,8 +17287,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) static void add_dirty_rect_test(void) { HRESULT hr; - IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; - IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; IDirect3DDevice9 *device; IDirect3D9 *d3d; unsigned int i; @@ -17325,6 +17327,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -17334,6 +17339,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -17526,6 +17533,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -17560,7 +17568,6 @@ static void add_dirty_rect_test(void) /* So does EvictManagedResources. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice9_EvictManagedResources(device); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -17570,6 +17577,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -17592,11 +17619,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface9_Release(surface_managed); IDirect3DSurface9_Release(surface_src_red); IDirect3DSurface9_Release(surface_src_green); + IDirect3DSurface9_Release(surface_dynamic); IDirect3DTexture9_Release(tex_src_red); IDirect3DTexture9_Release(tex_src_green); IDirect3DTexture9_Release(tex_dst1); IDirect3DTexture9_Release(tex_dst2); IDirect3DTexture9_Release(tex_managed); + IDirect3DTexture9_Release(tex_dynamic); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Akihiro Sagawa : d3d8/tests: Add LockRect tests with dynamic textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 58055a3c0856186f5e662fe6b89ebbe9c4d58d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58055a3c0856186f5e662fe6b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:55 2017 +0900 d3d8/tests: Add LockRect tests with dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(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 49f9e545fbb523d0f61ce9676a23513318d3e6e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c0ecc6a..e2b7742 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5216,8 +5216,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) static void add_dirty_rect_test(void) { - IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; - IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; + IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, + *tex_managed, *tex_dynamic; + IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, + *surface_managed, *surface_dynamic; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -5254,6 +5256,9 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dynamic); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -5263,6 +5268,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 0, &surface_managed); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -5455,6 +5462,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with managed textures. */ fill_surface(surface_managed, 0x00ff0000, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); @@ -5489,7 +5497,6 @@ static void add_dirty_rect_test(void) /* So does ResourceManagerDiscardBytes. */ fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); - ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); hr = IDirect3DDevice8_ResourceManagerDiscardBytes(device, 0); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -5499,6 +5506,26 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ + fill_surface(surface_dynamic, 0x0000ffff, 0); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dynamic); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ffff, 1), + "Expected color 0x0000ffff, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + /* Dynamic textures don't honor D3DLOCK_NO_DIRTY_UPDATE. */ + fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ffff00, 1), + "Expected color 0x00ffff00, got 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* AddDirtyRect on a locked texture is allowed. */ hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); @@ -5517,11 +5544,13 @@ static void add_dirty_rect_test(void) IDirect3DSurface8_Release(surface_managed); IDirect3DSurface8_Release(surface_src_red); IDirect3DSurface8_Release(surface_src_green); + IDirect3DSurface8_Release(surface_dynamic); IDirect3DTexture8_Release(tex_src_red); IDirect3DTexture8_Release(tex_src_green); IDirect3DTexture8_Release(tex_dst1); IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); + IDirect3DTexture8_Release(tex_dynamic); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Akihiro Sagawa : wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: c694f5eb74167f46c136deb16777860c48d73375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c694f5eb74167f46c136deb16… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 4 19:56:57 2017 +0900 wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures. Signed-off-by: Akihiro Sagawa <sagawa.aki(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 6cf2dc67e1eb06b5c5483c82b16ed55dd0272d2d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e2b7742..4b6c1dc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5521,7 +5521,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 068fb4e..963d37b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17592,7 +17592,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da003e1..9857a82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1752,7 +1752,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; } - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + if (!(flags & WINED3D_MAP_READONLY) + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding);

1 0