February 2014 - Wine-commits

Matteo Bruni : d3dx9: Enforce minimum texture dimensions for block-based pixel formats.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 190877422e644eb1eb7f43c2e817a7d163853175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190877422e644eb1eb7f43c2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:10 2014 +0100 d3dx9: Enforce minimum texture dimensions for block-based pixel formats. --- dlls/d3dx9_36/tests/texture.c | 11 +++ dlls/d3dx9_36/texture.c | 149 +++++++++++++++++++++-------------------- 2 files changed, 89 insertions(+), 71 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index afc7144..4a93ac6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -340,6 +340,17 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + /* Block-based texture formats and size < block size. */ + format = D3DFMT_DXT1; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 4, "Returned width %d, expected %d\n", width, 4); + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT1, "Returned format %u, expected %u\n", format, D3DFMT_DXT1); + IDirect3D9_Release(d3d); } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f96536a..be86347 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -195,6 +195,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN D3DDISPLAYMODE mode; HRESULT hr; D3DFORMAT usedformat = D3DFMT_UNKNOWN; + const struct pixel_format_desc *fmt; TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); @@ -211,73 +212,6 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if ((pool != D3DPOOL_DEFAULT) && (pool != D3DPOOL_MANAGED) && (pool != D3DPOOL_SYSTEMMEM) && (pool != D3DPOOL_SCRATCH)) return D3DERR_INVALIDCALL; - /* width and height */ - if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) - return D3DERR_INVALIDCALL; - - /* 256 x 256 default width/height */ - if ((w == D3DX_DEFAULT) && (h == D3DX_DEFAULT)) - w = h = 256; - else if (w == D3DX_DEFAULT) - w = (height ? h : 256); - else if (h == D3DX_DEFAULT) - h = (width ? w : 256); - - /* ensure width/height is power of 2 */ - if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) - w = make_pow2(w); - - if (w > caps.MaxTextureWidth) - w = caps.MaxTextureWidth; - - if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(h))) - h = make_pow2(h); - - if (h > caps.MaxTextureHeight) - h = caps.MaxTextureHeight; - - /* texture must be square? */ - if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) - { - if (w > h) - h = w; - else - w = h; - } - - if (width) - *width = w; - - if (height) - *height = h; - - /* miplevels */ - if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) - { - if (*miplevels > 1) - *miplevels = 0; - } - else if (miplevels) - { - UINT max_mipmaps = 1; - - if (!width && !height) - max_mipmaps = 9; /* number of mipmaps in a 256x256 texture */ - else - { - UINT max_dimen = max(w, h); - - while (max_dimen > 1) - { - max_dimen >>= 1; - max_mipmaps++; - } - } - - if (*miplevels == 0 || *miplevels > max_mipmaps) - *miplevels = max_mipmaps; - } - /* format */ if (format) { @@ -303,17 +237,18 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN if ((usedformat == D3DFMT_UNKNOWN) || (usedformat == D3DX_DEFAULT)) usedformat = D3DFMT_A8R8G8B8; + fmt = get_format_info(usedformat); + hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, usage, D3DRTYPE_TEXTURE, usedformat); - if (FAILED(hr)) { - /* Heuristic to choose the fallback format */ - const struct pixel_format_desc *fmt = get_format_info(usedformat); BOOL allow_24bits; int bestscore = INT_MIN, i = 0, j; unsigned int channels; - const struct pixel_format_desc *curfmt; + const struct pixel_format_desc *curfmt, *bestfmt = NULL; + + TRACE("Requested format not supported, looking for a fallback.\n"); if (!fmt) { @@ -358,11 +293,83 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN { bestscore = score; usedformat = curfmt->format; + bestfmt = curfmt; } } + fmt = bestfmt; hr = D3D_OK; } + if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) + return D3DERR_INVALIDCALL; + + if ((w == D3DX_DEFAULT) && (h == D3DX_DEFAULT)) + w = h = 256; + else if (w == D3DX_DEFAULT) + w = (height ? h : 256); + else if (h == D3DX_DEFAULT) + h = (width ? w : 256); + + if (fmt->block_width != 1 || fmt->block_height != 1) + { + if (w < fmt->block_width) + w = fmt->block_width; + if (h < fmt->block_height) + h = fmt->block_height; + } + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) + w = make_pow2(w); + + if (w > caps.MaxTextureWidth) + w = caps.MaxTextureWidth; + + if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(h))) + h = make_pow2(h); + + if (h > caps.MaxTextureHeight) + h = caps.MaxTextureHeight; + + if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) + { + if (w > h) + h = w; + else + w = h; + } + + if (width) + *width = w; + + if (height) + *height = h; + + if (miplevels && (usage & D3DUSAGE_AUTOGENMIPMAP)) + { + if (*miplevels > 1) + *miplevels = 0; + } + else if (miplevels) + { + UINT max_mipmaps = 1; + + if (!width && !height) + max_mipmaps = 9; /* number of mipmaps in a 256x256 texture */ + else + { + UINT max_dimen = max(w, h); + + while (max_dimen > 1) + { + max_dimen >>= 1; + max_mipmaps++; + } + } + + if (*miplevels == 0 || *miplevels > max_mipmaps) + *miplevels = max_mipmaps; + } + cleanup: if (d3d)

