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

Józef Kucia : d3dx9: Correctly check if a texture is dynamic in D3DXCreateTextureFromFileInMemoryEx .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: eb55412f664ac07b6ff13e51d221ca26e3415448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb55412f664ac07b6ff13e51d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:11 2012 +0200 d3dx9: Correctly check if a texture is dynamic in D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/tests/texture.c | 11 +++++++++++ dlls/d3dx9_36/texture.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 79e4023..f88ea75 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1238,6 +1238,17 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + if (!is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for textures\n"); + return; + } + + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_16bit, sizeof(dds_16bit), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); } static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8ca42c5..2a4a300 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -513,6 +513,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, IDirect3DSurface9 *surface; BOOL file_width = FALSE, file_height = FALSE; BOOL file_format = FALSE, file_miplevels = FALSE; + BOOL dynamic_texture; D3DXIMAGE_INFO imginfo; UINT loaded_miplevels; D3DCAPS9 caps; @@ -600,7 +601,8 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return D3DERR_INVALIDCALL; /* Create the to-be-filled texture */ - if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC)) + dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); + if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); texptr = &buftex;

1 0

Józef Kucia : d3dx9: Correctly check if a cube texture is dynamic in D3DXCreateCubeTextureFromFileInMemoryEx .
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 480e4e5bfccb772f5b331406d7e592442105defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=480e4e5bfccb772f5b331406d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:12 2012 +0200 d3dx9: Correctly check if a cube texture is dynamic in D3DXCreateCubeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/tests/texture.c | 18 ++++++++++++++++++ dlls/d3dx9_36/texture.c | 4 +++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index f88ea75..a595671 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1290,6 +1290,23 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) } else skip("Couldn't create cube texture\n"); } +static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3DCubeTexture9 *cube_texture; + + if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for cube textures\n"); + return; + } + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, + D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); +} + static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device) { HRESULT hr; @@ -1377,6 +1394,7 @@ START_TEST(texture) test_D3DXCreateTextureFromFileInMemory(device); test_D3DXCreateTextureFromFileInMemoryEx(device); test_D3DXCreateCubeTextureFromFileInMemory(device); + test_D3DXCreateCubeTextureFromFileInMemoryEx(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); IDirect3DDevice9_Release(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2a4a300..750025c 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1124,6 +1124,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, D3DCAPS9 caps; UINT loaded_miplevels; D3DXIMAGE_INFO img_info; + BOOL dynamic_texture; BOOL file_size = FALSE; BOOL file_format = FALSE; BOOL file_mip_levels = FALSE; @@ -1191,7 +1192,8 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, mip_levels = img_info.MipLevels; } - if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC)) + dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); + if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex;

1 0

Józef Kucia : d3dx9/tests: Add more tests for D3DXFilterTexture.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: d7a633a4381001a7a68163f6dd96e5f85523b2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a633a4381001a7a68163f6d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:13 2012 +0200 d3dx9/tests: Add more tests for D3DXFilterTexture. --- dlls/d3dx9_36/tests/texture.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index a595671..ff7c811 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -797,6 +797,26 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) else skip("Failed to create texture\n"); + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_POINT); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); + /* Cube texture test */ hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &cubetex, NULL); @@ -814,6 +834,33 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) } else skip("Failed to create texture\n"); + + /* Test textures with D3DUSAGE_AUTOGENMIPMAP usage */ + if (!is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP supported for textures\n"); + return; + } + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3dXFilteTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); + if (SUCCEEDED(hr)) + { + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3dXFilteTexture returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DTexture9_Release(tex); + } + else + skip("Failed to create texture\n"); } static BOOL color_match(const DWORD *value, const DWORD *expected)

1 0

Józef Kucia : d3dx9/tests: Add a test for D3DXLoadSurfaceFromSurface.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0da94d4985376611bff47508cb9c05d134be233a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da94d4985376611bff47508c… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:14 2012 +0200 d3dx9/tests: Add a test for D3DXLoadSurfaceFromSurface. --- dlls/d3dx9_36/tests/surface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index cb49ca3..8fefd0c 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -437,6 +437,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) { HRESULT hr; BOOL testdummy_ok, testbitmap_ok; + IDirect3DTexture9 *tex; IDirect3DSurface9 *surf, *newsurf; RECT rect, destrect; D3DLOCKED_RECT lockrect; @@ -586,6 +587,18 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } else skip("Failed to create a second surface\n"); + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); + if (SUCCEEDED(hr)) + { + IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + + IDirect3DSurface9_Release(newsurf); + IDirect3DTexture9_Release(tex); + } else skip("Failed to create texture\n"); + check_release((IUnknown*)surf, 0);

1 0

Józef Kucia : d3dx9/tests: Use more common formats for surfaces in DXTn tests.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 4d462adef90511812cc1f54ff1345a1537ac4d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d462adef90511812cc1f54ff… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:15 2012 +0200 d3dx9/tests: Use more common formats for surfaces in DXTn tests. --- dlls/d3dx9_36/tests/surface.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 8fefd0c..f8a29c3 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -853,7 +853,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) } /* DXT1, DXT2, DXT3, DXT4, DXT5 */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); if (FAILED(hr)) skip("Failed to create R8G8B8 surface, hr %#x.\n", hr); else @@ -861,7 +861,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, dds_24bit, sizeof(dds_24bit), NULL, D3DX_FILTER_NONE, 0, NULL); ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT2, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT2 surface, hr %#x.\n", hr); else @@ -871,7 +871,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT3, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT3 surface, hr %#x.\n", hr); else @@ -881,7 +881,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT4, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT4 surface, hr %#x.\n", hr); else @@ -891,7 +891,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT5 surface, hr %#x.\n", hr); else @@ -901,7 +901,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown*)newsurf, 0); } - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &newsurf, NULL); if (FAILED(hr)) skip("Failed to create DXT1 surface, hr %#x.\n", hr); else

