January 2012 - Wine-commits

Henri Verbeet : wined3d: Make sure transparent hardware cursors are really transparent.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 348c655b5cc670f53d3b266b3e21f61cc978faca URL: http://source.winehq.org/git/wine.git/?a=commit;h=348c655b5cc670f53d3b266b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 23:04:19 2012 +0100 wined3d: Make sure transparent hardware cursors are really transparent. Loosely based on a patch by Stefan Dösinger. --- dlls/wined3d/device.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5f3506..2d014ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5004,14 +5004,16 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) { - /* Draw a hardware cursor */ + UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; ICONINFO cursorInfo; + DWORD *maskBits; HCURSOR cursor; - /* Create and clear maskBits because it is not needed for - * 32-bit cursors. 32x32 bits split into 32-bit chunks == 32 - * chunks. */ - DWORD *maskBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (cursor_image->resource.width * cursor_image->resource.height / 8)); + + /* 32-bit user32 cursors ignore the alpha channel if it's all + * zeroes, and use the mask instead. Fill the mask with all ones + * to ensure we still get a fully transparent cursor. */ + maskBits = HeapAlloc(GetProcessHeap(), 0, mask_size); + memset(maskBits, 0xff, mask_size); wined3d_surface_map(cursor_image, &mapped_rect, NULL, WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY); TRACE("width: %u height: %u.\n", cursor_image->resource.width, cursor_image->resource.height);

1 0

Henri Verbeet : ddraw/tests: Add a test for SetCooperativeLevel() on a window that belongs to another thread.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: ed6461f9dacb0c163f7273b1fa5b62bdea3bd442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6461f9dacb0c163f7273b1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 23:04:20 2012 +0100 ddraw/tests: Add a test for SetCooperativeLevel() on a window that belongs to another thread. --- dlls/ddraw/tests/ddraw1.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6461f9dacb0c163f727…

1 0

