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

Henri Verbeet : ddraw/tests: Properly cleanup on failed device creation in a couple of places.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: fa90a256d7f8ae2cdf5dd53acf1ae7668626241f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa90a256d7f8ae2cdf5dd53ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:31 2012 +0200 ddraw/tests: Properly cleanup on failed device creation in a couple of places. --- dlls/ddraw/tests/ddraw1.c | 4 ++++ dlls/ddraw/tests/ddraw2.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 158f92d..a3f548c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1158,6 +1158,7 @@ static void test_ck_rgba(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } @@ -1390,6 +1391,7 @@ static void test_surface_qi(void) if (!(ddraw = create_ddraw())) { skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); return; } /* Try to create a D3D device to see if the ddraw implementation supports @@ -1398,6 +1400,7 @@ static void test_surface_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } @@ -1483,6 +1486,7 @@ static void test_device_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); DestroyWindow(window); return; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 45a5cfd..02d0d6b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1373,6 +1373,7 @@ static void test_ck_rgba(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; } @@ -1586,6 +1587,7 @@ static void test_surface_qi(void) if (!(ddraw = create_ddraw())) { skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); return; } /* Try to create a D3D device to see if the ddraw implementation supports @@ -1594,6 +1596,7 @@ static void test_surface_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; } @@ -1678,6 +1681,7 @@ static void test_device_qi(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create D3D device, skipping test.\n"); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; }

1 0

Henri Verbeet : ddraw/tests: Add a test for the initial color keying state.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: baa5ceecb0351de55ecf083340fa83985cbf0e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa5ceecb0351de55ecf08334… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:32 2012 +0200 ddraw/tests: Add a test for the initial color keying state. --- dlls/ddraw/tests/ddraw1.c | 180 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 122 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 118 +++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 107 +++++++++++++++++++++++++++ 4 files changed, 527 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baa5ceecb0351de55ecf0…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DSurface8Impl.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: ec466ff3b7ee94fa4e09134e2b6cdf3c775098d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec466ff3b7ee94fa4e09134e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:33 2012 +0200 d3d8: Get rid of IDirect3DSurface8Impl. --- dlls/d3d8/d3d8_private.h | 18 ++---- dlls/d3d8/device.c | 37 +++++------ dlls/d3d8/surface.c | 163 ++++++++++++++++++++++++---------------------- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 12 ++-- 5 files changed, 114 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec466ff3b7ee94fa4e091…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DVolume8Impl.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 75d166f62c5b5c359650ccaf281923c9b99a5108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d166f62c5b5c359650ccaf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:34 2012 +0200 d3d8: Get rid of IDirect3DVolume8Impl. --- dlls/d3d8/d3d8_private.h | 17 +---- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 6 +- dlls/d3d8/volume.c | 156 +++++++++++++++++++++++---------------------- 4 files changed, 88 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75d166f62c5b5c359650c…

1 0

Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetCubeMapSurface is called with invalid level.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 707c3559a209441b1e585b46d41eafc0c18b7ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707c3559a209441b1e585b46d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:32 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetCubeMapSurface is called with invalid level. --- dlls/d3d8/texture.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 6b5f95c..14f8207 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -656,11 +656,19 @@ static HRESULT WINAPI d3d8_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture8 struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; + DWORD level_count; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); wined3d_mutex_lock(); - sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + + sub_resource_idx = level_count * face + level; if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock();

1 0

Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetLevelDesc is called with invalid level.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 7b1aa04b00796238c0abd1556d26c295e9ca3105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1aa04b00796238c0abd1556… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:33 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetLevelDesc is called with invalid level. --- dlls/d3d8/texture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 14f8207..59bc693 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -628,6 +628,12 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); + if (level >= wined3d_texture_get_level_count(texture->wined3d_texture)) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else

1 0

Józef Kucia : d3dx9: Fix the expected_length computation for non-square DDS files.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: d313e4f9d3288bc9ee958a258bd4fd730af8cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313e4f9d3288bc9ee958a258… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:56 2012 +0200 d3dx9: Fix the expected_length computation for non-square DDS files. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 28975b9..6b0786c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -366,7 +366,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG calculate_dds_surface_size(info, width, height, &pitch, &size); expected_length += size; width = max(1, width / 2); - height = max(1, width / 2); + height = max(1, height / 2); } expected_length *= faces;

1 0

Józef Kucia : d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 3a944738025b4f608e746b28f9ea747f5755e447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a944738025b4f608e746b28f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:57 2012 +0200 d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files. --- dlls/d3dx9_36/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6b0786c..821d51e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -372,7 +372,10 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG expected_length *= faces; expected_length += sizeof(*header); if (length < expected_length) + { + WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); return D3DXERR_INVALIDDATA; + } info->ImageFileFormat = D3DXIFF_DDS;

1 0

Józef Kucia : d3dx9: Add support for luminance pixel formats.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: ada51526503db123dec4207d8a4750c0d3d06ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada51526503db123dec4207d8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:58 2012 +0200 d3dx9: Add support for luminance pixel formats. --- dlls/d3dx9_36/tests/surface.c | 12 ++++-------- dlls/d3dx9_36/util.c | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15336da..2f1f2a8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -465,10 +465,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { - todo_wine { - hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -506,10 +504,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ - todo_wine { - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index ad8a6ea..d936fb9 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -63,6 +63,8 @@ static const PixelFormatDesc formats[] = {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL },

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 072c96565dd47c5bbbd5711934936ed000ba7ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072c96565dd47c5bbbd571193… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 09:05:38 2012 +0400 po: Update Russian translation. --- po/ru.po | 53 +++++------------------------------------------------ 1 files changed, 5 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed63276..01b747f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Отмена" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Установка Wine Gecko" +msgstr "Установка Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine не может найти пакет Gecko, который необходим для корректной работы " -"приложений с поддержкой HTML. Wine может автоматически загрузить и " -"установить его.\n" +"Wine не может найти пакет Mono, который необходим для корректной работы .NET " +"приложений. Wine может автоматически загрузить и установить его.\n" "\n" "Примечание: рекомендуется использовать пакет, предоставляемый вашим " -"дистрибутивом. Посетите <a href=\"http://wiki.winehq.org/Gecko\">http://wiki." -"winehq.org/Gecko</a> для получения более подробной информации." +"дистрибутивом. Посетите <a href=\"http://wiki.winehq.org/Mono\">http://wiki." +"winehq.org/Mono</a> для получения более подробной информации." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -6679,37 +6667,6 @@ msgid "insert disk %s" msgstr "вставьте диск %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n"

1 0