1 0

Matteo Bruni : d3dx9: Trace DDS pixel format.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: ac5664c8790c72ecc7c38126ddd0b227d9d9d47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5664c8790c72ecc7c38126d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:11 2014 +0100 d3dx9: Trace DDS pixel format. --- dlls/d3dx9_36/surface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fbfff0f..48d129e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -259,6 +259,11 @@ static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_form static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) { + TRACE("pixel_format: size %u, flags %#x, fourcc %#x, bpp %u.\n", pixel_format->size, + pixel_format->flags, pixel_format->fourcc, pixel_format->bpp); + TRACE("rmask %#x, gmask %#x, bmask %#x, amask %#x.\n", pixel_format->rmask, pixel_format->gmask, + pixel_format->bmask, pixel_format->amask); + if (pixel_format->flags & DDS_PF_FOURCC) return dds_fourcc_to_d3dformat(pixel_format->fourcc); if (pixel_format->flags & DDS_PF_RGB)

1 0

Matteo Bruni : d3dx9: Add missing trace to D3DXLoadVolumeFromFileInMemory.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 73e4f6200e9a79e284849ac25cfe468c1fdaf913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e4f6200e9a79e284849ac25… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 15:53:12 2014 +0100 d3dx9: Add missing trace to D3DXLoadVolumeFromFileInMemory. --- dlls/d3dx9_36/volume.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 6ba758f..52683da 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -238,6 +238,10 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, D3DBOX box; D3DXIMAGE_INFO image_info; + TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p,\n", + dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box); + TRACE("filter %#x, color_key %#x, src_info %p.\n", filter, color_key, src_info); + if (!dst_volume || !src_data) return D3DERR_INVALIDCALL; hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info);

1 0

Matteo Bruni : d3dx9: Handle pixel formats larger than 32 bits in surface loading / filtering functions.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 950c40b1170598d0c7fd6b7545a7e8308e158a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950c40b1170598d0c7fd6b754… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 14 17:36:38 2014 +0100 d3dx9: Handle pixel formats larger than 32 bits in surface loading / filtering functions. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/math.c | 2 +- dlls/d3dx9_36/surface.c | 196 +++++++++++++++++++------------------- 3 files changed, 101 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=950c40b1170598d0c7fd6…

1 0

Stefan Dösinger : d3d9/tests: Clean up yuv_color_test.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 35223d80cb538787c69b2382a034b7210e6bac25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35223d80cb538787c69b2382a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 16 22:42:19 2014 +0100 d3d9/tests: Clean up yuv_color_test. --- dlls/d3d9/tests/visual.c | 196 +++++++++++++++++++++++----------------------- 1 file changed, 97 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35223d80cb538787c69b2…

1 0

Ken Thomases : kernel32: Check that sysctl() call succeeded before using its output.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 89a96db01ff5aee1c25cbb8e0590fdd81d6b5614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a96db01ff5aee1c25cbb8e0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:28 2014 -0600 kernel32: Check that sysctl() call succeeded before using its output. --- dlls/kernel32/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 51bd235..578cb43 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1222,12 +1222,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; size_sys = sizeof(val); - sysctl(mib, 2, &val, &size_sys, NULL, 0); - if (val) lpmemex->ullTotalPhys = val; + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullTotalPhys = val; mib[1] = HW_USERMEM; size_sys = sizeof(val); - sysctl(mib, 2, &val, &size_sys, NULL, 0); - if (!val) val = lpmemex->ullTotalPhys; + if (sysctl(mib, 2, &val, &size_sys, NULL, 0) || size_sys != sizeof(val) || !val) + val = lpmemex->ullTotalPhys; lpmemex->ullAvailPhys = val; lpmemex->ullTotalPageFile = val; lpmemex->ullAvailPageFile = val;

1 0

Ken Thomases : kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to ullAvailPhys , ullTotalPageFile, and ullAvailPageFile.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: c91dd240987ed8f54e6d2d6ffb9ecbae33f05015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91dd240987ed8f54e6d2d6ff… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:32 2014 -0600 kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to ullAvailPhys, ullTotalPageFile, and ullAvailPageFile. --- dlls/kernel32/heap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 578cb43..8d4325a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1226,11 +1226,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullTotalPhys = val; mib[1] = HW_USERMEM; size_sys = sizeof(val); - if (sysctl(mib, 2, &val, &size_sys, NULL, 0) || size_sys != sizeof(val) || !val) - val = lpmemex->ullTotalPhys; - lpmemex->ullAvailPhys = val; - lpmemex->ullTotalPageFile = val; - lpmemex->ullAvailPageFile = val; + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullAvailPhys = val; + else + lpmemex->ullAvailPhys = lpmemex->ullTotalPhys; + + lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys; + lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES);

