September 2012 - Wine-Commits

Christian Costa : d3dx9_36: Cube texture can be loaded as a simple texture. The first face texture is taken in that case.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 12d11833f71fd2268386bbd846fd52589703ad0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d11833f71fd2268386bbd84… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Sep 24 22:15:09 2012 +0200 d3dx9_36: Cube texture can be loaded as a simple texture. The first face texture is taken in that case. --- dlls/d3dx9_36/surface.c | 3 ++- dlls/d3dx9_36/tests/texture.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 9f215c7..ab6a9f6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -542,7 +542,8 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const struct dds_header *header = src_data; const BYTE *pixels = (BYTE *)(header + 1); - if (src_info->ResourceType != D3DRTYPE_TEXTURE) + /* Loading a cube texture as a simple texture is also supported (only first face texture is taken) */ + if ((src_info->ResourceType != D3DRTYPE_TEXTURE) && (src_info->ResourceType != D3DRTYPE_CUBETEXTURE)) return D3DXERR_INVALIDDATA; width = src_info->Width; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1edfe9e..06e69e2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -62,11 +62,11 @@ static const unsigned char dds_cube_map[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, 0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, -0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, -0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, -0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, -0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, -0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50 +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x51, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x52, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x53, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x54, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x55 }; /* 4x4x2 volume map dds, 2 mipmaps */ @@ -1288,6 +1288,10 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) { HRESULT hr; IDirect3DTexture9 *texture; + D3DRESOURCETYPE type; + D3DSURFACE_DESC desc; + D3DLOCKED_RECT lock_rect; + int i; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1299,6 +1303,29 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) hr = D3DXCreateTextureFromFileInMemory(device, dds_24bit, sizeof(dds_24bit) - 1, &texture); ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + /* Check that D3DXCreateTextureFromFileInMemory accepts cube texture dds file (only first face texture is loaded) */ + hr = D3DXCreateTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "IDirect3DTexture9_GetType returned %u, expected %u\n", type, D3DRTYPE_TEXTURE); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(desc.Width == 4, "Width is %u, expected 4\n", desc.Width); + ok(desc.Height == 4, "Width is %u, expected 4\n", desc.Height); + hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "IDirect3DTexture9_LockTexture returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + for (i = 0; i < 16; i++) + ok(((BYTE*)lock_rect.pBits)[i] == dds_cube_map[128+i], "Byte at index %u is 0x%02x, expected 0x%02x\n", i, ((BYTE*)lock_rect.pBits)[i], dds_cube_map[144+i]); + IDirect3DTexture9_UnlockRect(texture, 0); + } + IDirect3DTexture9_Release(texture); + + } } static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device)

1 0

Alexandre Julliard : server: Get rid of the waitpid wrapper.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 1fd55b7334bd743fb7e83b2eb10b428eca1bff84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd55b7334bd743fb7e83b2eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 24 20:29:43 2012 +0200 server: Get rid of the waitpid wrapper. --- server/ptrace.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index efcdec0..19ec7da 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -98,6 +98,10 @@ static inline int ptrace(int req, ...) { errno = EPERM; return -1; /*FAIL*/ } #endif /* HAVE_SYS_PTRACE_H */ +#ifndef __WALL +#define __WALL 0 +#endif + /* handle a status returned by waitpid */ static int handle_child_status( struct thread *thread, int pid, int status, int want_sig ) { @@ -130,23 +134,6 @@ static int handle_child_status( struct thread *thread, int pid, int status, int return 0; } -/* waitpid wrapper to handle missing __WALL flag in older kernels */ -static inline pid_t waitpid_wrapper( pid_t pid, int *status, int options ) -{ -#ifdef __WALL - static int wall_flag = __WALL; - - for (;;) - { - pid_t ret = waitpid( pid, status, options | wall_flag ); - if (ret != -1 || !wall_flag || errno != EINVAL) return ret; - wall_flag = 0; - } -#else - return waitpid( pid, status, options ); -#endif -} - /* handle a SIGCHLD signal */ void sigchld_callback(void) { @@ -154,7 +141,7 @@ void sigchld_callback(void) for (;;) { - if (!(pid = waitpid_wrapper( -1, &status, WUNTRACED | WNOHANG ))) break; + if (!(pid = waitpid( -1, &status, WUNTRACED | WNOHANG | __WALL ))) break; if (pid != -1) { struct thread *thread = get_thread_from_tid( pid ); @@ -189,7 +176,7 @@ static int waitpid_thread( struct thread *thread, int signal ) start_watchdog(); for (;;) { - if ((res = waitpid_wrapper( get_ptrace_pid(thread), &status, WUNTRACED )) == -1) + if ((res = waitpid( get_ptrace_pid(thread), &status, WUNTRACED | __WALL )) == -1) { if (errno == EINTR) {

