wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Nikolay Sivov : msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 6c1275a57cef4c5a03ff9df2c346a349e095397d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1275a57cef4c5a03ff9df2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 13 00:30:46 2010 +0300 msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 25 +++++++++++++++++++++++-- dlls/msxml3/xmldoc.c | 5 +++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 426ef6f..9611f7c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -355,6 +355,7 @@ static void test_createElement(void) static void test_persiststreaminit(void) { IXMLDocument *doc = NULL; + IXMLElement *element = NULL; IPersistStreamInit *psi = NULL; IStream *stream = NULL; STATSTG stat; @@ -362,6 +363,8 @@ static void test_persiststreaminit(void) ULARGE_INTEGER size; CHAR path[MAX_PATH]; CLSID id; + BSTR str; + static const WCHAR testW[] = {'t','e','s','t',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -382,7 +385,10 @@ static void test_persiststreaminit(void) todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); hr = IPersistStreamInit_GetClassID(psi, NULL); - ok(hr == E_POINTER, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); @@ -400,6 +406,9 @@ static void test_persiststreaminit(void) if(hr == XML_E_INVALIDATROOTLEVEL) goto cleanup; + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* try to save document */ stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); @@ -413,9 +422,21 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); + str = SysAllocString(testW); + hr = IXMLDocument_get_root(doc, &element); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXMLElement_put_text(element, str); + SysFreeString(str); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* reset internal stream */ hr = IPersistStreamInit_InitNew(psi); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 7f5e41d..2ca874b 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -670,8 +670,9 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( IPersistStreamInit *iface) { - FIXME("(%p): stub!\n", iface); - return E_NOTIMPL; + xmldoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p)\n", This); + return S_OK; } static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =

1 0

