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

Re: [5/8] d3dx9: Add DDS support in D3DXCreateTextureFromFile functions.
by Józef Kucia 10 May '12

10 May '12

On Wed, May 9, 2012 at 11:32 PM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index ab56593..3d5a50f 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > @@ -917,6 +917,20 @@ static void test_D3DXCreateVolumeTexture(IDirect3DDevice9 *device) > } > } > > +static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) > +{ > + HRESULT hr; > + IDirect3DTexture9 *texture; > + > + hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); > + ok(hr == D3D_OK, "D3DCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); > + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); > + > + hr = D3DXCreateTextureFromFileInMemory(device, dds_24bit, sizeof(dds_24bit), &texture); > + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); > + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); > +} > + I noticed that I put more and more texture functions tests in tests/surface.c, because these tests needs the dds files which are in tests/surface.c. I wonder if it would be better to copy needed dds files to tests/texture.c and move texture function tests to their proper place. I think the dds files could be used to tests other texture functions, e.g. D3DXCreateTextureFromFileInMemoryEx doesn't seem to have any tests.

2 1

Re: [1/5] gdiplus: Retrive LOGFONT from a GpFont using GdipGetLogFontW instead of accessing it directly.
by Alexandre Julliard 10 May '12

10 May '12

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -4926,12 +4925,15 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, > TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), > length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); > > - if (!(graphics && string && font && layoutRect && stringFormat && regions)) > + if (!graphics || !string || !font || !layoutRect || !stringFormat || !regions) > return InvalidParameter; Please avoid mixing that sort of gratuitous change with the real changes. > + stat = GdipGetLogFontW((GpFont *)font, graphics, &lfw); > + if (stat != Ok) return stat; I'm not sure it's an improvement, since you need to add these ugly casts. You should find a way that doesn't require that. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: kernel32: Correct WideCharToMultiByte and MultiByteToWideChar error codes and conditions (try 4)
by Juan Lang 10 May '12

10 May '12

Hi Alex, first, thanks for taking the time to respond to feedback. Showing responsiveness helps a great deal. Next, on your patch: I'm trying to help you get this committed, so this is meant to be constructive feedback. +static void test_WideCharToMultiByte_error(UINT page, DWORD flags, LPCWSTR src, + INT srclen, LPSTR dst, INT dstlen, + LPCSTR defchar, BOOL* used, + const char* test_description, + DWORD expected_error) +{ + SetLastError(ERROR_SUCCESS); + WideCharToMultiByte(page, flags, src, srclen, dst, dstlen, defchar, used); + ok(GetLastError() == expected_error, + "codepage %i, %s, expected error %i got error %i\n", page, + test_description, expected_error, GetLastError()); +} + +static void test_MultiByteToWideChar_error(UINT page, DWORD flags, LPCSTR src, + INT srclen, LPWSTR dst, INT dstlen, + const char* test_description, + DWORD expected_error) +{ + SetLastError(ERROR_SUCCESS); + MultiByteToWideChar(page, flags, src, srclen, dst, dstlen); + ok(GetLastError() == expected_error, + "codepage %i, %s, expected error %i got error %i\n", page, + test_description, expected_error, GetLastError()); +} These helpers don't really gain you anything here, there's really not enough code to be worth using helpers. Please just copy/paste the changes everyplace you're currently using them. Also, a common convention we use is to set last error to 0xdeadbeef prior to a test we expect to set last error on failure. Thanks, --Juan

2 1

Re: [PATCH] winmm: Don't call MMDevAPI during process exit
by Alexandre Julliard 10 May '12

10 May '12

Andrew Eikum <aeikum(a)codeweavers.com> writes: > --- > This fixes bug 30631, introduced by > 31291cdc6ccc4c172ccf86f383c6a90f31a50ba1. > > In addition to safely exiting on process exit, we do much more > thorough cleanup on process detach. There shouldn't be any reason to do cleanup on process exit (and you can't really do anything reliably at that point anyway). -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [5/8] d3dx9: Add DDS support in D3DXCreateTextureFromFile functions.
by Matteo Bruni 10 May '12

10 May '12

2012/5/9 Józef Kucia <joseph.kucia(a)gmail.com>: > --- > +HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, UINT srd_data_size, > + const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; ... > +HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, UINT srd_data_size, > + const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) I guess that was meant to be called "src_data_size". More to the point, anyway, you're not using that value right now, you should probably add a check against it or remove the parameter altogether.

2 1

Re: [4/8] d3dx9: Implement D3DXCreateCubeTextureFromFileInMemoryEx.
by Matteo Bruni 10 May '12

10 May '12