1 0

Christian Costa : dmusic: Add master clock tests.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 6ebf13960be6105243536113625b5ca50883c8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebf13960be61052435361136… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Sep 24 22:15:40 2012 +0200 dmusic: Add master clock tests. --- dlls/dmusic/tests/dmusic.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 24ae90d..8d070b7 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -58,6 +58,8 @@ static void test_dmusic(void) DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; DMUS_CLOCKINFO clock_info; + GUID guid_clock; + IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); if (hr != S_OK) @@ -66,6 +68,13 @@ static void test_dmusic(void) return; } + hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); + ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); + ok(clock != NULL, "No clock returned\n"); + trace(" guidPort = %s\n", debugstr_guid(&guid_clock)); + if (clock) + IReferenceClock_Release(clock); + port_params.dwSize = sizeof(port_params); port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; port_params.dwChannelGroups = 1;

1 0

Józef Kucia : d3dx9/tests: Add a more detailed test for saving a surface to a DDS file.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 94ab09a226883c96e5658c9f0b95710af356f890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab09a226883c96e5658c9f0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:39 2012 +0200 d3dx9/tests: Add a more detailed test for saving a surface to a DDS file. --- dlls/d3dx9_36/tests/surface.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 50ed2b2..84a70cf 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1160,6 +1160,24 @@ next_tests: hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) { + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.dds", NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); + + if (SUCCEEDED(hr)) { + ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_DDS, "Wrong file format %u\n", image_info.ImageFileFormat); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); + if (SUCCEEDED(hr)) { + ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); + IDirect3DSurface9_UnlockRect(surface); + } + } + } else skip("Couldn't save surface\n"); hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Francois Gouget : shlwapi: Fix the declaration of UrlIsFileUrlW().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 340dee86f0ee6bd3c9029c1e950c8cd2fb2fc472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340dee86f0ee6bd3c9029c1e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:05:30 2012 +0200 shlwapi: Fix the declaration of UrlIsFileUrlW(). --- include/shlwapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 2ebcdc9..cbfaabe 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -701,7 +701,7 @@ BOOL WINAPI UrlIsOpaqueW(LPCWSTR); #define UrlIsOpaque WINELIB_NAME_AW(UrlIsOpaque) #define UrlIsFileUrlA(x) UrlIsA(x, URLIS_FILEURL) -#define UrlIsFileUrlW(y) UrlIsW(x, URLIS_FILEURL) +#define UrlIsFileUrlW(x) UrlIsW(x, URLIS_FILEURL) #define UrlIsFileUrl WINELIB_NAME_AW(UrlIsFileUrl) HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD);

1 0

Piotr Caban : wininet: Added support for cache path parameter in FreeUrlCacheSpace function.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 78835843c2ced74e7317a3662d21f5b25db20276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78835843c2ced74e7317a3662… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:57:21 2012 +0200 wininet: Added support for cache path parameter in FreeUrlCacheSpace function. --- dlls/wininet/urlcache.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 5a4ed0b..cbfa04f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2413,7 +2413,7 @@ static int dword_cmp(const void *p1, const void *p2) BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) { URLCACHECONTAINER *container; - DWORD err; + DWORD path_len, err; TRACE("(%s, %x, %x)\n", debugstr_w(cache_path), size, filter); @@ -2423,16 +2423,20 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) } if(cache_path) { - FIXME("cache_path != NULL not supported yet\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + path_len = strlenW(cache_path); + if(cache_path[path_len-1] == '\\') + path_len--; + }else { + path_len = 0; } if(size==100 && !filter) { LIST_FOR_EACH_ENTRY(container, &UrlContainers, URLCACHECONTAINER, entry) { - /* The URL cache has prefix L"" (unlike Cookies and History) */ - if (container->cache_prefix[0] == 0) + /* When cache_path==NULL only clean Temporary Internet Files */ + if((!path_len && container->cache_prefix[0]==0) || + (path_len && !strncmpiW(container->path, cache_path, path_len) && + (container->path[path_len]=='\0' || container->path[path_len]=='\\'))) { BOOL ret_del; @@ -2444,9 +2448,12 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) err = URLCacheContainer_OpenIndex(container, MIN_BLOCK_NO); ReleaseMutex(container->hMutex); - return ret_del && (err == ERROR_SUCCESS); + if(!ret_del || (err != ERROR_SUCCESS)) + return FALSE; } } + + return TRUE; } LIST_FOR_EACH_ENTRY(container, &UrlContainers, URLCACHECONTAINER, entry) @@ -2460,6 +2467,11 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) DWORD rate[100], rate_no; FILETIME cur_time; + if((path_len || container->cache_prefix[0]!=0) && + (!path_len || strncmpiW(container->path, cache_path, path_len) || + (container->path[path_len]!='\0' && container->path[path_len]!='\\'))) + continue; + err = URLCacheContainer_OpenIndex(container, MIN_BLOCK_NO); if(err != ERROR_SUCCESS) continue; @@ -2555,12 +2567,12 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) * * See FreeUrlCacheSpaceW. */ -BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) +BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) { BOOL ret = FALSE; LPWSTR path = heap_strdupAtoW(lpszCachePath); if (lpszCachePath == NULL || path != NULL) - ret = FreeUrlCacheSpaceW(path, dwSize, dwSizeType); + ret = FreeUrlCacheSpaceW(path, dwSize, dwFilter); heap_free(path); return ret; }

1 0

Józef Kucia : d3dx9: Use 4 spaces per indent level in get_image_info_from_dds().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 8f00a63161f17ea6205b491205c6dcc26d4d3e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f00a63161f17ea6205b49120… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:37 2012 +0200 d3dx9: Use 4 spaces per indent level in get_image_info_from_dds(). --- dlls/d3dx9_36/surface.c | 102 +++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4b9b056..3bf8cb1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -337,58 +337,58 @@ static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, U */ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { - UINT faces = 1; - UINT expected_length; - const struct dds_header *header = buffer; - - if (length < sizeof(*header) || !info) - return D3DXERR_INVALIDDATA; - - if (header->pixel_format.size != sizeof(header->pixel_format)) - return D3DXERR_INVALIDDATA; - - info->Width = header->width; - info->Height = header->height; - info->Depth = 1; - info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; - - info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); - if (info->Format == D3DFMT_UNKNOWN) - return D3DXERR_INVALIDDATA; - - TRACE("Pixel format is %#x\n", info->Format); - - if (header->caps2 & DDS_CAPS2_VOLUME) - { - info->Depth = header->depth; - info->ResourceType = D3DRTYPE_VOLUMETEXTURE; - } - else if (header->caps2 & DDS_CAPS2_CUBEMAP) - { - DWORD face; - faces = 0; - for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) - { - if (header->caps2 & face) - faces++; - } - info->ResourceType = D3DRTYPE_CUBETEXTURE; - } - else - { - info->ResourceType = D3DRTYPE_TEXTURE; - } - - expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, + UINT faces = 1; + UINT expected_length; + const struct dds_header *header = buffer; + + if (length < sizeof(*header) || !info) + return D3DXERR_INVALIDDATA; + + if (header->pixel_format.size != sizeof(header->pixel_format)) + return D3DXERR_INVALIDDATA; + + info->Width = header->width; + info->Height = header->height; + info->Depth = 1; + info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + + info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); + if (info->Format == D3DFMT_UNKNOWN) + return D3DXERR_INVALIDDATA; + + TRACE("Pixel format is %#x\n", info->Format); + + if (header->caps2 & DDS_CAPS2_VOLUME) + { + info->Depth = header->depth; + info->ResourceType = D3DRTYPE_VOLUMETEXTURE; + } + else if (header->caps2 & DDS_CAPS2_CUBEMAP) + { + DWORD face; + faces = 0; + for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + { + if (header->caps2 & face) + faces++; + } + info->ResourceType = D3DRTYPE_CUBETEXTURE; + } + else + { + info->ResourceType = D3DRTYPE_TEXTURE; + } + + expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, info->MipLevels, faces); - 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; - return D3D_OK; + 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; + return D3D_OK; } static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette,