Thomas Faber : usp10: Fix build with MSVC.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 8ab4f85bbb7232c76c9f6a5902aa93257469e985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab4f85bbb7232c76c9f6a590… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jan 27 00:09:10 2012 +0100 usp10: Fix build with MSVC. --- dlls/usp10/shape.c | 45 +++++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5f71d6c..a893f7e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -357,9 +357,6 @@ static const char* required_khmer_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD no_features[] = -{ }; - static OPENTYPE_FEATURE_RECORD ethiopic_features[] = { { MS_MAKE_TAG('c','c','m','p'), 1}, @@ -441,31 +438,31 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, {{ ethiopic_features, 4}, NULL, 0, NULL, NULL}, {{ ethiopic_features, 4}, NULL, 0, NULL, NULL}, {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL}, {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, - {{ no_features, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, + {{ NULL, 0}, NULL, 0, NULL, NULL}, {{ hebrew_features, 1}, NULL, 0, NULL, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL}, {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai},

1 0

Erich Hoover : itss: Enlarge buffer to include space for a concatenated value.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 88f6e898c617c6c4ffc560922c6c19ba9bebe915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f6e898c617c6c4ffc560922… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 27 09:48:47 2012 -0700 itss: Enlarge buffer to include space for a concatenated value. --- dlls/itss/storage.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 4f687c6..c53b0c2 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -406,7 +406,6 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( IStorage** ppstg) { ITSS_IStorageImpl *This = impl_from_IStorage(iface); - static const WCHAR szRoot[] = { '/', 0 }; struct chmFile *chmfile; WCHAR *path, *p; DWORD len; @@ -418,7 +417,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( if( !chmfile ) return E_FAIL; - len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; + len = strlenW( This->dir ) + strlenW( pwcsName ) + 2; /* need room for a terminating slash */ path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); strcpyW( path, This->dir ); @@ -435,10 +434,12 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( *p = '/'; } - if(*--p == '/') + /* add a terminating slash if one does not already exist */ + if(*(p-1) != '/') + { + *p++ = '/'; *p = 0; - - strcatW( path, szRoot ); + } TRACE("Resolving %s\n", debugstr_w(path));

1 0

Erich Hoover : hhctrl.ocx: Add a missing Release call.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: fbc12b4a82953c0044d5a9dea21c0f615ff27815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc12b4a82953c0044d5a9dea… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 25 13:26:06 2012 -0700 hhctrl.ocx: Add a missing Release call. --- dlls/hhctrl.ocx/search.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index f81e46c..571cdd6 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -193,6 +193,7 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, FIXME("Unhandled IStorage stream element.\n"); } } + IEnumSTATSTG_Release(elem); return item; }

1 0

Dmitry Timoshkov : psapi: Add more GetMappedFileName tests.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 7705ad45c9a1ebd3d8033ddc3dc2fb3b15a23e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7705ad45c9a1ebd3d8033ddc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 27 15:33:19 2012 +0800 psapi: Add more GetMappedFileName tests. --- dlls/psapi/tests/psapi_main.c | 125 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 115 insertions(+), 10 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8a1cfc1..71c3c95 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -2,6 +2,7 @@ * Unit test suite for PSAPI * * Copyright (C) 2005 Felix Nawothnig + * Copyright (C) 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -184,9 +185,13 @@ static void test_GetMappedFileName(void) HMODULE hMod = GetModuleHandle(NULL); char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName; DWORD ret; - + char *base; + char temp_path[MAX_PATH], file_name[MAX_PATH], map_name[MAX_PATH], device_name[MAX_PATH], drive[3]; + HANDLE hfile, hmap; + SetLastError(0xdeadbeef); pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); +todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -195,20 +200,120 @@ static void test_GetMappedFileName(void) SetLastError( 0xdeadbeef ); ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); +todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); - if (!ret) return; ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); +todo_wine ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ - if(!szMapBaseName || !*szMapBaseName) +todo_wine + ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); + if (szMapBaseName) { - ok(0, "szMapPath=\"%s\"\n", szMapPath); - return; + GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); + ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), + "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); } - GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); - ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), - "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + + GetTempPath(MAX_PATH, temp_path); + GetTempFileName(temp_path, "map", 0, file_name); + + drive[0] = file_name[0]; + drive[1] = ':'; + drive[2] = 0; + SetLastError(0xdeadbeef); + ret = QueryDosDevice(drive, device_name, sizeof(device_name)); + ok(ret, "QueryDosDevice error %d\n", GetLastError()); + trace("%s -> %s\n", drive, device_name); + + SetLastError(0xdeadbeef); + hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN); + SetEndOfFile(hfile); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); + ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); +todo_wine + ok(ret == 1, "GetMappedFileName error %d\n", GetLastError()); + ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */, "expected 0, got %c\n", map_name[0]); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); +todo_wine { + ok(ret, "GetMappedFileName error %d\n", GetLastError()); + ok(ret > strlen(file_name), "map_name should be longer than device_name\n"); + ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); +} + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); +todo_wine { + ok(ret, "GetMappedFileName error %d\n", GetLastError()); + ok(ret > strlen(file_name), "map_name should be longer than device_name\n"); + ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); +} + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), NULL, map_name, sizeof(map_name)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(0, base, map_name, sizeof(map_name)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + UnmapViewOfFile(base); + CloseHandle(hmap); + CloseHandle(hfile); + DeleteFile(file_name); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); + ok(base != NULL, "MapViewOfFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); + + UnmapViewOfFile(base); + CloseHandle(hmap); } static void test_GetProcessImageFileName(void) @@ -431,7 +536,7 @@ START_TEST(psapi_main) if(!hpsapi) { - trace("Could not load psapi.dll\n"); + win_skip("Could not load psapi.dll\n"); return; } @@ -451,7 +556,7 @@ START_TEST(psapi_main) test_EnumProcessModules(); test_GetModuleInformation(); test_GetProcessMemoryInfo(); - todo_wine test_GetMappedFileName(); + test_GetMappedFileName(); test_GetProcessImageFileName(); test_GetModuleFileNameEx(); test_GetModuleBaseName();

1 0

Jörg Höhle : winmm: Parse MCI colon notation as in T:MM:SS:F.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 644f539358e373cb55dd6cc2c2868d797a330cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=644f539358e373cb55dd6cc2c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Feb 20 18:50:47 2011 +0100 winmm: Parse MCI colon notation as in T:MM:SS:F. --- dlls/winmm/mci.c | 49 +++++++++++++++++++++++++++++++++------------ dlls/winmm/tests/mci.c | 33 ++++++++++++++++++++++++++--- dlls/winmm/tests/mcicda.c | 2 +- 3 files changed, 66 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 9f85bde..ba2fea6 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -974,23 +974,47 @@ static WORD MCI_GetMessage(LPCWSTR lpCmd) /************************************************************************** * MCI_GetDWord [internal] + * + * Accept 0 -1 255 255:0 255:255:255:255 :::1 1::: 2::3 ::4: 12345678 + * Refuse -1:0 0:-1 :: 256:0 1:256 0::::1 */ static BOOL MCI_GetDWord(DWORD* data, LPWSTR* ptr) { - DWORD val; - LPWSTR ret; - - val = strtoulW(*ptr, &ret, 10); + LPWSTR ret = *ptr; + DWORD total = 0, shift = 0; + BOOL sign = FALSE, digits = FALSE; + + while (*ret == ' ' || *ret == '\t') ret++; + if (*ret == '-') { + ret++; + sign = TRUE; + } + for(;;) { + DWORD val = 0; + while ('0' <= *ret && *ret <= '9') { + val = *ret++ - '0' + 10 * val; + digits = TRUE; + } + switch (*ret) { + case '\0': break; + case '\t': + case ' ': ret++; break; + default: return FALSE; + case ':': + if ((val >= 256) || (shift >= 24)) return FALSE; + total |= val << shift; + shift += 8; + ret++; + continue; + } - switch (*ret) { - case '\0': break; - case ' ': ret++; break; - default: return FALSE; + if (!digits) return FALSE; + if (shift && (val >= 256 || sign)) return FALSE; + total |= val << shift; + *data = sign ? -total : total; + *ptr = ret; + return TRUE; } - - *data |= val; - *ptr = ret; - return TRUE; } /************************************************************************** @@ -1116,7 +1140,6 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, !MCI_GetDWord(&(data[offset+1]), &args) || !MCI_GetDWord(&(data[offset+2]), &args) || !MCI_GetDWord(&(data[offset+3]), &args)) { - ERR("Bad rect %s\n", debugstr_w(args)); return MCIERR_BAD_INTEGER; } TRACE("flag=%08x for rectangle\n", flg); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1cbcc68..5fbd2b8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -241,7 +241,7 @@ static void test_mciParser(HWND hwnd) ok(!buf[0], "status error buffer %s\n", buf); err = mciSendString("status x track", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_BAD_INTEGER,"status waveaudio no track: %s\n", dbg_mcierr(err)); + ok(err==MCIERR_BAD_INTEGER,"status waveaudio no track: %s\n", dbg_mcierr(err)); err = mciSendString("status x track 3", buf, sizeof(buf), NULL); ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio track 3: %s\n", dbg_mcierr(err)); @@ -273,6 +273,21 @@ static void test_mciParser(HWND hwnd) err = mciSendString("status x nsa", buf, sizeof(buf), hwnd); todo_wine ok(err==MCIERR_BAD_CONSTANT,"status nsa: %s\n", dbg_mcierr(err)); + err = mciSendString("seek x to 0:0:0:0:0", buf, sizeof(buf), NULL); + ok(err==MCIERR_BAD_INTEGER,"seek to 0:0:0:0:0 returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek x to 0:0:0:0:", buf, sizeof(buf), NULL); + ok(err==MCIERR_BAD_INTEGER,"seek to 0:0:0:0: returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek x to :0:0:0:0", buf, sizeof(buf), NULL); + ok(err==MCIERR_BAD_INTEGER,"seek to :0:0:0:0 returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek x to 256:0:0:0", buf, sizeof(buf), NULL); + ok(err==MCIERR_BAD_INTEGER,"seek to 256:0:0:0 returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek x to 0:256", buf, sizeof(buf), NULL); + ok(err==MCIERR_BAD_INTEGER,"seek to 0:256 returned %s\n", dbg_mcierr(err)); + err = mciSendString("status all time format", buf, sizeof(buf), hwnd); ok(err==MCIERR_CANNOT_USE_ALL,"status all: %s\n", dbg_mcierr(err)); @@ -296,7 +311,7 @@ static void test_mciParser(HWND hwnd) if(!err) ok(!strcmp(buf,"1"), "sysinfo digitalvideo quantity open returned %s\n", buf); err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); + ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); /*w9X-w2k report code from device last opened, newer versions compare them all * and return the one error code or MCIERR_MULTIPLE if they differ. */ @@ -844,8 +859,8 @@ static void test_playWAVE(HWND hwnd) /* No notification (checked below) sent if error */ /* A second play caused Wine<1.1.33 to hang */ - err = mciSendString("play mysound from 500 to 1500 wait", NULL, 0, NULL); - ok(!err,"mci play from 500 to 1500 returned %s\n", dbg_mcierr(err)); + err = mciSendString("play mysound from 500 to 220:5:0 wait", NULL, 0, NULL); + ok(!err,"mci play from 500 to 220:5:0 (=1500) returned %s\n", dbg_mcierr(err)); err = mciSendString("status mysound position", buf, sizeof(buf), hwnd); ok(!err,"mci status position returned %s\n", dbg_mcierr(err)); @@ -880,6 +895,16 @@ static void test_playWAVE(HWND hwnd) err = mciSendString("seek mysound to 0xfa", NULL, 0, NULL); ok(err==MCIERR_BAD_INTEGER,"mci seek to 0xfa returned %s\n", dbg_mcierr(err)); + /* MCI_INTEGER always accepts colon notation */ + err = mciSendString("seek mysound to :1", NULL, 0, NULL); + ok(!err,"mci seek to :1 (=256) returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek mysound to 250::", NULL, 0, NULL); + ok(!err,"mci seek to 250:: returned %s\n", dbg_mcierr(err)); + + err = mciSendString("seek mysound to 250:0", NULL, 0, NULL); + ok(!err,"mci seek to 250:0 returned %s\n", dbg_mcierr(err)); + err = mciSendString("status mysound position notify", buf, sizeof(buf), hwnd); ok(!err,"mci status position notify returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"250"), "mci status position: %s\n", buf); diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index acd03f0..553679e 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -250,7 +250,7 @@ static void test_play(HWND hwnd) test_notification(hwnd, "status 2flags", err ? 0 : MCI_NOTIFY_SUCCESSFUL); err = mciSendString("play c from 00:02:00 to 00:01:00 notify", buf, sizeof(buf), hwnd); - todo_wine ok(err == MCIERR_OUTOFRANGE, "play 2s to 1s: %s\n", dbg_mcierr(err)); + ok(err == MCIERR_OUTOFRANGE, "play 2s to 1s: %s\n", dbg_mcierr(err)); test_notification(hwnd, "play 2s to 1s", err ? 0 : MCI_NOTIFY_SUCCESSFUL); err = mciSendString("resume c", buf, sizeof(buf), hwnd);

1 0

Hans Leidekker : winhttp: Only turn POST requests into GET requests when redirecting.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: afd368577986ea5c756164622b13f73b138fcc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd368577986ea5c756164622… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:53:00 2012 +0100 winhttp: Only turn POST requests into GET requests when redirecting. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fac6fac..f615f41 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1650,7 +1650,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB) + if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !strcmpW( request->verb, postW )) { heap_free( request->verb ); request->verb = strdupW( getW );

1 0

Hans Leidekker : winhttp: Also close the connection when there' s nothing to read.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 07ed66f8ecb5c81c7bbc4bc0825e0d7fc728111d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ed66f8ecb5c81c7bbc4bc08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:53:23 2012 +0100 winhttp: Also close the connection when there's nothing to read. --- dlls/winhttp/request.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f615f41..516ff35 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1820,7 +1820,11 @@ static void drain_content( request_t *request ) DWORD bytes_read; char buffer[2048]; - if (!request->content_length) return; + if (!request->content_length) + { + finished_reading( request ); + return; + } for (;;) { if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return;

1 0

Hans Leidekker : winhttp: Don' t attempt to read data after receiving a response to a HEAD request.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: ebc4fd146285d4f45803d52b1b9da6cddfad2058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc4fd146285d4f45803d52b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:53:50 2012 +0100 winhttp: Don't attempt to read data after receiving a response to a HEAD request. --- dlls/winhttp/request.c | 6 +++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 516ff35..a3a92ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,7 +2815,11 @@ static HRESULT request_receive( struct winhttp_request *request ) return HRESULT_FROM_WIN32( get_last_error() ); } if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); - + if (!strcmpW( request->verb, headW )) + { + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + return S_OK; + } if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; request->buffer[0] = 0; size = total_bytes_read = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7105553..021bc93 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -46,6 +46,7 @@ static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; +static const WCHAR headW[] = {'H','E','A','D',0}; static const WCHAR slashW[] = {'/',0}; static const WCHAR http1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0};

1 0