August 2009 - Wine-commits - list.winehq.org

Huw Davies : msdaps: Implement IDBCreateSession_CreateSession proxy and stub.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 78729fb47f776c9b911f115a6d80bc8038f13ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78729fb47f776c9b911f115a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 24 10:42:23 2009 +0100 msdaps: Implement IDBCreateSession_CreateSession proxy and stub. --- dlls/msdaps/usrmarshal.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b690167..4815278 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -57,18 +57,31 @@ HRESULT __RPC_STUB IDBCreateCommand_CreateCommand_Stub(IDBCreateCommand* This, I HRESULT CALLBACK IDBCreateSession_CreateSession_Proxy(IDBCreateSession* This, IUnknown *pUnkOuter, REFIID riid, IUnknown **ppDBSession) { - FIXME("(%p, %p, %s, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), - ppDBSession); - return E_NOTIMPL; + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p, %p, %s, %p)\n", This, pUnkOuter, debugstr_guid(riid), ppDBSession); + hr = IDBCreateSession_RemoteCreateSession_Proxy(This, pUnkOuter, riid, ppDBSession, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IDBCreateSession_CreateSession_Stub(IDBCreateSession* This, IUnknown *pUnkOuter, REFIID riid, IUnknown **ppDBSession, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %p, %s, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), + HRESULT hr; + TRACE("(%p, %p, %s, %p, %p)\n", This, pUnkOuter, debugstr_guid(riid), ppDBSession, ppErrorInfoRem); - return E_NOTIMPL; + *ppErrorInfoRem = NULL; + hr = IDBCreateSession_CreateSession(This, pUnkOuter, riid, ppDBSession); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IDBProperties_GetProperties_Proxy(IDBProperties* This, ULONG cPropertyIDSets, const DBPROPIDSET rgPropertyIDSets[],

1 0

Huw Davies : msdaps: Implement IDBProperties_SetProperties proxy and stub.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 9d1ddfaa47a80c7a1387c490ea4b2966ca89a32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1ddfaa47a80c7a1387c490e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 24 10:31:59 2009 +0100 msdaps: Implement IDBProperties_SetProperties proxy and stub. --- dlls/msdaps/Makefile.in | 2 +- dlls/msdaps/usrmarshal.c | 48 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index d6f71a0..3eba6b2 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdaps.dll -IMPORTS = oleaut32 rpcrt4 kernel32 ntdll +IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" EXTRA_OBJS = dlldata.o diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 106340b..b690167 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -108,16 +108,56 @@ HRESULT __RPC_STUB IDBProperties_GetPropertyInfo_Stub(IDBProperties* This, ULONG HRESULT CALLBACK IDBProperties_SetProperties_Proxy(IDBProperties* This, ULONG cPropertySets, DBPROPSET rgPropertySets[]) { - FIXME("(%p, %d, %p): stub\n", This, cPropertySets, rgPropertySets); - return E_NOTIMPL; + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + IErrorInfo *error; + DBPROPSTATUS *status; + + TRACE("(%p, %d, %p)\n", This, cPropertySets, rgPropertySets); + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + total_props += rgPropertySets[prop_set].cProperties; + + if(total_props == 0) return S_OK; + + status = CoTaskMemAlloc(total_props * sizeof(*status)); + if(!status) return E_OUTOFMEMORY; + + hr = IDBProperties_RemoteSetProperties_Proxy(This, cPropertySets, rgPropertySets, + total_props, status, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + total_props = 0; + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropertySets[prop_set].rgProperties[prop].dwStatus = status[total_props++]; + + CoTaskMemFree(status); + return hr; } HRESULT __RPC_STUB IDBProperties_SetProperties_Stub(IDBProperties* This, ULONG cPropertySets, DBPROPSET *rgPropertySets, ULONG cTotalProps, DBPROPSTATUS *rgPropStatus, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %d, %p, %d, %p, %p): stub\n", This, cPropertySets, rgPropertySets, cTotalProps, + ULONG prop_set, prop, total_props = 0; + HRESULT hr; + + TRACE("(%p, %d, %p, %d, %p, %p)\n", This, cPropertySets, rgPropertySets, cTotalProps, rgPropStatus, ppErrorInfoRem); - return E_NOTIMPL; + + *ppErrorInfoRem = NULL; + hr = IDBProperties_SetProperties(This, cPropertySets, rgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + for(prop_set = 0; prop_set < cPropertySets; prop_set++) + for(prop = 0; prop < rgPropertySets[prop_set].cProperties; prop++) + rgPropStatus[total_props++] = rgPropertySets[prop_set].rgProperties[prop].dwStatus; + + return hr; } HRESULT CALLBACK IDBInitialize_Initialize_Proxy(IDBInitialize* This)

1 0

Huw Davies : msdaps: Implement IDBInitialize_Initialize proxy and stub.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 27f087e25e8e6cb3b7b8d7fa1c83ad4fc1c24433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f087e25e8e6cb3b7b8d7fa1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 24 10:21:16 2009 +0100 msdaps: Implement IDBInitialize_Initialize proxy and stub. --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 917b426..106340b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -30,6 +30,7 @@ #include "winuser.h" #include "winerror.h" #include "objbase.h" +#include "oleauto.h" #include "oledb.h" #include "wine/debug.h" @@ -121,14 +122,29 @@ HRESULT __RPC_STUB IDBProperties_SetProperties_Stub(IDBProperties* This, ULONG c HRESULT CALLBACK IDBInitialize_Initialize_Proxy(IDBInitialize* This) { - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + HRESULT hr; + IErrorInfo *error; + + TRACE("(%p)\n", This); + hr = IDBInitialize_RemoteInitialize_Proxy(This, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IDBInitialize_Initialize_Stub(IDBInitialize* This, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p, %p): stub\n", This, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p, %p)\n", This, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + hr = IDBInitialize_Initialize(This); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IDBInitialize_Uninitialize_Proxy(IDBInitialize* This)

1 0

Tony Wasserka : windowscodecs: Add tests for IWICStream_Stat with memory streams.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 5b2a9a19dcddce2e1b3eb287658bcc392c00244c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2a9a19dcddce2e1b3eb2876… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:45:26 2009 +0200 windowscodecs: Add tests for IWICStream_Stat with memory streams. --- dlls/windowscodecs/tests/stream.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index e795008..dd66edc 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -36,6 +36,7 @@ static void test_StreamOnMemory(void) ULARGE_INTEGER uLargeNull, uNewPos; ULONG uBytesRead, uBytesWritten; HRESULT hr; + STATSTG Stats; LargeNull.QuadPart = 0; uLargeNull.QuadPart = 0; @@ -283,6 +284,23 @@ static void test_StreamOnMemory(void) ok(hr == E_NOTIMPL, "UnlockRegion returned %#x, expected %#x\n", hr, E_NOTIMPL); + /* Stat */ + hr = IWICStream_Stat(pStream, NULL, 0); + ok(hr == E_INVALIDARG, "Stat returned %#x, expected %#x\n", hr, E_INVALIDARG); + + hr = IWICStream_Stat(pStream, &Stats, 0); + ok(hr == S_OK, "Stat returned %#x, expected %#x\n", hr, S_OK); + ok(Stats.pwcsName == NULL, "Stat returned name %p, expected %p\n", Stats.pwcsName, NULL); + ok(Stats.type == STGTY_STREAM, "Stat returned type %d, expected %d\n", Stats.type, STGTY_STREAM); + ok(Stats.cbSize.HighPart == 0 && Stats.cbSize.LowPart == sizeof(Memory), "Stat returned size (%u;%u), expected (%u;%u)\n", Stats.cbSize.HighPart, Stats.cbSize.LowPart, 0, sizeof(Memory)); + ok(Stats.mtime.dwHighDateTime == 0 && Stats.mtime.dwLowDateTime == 0, "Stat returned mtime (%u;%u), expected (%u;%u)\n", Stats.mtime.dwHighDateTime, Stats.mtime.dwLowDateTime, 0, 0); + ok(Stats.ctime.dwHighDateTime == 0 && Stats.ctime.dwLowDateTime == 0, "Stat returned ctime (%u;%u), expected (%u;%u)\n", Stats.ctime.dwHighDateTime, Stats.ctime.dwLowDateTime, 0, 0); + ok(Stats.atime.dwHighDateTime == 0 && Stats.atime.dwLowDateTime == 0, "Stat returned atime (%u;%u), expected (%u;%u)\n", Stats.atime.dwHighDateTime, Stats.atime.dwLowDateTime, 0, 0); + ok(Stats.grfMode == 0, "Stat returned access mode %d, expected %d\n", Stats.grfMode, 0); + ok(Stats.grfLocksSupported == 0, "Stat returned supported locks %#x, expected %#x\n", Stats.grfLocksSupported, 0); + ok(Stats.grfStateBits == 0, "Stat returned state bits %#x, expected %#x\n", Stats.grfStateBits, 0); + + /* Clone */ hr = IWICStream_Clone(pStream, (IStream**)&pBufStream); ok(hr == E_NOTIMPL, "UnlockRegion returned %#x, expected %#x\n", hr, E_NOTIMPL);

1 0

Tony Wasserka : windowscodecs: Add tests for the unimplemented IWICStream methods when using memory streams .
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 3d8afaca5fc0f95f329b33d837d49946fe016973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8afaca5fc0f95f329b33d83… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:44:55 2009 +0200 windowscodecs: Add tests for the unimplemented IWICStream methods when using memory streams. --- dlls/windowscodecs/tests/stream.c | 85 ++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 89a238b..e795008 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -24,7 +24,7 @@ static void test_StreamOnMemory(void) { IWICImagingFactory *pFactory; - IWICStream *pStream; + IWICStream *pStream, *pBufStream; const BYTE CmpMem[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, @@ -33,11 +33,12 @@ static void test_StreamOnMemory(void) }; BYTE Memory[64], MemBuf[64]; LARGE_INTEGER LargeNull, LargeInt; - ULARGE_INTEGER uNewPos; + ULARGE_INTEGER uLargeNull, uNewPos; ULONG uBytesRead, uBytesWritten; HRESULT hr; LargeNull.QuadPart = 0; + uLargeNull.QuadPart = 0; memcpy(Memory, CmpMem, sizeof(CmpMem)); @@ -207,6 +208,86 @@ static void test_StreamOnMemory(void) IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + /* SetSize */ + uNewPos.HighPart = 0; + uNewPos.LowPart = sizeof(Memory) + 10; + hr = IWICStream_SetSize(pStream, uNewPos); + ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); + + uNewPos.HighPart = 0; + uNewPos.LowPart = sizeof(Memory); + hr = IWICStream_SetSize(pStream, uNewPos); + ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); + + uNewPos.HighPart = 0; + uNewPos.LowPart = sizeof(Memory) - 10; + hr = IWICStream_SetSize(pStream, uNewPos); + ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); + + uNewPos.HighPart = 0; + uNewPos.LowPart = 0; + hr = IWICStream_SetSize(pStream, uNewPos); + ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); + + uNewPos.QuadPart = -10; + hr = IWICStream_SetSize(pStream, uNewPos); + ok(hr == E_NOTIMPL, "SetSize returned %#x, expected %#x\n", hr, E_NOTIMPL); + + + /* CopyTo */ + uNewPos.HighPart = 0; + uNewPos.LowPart = 5; + hr = IWICStream_CopyTo(pStream, NULL, uNewPos, NULL, NULL); + ok(hr == E_NOTIMPL, "CopyTo returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICImagingFactory_CreateStream(pFactory, &pBufStream); + ok(hr == S_OK, "CreateStream failed with %#x\n", hr); + + hr = IWICStream_InitializeFromMemory(pBufStream, Memory, sizeof(Memory)); + ok(hr == S_OK, "InitializeFromMemory returned with %#x, expected %#x\n", hr, S_OK); + + hr = IWICStream_CopyTo(pStream, (IStream*)pBufStream, uNewPos, NULL, NULL); + ok(hr == E_NOTIMPL, "CopyTo returned %#x, expected %#x\n", hr, E_NOTIMPL); + IWICStream_Release(pBufStream); + + + /* Commit */ + hr = IWICStream_Commit(pStream, STGC_DEFAULT); + ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICStream_Commit(pStream, STGC_OVERWRITE); + ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICStream_Commit(pStream, STGC_ONLYIFCURRENT); + ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICStream_Commit(pStream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); + ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICStream_Commit(pStream, STGC_CONSOLIDATE); + ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + + + /* Revert */ + IWICStream_Write(pStream, &MemBuf[5], 6, NULL); + hr = IWICStream_Revert(pStream); + ok(hr == E_NOTIMPL, "Revert returned %#x, expected %#x\n", hr, E_NOTIMPL); + memcpy(Memory, CmpMem, sizeof(Memory)); + + + /* LockRegion/UnlockRegion */ + hr = IWICStream_LockRegion(pStream, uLargeNull, uLargeNull, 0); + ok(hr == E_NOTIMPL, "LockRegion returned %#x, expected %#x\n", hr, E_NOTIMPL); + + hr = IWICStream_UnlockRegion(pStream, uLargeNull, uLargeNull, 0); + ok(hr == E_NOTIMPL, "UnlockRegion returned %#x, expected %#x\n", hr, E_NOTIMPL); + + + /* Clone */ + hr = IWICStream_Clone(pStream, (IStream**)&pBufStream); + ok(hr == E_NOTIMPL, "UnlockRegion returned %#x, expected %#x\n", hr, E_NOTIMPL); + + IWICStream_Release(pStream); IWICStream_Release(pFactory); CoUninitialize();

1 0

Tony Wasserka : windowscodecs: Add tests for IWICStream_Write with memory streams.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 7a81507fa7bafae67bf5a0caedead4a039c62110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a81507fa7bafae67bf5a0cae… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:44:32 2009 +0200 windowscodecs: Add tests for IWICStream_Write with memory streams. --- dlls/windowscodecs/tests/stream.c | 41 ++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 6528b20..89a238b 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -34,7 +34,7 @@ static void test_StreamOnMemory(void) BYTE Memory[64], MemBuf[64]; LARGE_INTEGER LargeNull, LargeInt; ULARGE_INTEGER uNewPos; - ULONG uBytesRead; + ULONG uBytesRead, uBytesWritten; HRESULT hr; LargeNull.QuadPart = 0; @@ -168,6 +168,45 @@ static void test_StreamOnMemory(void) IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + /* Write */ + MemBuf[0] = CmpMem[0] + 1; + MemBuf[1] = CmpMem[1] + 1; + MemBuf[2] = CmpMem[2] + 1; + hr = IWICStream_Write(pStream, MemBuf, 3, &uBytesWritten); + ok(hr == S_OK, "Write returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesWritten == 3, "Wrote %u bytes, expected %u\n", uBytesWritten, 3); + ok(memcmp(MemBuf, Memory, 3) == 0, "Wrote returned invalid data!\n"); /* make sure we're writing directly */ + + /* check whether the seek pointer has moved correctly */ + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesWritten); + } + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + hr = IWICStream_Write(pStream, MemBuf, 0, &uBytesWritten); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + + hr = IWICStream_Write(pStream, NULL, 3, &uBytesWritten); + ok(hr == E_INVALIDARG, "Write returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + hr = IWICStream_Write(pStream, NULL, 0, &uBytesWritten); + ok(hr == E_INVALIDARG, "Write returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + hr = IWICStream_Write(pStream, CmpMem, sizeof(Memory) + 10, &uBytesWritten); + ok(hr == STG_E_MEDIUMFULL, "Write returned with %#x, expected %#x\n", hr, STG_E_MEDIUMFULL); + ok(uBytesWritten == 0, "Wrote %u bytes, expected %u\n", uBytesWritten, 0); + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesWritten, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesWritten); + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + IWICStream_Release(pStream); IWICStream_Release(pFactory); CoUninitialize();

1 0

Tony Wasserka : windowscodecs: Add tests for IWICStream_Read with memory streams.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: b5c71551a76732ed4864ef6cc211f533ce31882b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c71551a76732ed4864ef6cc… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:43:38 2009 +0200 windowscodecs: Add tests for IWICStream_Read with memory streams. --- dlls/windowscodecs/tests/stream.c | 60 ++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 255cf14..6528b20 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -31,9 +31,10 @@ static void test_StreamOnMemory(void) 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, }; - BYTE Memory[64]; + BYTE Memory[64], MemBuf[64]; LARGE_INTEGER LargeNull, LargeInt; ULARGE_INTEGER uNewPos; + ULONG uBytesRead; HRESULT hr; LargeNull.QuadPart = 0; @@ -108,6 +109,63 @@ static void test_StreamOnMemory(void) hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); /* remains unchanged */ + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + + /* Read */ + hr = IWICStream_Read(pStream, MemBuf, 12, &uBytesRead); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 3); + ok(memcmp(MemBuf, CmpMem, 12) == 0, "Read returned invalid data!\n"); + + /* check whether the seek pointer has moved correctly */ + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_CUR, &uNewPos); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == uBytesRead, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, uBytesRead); + } + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + hr = IWICStream_Read(pStream, Memory, 10, &uBytesRead); /* source = dest */ + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == 10, "Read %u bytes, expected %u\n", uBytesRead, 10); + ok(memcmp(Memory, CmpMem, uBytesRead) == 0, "Read returned invalid data!\n"); + } + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + hr = IWICStream_Read(pStream, Memory, sizeof(Memory) + 10, &uBytesRead); /* request too many bytes */ + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == sizeof(Memory), "Read %u bytes, expected %u\n", uBytesRead, sizeof(Memory)); + ok(memcmp(Memory, CmpMem, uBytesRead) == 0, "Read returned invalid data!\n"); + } + + hr = IWICStream_Read(pStream, NULL, 1, &uBytesRead); /* destination buffer = NULL */ + ok(hr == E_INVALIDARG, "Read returned with %#x, expected %#x\n", hr, E_INVALIDARG); + + hr = IWICStream_Read(pStream, MemBuf, 0, &uBytesRead); /* read 0 bytes */ + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + + hr = IWICStream_Read(pStream, NULL, 0, &uBytesRead); + ok(hr == E_INVALIDARG, "Read returned with %#x, expected %#x\n", hr, E_INVALIDARG); + + hr = IWICStream_Read(pStream, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "Read returned with %#x, expected %#x\n", hr, E_INVALIDARG); + + hr = IWICStream_Read(pStream, MemBuf, 1, NULL); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + ZeroMemory(MemBuf, sizeof(MemBuf)); + hr = IWICStream_Read(pStream, MemBuf, sizeof(Memory) + 10, &uBytesRead); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == sizeof(Memory), "Read %u bytes, expected %u\n", uBytesRead, sizeof(Memory)); + ok(memcmp(Memory, CmpMem, 64) == 0, "Read returned invalid data!\n"); + } + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); IWICStream_Release(pStream);