1 0

Józef Kucia : d3dx9: Implement the support for saving a surface to a DDS file.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: bf4201ea58efb099f0d9f4fe8669d68d74f2a633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4201ea58efb099f0d9f4fe8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:38 2012 +0200 d3dx9: Implement the support for saving a surface to a DDS file. --- dlls/d3dx9_36/surface.c | 93 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 3 +- 2 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 3bf8cb1..770a2e5 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -275,6 +275,27 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } +static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat) +{ + memset(pixel_format, 0, sizeof(*pixel_format)); + + pixel_format->size = sizeof(*pixel_format); + + if (d3dformat == D3DFMT_R8G8B8) + { + pixel_format->flags = DDS_PF_RGB; + pixel_format->bpp = 24; + pixel_format->rmask = 0xff0000; + pixel_format->gmask = 0x00ff00; + pixel_format->bmask = 0x0000ff; + pixel_format->amask = 0x000000; + return D3D_OK; + } + + WARN("Unknown pixel format %#x\n", d3dformat); + return E_NOTIMPL; +} + static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT height, UINT *pitch, UINT *size) { @@ -410,6 +431,77 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET src_pitch, NULL, src_rect, filter, color_key); } +static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSurface9 *src_surface, const RECT *src_rect) +{ + HRESULT hr; + UINT dst_pitch, surface_size, file_size; + D3DSURFACE_DESC src_desc; + D3DLOCKED_RECT locked_rect; + ID3DXBuffer *buffer; + struct dds_header *header; + BYTE *pixels; + struct volume volume; + const struct pixel_format_desc *pixel_format; + + if (src_rect) + { + FIXME("Saving a part of a surface to a DDS file is not implemented yet\n"); + return E_NOTIMPL; + } + + hr = IDirect3DSurface9_GetDesc(src_surface, &src_desc); + if (FAILED(hr)) return hr; + + pixel_format = get_format_info(src_desc.Format); + if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; + + file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); + + hr = calculate_dds_surface_size(src_desc.Format, src_desc.Width, src_desc.Height, &dst_pitch, &surface_size); + if (FAILED(hr)) return hr; + + hr = D3DXCreateBuffer(file_size, &buffer); + if (FAILED(hr)) return hr; + + header = ID3DXBuffer_GetBufferPointer(buffer); + pixels = (BYTE *)(header + 1); + + memset(header, 0, sizeof(header)); + header->signature = MAKEFOURCC('D','D','S',' '); + header->size = sizeof(*header); + header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT; + header->height = src_desc.Height; + header->width = src_desc.Width; + header->pitch_or_linear_size = dst_pitch; + header->depth = 1; + header->miplevels = 1; + header->caps = DDS_CAPS_TEXTURE; + hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format); + if (FAILED(hr)) + { + ID3DXBuffer_Release(buffer); + return hr; + } + + hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, NULL, D3DLOCK_READONLY); + if (FAILED(hr)) + { + ID3DXBuffer_Release(buffer); + return hr; + } + + volume.width = src_desc.Width; + volume.height = src_desc.Height; + volume.depth = 1; + copy_simple_data(locked_rect.pBits, locked_rect.Pitch, 0, &volume, pixel_format, + pixels, dst_pitch, 0, &volume, pixel_format, 0); + + IDirect3DSurface9_UnlockRect(src_surface); + + *dst_buffer = buffer; + return D3D_OK; +} + HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) @@ -1761,6 +1853,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE encoder_clsid = &CLSID_WICJpegEncoder; break; case D3DXIFF_DDS: + return save_dds_surface_to_memory(dst_buffer, src_surface, src_rect); case D3DXIFF_DIB: case D3DXIFF_HDR: case D3DXIFF_PFM: diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 5a01200..50ed2b2 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1156,9 +1156,10 @@ next_tests: ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + } + hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); - } hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Józef Kucia : d3dx9: Introduce a function for calculating the expected size of a DDS file.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 00ea54f64f0bc90d38fc49ea803c8d8459db2bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ea54f64f0bc90d38fc49ea8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:36 2012 +0200 d3dx9: Introduce a function for calculating the expected size of a DDS file. --- dlls/d3dx9_36/surface.c | 61 ++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f0b1c72..4b9b056 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -275,10 +275,10 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } -static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, - UINT width, UINT height, UINT *pitch, UINT *size) +static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT height, + UINT *pitch, UINT *size) { - const struct pixel_format_desc *format_desc = get_format_info(img_info->Format); + const struct pixel_format_desc *format_desc = get_format_info(format); if (format_desc->format == D3DFMT_UNKNOWN) return E_NOTIMPL; @@ -298,6 +298,27 @@ static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, return D3D_OK; } +static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, UINT depth, + UINT miplevels, UINT faces) +{ + UINT i, file_size = 0; + + for (i = 0; i < miplevels; i++) + { + UINT pitch, size = 0; + calculate_dds_surface_size(format, width, height, &pitch, &size); + size *= depth; + file_size += size; + width = max(1, width / 2); + height = max(1, height / 2); + depth = max(1, depth / 2); + } + + file_size *= faces; + file_size += sizeof(struct dds_header); + return file_size; +} + /************************************************************ * get_image_info_from_dds * @@ -316,11 +337,9 @@ static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, */ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { - UINT i; UINT faces = 1; - UINT width, height, depth; + UINT expected_length; const struct dds_header *header = buffer; - UINT expected_length = 0; if (length < sizeof(*header) || !info) return D3DXERR_INVALIDDATA; @@ -360,23 +379,8 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG info->ResourceType = D3DRTYPE_TEXTURE; } - /* calculate the expected length */ - width = info->Width; - height = info->Height; - depth = info->Depth; - for (i = 0; i < info->MipLevels; i++) - { - UINT pitch, size = 0; - calculate_dds_surface_size(info, width, height, &pitch, &size); - size *= depth; - expected_length += size; - width = max(1, width / 2); - height = max(1, height / 2); - depth = max(1, depth / 2); - } - - expected_length *= faces; - expected_length += sizeof(*header); + expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, + info->MipLevels, faces); if (length < expected_length) { WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); @@ -384,7 +388,6 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG } info->ImageFileFormat = D3DXIFF_DDS; - return D3D_OK; } @@ -400,7 +403,7 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET if (src_info->ResourceType != D3DRTYPE_TEXTURE) return D3DXERR_INVALIDDATA; - if (FAILED(calculate_dds_surface_size(src_info, src_info->Width, src_info->Height, &src_pitch, &size))) + if (FAILED(calculate_dds_surface_size(src_info->Format, src_info->Width, src_info->Height, &src_pitch, &size))) return E_NOTIMPL; return D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, pixels, src_info->Format, @@ -418,7 +421,7 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d if (src_info->ResourceType != D3DRTYPE_VOLUMETEXTURE) return D3DXERR_INVALIDDATA; - if (FAILED(calculate_dds_surface_size(src_info, src_info->Width, src_info->Height, &row_pitch, &slice_pitch))) + if (FAILED(calculate_dds_surface_size(src_info->Format, src_info->Width, src_info->Height, &row_pitch, &slice_pitch))) return E_NOTIMPL; return D3DXLoadVolumeFromMemory(dst_volume, dst_palette, dst_box, pixels, src_info->Format, @@ -448,7 +451,7 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); for (mip_level = 0; mip_level < mip_levels; mip_level++) { - hr = calculate_dds_surface_size(src_info, width, height, &src_pitch, &mip_level_size); + hr = calculate_dds_surface_size(src_info->Format, width, height, &src_pitch, &mip_level_size); if (FAILED(hr)) return hr; SetRect(&src_rect, 0, 0, width, height); @@ -497,7 +500,7 @@ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const vo size = src_info->Width; for (mip_level = 0; mip_level < src_info->MipLevels; mip_level++) { - hr = calculate_dds_surface_size(src_info, size, size, &src_pitch, &mip_level_size); + hr = calculate_dds_surface_size(src_info->Format, size, size, &src_pitch, &mip_level_size); if (FAILED(hr)) return hr; /* if texture has fewer mip levels than DDS file, skip excessive mip levels */ @@ -544,7 +547,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co for (mip_level = 0; mip_level < mip_levels; mip_level++) { - hr = calculate_dds_surface_size(src_info, width, height, &src_row_pitch, &src_slice_pitch); + hr = calculate_dds_surface_size(src_info->Format, width, height, &src_row_pitch, &src_slice_pitch); if (FAILED(hr)) return hr; hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, mip_level, &volume);

1 0

Jacek Caban : jscript: Properly invoke regexp matching in String.split.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: fa0dfd0bb648c590a7cb24958ef837245b6955d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0dfd0bb648c590a7cb24958… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 15:41:53 2012 +0200 jscript: Properly invoke regexp matching in String.split. --- dlls/jscript/string.c | 42 ++++++++++++++++++------------------------ dlls/jscript/tests/regexp.js | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e7216df..6387896 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1081,12 +1081,11 @@ static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - match_result_t *match_result = NULL; - DWORD length, match_cnt, i, match_len = 0; - const WCHAR *str, *ptr, *ptr2; + match_result_t match_result; + DWORD length, i, match_len = 0; + const WCHAR *str, *ptr, *ptr2, *cp; unsigned limit = UINT32_MAX; - BOOL use_regexp = FALSE; - jsdisp_t *array; + jsdisp_t *array, *regexp = NULL; BSTR val_str, match_str = NULL, tmp_str; HRESULT hres; @@ -1110,23 +1109,16 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } if(is_object_instance(argv[0])) { - jsdisp_t *regexp; - regexp = iface_to_jsdisp((IUnknown*)get_object(argv[0])); if(regexp) { - if(is_class(regexp, JSCLASS_REGEXP)) { - use_regexp = TRUE; - hres = regexp_match(ctx, regexp, str, length, TRUE, &match_result, &match_cnt); - } - jsdisp_release(regexp); - if(FAILED(hres)) { - SysFreeString(val_str); - return hres; + if(!is_class(regexp, JSCLASS_REGEXP)) { + jsdisp_release(regexp); + regexp = NULL; } } } - if(!use_regexp) { + if(!regexp) { hres = to_string(ctx, argv[0], &match_str); if(FAILED(hres)) { SysFreeString(val_str); @@ -1143,12 +1135,13 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi hres = create_array(ctx, 0, &array); if(SUCCEEDED(hres)) { - ptr = str; + ptr = cp = str; for(i=0; i<limit; i++) { - if(use_regexp) { - if(i == match_cnt) + if(regexp) { + hres = regexp_match_next(ctx, regexp, 0, str, length, &cp, NULL, NULL, NULL, &match_result); + if(hres != S_OK) break; - ptr2 = match_result[i].str; + ptr2 = match_result.str; }else if(match_str) { ptr2 = strstrW(ptr, match_str); if(!ptr2) @@ -1170,8 +1163,8 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(FAILED(hres)) break; - if(use_regexp) - ptr = match_result[i].str + match_result[i].len; + if(regexp) + ptr = cp; else if(match_str) ptr = ptr2 + match_len; else @@ -1179,7 +1172,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } } - if(SUCCEEDED(hres) && (match_str || use_regexp) && i<limit) { + if(SUCCEEDED(hres) && (match_str || regexp) && i<limit) { DWORD len = (str+length) - ptr; if(len || match_str) { @@ -1194,9 +1187,10 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } } + if(regexp) + jsdisp_release(regexp); SysFreeString(match_str); SysFreeString(val_str); - heap_free(match_result); if(SUCCEEDED(hres) && r) *r = jsval_obj(array); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 38d5377..6274f93 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -378,6 +378,19 @@ ok(r[2] === "3", "r[2] = " + r[2]); ok(RegExp.leftContext === "1,,2", "RegExp.leftContext = " + RegExp.leftContext); ok(RegExp.rightContext === "3", "RegExp.rightContext = " + RegExp.rightContext); +r = "1,,2,3".split(/,+/g, 2); +ok(r.length === 2, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(RegExp.leftContext === "1,,2", "RegExp.leftContext = " + RegExp.leftContext); +ok(RegExp.rightContext === "3", "RegExp.rightContext = " + RegExp.rightContext); + +r = "1,,2,3".split(/,+/g, 1); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(RegExp.leftContext === "1", "RegExp.leftContext = " + RegExp.leftContext); +ok(RegExp.rightContext === "2,3", "RegExp.rightContext = " + RegExp.rightContext); + r = "1,,2,3".split(/,+/); ok(r.length === 3, "r.length = " + r.length); ok(r[0] === "1", "r[0] = " + r[0]); @@ -411,6 +424,15 @@ r = "123".split(re = /\s+/).join(";"); ok(r === "123", "r = " + r); ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); +r = "1ab2aab3".split(/(a+)b/); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + +r = "A<B>bold</B>and<CODE>coded</CODE>".split(/<(\/)?([^<>]+)>/) ; +ok(r.length === 4, "r.length = " + r.length); + /* another standard violation */ r = "1 12 \t3".split(re = /(\s)+/g).join(";"); ok(r === "1;12;3", "r = " + r);

1 0