January 2007 - Wine-Commits

Rob Shearman : ole32: Fix Read/ WriteClassStm to return an error if the passed in stream pointer is NULL.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 35548d15c4bca00504915ea657d9db84cd7fb860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35548d15c4bca00504915ea65… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:17:40 2007 +0000 ole32: Fix Read/WriteClassStm to return an error if the passed in stream pointer is NULL. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ac8264d..450d5cd 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7901,7 +7901,7 @@ HRESULT WINAPI WriteClassStm(IStream *pS { TRACE("(%p,%p)\n",pStm,rclsid); - if (rclsid==NULL) + if (!pStm || !rclsid) return E_INVALIDARG; return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL); @@ -7927,7 +7927,7 @@ HRESULT WINAPI ReadClassStm(IStream *pSt TRACE("(%p,%p)\n",pStm,pclsid); - if (pclsid==NULL) + if (!pStm || !pclsid) return E_INVALIDARG; res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte);

1 0

Rob Shearman : ole32: Return an error in CoMarshalInterface if pStream is NULL.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 923bc6bf3d443079ad698cee514c76d4cb435d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923bc6bf3d443079ad698cee5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:16:19 2007 +0000 ole32: Return an error in CoMarshalInterface if pStream is NULL. --- dlls/ole32/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 01368cb..4294cb5 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1550,7 +1550,7 @@ HRESULT WINAPI CoMarshalInterface(IStrea dump_MSHLFLAGS(mshlFlags); TRACE(")\n"); - if (pUnk == NULL) + if (!pUnk || !pStream) return E_INVALIDARG; objref.signature = OBJREF_SIGNATURE;

1 0

Rob Shearman : ole32: Remove some unneeded inclusions of headers.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: ba25254d9f02852bae16a42138ce585cf4bb2348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba25254d9f02852bae16a4213… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:15:59 2007 +0000 ole32: Remove some unneeded inclusions of headers. Change some incorrect usages of SEEK_SET to the intended STREAM_SEEK_SET instead. --- dlls/ole32/compobj.c | 3 +-- dlls/ole32/git.c | 10 +--------- dlls/ole32/marshal.c | 9 +-------- dlls/ole32/rpc.c | 4 ---- dlls/ole32/stubmanager.c | 3 +-- 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 452ea0d..f1c6ebe 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -41,7 +41,6 @@ #include "config.h" -#include <stdlib.h> #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -1677,7 +1676,7 @@ HRESULT WINAPI CoRevokeClassObject( LARGE_INTEGER zero; memset(&zero, 0, sizeof(zero)); /* FIXME: stop local server thread */ - IStream_Seek(curClass->pMarshaledData, zero, SEEK_SET, NULL); + IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL); CoReleaseMarshalData(curClass->pMarshaledData); } diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 4f8d17d..222eb6f 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -24,13 +24,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdlib.h> #include <stdarg.h> -#include <stdio.h> -#include <string.h> #define COBJMACROS #define NONAMELESSUNION @@ -42,8 +36,6 @@ #include "objbase.h" #include "ole2.h" #include "winerror.h" -#include "winreg.h" -#include "winternl.h" #include "compobj_private.h" @@ -208,7 +200,7 @@ StdGlobalInterfaceTable_RegisterInterfac } zero.QuadPart = 0; - IStream_Seek(stream, zero, SEEK_SET, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); if (entry == NULL) return E_OUTOFMEMORY; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index dd50486..01368cb 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -20,11 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdlib.h> #include <stdarg.h> -#include <stdio.h> #include <string.h> #include <assert.h> @@ -35,10 +31,7 @@ #include "winuser.h" #include "objbase.h" #include "ole2.h" -#include "rpc.h" #include "winerror.h" -#include "winreg.h" -#include "wtypes.h" #include "wine/unicode.h" #include "compobj_private.h" @@ -1780,7 +1773,7 @@ HRESULT WINAPI CoMarshalInterThreadInter if (SUCCEEDED(hres)) { memset(&seekto, 0, sizeof(seekto)); - IStream_Seek(*ppStm, seekto, SEEK_SET, &xpos); + IStream_Seek(*ppStm, seekto, STREAM_SEEK_SET, &xpos); } else { diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index f063883..d28241b 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -23,11 +23,8 @@ #include "config.h" #include "wine/port.h" -#include <stdlib.h> #include <stdarg.h> -#include <stdio.h> #include <string.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION @@ -42,7 +39,6 @@ #include "rpc.h" #include "winerror.h" #include "winreg.h" -#include "wtypes.h" #include "wine/unicode.h" #include "compobj_private.h" diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 264a2e5..3665443 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -35,9 +35,8 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "ole2.h" -#include "ole2ver.h" #include "rpc.h" + #include "wine/debug.h" #include "compobj_private.h"

1 0

Rob Shearman : ole32: Fix HGLOBALStreamImpl_CopyTo to check the return values of IStream_Read and IStream_Write and to not compare the bytes read to the bytes written .
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: fd07191673dea171af0449654d3106c5d6429025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd07191673dea171af0449654… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:16:07 2007 +0000 ole32: Fix HGLOBALStreamImpl_CopyTo to check the return values of IStream_Read and IStream_Write and to not compare the bytes read to the bytes written. Add tests for IStream::CopyTo of the HGLOBAL stream implementation. --- dlls/ole32/hglobalstream.c | 20 ++--- dlls/ole32/tests/hglobalstream.c | 179 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 5774c90..40a0dbf 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -476,21 +476,19 @@ static HRESULT WINAPI HGLOBALStreamImpl_ else copySize = cb.u.LowPart; - IStream_Read(iface, tmpBuffer, copySize, &bytesRead); + hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); + if (FAILED(hr)) + break; totalBytesRead.u.LowPart += bytesRead; - IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); - - totalBytesWritten.u.LowPart += bytesWritten; - - /* - * Check that read & write operations were successful - */ - if (bytesRead != bytesWritten) + if (bytesRead) { - hr = STG_E_MEDIUMFULL; - break; + hr = IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); + if (FAILED(hr)) + break; + + totalBytesWritten.u.LowPart += bytesWritten; } if (bytesRead!=copySize) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index c6eaa19..8f14544 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -30,6 +30,19 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) +static char const * const *expected_method_list; + +#define CHECK_EXPECTED_METHOD(method_name) \ +do { \ + ok(*expected_method_list != NULL, "Extra method %s called\n", method_name); \ + if (*expected_method_list) \ + { \ + ok(!strcmp(*expected_method_list, method_name), "Expected %s to be called instead of %s\n", \ + *expected_method_list, method_name); \ + expected_method_list++; \ + } \ +} while(0) + static void test_streamonhglobal(IStream *pStream) { const char data[] = "Test String"; @@ -82,6 +95,170 @@ static void test_streamonhglobal(IStream ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); } +static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISequentialStream) || + IsEqualIID(riid, &IID_IStream)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TestStream_AddRef(IStream *iface) +{ + return 2; +} + +static ULONG WINAPI TestStream_Release(IStream *iface) +{ + return 1; +} + +static HRESULT WINAPI TestStream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + CHECK_EXPECTED_METHOD("TestStream_Read"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + CHECK_EXPECTED_METHOD("TestStream_Write"); + *pcbWritten = 5; + return S_OK; +} + +static HRESULT WINAPI TestStream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + CHECK_EXPECTED_METHOD("TestStream_Seek"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + CHECK_EXPECTED_METHOD("TestStream_SetSize"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_CopyTo(IStream *iface, IStream *pStream, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + CHECK_EXPECTED_METHOD("TestStream_CopyTo"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + CHECK_EXPECTED_METHOD("TestStream_Commit"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_Revert(IStream *iface) +{ + CHECK_EXPECTED_METHOD("TestStream_Revert"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + CHECK_EXPECTED_METHOD("TestStream_LockRegion"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + CHECK_EXPECTED_METHOD("TestStream_UnlockRegion"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) +{ + CHECK_EXPECTED_METHOD("TestStream_Stat"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestStream_Clone(IStream *iface, IStream **pStream) +{ + CHECK_EXPECTED_METHOD("TestStream_Clone"); + return E_NOTIMPL; +} + +static /*const*/ IStreamVtbl StreamVtbl = +{ + TestStream_QueryInterface, + TestStream_AddRef, + TestStream_Release, + TestStream_Read, + TestStream_Write, + TestStream_Seek, + TestStream_SetSize, + TestStream_CopyTo, + TestStream_Commit, + TestStream_Revert, + TestStream_LockRegion, + TestStream_UnlockRegion, + TestStream_Stat, + TestStream_Clone +}; + +static IStream Test_Stream = { &StreamVtbl }; + +static void test_copyto(void) +{ + IStream *pStream, *pStream2; + HRESULT hr = CreateStreamOnHGlobal(NULL, FALSE, &pStream); + static const char szHello[] = "Hello"; + ULARGE_INTEGER cb; + static const char *methods_copyto[] = + { + "TestStream_Write", + NULL + }; + ULONG written; + ULARGE_INTEGER ullRead; + ULARGE_INTEGER ullWritten; + ULARGE_INTEGER libNewPosition; + static const LARGE_INTEGER llZero; + char buffer[15]; + + expected_method_list = methods_copyto; + + hr = IStream_Write(pStream, szHello, sizeof(szHello), &written); + ok_ole_success(hr, "IStream_Write"); + ok(written == sizeof(szHello), "only %d bytes written\n", written); + + hr = IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + + cb.QuadPart = sizeof(szHello); + hr = IStream_CopyTo(pStream, &Test_Stream, cb, &ullRead, &ullWritten); + ok(ullWritten.QuadPart == 5, "ullWritten was %d instead\n", (ULONG)ullWritten.QuadPart); + ok(ullRead.QuadPart == sizeof(szHello), "only %d bytes read\n", (ULONG)ullRead.QuadPart); + ok_ole_success(hr, "IStream_CopyTo"); + + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + + hr = IStream_Clone(pStream, &pStream2); + ok_ole_success(hr, "IStream_Clone"); + + hr = IStream_Seek(pStream2, llZero, STREAM_SEEK_CUR, &libNewPosition); + ok_ole_success(hr, "IStream_Seek"); + ok(libNewPosition.QuadPart == sizeof(szHello), "libNewPosition wasn't set correctly for the cloned stream\n"); + + hr = IStream_Seek(pStream2, llZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + + hr = IStream_Read(pStream2, buffer, sizeof(buffer), NULL); + ok_ole_success(hr, "IStream_Read"); + ok(!strcmp(buffer, szHello), "read data \"%s\" didn't match originally written data\n", buffer); + + IStream_Release(pStream2); + IStream_Release(pStream); +} + START_TEST(hglobalstream) { HRESULT hr; @@ -91,4 +268,6 @@ START_TEST(hglobalstream) ok_ole_success(hr, "CreateStreamOnHGlobal"); test_streamonhglobal(pStream); + IStream_Release(pStream); + test_copyto(); }