Nikolay Sivov : msxml3/xmldoc: Fix IPersistStreamInit::GetClassID() for IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: a18ee2111ac6595c80a2e909c9925d32706557a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18ee2111ac6595c80a2e909c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 12 04:13:15 2010 +0300 msxml3/xmldoc: Fix IPersistStreamInit::GetClassID() for IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 9 +++++++++ dlls/msxml3/xmldoc.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 8cf3357..426ef6f 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -361,6 +361,7 @@ static void test_persiststreaminit(void) HRESULT hr; ULARGE_INTEGER size; CHAR path[MAX_PATH]; + CLSID id; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -380,6 +381,9 @@ static void test_persiststreaminit(void) hr = IPersistStreamInit_Save(psi, NULL, FALSE); todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + hr = IPersistStreamInit_GetClassID(psi, NULL); + ok(hr == E_POINTER, "Expected E_INVALIDARG, got %08x\n", hr); + create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); create_stream_on_file(&stream, path); @@ -426,6 +430,11 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); + memset(&id, 0, sizeof(id)); + hr = IPersistStreamInit_GetClassID(psi, &id); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(IsEqualCLSID(&id, &CLSID_XMLDocument), "Expected CLSID_XMLDocument\n"); + cleanup: IPersistStreamInit_Release(psi); IXMLDocument_Release(doc); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 72e185c..7f5e41d 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -574,8 +574,13 @@ static ULONG WINAPI xmldoc_IPersistStreamInit_Release( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { - FIXME("(%p,%p): stub!\n", iface, classid); - return E_NOTIMPL; + xmldoc *this = impl_from_IPersistStreamInit(iface); + TRACE("(%p,%p)\n", this, classid); + + if (!classid) return E_POINTER; + + *classid = CLSID_XMLDocument; + return S_OK; } static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty(

1 0

Nikolay Sivov : msxml3/tests: Add some tests for IPersistStreamInit implementation of IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 1b2f1867c8b1e04a7d66bc5337397990c130d26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f1867c8b1e04a7d66bc533… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 12 03:48:00 2010 +0300 msxml3/tests: Add some tests for IPersistStreamInit implementation of IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 166 +++++++++++++++++++++++++++++++++++--------- dlls/msxml3/xmldoc.c | 3 +- 2 files changed, 136 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 5db91f1..8cf3357 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -49,6 +49,33 @@ static void create_xml_file(LPCSTR filename) CloseHandle(hf); } +static void create_stream_on_file(IStream **stream, LPCSTR path) +{ + HANDLE hfile; + HGLOBAL hglobal; + LPVOID ptr; + HRESULT hr; + DWORD file_size, read; + + hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); + file_size = GetFileSize(hfile, NULL); + + hglobal = GlobalAlloc(GHND, file_size); + ptr = GlobalLock(hglobal); + + ReadFile(hfile, ptr, file_size, &read, NULL); + ok(file_size == read, "Expected to read the whole file, read %d\n", read); + + hr = CreateStreamOnHGlobal(hglobal, TRUE, stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(*stream != NULL, "Expected non-NULL stream\n"); + + CloseHandle(hfile); + GlobalUnlock(hglobal); +} + static void test_xmldoc(void) { HRESULT hr; @@ -57,10 +84,6 @@ static void test_xmldoc(void) IXMLElementCollection *collection = NULL, *inner = NULL; IPersistStreamInit *psi = NULL; IStream *stream = NULL; - HGLOBAL hglobal; - HANDLE hfile; - LPVOID ptr; - DWORD file_size, read; CHAR path[MAX_PATH]; LONG type, num_child; VARIANT vIndex, vName; @@ -75,32 +98,11 @@ static void test_xmldoc(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); - - hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); - file_size = GetFileSize(hfile, NULL); - - hglobal = GlobalAlloc(GHND, file_size); - ptr = GlobalLock(hglobal); - - ReadFile(hfile, ptr, file_size, &read, NULL); - ok(file_size == read, "Expected to read the whole file, read %d\n", read); - - hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(stream != NULL, "Expected non-NULL stream\n"); - - CloseHandle(hfile); - GlobalUnlock(hglobal); + create_stream_on_file(&stream, path); hr = IXMLDocument_QueryInterface(doc, &IID_IPersistStreamInit, (LPVOID *)&psi); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -271,11 +273,7 @@ static void test_createElement(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* invalid vType type */ V_VT(&vType) = VT_NULL; @@ -354,6 +352,103 @@ static void test_createElement(void) IXMLDocument_Release(doc); } +static void test_persiststreaminit(void) +{ + IXMLDocument *doc = NULL; + IPersistStreamInit *psi = NULL; + IStream *stream = NULL; + STATSTG stat; + HRESULT hr; + ULARGE_INTEGER size; + CHAR path[MAX_PATH]; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLDocument_QueryInterface(doc, &IID_IPersistStreamInit, (LPVOID *)&psi); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(psi != NULL, "Expected non-NULL psi\n"); + + /* null arguments */ + hr = IPersistStreamInit_GetSizeMax(psi, NULL); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); + + hr = IPersistStreamInit_Load(psi, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IPersistStreamInit_Save(psi, NULL, FALSE); + todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + create_xml_file("bank.xml"); + GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); + create_stream_on_file(&stream, path); + + /* GetSizeMax not implemented */ + size.QuadPart = 0; + hr = IPersistStreamInit_GetSizeMax(psi, &size); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); + ok(size.QuadPart == 0, "Expected 0\n"); + + hr = IPersistStreamInit_Load(psi, stream); + IStream_Release(stream); + ok(hr == S_OK || hr == XML_E_INVALIDATROOTLEVEL, "Expected S_OK, got %08x\n", hr); + if(hr == XML_E_INVALIDATROOTLEVEL) + goto cleanup; + + /* try to save document */ + stream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IPersistStreamInit_Save(psi, stream, FALSE); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stat.cbSize.QuadPart = 0; + hr = IStream_Stat(stream, &stat, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); + IStream_Release(stream); + + /* reset internal stream */ + hr = IPersistStreamInit_InitNew(psi); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IPersistStreamInit_Save(psi, stream, FALSE); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stat.cbSize.QuadPart = 0; + hr = IStream_Stat(stream, &stat, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); + IStream_Release(stream); + +cleanup: + IPersistStreamInit_Release(psi); + IXMLDocument_Release(doc); + DeleteFileA("bank.xml"); +} + +static BOOL test_try_xmldoc(void) +{ + IXMLDocument *doc = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + if (FAILED(hr)) + { + skip("Failed to create XMLDocument instance\n"); + return FALSE; + } + + IXMLDocument_Release(doc); + return TRUE; +} + START_TEST(xmldoc) { HRESULT hr; @@ -361,8 +456,15 @@ START_TEST(xmldoc) hr = CoInitialize(NULL); ok(hr == S_OK, "failed to init com\n"); + if (!test_try_xmldoc()) + { + CoUninitialize(); + return; + } + test_xmldoc(); test_createElement(); + test_persiststreaminit(); CoUninitialize(); } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 018cf6c..72e185c 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -657,7 +657,8 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { - FIXME("(%p, %p): stub!\n", iface, pcbSize); + xmldoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p, %p)\n", This, pcbSize); return E_NOTIMPL; }