1 0

Józef Kucia : d3dx9/tests: Do not release a texture when it wasn't created.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8061bec3af22b7ebf632d6b90a098d7a5cc84f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8061bec3af22b7ebf632d6b90… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:16 2012 +0200 d3dx9/tests: Do not release a texture when it wasn't created. --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ff7c811..884d4e7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -765,12 +765,12 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, NULL, 5, D3DX_FILTER_NONE); /* Invalid miplevel */ ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + IDirect3DTexture9_Release(tex); } else skip("Failed to create texture\n"); - IDirect3DTexture9_Release(tex); - hr = D3DXFilterTexture(NULL, NULL, 0, D3DX_FILTER_NONE); ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Józef Kucia : d3dx9/tests: Mark broken behavior of the debug version of d3d9.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: e46d650d3f0e4f821add75abbf815977dc10eb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46d650d3f0e4f821add75abb… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:17 2012 +0200 d3dx9/tests: Mark broken behavior of the debug version of d3d9. --- dlls/d3dx9_36/tests/surface.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f8a29c3..15336da 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -565,7 +565,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) SetRect(&destrect, 0, 0, 0, 0); /* left = right, top = bottom */ hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + /* fails when debug version of d3d9 is used */ + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); SetRect(&destrect, 257, 257, 257, 257); /* left = right, top = bottom, but invalid values */ hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_FILTER_NONE, 0); @@ -996,7 +997,8 @@ next_tests: ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); SetRect(&rect, 0, 0, 0, 0); hr = D3DXSaveSurfaceToFileA("saved_surface.bmp", D3DXIFF_BMP, surface, NULL, &rect); - ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + /* fails when debug version of d3d9 is used */ + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); DeleteFileA("saved_surface.bmp"); DeleteFileA("saved_surface.ppm");

1 0

André Hentschel : Update German Contributing page
by Jeremy Newman 21 May '12

21 May '12

Module: website Branch: master Commit: 94c9f1bed32e10ed37745e932a0b0166705ffe6b URL: http://source.winehq.org/git/website.git/?a=commit;h=94c9f1bed32e10ed37745e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 18 17:18:32 2012 +0200 Update German Contributing page --- templates/de/contributing.template | 317 ++++++++++++++++++------------------ 1 files changed, 159 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=94c9f1bed32e10ed37…

1 0

Christian Costa : dmusic: Cleanup IDirectMusicCollection_EnumInstrument.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: c0dff8ac44d89d3a5a83b0e588cf4f66f58756a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dff8ac44d89d3a5a83b0e58… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:01:55 2012 +0200 dmusic: Cleanup IDirectMusicCollection_EnumInstrument. --- dlls/dmusic/collection.c | 49 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 67670b1..474557d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -129,31 +129,32 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen) +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - unsigned int r = 0; - DMUS_PRIVATE_INSTRUMENTENTRY *tmpEntry; - struct list *listEntry; - DWORD dwLen; - - TRACE("(%p, %d, %p, %p, %d)\n", This, dwIndex, pdwPatch, pwszName, dwNameLen); - LIST_FOR_EACH (listEntry, &This->Instruments) { - tmpEntry = LIST_ENTRY(listEntry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); - if (r == dwIndex) { - IDirectMusicInstrumentImpl *pInstrument = impl_from_IDirectMusicInstrument(tmpEntry->pInstrument); - IDirectMusicInstrument_GetPatch (tmpEntry->pInstrument, pdwPatch); - if (pwszName) { - dwLen = min(strlenW(pInstrument->wszName),dwNameLen-1); - memcpy (pwszName, pInstrument->wszName, dwLen * sizeof(WCHAR)); - pwszName[dwLen] = '\0'; - } - return S_OK; - } - r++; - } - - return S_FALSE; + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); + DWORD i = 0; + DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; + struct list *list_entry; + DWORD length; + + TRACE("(%p/%p)->(%d, %p, %p, %d)\n", iface, This, index, patch, name, name_length); + + LIST_FOR_EACH(list_entry, &This->Instruments) { + inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); + if (i == index) { + IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); + IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); + if (name) { + length = min(strlenW(instrument->wszName), name_length - 1); + memcpy(name, instrument->wszName, length * sizeof(WCHAR)); + name[length] = '\0'; + } + return S_OK; + } + i++; + } + + return S_FALSE; } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = {

1 0

Christian Costa : dmusic: COM cleanup of DirectMusicPort object.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: decada5f73abab68df77d75bf5f879c4992c21a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decada5f73abab68df77d75bf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:02:03 2012 +0200 dmusic: COM cleanup of DirectMusicPort object. --- dlls/dmusic/dmusic_private.h | 26 ++-- dlls/dmusic/port.c | 396 +++++++++++++++++++++++++++--------------- 2 files changed, 267 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=decada5f73abab68df77d…

1 0