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

Dmitry Timoshkov : gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: a4f79c347e1aa55516d0e8f3916f68b25483ed75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f79c347e1aa55516d0e8f39… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 21 14:40:53 2012 +0900 gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 70ddef6..51733f4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -483,7 +483,7 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { /* FIXME: use graphics */ - lf->lfHeight = -font->otm.otmTextMetrics.tmAscent; + lf->lfHeight = -em_size_to_pixel(font->emSize, font->unit, font->family->dpi); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0;

1 0

Michael Stefaniuc : winhttp/tests: Remove wrong check for 'len'.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 6542c708ed51f90cf94366faa967eb88fc8c3408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6542c708ed51f90cf94366faa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:06:37 2012 +0200 winhttp/tests: Remove wrong check for 'len'. --- dlls/winhttp/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index d447879..f0bd434 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -142,7 +142,6 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); /* valid components, NULL url */ SetLastError( 0xdeadbeef );

1 0

Nikolay Sivov : urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 6c4bdf3bdf95718db25ccf67d16ee0e7bdf1a55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4bdf3bdf95718db25ccf67d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 02:06:06 2012 +0400 urlmon: Implement TYMED_HGLOBAL case for CopyStgMedium. --- dlls/urlmon/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.c | 15 +++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6af98f3..fb20509 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1219,8 +1219,10 @@ static void test_ReleaseBindInfo(void) static void test_CopyStgMedium(void) { STGMEDIUM src, dst; - HGLOBAL empty; + HGLOBAL empty, hg; + char *ptr1, *ptr2; HRESULT hres; + int size; static WCHAR fileW[] = {'f','i','l','e',0}; @@ -1257,6 +1259,35 @@ static void test_CopyStgMedium(void) ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); ReleaseStgMedium(&dst); + /* TYMED_HGLOBAL */ + hg = GlobalAlloc(GMEM_MOVEABLE, 10); + ptr1 = GlobalLock(hg); + memset(ptr1, 0xfa, 10); + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = hg; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_HGLOBAL, "tymed=%d\n", dst.tymed); + ok(dst.u.hGlobal != hg, "got %p, %p\n", dst.u.hGlobal, hg); + size = GlobalSize(dst.u.hGlobal); + ok(size == 10, "got size %d\n", size); + /* compare contents */ + ptr2 = GlobalLock(dst.u.hGlobal); + ok(!memcmp(ptr1, ptr2, 10), "got wrong data\n"); + GlobalUnlock(ptr2); + GlobalUnlock(ptr1); + ok(GlobalFlags(dst.u.hGlobal) == 0, "got 0x%08x\n", GlobalFlags(dst.u.hGlobal)); + GlobalFree(hg); + ReleaseStgMedium(&dst); + + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_HGLOBAL; + src.u.hGlobal = NULL; + hres = pCopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.u.hGlobal == NULL, "got %p\n", dst.u.hGlobal); + hres = pCopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); hres = pCopyStgMedium(NULL, &dst); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0cb72dd..f2abe13 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -544,6 +544,21 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(dst->u.pstg) IStorage_AddRef(dst->u.pstg); break; + case TYMED_HGLOBAL: + if(dst->u.hGlobal) { + SIZE_T size = GlobalSize(src->u.hGlobal); + char *src_ptr, *dst_ptr; + + dst->u.hGlobal = GlobalAlloc(GMEM_FIXED, size); + if(!dst->u.hGlobal) + return E_OUTOFMEMORY; + dst_ptr = GlobalLock(dst->u.hGlobal); + src_ptr = GlobalLock(src->u.hGlobal); + memcpy(dst_ptr, src_ptr, size); + GlobalUnlock(src_ptr); + GlobalUnlock(dst_ptr); + } + break; default: FIXME("Unimplemented tymed %d\n", src->tymed); }

1 0