1 0

Jeff Zaroyko : msvcrt: Check if argument passed to _dup2 is positive.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: c2459deefffaef80ea78faadeb9ab7fa66a67ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2459deefffaef80ea78faade… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Jan 12 14:14:33 2010 +1100 msvcrt: Check if argument passed to _dup2 is positive. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index cbaa04e..df42d47 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -705,7 +705,7 @@ int CDECL MSVCRT__dup2(int od, int nd) TRACE("(od=%d, nd=%d)\n", od, nd); LOCK_FILES(); - if (nd < MSVCRT_MAX_FILES && msvcrt_is_valid_fd(od)) + if (nd < MSVCRT_MAX_FILES && nd >= 0 && msvcrt_is_valid_fd(od)) { HANDLE handle; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 27d64bd..042a82e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1363,7 +1363,7 @@ static void test_unlink(void) void test_dup2(void) { - todo_wine ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); + ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } START_TEST(file)

1 0

Jeff Zaroyko : msvcrt/tests: Test _dup2 for failure when second arg is negative.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: f4e5ab4892b91e5937069ebae45f5f717cfe2c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e5ab4892b91e5937069ebae… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Jan 12 14:13:10 2010 +1100 msvcrt/tests: Test _dup2 for failure when second arg is negative. --- dlls/msvcrt/tests/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index da3d16c..27d64bd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1361,6 +1361,11 @@ static void test_unlink(void) rmdir("test_unlink"); } +void test_dup2(void) +{ + todo_wine ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); +} + START_TEST(file) { int arg_c; @@ -1381,6 +1386,7 @@ START_TEST(file) ok(0, "invalid argument '%s'\n", arg_v[2]); return; } + test_dup2(); test_file_inherit(arg_v[0]); test_file_write_read(); test_chsize();

1 0

