September 2012 - Wine-commits

Alexandre Julliard : server: Get rid of the waitpid wrapper.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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 : d3dx9_36: Cube texture can be loaded as a simple texture. The first face texture is taken in that case.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Christian Costa : dmusic: Add master clock tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Francois Gouget : shlwapi/tests: Add more PathCreateFromUrl() tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 73f89e7e4cb150f7a555168c301fdf99e095f29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f89e7e4cb150f7a555168c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:05:13 2012 +0200 shlwapi/tests: Add more PathCreateFromUrl() tests. --- dlls/shlwapi/tests/path.c | 141 +++++++++++++++++++++++++++++++++------------ 1 files changed, 105 insertions(+), 36 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index cd5ee37..24eab7d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -39,34 +39,88 @@ static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); static const struct { const char *url; const char *path; - DWORD ret; + DWORD ret, todo; } TEST_PATHFROMURL[] = { - {"file:///c:/foo/ba%5Cr", "c:\\foo\\ba\\r", S_OK}, - {"file:///c:/foo/../ba%5Cr", "c:\\foo\\..\\ba\\r", S_OK}, - {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK}, - {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK}, - {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK}, - {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK}, - {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK}, - {"file://c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK}, - {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK}, - {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK}, - {"file:/foo/bar", "\\foo\\bar", S_OK}, - {"file:/foo/bar/", "\\foo\\bar\\", S_OK}, - {"file:foo/bar", "foo\\bar", S_OK}, - {"file:c:/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:c|/foo/bar", "c:\\foo\\bar", S_OK}, - {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK}, - {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK}, -/* {"file:////c:/foo/foo%20bar", "c:\\foo\\foo%20bar", S_OK},*/ - - {"c:\\foo\\bar", NULL, E_INVALIDARG}, - {"foo/bar", NULL, E_INVALIDARG}, - {"http://foo/bar", NULL, E_INVALIDARG}, + /* 0 leading slash */ + {"file:c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:cx|/foo/bar", "cx|\\foo\\bar", S_OK, 0}, + {"file:c:foo/bar", "c:foo\\bar", S_OK, 0}, + {"file:c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:foo%20ba%2fr", "foo ba/r", S_OK, 0x2}, + {"file:foo/bar/", "foo\\bar\\", S_OK, 0}, + + /* 1 leading (back)slash */ + {"file:/c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:\\c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/c|/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:/cx|/foo/bar", "\\cx|\\foo\\bar", S_OK, 0}, + {"file:/c:foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:/c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file:/c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:/foo%20ba%2fr", "\\foo ba/r", S_OK, 0x2}, + {"file:/foo/bar/", "\\foo\\bar\\", S_OK, 0}, + + /* 2 leading (back)slashes */ + {"file://c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file://c:/d:/foo/bar", "c:\\d:\\foo\\bar", S_OK, 0}, + {"file://c|/d|/foo/bar", "c:\\d|\\foo\\bar", S_OK, 0}, + {"file://cx|/foo/bar", "\\\\cx|\\foo\\bar", S_OK, 0}, + {"file://c:foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file://c|foo/bar", "c:foo\\bar", S_OK, 0x2}, + {"file://c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0x2}, + {"file://c%3a/foo/../bar", "\\\\c:\\foo\\..\\bar", S_OK, 0}, + {"file://c%7c/foo/../bar", "\\\\c|\\foo\\..\\bar", S_OK, 0x2}, + {"file://foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, + {"file://localhost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://localhost/c:/foo%20ba%5Cr", "c:\\foo ba\\r", S_OK, 0x2}, + {"file://LocalHost/c:/foo/bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file:\\\\localhost\\c:\\foo\\bar", "c:\\foo\\bar", S_OK, 0x2}, + {"file://incomplete", "\\\\incomplete", S_OK, 0}, + + /* 3 leading (back)slashes (omitting hostname) */ + {"file:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"File:///c:/foo/bar", "c:\\foo\\bar", S_OK, 0x1}, + {"file:///c:/foo%20ba%2fr", "c:\\foo ba/r", S_OK, 0x2}, + {"file:///foo%20ba%2fr", "\\foo ba/r", S_OK, 0x2}, + {"file:///foo/bar/", "\\foo\\bar\\", S_OK, 0}, + {"file:///localhost/c:/foo/bar", "\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* 4 leading (back)slashes */ + {"file:////c:/foo/bar", "c:\\foo\\bar", S_OK, 0}, + {"file:////c:/foo%20ba%2fr", "c:\\foo%20ba%2fr", S_OK, 0x2}, + {"file:////foo%20ba%2fr", "\\\\foo%20ba%2fr", S_OK, 0x2}, + + /* 5 and more leading (back)slashes */ + {"file://///c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0x2}, + {"file://///c:/foo%20ba%2fr", "\\\\c:\\foo ba/r", S_OK, 0x2}, + {"file://///foo%20ba%2fr", "\\\\foo ba/r", S_OK, 0x2}, + {"file://////c:/foo/bar", "\\\\c:\\foo\\bar", S_OK, 0x2}, + + /* Leading (back)slashes cannot be escaped */ + {"file:%2f%2flocalhost%2fc:/foo/bar", "//localhost/c:\\foo\\bar", S_OK, 0x2}, + {"file:%5C%5Clocalhost%5Cc:/foo/bar", "\\\\localhost\\c:\\foo\\bar", S_OK, 0}, + + /* Hostname handling */ + {"file://l%6fcalhost/c:/foo/bar", "\\\\localhostc:\\foo\\bar", S_OK, 0}, + {"file://localhost:80/c:/foo/bar", "\\\\localhost:80c:\\foo\\bar", S_OK, 0}, + {"file://host/c:/foo/bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file://host//c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/\\c:/foo/bar", "\\\\host\\\\c:\\foo\\bar", S_OK, 0}, + {"file://host/c:foo/bar", "\\\\hostc:foo\\bar", S_OK, 0x2}, + {"file://host/foo/bar", "\\\\host\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c:\\foo\\bar", "\\\\hostc:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\ca\\foo\\bar", "\\\\host\\ca\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\c|\\foo\\bar", "\\\\hostc|\\foo\\bar", S_OK, 0}, + {"file:\\%5Chost\\c:\\foo\\bar", "\\\\host\\c:\\foo\\bar", S_OK, 0}, + {"file:\\\\host\\cx:\\foo\\bar", "\\\\host\\cx:\\foo\\bar", S_OK, 0}, + {"file:///host/c:/foo/bar", "\\host\\c:\\foo\\bar", S_OK, 0}, + + /* Not file URLs */ + {"c:\\foo\\bar", NULL, E_INVALIDARG, 0}, + {"foo/bar", NULL, E_INVALIDARG, 0}, + {"http://foo/bar", NULL, E_INVALIDARG, 0}, }; @@ -221,10 +275,17 @@ static void test_PathCreateFromUrl(void) for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == strlen(ret_path), "ret len %d from url %s\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpi(ret_path, TEST_PATHFROMURL[i].path), "got %s expected %s from url %s\n", ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } if (pPathCreateFromUrlW) { len = INTERNET_MAX_URL_LENGTH; @@ -232,11 +293,19 @@ static void test_PathCreateFromUrl(void) urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - if(TEST_PATHFROMURL[i].path) { - ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", - ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); - ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + if (!(TEST_PATHFROMURL[i].todo & 0x1)) + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + else todo_wine + ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); + if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { + if(!(TEST_PATHFROMURL[i].todo & 0x2)) { + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); + ok(len == lstrlenW(ret_pathW), "ret len %d from url L\"%s\"\n", len, TEST_PATHFROMURL[i].url); + } else todo_wine + /* Wrong string, don't bother checking the length */ + ok(!lstrcmpiW(ret_pathW, pathW), "got %s expected %s from url L\"%s\"\n", + ret_path, TEST_PATHFROMURL[i].path, TEST_PATHFROMURL[i].url); } FreeWideString(urlW); FreeWideString(pathW);

1 0

Francois Gouget : shlwapi: Fix the declaration of UrlIsFileUrlW().
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Francois Gouget : shell32/tests: Add a few more ShellExecute() file URL tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e8a515c28f54f03610367bd781c95c48dc977a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a515c28f54f03610367bd78… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:07:15 2012 +0200 shell32/tests: Add a few more ShellExecute() file URL tests. --- dlls/shell32/tests/shlexec.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5130240..6fdde5c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1321,22 +1321,30 @@ typedef struct static fileurl_tests_t fileurl_tests[]= { - {"file:///", "%s\\nonexistent.shlexec", 0, 0x1}, + /* How many slashes does it take... */ + {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://///", "%s\\test file.shlexec", 0, 0x1}, + + /* Test with Windows-style paths */ + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, + + /* Check handling of hostnames */ {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://localhost:80/", "%s\\test file.shlexec", 0, 0x1}, {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0x1}, {"file://::1/", "%s\\test file.shlexec", 0, 0x1}, {"file://notahost/", "%s\\test file.shlexec", 0, 0x1}, - {"file://www.winehq.org/", "%s\\test file.shlexec", 0, 0x1}, + + /* Environment variables are not expanded in URLs */ + {"%urlprefix%", "%s\\test file.shlexec", 0, 0x1}, + {"file:///", "%s\\%%urlenvvar%% file.shlexec", 0, 0x1}, {NULL, NULL, 0, 0} }; @@ -1357,6 +1365,8 @@ static void test_fileurl(void) } get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); + SetEnvironmentVariable("urlprefix", "file:///"); + SetEnvironmentVariable("urlenvvar", "test"); test=fileurl_tests; while (test->basename) @@ -1423,6 +1433,9 @@ static void test_fileurl(void) } test++; } + + SetEnvironmentVariable("urlprefix", NULL); + SetEnvironmentVariable("urlenvvar", NULL); } static void test_find_executable(void)

1 0

Francois Gouget : kernel32: Add more flags for CompareString().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 4927f9595f761db454be21a6cbff2ef5f64706ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4927f9595f761db454be21a6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 24 13:04:00 2012 +0200 kernel32: Add more flags for CompareString(). And fix the name of SORT_STRINGSORT. --- include/winnls.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index d6bbc13..71b5a8f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -342,12 +342,16 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define LOCALE_IDEFAULTUNIXCODEPAGE 0x1030 /* Wine extension */ -#define NORM_IGNORECASE 0x00001 -#define NORM_IGNORENONSPACE 0x00002 -#define NORM_IGNORESYMBOLS 0x00004 -#define NORM_STRINGSORT 0x01000 -#define NORM_IGNOREKANATYPE 0x10000 -#define NORM_IGNOREWIDTH 0x20000 +#define NORM_IGNORECASE 0x00000001 +#define NORM_IGNORENONSPACE 0x00000002 +#define NORM_IGNORESYMBOLS 0x00000004 +#define SORT_DIGITSASNUMBERS 0x00000008 +#define LINGUISTIC_IGNORECASE 0x00000010 +#define LINGUISTIC_IGNOREDIACRITIC 0x00000020 +#define SORT_STRINGSORT 0x00001000 +#define NORM_IGNOREKANATYPE 0x00010000 +#define NORM_IGNOREWIDTH 0x00020000 +#define NORM_LINGUISTIC_CASING 0x08000000 #define CP_ACP 0 #define CP_OEMCP 1

1 0

Piotr Caban : wininet: Reserve more space for urlcache entry flags.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 122daa50bc8fdccbea0a2de8452e4d81b9f5c40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=122daa50bc8fdccbea0a2de84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:56:37 2012 +0200 wininet: Reserve more space for urlcache entry flags. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 89be901..5a4ed0b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -78,7 +78,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_LOCK 2 #define HASHTABLE_FREE 3 #define HASHTABLE_REDR 5 -#define HASHTABLE_FLAG_BITS 5 +#define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000

1 0

Piotr Caban : wininet: Added tests for entries with identical hash key.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 71511c9fc55a32b43aaebcb4f29d77d08d24b072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71511c9fc55a32b43aaebcb4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:56:56 2012 +0200 wininet: Added tests for entries with identical hash key. --- dlls/wininet/tests/urlcache.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 4118220..c2e355a 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -31,6 +31,8 @@ #define TEST_URL "http://urlcachetest.winehq.org/index.html" #define TEST_URL1 "Visited: user(a)http://urlcachetest.winehq.org/index.html" +#define TEST_HASH_COLLISIONS1 "Visited: http://winehq.org/doc0.html" +#define TEST_HASH_COLLISIONS2 "Visited: http://winehq.org/doc75651909.html" static BOOL (WINAPI *pDeleteUrlCacheEntryA)(LPCSTR); static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); @@ -751,6 +753,43 @@ static void test_urlcacheA(void) ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); check_file_not_exists(filenameA); } + + /* Test if files with identical hash keys are handled correctly */ + ret = CommitUrlCacheEntryA(TEST_HASH_COLLISIONS1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + ret = CommitUrlCacheEntryA(TEST_HASH_COLLISIONS2, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + cbCacheEntryInfo = 0; + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS1, NULL, &cbCacheEntryInfo); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS1, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_HASH_COLLISIONS1), + "got incorrect entry: %s\n", lpCacheEntryInfo->lpszSourceUrlName); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + cbCacheEntryInfo = 0; + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS2, NULL, &cbCacheEntryInfo); + ok(!ret, "GetUrlCacheEntryInfo should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); + ret = GetUrlCacheEntryInfo(TEST_HASH_COLLISIONS2, lpCacheEntryInfo, &cbCacheEntryInfo); + ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); + ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_HASH_COLLISIONS2), + "got incorrect entry: %s\n", lpCacheEntryInfo->lpszSourceUrlName); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + if (pDeleteUrlCacheEntryA) { + ret = pDeleteUrlCacheEntryA(TEST_HASH_COLLISIONS1); + ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); + ret = pDeleteUrlCacheEntryA(TEST_HASH_COLLISIONS2); + ok(ret, "DeleteUrlCacheEntry failed: %d\n", GetLastError()); + } } static void test_FindCloseUrlCache(void)

1 0

Piotr Caban : wininet: Added support for cache path parameter in FreeUrlCacheSpace function.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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