Józef Kucia : d3dx9: Use actual level count for computing the number of loaded mipmaps.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 1a4f1edf3233d476e7441da1903f19ca8c1fd8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4f1edf3233d476e7441da19… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:10 2012 +0200 d3dx9: Use actual level count for computing the number of loaded mipmaps. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 377e4f6..8ca42c5 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -636,7 +636,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return hr; } - loaded_miplevels = min(miplevels, imginfo.MipLevels); + loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); if (FAILED(hr)) @@ -1209,7 +1209,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, return hr; } - loaded_miplevels = min(mip_levels, img_info.MipLevels); + loaded_miplevels = min(IDirect3DCubeTexture9_GetLevelCount(tex), img_info.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) tex, palette, loaded_miplevels - 1, mip_filter); if (FAILED(hr)) {

1 0

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

May 21, 2012

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: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckVolumeTextureRequirements .
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 7d07f1f2f6e043c1ec2ad6d73056234d07a02229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d07f1f2f6e043c1ec2ad6d73… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:09 2012 +0200 d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckVolumeTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 20 ++++++++++++++++++++ dlls/d3dx9_36/texture.c | 5 +++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 80311e6..79e4023 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -517,6 +517,26 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + + if (!is_autogenmipmap_supported(device, D3DRTYPE_VOLUMETEXTURE)) + { + skip("No D3DUSAGE_AUTOGENMIPMAP support for volume textures\n"); + return; + } + + /* mipmaps when D3DUSAGE_AUTOGENMIPMAP is set */ + mipmaps = 0; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 1; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + mipmaps = 3; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL,NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); } static void test_D3DXCreateTexture(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 89cc078..377e4f6 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -436,6 +436,11 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device, { if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) *miplevels = 1; + else if ((usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } else { UINT max_mipmaps = 1;

1 0

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

May 21, 2012

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

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

May 21, 2012

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: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckTextureRequirements.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: dfc085b684a23ccd7593b07b8777f495d4258a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc085b684a23ccd7593b07b8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 18 15:50:08 2012 +0200 d3dx9: Correctly handle D3DUSAGE_AUTOGENMIPMAP in D3DXCheckTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 7 ++++- 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 5663bfa..80311e6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -85,6 +85,29 @@ static const unsigned char dds_volume_map[] = { 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab }; +static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) +{ + HRESULT hr; + D3DCAPS9 caps; + IDirect3D9 *d3d9; + D3DDISPLAYMODE mode; + D3DDEVICE_CREATION_PARAMETERS params; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + IDirect3DDevice9_GetDirect3D(device, &d3d9); + IDirect3DDevice9_GetCreationParameters(device, &params); + IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + + if (!(caps.Caps2 & D3DCAPS2_CANAUTOGENMIPMAP)) + return FALSE; + + hr = IDirect3D9_CheckDeviceFormat(d3d9, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_AUTOGENMIPMAP, resource_type, D3DFMT_A8R8G8B8); + + IDirect3D9_Release(d3d9); + return SUCCEEDED(hr); +} + static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { UINT width, height, mipmaps; @@ -199,6 +222,29 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + /* mipmaps when D3DUSAGE_AUTOGENMIPMAP is set */ + if (is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) + { + mipmaps = 0; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + mipmaps = 2; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + mipmaps = 6; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + } + else + skip("No D3DUSAGE_AUTOGENMIPMAP support for textures\n"); + /* usage */ hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements succeeded, but should've failed.\n"); @@ -322,6 +368,16 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + if (is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) + { + mipmaps = 3; + hr = D3DXCheckCubeTextureRequirements(device, NULL, &mipmaps, D3DUSAGE_AUTOGENMIPMAP, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 0, "Returned mipmaps %d, expected %d\n", mipmaps, 0); + } + else + skip("No D3DUSAGE_AUTOGENMIPMAP support for cube textures\n"); + /* usage */ hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, D3DUSAGE_WRITEONLY, NULL, D3DPOOL_DEFAULT); ok(hr == D3DERR_INVALIDCALL, "D3DXCheckCubeTextureRequirements succeeded, but should've failed.\n"); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6a33547..89cc078 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -216,7 +216,12 @@ HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, *height = h; /* miplevels */ - if (miplevels) + if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } + else if (miplevels) { UINT max_mipmaps = 1;

1 0

Detlef Riekenberg : ntdll: Read the current processor with the __NR_getcpu syscall.
by Alexandre Julliard May 21, 2012

May 21, 2012

Module: wine Branch: master Commit: 979099a441682c99ee0c1ee1fab5e1de635a579c URL: http://source.winehq.org/git/wine.git/?a=commit;h=979099a441682c99ee0c1ee1f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 18 01:03:31 2012 +0200 ntdll: Read the current processor with the __NR_getcpu syscall. --- dlls/ntdll/thread.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b34e279..881d961 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -30,6 +30,9 @@ #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -1184,6 +1187,11 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) { ULONG processor; +#if defined(__linux__) && defined(__NR_getcpu) + int res = syscall(__NR_getcpu, &processor); + if (res != -1) return processor; +#endif + if (NtCurrentTeb()->Peb->NumberOfProcessors > 1) { ULONG_PTR thread_mask, processor_mask;

1 0