Julius Schwartzenberg : avifil32: Fix header suggested buffersize.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 6a5e443f3fe9769ea754b44b9f5c56df8697bcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5e443f3fe9769ea754b44b9… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Tue Jan 12 00:30:55 2010 +0100 avifil32: Fix header suggested buffersize. --- dlls/avifil32/avifile.c | 12 +++++++++--- dlls/avifil32/tests/api.c | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index aa1df3b..c034a6b 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1655,7 +1655,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) This->fInfo.dwCaps = AVIFILECAPS_CANREAD|AVIFILECAPS_CANWRITE; This->fInfo.dwLength = MainAVIHdr.dwTotalFrames; This->fInfo.dwStreams = MainAVIHdr.dwStreams; - This->fInfo.dwSuggestedBufferSize = MainAVIHdr.dwSuggestedBufferSize; + This->fInfo.dwSuggestedBufferSize = 0; This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, @@ -1757,8 +1757,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) pStream->sInfo.dwRate = streamHdr.dwRate; pStream->sInfo.dwStart = streamHdr.dwStart; pStream->sInfo.dwLength = streamHdr.dwLength; - pStream->sInfo.dwSuggestedBufferSize = - streamHdr.dwSuggestedBufferSize; + pStream->sInfo.dwSuggestedBufferSize = 0; pStream->sInfo.dwQuality = streamHdr.dwQuality; pStream->sInfo.dwSampleSize = streamHdr.dwSampleSize; pStream->sInfo.rcFrame.left = streamHdr.rcFrame.left; @@ -1907,6 +1906,13 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) } } + for (nStream = 0; nStream < This->fInfo.dwStreams; nStream++) + { + DWORD sugbuf = This->ppStreams[nStream]->sInfo.dwSuggestedBufferSize; + if (This->fInfo.dwSuggestedBufferSize < sugbuf) + This->fInfo.dwSuggestedBufferSize = sugbuf; + } + /* find other chunks */ FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ck, &ckRIFF, 0); diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index a68ce9c..f5945c2 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -311,7 +311,7 @@ static void test_default_data(void) ok(asi0.dwStart == 0, "got %u (expected 0)\n", asi0.dwStart); ok(asi0.dwLength == 1, "got %u (expected 1)\n", asi0.dwLength); ok(asi0.dwInitialFrames == 0, "got %u (expected 0)\n", asi0.dwInitialFrames); - todo_wine { ok(asi0.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi0.dwSuggestedBufferSize); } + ok(asi0.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi0.dwSuggestedBufferSize); ok(asi0.dwQuality == 0xffffffff, "got 0x%x (expected 0xffffffff)\n", asi0.dwQuality); ok(asi0.dwSampleSize == 0, "got %u (expected 0)\n", asi0.dwSampleSize); ok(asi0.rcFrame.left == 0, "got %u (expected 0)\n", asi0.rcFrame.left); @@ -331,7 +331,7 @@ static void test_default_data(void) ok(asi1.dwStart == 0, "got %u (expected 0)\n", asi1.dwStart); ok(asi1.dwLength == 1637, "got %u (expected 1637)\n", asi1.dwLength); ok(asi1.dwInitialFrames == 0, "got %u (expected 0)\n", asi1.dwInitialFrames); - todo_wine { ok(asi1.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi1.dwSuggestedBufferSize); } + ok(asi1.dwSuggestedBufferSize == 0, "got %u (expected 0)\n", asi1.dwSuggestedBufferSize); ok(asi1.dwQuality == 0xffffffff, "got 0x%x (expected 0xffffffff)\n", asi1.dwQuality); ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); ok(asi1.rcFrame.left == 0, "got %u (expected 0)\n", asi1.rcFrame.left);

1 0