1 0

Ken Thomases : kernel32: Consolidate some duplicate variable declarations.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 69531892713f6ad4e375e63f4e95a99d96ebdcca URL: http://source.winehq.org/git/wine.git/?a=commit;h=69531892713f6ad4e375e63f4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:35 2014 -0600 kernel32: Consolidate some duplicate variable declarations. --- dlls/kernel32/heap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8d4325a..c88d31c 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1146,12 +1146,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) SYSTEM_INFO si; #ifdef linux FILE *f; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - unsigned long val; - int mib[2]; - size_t size_sys; -#elif defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#ifdef __APPLE__ unsigned int val; +#else + unsigned long val; +#endif int mib[2]; size_t size_sys; #elif defined(sun)

1 0

Ken Thomases : kernel32: Prefer HW_MEMSIZE sysctl variable over HW_PHYSMEM , if available, since it's 64 bits.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 95df19efed1c6b31beedf556adb18cea63bd92ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=95df19efed1c6b31beedf556a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:38 2014 -0600 kernel32: Prefer HW_MEMSIZE sysctl variable over HW_PHYSMEM, if available, since it's 64 bits. --- dlls/kernel32/heap.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c88d31c..646890a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1147,6 +1147,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef linux FILE *f; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + DWORDLONG total; #ifdef __APPLE__ unsigned int val; #else @@ -1154,6 +1155,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #endif int mib[2]; size_t size_sys; +#ifdef HW_MEMSIZE + uint64_t val64; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1219,11 +1223,27 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) fclose( f ); } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + total = 0; + mib[0] = CTL_HW; - mib[1] = HW_PHYSMEM; - size_sys = sizeof(val); - if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) - lpmemex->ullTotalPhys = val; +#ifdef HW_MEMSIZE + mib[1] = HW_MEMSIZE; + size_sys = sizeof(val64); + if (!sysctl(mib, 2, &val64, &size_sys, NULL, 0) && size_sys == sizeof(val64) && val64) + total = val64; +#endif + + if (!total) + { + mib[1] = HW_PHYSMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + total = val; + } + + if (total) + lpmemex->ullTotalPhys = total; + mib[1] = HW_USERMEM; size_sys = sizeof(val); if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val)

1 0

Ken Thomases : kernel32: Use sysctl(VM_SWAPUSAGE) to get swap sizes on BSDs, if available.
by Alexandre Julliard 17 Feb '14

17 Feb '14

Module: wine Branch: master Commit: 9b7c94bc55379941dd549c492424e3079b914b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7c94bc55379941dd549c492… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:42 2014 -0600 kernel32: Use sysctl(VM_SWAPUSAGE) to get swap sizes on BSDs, if available. --- dlls/kernel32/heap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 646890a..fb0b07d 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1158,6 +1158,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef HW_MEMSIZE uint64_t val64; #endif +#ifdef VM_SWAPUSAGE + struct xsw_usage swap; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1253,6 +1256,17 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys; lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; + +#ifdef VM_SWAPUSAGE + mib[0] = CTL_VM; + mib[1] = VM_SWAPUSAGE; + size_sys = sizeof(swap); + if (!sysctl(mib, 2, &swap, &size_sys, NULL, 0) && size_sys == sizeof(swap)) + { + lpmemex->ullTotalPageFile = swap.xsu_total; + lpmemex->ullAvailPageFile = swap.xsu_avail; + } +#endif #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES);

1 0