2012/5/9 Józef Kucia <joseph.kucia(a)gmail.com>: > + mip_levels = min(src_info->MipLevels, IDirect3DCubeTexture9_GetLevelCount(cube_texture)); > + for (face = D3DCUBEMAP_FACE_POSITIVE_X; face <= D3DCUBEMAP_FACE_NEGATIVE_Z; face++) > + { > + size = src_info->Width; > + for (mip_level = 0; mip_level < mip_levels; mip_level++) > + { > + hr = calculate_dds_surface_size(src_info, size, size, &src_pitch, &mip_level_size); > + if (FAILED(hr)) return hr; > + > + SetRect(&src_rect, 0, 0, size, size); > + > + IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, face, mip_level, &surface); > + hr = D3DXLoadSurfaceFromMemory(surface, palette, NULL, pixels, src_info->Format, src_pitch, > + NULL, &src_rect, filter, color_key); > + IDirect3DSurface9_Release(surface); > + if (FAILED(hr)) return hr; > + > + pixels += mip_level_size; > + size = max(1, size / 2); > + } > + > + /* if texture has fewer mip levels than DDS file, skip excessive mip levels */ > + while (mip_level < src_info->MipLevels) > + { > + calculate_dds_surface_size(src_info, size, size, &src_pitch, &mip_level_size); > + pixels += mip_level_size; > + size = max(1, size / 2); > + mip_level++; > + } > + } Really a nitpick, you could merge the "while" into the "for" loop above. > + if ((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (pool != D3DPOOL_DEFAULT) && (usage != D3DUSAGE_DYNAMIC)) > + { > + hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, pool, &tex); > + buftex = NULL; > + } > + else > + { > + hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); > + tex = buftex; > + } The "if" condition doesn't look correct to me, since e.g. you don't need a temporary texture if pool == D3DPOOL_DEFAULT and usage == D3DUSAGE_DYNAMIC.

2 1

Re: [2/8] d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory.
by Matteo Bruni 10 May '12

10 May '12