Julius Schwartzenberg : avifil32: Overwrite dwRate in the audiostream with the nBlockAlign from the wave header .
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: cf73a26c6bc20e03904f23cc9c55546db27f44d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf73a26c6bc20e03904f23cc9… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Tue Jan 12 00:30:54 2010 +0100 avifil32: Overwrite dwRate in the audiostream with the nBlockAlign from the wave header. --- dlls/avifil32/avifile.c | 9 ++++++++- dlls/avifil32/tests/api.c | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 57ebb11..aa1df3b 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1819,7 +1819,14 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) if (FAILED(hr)) return hr; }; - + if (pStream->lpFormat != NULL && pStream->sInfo.fccType == streamtypeAUDIO) + { + WAVEFORMATEX *wfx = pStream->lpFormat; /* wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; could be added */ + pStream->sInfo.dwSampleSize = wfx->nBlockAlign; /* to deal with corrupt wfx->nBlockAlign but Windows doesn't do this */ + TRACE("Block size reset to %u, chan=%u bpp=%u\n", wfx->nBlockAlign, wfx->nChannels, wfx->wBitsPerSample); + pStream->sInfo.dwScale = 1; + pStream->sInfo.dwRate = wfx->nSamplesPerSec; + } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEREAD; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 28bae04..a68ce9c 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -404,7 +404,7 @@ static void test_ash1_corruption(void) /* The result will still be 2, because the value is dynamically replaced with the nBlockAlign value from the stream format header. The next test will prove this */ - todo_wine{ ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); } + ok(asi1.dwSampleSize == 2, "got %u (expected 2)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile); @@ -438,7 +438,7 @@ static void test_ash1_corruption2(void) ok(AVIStreamInfo(pStream1, &asi1, sizeof(AVISTREAMINFO)) == 0, "Unable to read stream info\n"); /* The result will also be the corrupt value, as explained above. */ - todo_wine{ ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); } + ok(asi1.dwSampleSize == 0xdead, "got 0x%x (expected 0xdead)\n", asi1.dwSampleSize); AVIStreamRelease(pStream1); AVIFileRelease(pFile);

1 0

Paul Vriens : shell32: Remove some unneeded parameter setting.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 3cbaaaa564bb5471653b8c47b1a6dfa8fa52d7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbaaaa564bb5471653b8c47b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 14 13:47:48 2010 +0100 shell32: Remove some unneeded parameter setting. --- dlls/shell32/shlexec.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 20e2888..a81cada 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -587,7 +587,6 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) { strcpyW(filetype, wszFolder); - filetypelen = 6; /* strlen("Folder") */ } else { @@ -660,14 +659,12 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera else { *filetype = '\0'; - filetypelen = 0; } } if (*filetype) { /* pass the operation string to SHELL_FindExecutableByOperation() */ - filetype[filetypelen] = '\0'; retval = SHELL_FindExecutableByOperation(lpOperation, key, filetype, command, sizeof(command)); if (retval > 32)

1 0

Paul Vriens : inetmib1/tests: Free memory after use (Valgrind).
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 5f8717d7f67e3406f7477214873bbfa512d320a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8717d7f67e3406f74772148… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 13 20:34:06 2010 +0100 inetmib1/tests: Free memory after use (Valgrind). --- dlls/inetmib1/tests/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index c52cc43..158e23c 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -47,6 +47,8 @@ static void testInit(void) ok(ret, "SnmpExtensionInit failed: %d\n", GetLastError()); ok(!strcmp("1.3.6.1.2.1.1", SnmpUtilOidToA(&oid)), "Expected 1.3.6.1.2.1.1, got %s\n", SnmpUtilOidToA(&oid)); + + SnmpUtilOidFree(&oid); } static void testQuery(void)

1 0

Paul Vriens : dxdiagn/tests: Fix some test failures on a clean W2K3.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 16d161bc95960a71856b0eb110d2e6aa9b17b91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d161bc95960a71856b0eb11… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 13 08:25:15 2010 +0100 dxdiagn/tests: Fix some test failures on a clean W2K3. --- dlls/dxdiagn/tests/provider.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index 47732bc..0aa228b 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -32,7 +32,9 @@ static void test_Initialize(void) hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, &IID_IDxDiagProvider, (LPVOID*)&pddp); - ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + ok(hr == S_OK || + broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */ + "Creating a IDxDiagProvider instance failed with %x\n", hr); if (FAILED(hr)) { skip("Failed to create a IDxDiagProvider instance\n"); @@ -97,7 +99,9 @@ static void test_GetRootContainer(void) hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, &IID_IDxDiagProvider, (LPVOID*)&pddp); - ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + ok(hr == S_OK || + broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */ + "Creating a IDxDiagProvider instance failed with %x\n", hr); if (FAILED(hr)) { skip("Failed to create a IDxDiagProvider instance\n");

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010