1 0

Tony Wasserka : windowscodecs: Add tests for IWICStream_Seek with memory streams.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 12354a84cb78a2be028dd81fd9d96b94ca3f944d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12354a84cb78a2be028dd81fd… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:43:09 2009 +0200 windowscodecs: Add tests for IWICStream_Seek with memory streams. --- dlls/windowscodecs/tests/stream.c | 40 +++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 20ac810..255cf14 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -32,8 +32,12 @@ static void test_StreamOnMemory(void) 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, }; BYTE Memory[64]; + LARGE_INTEGER LargeNull, LargeInt; + ULARGE_INTEGER uNewPos; HRESULT hr; + LargeNull.QuadPart = 0; + memcpy(Memory, CmpMem, sizeof(CmpMem)); CoInitialize(NULL); @@ -70,6 +74,42 @@ static void test_StreamOnMemory(void) ok(hr == S_OK, "InitializeFromMemory returned with %#x, expected %#x\n", hr, S_OK); + /* Seek */ + hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); + + LargeInt.HighPart = 1; + LargeInt.LowPart = 0; + hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_SET, &uNewPos); + ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "Seek returned with %#x, expected %#x\n", hr, HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW)); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + LargeInt.QuadPart = sizeof(Memory) + 10; + hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_SET, &uNewPos); + ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + LargeInt.QuadPart = 1; + hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); + ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); + + LargeInt.QuadPart = -1; + hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); + ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == sizeof(Memory) - 1, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, sizeof(Memory) - 1); + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); /* reset seek pointer */ + LargeInt.QuadPart = -sizeof(Memory) - 5; + hr = IWICStream_Seek(pStream, LargeInt, STREAM_SEEK_END, &uNewPos); + ok(hr == E_INVALIDARG, "Seek returned with %#x, expected %#x\n", hr, E_INVALIDARG); + ok(uNewPos.HighPart == 0 && uNewPos.LowPart == 0, "bSeek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.HighPart, uNewPos.LowPart, 0, 0); /* remains unchanged */ + + IWICStream_Release(pStream); IWICStream_Release(pFactory); CoUninitialize();

1 0

Tony Wasserka : windowscodecs: Add tests for IWICStream_InitializeFromMemory.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: df90e5d12042f92420744687705dfc6a908bcd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df90e5d12042f924207446877… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sun Aug 23 11:42:17 2009 +0200 windowscodecs: Add tests for IWICStream_InitializeFromMemory. --- dlls/windowscodecs/tests/Makefile.in | 3 +- dlls/windowscodecs/tests/stream.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index acde1d8..707d23f 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,7 +8,8 @@ IMPORTS = kernel32 ole32 windowscodecs CTESTS = \ bmpformat.c \ converter.c \ - palette.c + palette.c \ + stream.c @MAKE_TEST_RULES@ diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c new file mode 100644 index 0000000..20ac810 --- /dev/null +++ b/dlls/windowscodecs/tests/stream.c @@ -0,0 +1,81 @@ +/* + * Copyright 2009 Tony Wasserka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +#define COBJMACROS +#include "wincodec.h" + +static void test_StreamOnMemory(void) +{ + IWICImagingFactory *pFactory; + IWICStream *pStream; + const BYTE CmpMem[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + }; + BYTE Memory[64]; + HRESULT hr; + + memcpy(Memory, CmpMem, sizeof(CmpMem)); + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&pFactory); + if(FAILED(hr)) { + skip("CoCreateInstance returned with %#x, expected %#x\n", hr, S_OK); + return; + } + + hr = IWICImagingFactory_CreateStream(pFactory, &pStream); + ok(hr == S_OK, "CreateStream returned with %#x, expected %#x\n", hr, S_OK); + if(FAILED(hr)) { + skip("Failed to create stream\n"); + return; + } + + /* InitializeFromMemory */ + hr = IWICStream_InitializeFromMemory(pStream, NULL, sizeof(Memory)); /* memory = NULL */ + ok(hr == E_INVALIDARG, "InitializeFromMemory returned with %#x, expected %#x\n", hr, E_INVALIDARG); + + hr = IWICStream_InitializeFromMemory(pStream, Memory, 0); /* size = 0 */ + ok(hr == S_OK, "InitializeFromMemory returned with %#x, expected %#x\n", hr, S_OK); + + hr = IWICStream_InitializeFromMemory(pStream, Memory, sizeof(Memory)); /* stream already initialized */ + ok(hr == WINCODEC_ERR_WRONGSTATE, "InitializeFromMemory returned with %#x, expected %#x\n", hr, WINCODEC_ERR_WRONGSTATE); + + /* recreate stream */ + IWICStream_Release(pStream); + hr = IWICImagingFactory_CreateStream(pFactory, &pStream); + ok(hr == S_OK, "CreateStream failed with %#x\n", hr); + + hr = IWICStream_InitializeFromMemory(pStream, Memory, sizeof(Memory)); + ok(hr == S_OK, "InitializeFromMemory returned with %#x, expected %#x\n", hr, S_OK); + + + IWICStream_Release(pStream); + IWICStream_Release(pFactory); + CoUninitialize(); +} + +START_TEST(stream) +{ + test_StreamOnMemory(); +}

1 0

Dylan Smith : taskmgr: Finish partial unicode conversion of process page.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: fc888d683526a353676fb2ab84556551526f7fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc888d683526a353676fb2ab8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 24 00:55:22 2009 -0400 taskmgr: Finish partial unicode conversion of process page. --- programs/taskmgr/dbgchnl.c | 14 ++-- programs/taskmgr/perfdata.c | 46 ++++---------- programs/taskmgr/perfdata.h | 5 +- programs/taskmgr/procpage.c | 145 +++++++++++++++++++++++-------------------- programs/taskmgr/run.c | 3 +- 5 files changed, 101 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc888d683526a353676fb…

1 0