1 0

Rob Shearman : ole32: Move test for CoGetInterfaceAndReleaseStream to compobj.c.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: d02b27c0e999dcdf12a0772294687ec5db477fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02b27c0e999dcdf12a077229… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:15:02 2007 +0000 ole32: Move test for CoGetInterfaceAndReleaseStream to compobj.c. --- dlls/ole32/tests/compobj.c | 13 +++++++++++++ dlls/ole32/tests/marshal.c | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 81bf831..d68d54a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -455,6 +455,18 @@ static void test_CoGetPSClsid(void) CoUninitialize(); } +static void test_CoGetInterfaceAndReleaseStream(void) +{ + HRESULT hr; + IUnknown *pUnk; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk); + ok(hr == E_INVALIDARG, "hr %08x\n", hr); + + CoUninitialize(); +} START_TEST(compobj) { @@ -474,4 +486,5 @@ START_TEST(compobj) test_CoRegisterMessageFilter(); test_CoRegisterPSClsid(); test_CoGetPSClsid(); + test_CoGetInterfaceAndReleaseStream(); } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index f1d912e..1742588 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2150,15 +2150,6 @@ static void test_globalinterfacetable(vo CloseHandle(thread); } -static void test_CoGetInterfaceAndReleaseStream(void) -{ - HRESULT hr; - IUnknown *pUnk; - - hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk); - ok(hr == E_INVALIDARG, "hr %08x\n", hr); -} - static const char *debugstr_iid(REFIID riid) { static char name[256]; @@ -2429,8 +2420,6 @@ START_TEST(marshal) test_globalinterfacetable(); - test_CoGetInterfaceAndReleaseStream(); - /* must be last test as channel hooks can't be unregistered */ test_channel_hook();

1 0

Rob Shearman : ole32: Use the standard list functions for the global interface table implementation .
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 43d0d85f6713440a4a3370596b7a88772ea57872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d0d85f6713440a4a3370596… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:15:06 2007 +0000 ole32: Use the standard list functions for the global interface table implementation. --- dlls/ole32/git.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index fbfa95f..4f8d17d 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -47,6 +47,7 @@ #include "compobj_private.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -65,8 +66,7 @@ typedef struct StdGITEntry IID iid; /* IID of the interface */ IStream* stream; /* Holds the marshalled interface */ - struct StdGITEntry* next; - struct StdGITEntry* prev; + struct list entry; } StdGITEntry; /* Class data */ @@ -75,8 +75,7 @@ typedef struct StdGlobalInterfaceTableIm const IGlobalInterfaceTableVtbl *lpVtbl; ULONG ref; - struct StdGITEntry* firstEntry; - struct StdGITEntry* lastEntry; + struct list list; ULONG nextCookie; } StdGlobalInterfaceTableImpl; @@ -116,13 +115,11 @@ StdGlobalInterfaceTable_FindEntry(IGloba TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); EnterCriticalSection(&git_section); - e = self->firstEntry; - while (e != NULL) { + LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { if (e->cookie == cookie) { LeaveCriticalSection(&git_section); return e; } - e = e->next; } LeaveCriticalSection(&git_section); @@ -224,11 +221,7 @@ StdGlobalInterfaceTable_RegisterInterfac self->nextCookie++; /* inc the cookie count */ /* insert the new entry at the end of the list */ - entry->next = NULL; - entry->prev = self->lastEntry; - if (entry->prev) entry->prev->next = entry; - else self->firstEntry = entry; - self->lastEntry = entry; + list_add_tail(&self->list, &entry->entry); /* and return the cookie */ *pdwCookie = entry->cookie; @@ -243,7 +236,6 @@ static HRESULT WINAPI StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( IGlobalInterfaceTable* iface, DWORD dwCookie) { - StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; StdGITEntry* entry; HRESULT hr; @@ -266,10 +258,7 @@ StdGlobalInterfaceTable_RevokeInterfaceF /* chop entry out of the list, and free the memory */ EnterCriticalSection(&git_section); - if (entry->prev) entry->prev->next = entry->next; - else self->firstEntry = entry->next; - if (entry->next) entry->next->prev = entry->prev; - else self->lastEntry = entry->prev; + list_remove(&entry->entry); LeaveCriticalSection(&git_section); HeapFree(GetProcessHeap(), 0, entry); @@ -400,8 +389,7 @@ void* StdGlobalInterfaceTable_Construct( newGIT->lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; newGIT->ref = 1; /* Initialise the reference count */ - newGIT->firstEntry = NULL; /* we start with an empty table */ - newGIT->lastEntry = NULL; + list_init(&newGIT->list); newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ TRACE("Created the GIT at %p\n", newGIT);

1 0

Rob Shearman : ole32: Move the Running Object Table test in marshal. c to moniker.c to put it with the other ROT tests.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: c21f5c7c6ab205f1f1c936ca236f8f29d619178f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21f5c7c6ab205f1f1c936ca2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:14:53 2007 +0000 ole32: Move the Running Object Table test in marshal.c to moniker.c to put it with the other ROT tests. --- dlls/ole32/tests/marshal.c | 29 ----------------------------- dlls/ole32/tests/moniker.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 9a30df4..f1d912e 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2088,34 +2088,6 @@ static void test_out_of_process_com(void CloseHandle(heventShutdown); } -static void test_ROT(void) -{ - static const WCHAR wszFileName[] = {'B','E','2','0','E','2','F','5','-', - '1','9','0','3','-','4','A','A','E','-','B','1','A','F','-', - '2','0','4','6','E','5','8','6','C','9','2','5',0}; - HRESULT hr; - IMoniker *pMoniker = NULL; - IRunningObjectTable *pROT = NULL; - DWORD dwCookie; - - cLocks = 0; - - hr = CreateFileMoniker(wszFileName, &pMoniker); - ok_ole_success(hr, CreateClassMoniker); - hr = GetRunningObjectTable(0, &pROT); - ok_ole_success(hr, GetRunningObjectTable); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); - IMoniker_Release(pMoniker); - - ok_more_than_one_lock(); - - hr = IRunningObjectTable_Revoke(pROT, dwCookie); - ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); -} - struct git_params { DWORD cookie; @@ -2455,7 +2427,6 @@ START_TEST(marshal) /* doesn't pass with Win9x COM DLLs (even though Essential COM says it should) */ if (0) test_out_of_process_com(); - test_ROT(); test_globalinterfacetable(); test_CoGetInterfaceAndReleaseStream(); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2195750..6203ea6 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -584,6 +584,20 @@ static void test_ROT(void) hr = CreateFileMoniker(wszFileName, &pMoniker); ok_ole_success(hr, CreateClassMoniker); + /* test flags: 0 */ + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, + pMoniker, &dwCookie); + ok_ole_success(hr, IRunningObjectTable_Register); + IMoniker_Release(pMoniker); + + ok_more_than_one_lock(); + + hr = IRunningObjectTable_Revoke(pROT, dwCookie); + ok_ole_success(hr, IRunningObjectTable_Revoke); + + ok_no_locks(); + + /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE */ hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); @@ -595,6 +609,7 @@ static void test_ROT(void) ok_no_locks(); + /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT */ /* only succeeds when process is started by SCM and has LocalService * or RunAs AppId values */ hr = IRunningObjectTable_Register(pROT,

1 0

Rob Shearman : ole32: Fix a comment in rpc_sendreceive_thread that wasn' t correct.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: beaaf0514fa194081005e232f43bf99453abc383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beaaf0514fa194081005e232f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:14:45 2007 +0000 ole32: Fix a comment in rpc_sendreceive_thread that wasn't correct. --- dlls/ole32/rpc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 4f35ea1..f063883 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -704,7 +704,8 @@ static DWORD WINAPI rpc_sendreceive_thre { struct dispatch_params *data = (struct dispatch_params *) param; - /* FIXME: trap and rethrow RPC exceptions in app thread */ + /* Note: I_RpcSendReceive doesn't raise exceptions like the higher-level + * RPC functions do */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); TRACE("completed with status 0x%lx\n", data->status);

1 0

Rob Shearman : ole32: Remove a FIXME comment that no longer applies.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 84158d674252ecee8b023baf76a86963f73d6aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=84158d674252ecee8b023baf7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:14:39 2007 +0000 ole32: Remove a FIXME comment that no longer applies. --- dlls/ole32/compobj.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f5e2789..452ea0d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3219,7 +3219,6 @@ HRESULT WINAPI CoWaitForMultipleHandles( * COM call */ if (COM_PeekMessage(apt, &msg)) { - /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

James Hawkins : comctl32: Rewrite the up-down control tests to add message checking.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 74ada83c60fd153bbcb45fe41deda326b79f4816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ada83c60fd153bbcb45fe41… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 9 21:27:36 2007 -0600 comctl32: Rewrite the up-down control tests to add message checking. --- dlls/comctl32/tests/updown.c | 559 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 500 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74ada83c60fd153bbcb45…

1 0