2012/5/9 Józef Kucia <joseph.kucia(a)gmail.com>: > +static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) > { > + UINT i; > + UINT faces = 0; ... > + /* calculate the expected length */ > + width = info->Width; > + height = info->Height; > + for (i = 0; i < info->MipLevels; i++) > + { > + UINT pitch, size = 0; > + calculate_dds_surface_size(info, width, height, &pitch, &size); > + expected_length += size; > + width = max(1, width / 2); > + height = max(1, width / 2); > + } > + > + if (length < expected_length) > + return D3DXERR_INVALIDDATA; It looks like you're not actually using the faces variable.

2 1

Re: [PATCH] dmusic: Variable spelling fix.
by Andrew Eikum 10 May '12

10 May '12

On Thu, May 10, 2012 at 07:52:58AM +0200, Christian Costa wrote: > static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) > { > - ULONG readed; > + ULONG read; > HRESULT hr; > > - hr = IStream_Read(stream, data, size, &readed); > + hr = IStream_Read(stream, data, size, &read); > if(FAILED(hr)){ I called it that to prevent shadowing read(3). It probably doesn't matter since we almost never use that call in Wine, but that was the rationale. Andrew

2 1

Re: [PATCH 1/2] comctl32: LVM_SETITEMTEXT is not supported on LVS_OWNERDATA
by Nikolay Sivov 10 May '12

10 May '12

On 5/10/2012 12:01, Piotr Caban wrote: > > Thanks to this patch we no longer ask about the item text inside this > notification before returning error. > --- > dlls/comctl32/listview.c | 1 + > dlls/comctl32/tests/listview.c | 8 +++++++- > 2 files changed, 8 insertions(+), 1 deletions(-) > > case LVM_SETITEMTEXTA: > case LVM_SETITEMTEXTW: > + if (infoPtr->dwStyle& LVS_OWNERDATA) return FALSE; > return LISTVIEW_SetItemTextT(infoPtr, (INT)wParam, (LPLVITEMW)lParam, > uMsg == LVM_SETITEMTEXTW); Please place this inside LISTVIEW_SetItemTextT().

1 0

[PATCH 0/6] Extended file stat system call
by David Howells 10 May '12

10 May '12

Implement a pair of new system calls to provide extended and further extensible stat functions. The second of the associated patches is the main patch that provides these new system calls: ssize_t ret = xstat(int dfd, const char *filename, unsigned atflag, unsigned mask, struct xstat *buffer); ssize_t ret = fxstat(int fd, unsigned atflag, unsigned mask, struct xstat *buffer); which are more fully documented in the first patch's description. These new stat functions provide a number of useful features, in summary: (1) More information: creation time, inode generation number, data version number, flags/attributes. A subset of these is available through a number of filesystems (such as CIFS, NFS, AFS, Ext4 and BTRFS). (2) Lightweight stat: Ask for just those details of interest, and allow a netfs (such as NFS) to approximate anything not of interest, possibly without going to the server. (3) Heavyweight stat: Force a netfs to go to the server, even if it thinks its cached attributes are up to date. (4) Allow the filesystem to indicate what it can/cannot provide: A filesystem can now say it doesn't support a standard stat feature if that isn't available. (5) Make the fields a consistent size on all arches, and make them large. (6) Can be extended by using more request flags and appending further data after the end of the standard return data. Note that no lstat() equivalent is required as that can be implemented through xstat() with atflag == 0. ======= PATCHES ======= Patch 1 defines the xstat() and fxstat() system calls. Patches 2-6 implement extended stat facilities for Ext4, AFS, NFS and CIFS, and make eCryptFS go to the lower filesystem for such details. ============== CONSIDERATIONS ============== Should fxstat() be implemented as xstat() with a NULL filename, using dfd as fd? Should the default for a network fs be to do an unconditional (heavyweight) stat with a flag to suppress going to the server to update the locally held attributes and flushing pending writebacks? Should things like the Windows Archive, Hidden and System bits be handled through IOC flags, perhaps expanded to 64-bits? Are these things useful to userspace other than Samba and userspace NFS servers? Is it useful to pass the volume ID out? Or is statfs() sufficient for this? Should I add a sixth argument to xstat(), mark it reserved and require that must be supplied as 0 to hedge against future use? Is there anything else I can usefully add at the moment? ========== TO BE DONE ========== Autofs, ntfs, btrfs, ... I should perhaps use u8/u32/u64 rather than uint8/32/64_t. Handle remote filesystems being offline and indicate this with XSTAT_INFO_OFFLINE. ======= TESTING ======= There's a test program attached to the description for the main patch. It can be run as follows: [root(a)andromeda tmp]# ./xstat -R /mnt/foo xstat(/mnt/foo) = 0 0000: 000081a40000ffef 0000000000000001 0000020000000000 0000100000080000 0020: 0000000000000000 0000000600000008 000000004f88499a 0000000136fd9208 0040: 000000004f88499a 0000000136fd9208 000000004f8849b9 0000000106daf187 0060: 000000004f8849b9 0000000106daf187 000000000000000c 000000000000000f 0080: 0000000000000008 00000000484ebbef 0000000000000025 5949ebd4711efd82 00a0: d3250b5c15d5e380 0000000000000000 0000000000000000 0000000000000000 00c0: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 00e0: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 results=ffef Size: 15 Blocks: 8 IO Block: 4096 regular file Device: 08:06 Inode: 12 Links: 1 Access: (0644/-rw-r--r--) Uid: 0 Gid: 0 Access: 2012-04-13 16:43:22.922587656+0100 Modify: 2012-04-13 16:43:53.115011975+0100 Change: 2012-04-13 16:43:53.115011975+0100 Create: 2012-04-13 16:43:22.922587656+0100 Inode version: 484ebbefh Data version: 25h Inode flags: 00080000 (-------- ----e--- -------- --------) Information: 00000200 (-------- -------- ------a- --------) Volume ID: 82fd1e71d4eb4959-80e3d5155c0b25d3 David --- David Howells (6): xstat: eCryptFS: Return extended attributes xstat: CIFS: Return extended attributes xstat: NFS: Return extended attributes xstat: AFS: Return extended attributes xstat: Ext4: Return extended attributes xstat: Add a pair of system calls to make extended file stats available arch/x86/syscalls/syscall_32.tbl | 2 arch/x86/syscalls/syscall_64.tbl | 2 fs/afs/inode.c | 29 ++- fs/afs/super.c | 7 + fs/cifs/cifsfs.h | 4 fs/cifs/cifsglob.h | 16 +- fs/cifs/dir.c | 2 fs/cifs/inode.c | 120 +++++++++++-- fs/ecryptfs/inode.c | 14 +- fs/ext4/ext4.h | 2 fs/ext4/file.c | 2 fs/ext4/inode.c | 32 +++ fs/ext4/namei.c | 2 fs/ext4/super.c | 1 fs/ext4/symlink.c | 2 fs/nfs/inode.c | 49 ++++- fs/nfs/super.c | 1 fs/stat.c | 350 +++++++++++++++++++++++++++++++++++--- include/linux/fcntl.h | 1 include/linux/fs.h | 4 include/linux/stat.h | 126 +++++++++++++- include/linux/syscalls.h | 7 + 22 files changed, 694 insertions(+), 81 deletions(-)

10 65