January 2012 - Wine-Commits

Nikolay Sivov : msxml3: Support comment nodes in MXWriter.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: ac96be9c08f28c05af330ea4586cb5f2f88d33f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac96be9c08f28c05af330ea45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 15:13:54 2012 +0300 msxml3: Support comment nodes in MXWriter. --- dlls/msxml3/mxwriter.c | 19 ++++++++++++-- dlls/msxml3/tests/saxreader.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 82f7ebd..a94fa51 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1155,11 +1155,24 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) return E_NOTIMPL; } -static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int len) +static HRESULT WINAPI SAXLexicalHandler_comment(ISAXLexicalHandler *iface, const WCHAR *chars, int nchars) { mxwriter *This = impl_from_ISAXLexicalHandler( iface ); - FIXME("(%p)->(%s): stub\n", This, debugstr_wn(chars, len)); - return E_NOTIMPL; + static const WCHAR copenW[] = {'<','!','-','-'}; + static const WCHAR ccloseW[] = {'-','-','>','\r','\n'}; + + TRACE("(%p)->(%s:%d)\n", This, debugstr_wn(chars, nchars), nchars); + + if (!chars) return E_INVALIDARG; + + close_element_starttag(This); + + write_output_buffer(This->buffer, copenW, sizeof(copenW)/sizeof(WCHAR)); + if (nchars) + write_output_buffer(This->buffer, chars, nchars); + write_output_buffer(This->buffer, ccloseW, sizeof(ccloseW)/sizeof(WCHAR)); + + return S_OK; } static const struct ISAXLexicalHandlerVtbl SAXLexicalHandlerVtbl = diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 33eefff..d05596e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2851,6 +2851,60 @@ static void test_mxwriter_dispex(void) IMXWriter_Release(writer); } +static void test_mxwriter_comment(void) +{ + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + ISAXContentHandler *content; + ISAXLexicalHandler *lexical; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXLexicalHandler, (void**)&lexical); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXLexicalHandler_comment(lexical, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXLexicalHandler_comment(lexical, commentW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXLexicalHandler_comment(lexical, commentW, sizeof(commentW)/sizeof(WCHAR)-1); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("\r\n\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + ISAXLexicalHandler_Release(lexical); + IMXWriter_Release(writer); + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2886,6 +2940,7 @@ START_TEST(saxreader) test_mxwriter_startenddocument(); test_mxwriter_startendelement(); test_mxwriter_characters(); + test_mxwriter_comment(); test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream();

1 0

Dmitry Timoshkov : psapi: Add more GetMappedFileName tests.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

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

Thomas Faber : usp10: Fix build with MSVC.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

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

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

Jan. 27, 2012

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: Also close the connection when there' s nothing to read.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

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

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTranspose() test.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 0ae7c573b1529b1b6a7929319f4af6e19348d263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae7c573b1529b1b6a7929319… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:38 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTranspose() test. --- dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 31edcb6..5ff41a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1972,6 +1972,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTranspose */ + fvalue = 1.33; + for (l = 0; l < 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTranspose(effect, parameter, (D3DXMATRIX *)input_value); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns, res_desc->Type, + input_value + l * 4 + m, D3DXPT_FLOAT); + } + + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Olli-Pekka Wallin : winscard: Add new stub methods.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: e8e45b3454de40681c00a00225fda706e55a19ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e45b3454de40681c00a0022… Author: Olli-Pekka Wallin <extolli-pekka.wallin(a)ixonos.com> Date: Wed Jan 25 09:44:00 2012 +0200 winscard: Add new stub methods. --- dlls/winscard/winscard.c | 14 ++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 412299c..473d5f3 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -116,6 +116,20 @@ LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) return SCARD_F_INTERNAL_ERROR; } +LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + +LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 1bd6ef1..8ecf988 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -55,8 +55,8 @@ @ stub SCardSetCardTypeProviderNameA @ stub SCardSetCardTypeProviderNameW @ stub SCardState -@ stub SCardStatusA -@ stub SCardStatusW +@ stdcall SCardStatusA (long str long long long ptr long ) +@ stdcall SCardStatusW (long wstr long long long ptr long ) @ stub SCardTransmit @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci

1 0

Jacek Caban : vbscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 613c276ca3e37d195caa70565ee6acb10111ba93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613c276ca3e37d195caa70565… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:12 2012 +0100 vbscript: Get rid of unused SET_CALLED macro. --- dlls/vbscript/tests/createobj.c | 3 --- dlls/vbscript/tests/run.c | 3 --- dlls/vbscript/tests/vbscript.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b869d07..bbf53ee 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -38,9 +38,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9fa4240..43c9be4 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -35,9 +35,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 431f815..d4c4ec5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -35,9 +35,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \

1 0

Jacek Caban : jscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 2830a21e1daadd511099802d3a0f6c4f1a587691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2830a21e1daadd511099802d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:45:46 2012 +0100 jscript: Get rid of unused SET_CALLED macro. --- dlls/jscript/tests/activex.c | 3 --- dlls/jscript/tests/jscript.c | 3 --- dlls/jscript/tests/run.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 1508ca0..dc90d91 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -39,9 +39,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 7c81328..c453971 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -38,9 +38,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e5bd072..f83cedd 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -36,9 +36,6 @@ static const CLSID CLSID_JScript = #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: cf512fdf13ab596aa29105576160e7633cb6fe17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf512fdf13ab596aa29105576… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:43 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test. --- dlls/d3dx9_36/tests/effect.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5ff41a2..d0f2f00 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2005,6 +2005,47 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetMatrixTransposeArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) + { + UINT n; + + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0