November 2009 - Wine-Commits

Rob Shearman : ole32: Add tests for errors returned by CoCreateInstance for classes that are not registered .
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 8554ce5b18e8d7a23af20b3eeb3a97f779369fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8554ce5b18e8d7a23af20b3ee… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 23 21:52:22 2009 +0000 ole32: Add tests for errors returned by CoCreateInstance for classes that are not registered. --- dlls/ole32/tests/compobj.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e868014..21293bc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -261,6 +261,18 @@ static void test_CoCreateInstance(void) ok(pUnk == NULL, "CoCreateInstance should have changed the passed in pointer to NULL, instead of %p\n", pUnk); OleInitialize(NULL); + + /* test errors returned for non-registered clsids */ + hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered inproc server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pUnk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered inproc handler should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_LOCAL_SERVER, &IID_IUnknown, (void **)&pUnk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered local server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_REMOTE_SERVER, &IID_IUnknown, (void **)&pUnk); + todo_wine + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered remote server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); if(hr == REGDB_E_CLASSNOTREG) {

1 0

Roderick Colenbrander : opengl32: Fix wglCreateContextAttribsARB test on nvidia.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: c89fb41f802e6870e5d440d89f3eac5ee9c74b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89fb41f802e6870e5d440d89… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Nov 23 20:18:54 2009 +0100 opengl32: Fix wglCreateContextAttribsARB test on nvidia. --- dlls/opengl32/tests/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4709685..b2d8e18 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -551,6 +551,8 @@ static void test_dc(HWND hwnd, HDC hdc) } } +/* Nvidia converts win32 error codes to (0xc007 << 16) | win32_error_code */ +#define NVIDIA_HRESULT_FROM_WIN32(x) (HRESULT_FROM_WIN32(x) | 0x40000000) static void test_opengl3(HDC hdc) { /* Try to create a context compatible with OpenGL 1.x; 1.0-2.1 is allowed */ @@ -571,7 +573,7 @@ static void test_opengl3(HDC hdc) ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); todo_wine ok(error == ERROR_DC_NOT_FOUND || - broken(HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ + broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); } @@ -585,7 +587,7 @@ static void test_opengl3(HDC hdc) error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ todo_wine ok(error == ERROR_INVALID_OPERATION || - error == HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); }

1 0

Damjan Jovanovic : shell32: Deal better with spaces in ASSOCSTR_COMMAND values.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: b585b24397f93b3a323b2f3674b4b5d61bc035a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b585b24397f93b3a323b2f367… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 23 21:43:42 2009 +0200 shell32: Deal better with spaces in ASSOCSTR_COMMAND values. --- dlls/shell32/assoc.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index bf9ccb9..85efa07 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -320,16 +320,25 @@ static HRESULT ASSOC_GetExecutable(IQueryAssociationsImpl *This, { pszStart = pszCommand + 1; pszEnd = strchrW(pszStart, '"'); + if (pszEnd) + *pszEnd = 0; + *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); } else { pszStart = pszCommand; - pszEnd = strchrW(pszStart, ' '); + for (pszEnd = pszStart; (pszEnd = strchrW(pszEnd, ' ')); pszEnd++) + { + WCHAR c = *pszEnd; + *pszEnd = 0; + if ((*len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL))) + break; + *pszEnd = c; + } + if (!pszEnd) + *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); } - if (pszEnd) - *pszEnd = 0; - *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); HeapFree(GetProcessHeap(), 0, pszCommand); if (!*len) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);

1 0

Paul Vriens : advapi32/tests: Fix a test failure on W2K3 without a service pack.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: da92afa3e1c93d99c69e71fbe8d9209f2a5a41d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da92afa3e1c93d99c69e71fbe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 24 09:36:57 2009 +0100 advapi32/tests: Fix a test failure on W2K3 without a service pack. --- dlls/advapi32/tests/eventlog.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index c6272ff..207fec5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -741,6 +741,27 @@ static void test_readwrite(void) return; } + count = 0xdeadbeef; + GetNumberOfEventLogRecords(handle, &count); + if (count != 0) + { + /* Needed for W2K3 without a service pack */ + win_skip("We most likely opened the Application eventlog\n"); + CloseEventLog(handle); + Sleep(2000); + + handle = OpenEventLogA(NULL, eventlogname); + count = 0xdeadbeef; + GetNumberOfEventLogRecords(handle, &count); + if (count != 0) + { + win_skip("We didn't open our new eventlog\n"); + HeapFree(GetProcessHeap(), 0, user); + CloseEventLog(handle); + return; + } + } + SetLastError(0xdeadbeef); ret = ReportEvent(handle, 0x20, 0, 0, NULL, 0, 0, NULL, NULL); if (!ret && GetLastError() == ERROR_CRC)

1 0

Vincent Povirk : ole32: Copy the storage filename at stat time, not read time.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 6c3961f0c49a0684c5153282aa3293908c33cd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3961f0c49a0684c5153282a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 23 15:39:35 2009 -0600 ole32: Copy the storage filename at stat time, not read time. --- dlls/ole32/stg_stream.c | 3 ++- dlls/ole32/storage32.c | 31 +++++++++++++++++++++---------- dlls/ole32/storage32.h | 4 ++-- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 8b731dd..332ee8a 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -860,7 +860,8 @@ static HRESULT WINAPI StgStreamImpl_Stat( { StorageImpl *root = This->parentStorage->ancestorStorage; - StorageUtl_CopyDirEntryToSTATSTG(pstatstg, + StorageUtl_CopyDirEntryToSTATSTG(root, + pstatstg, &currentEntry, grfStatFlag); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 708f263..d4c6527 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -698,6 +698,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( if (readSuccessful) { StorageUtl_CopyDirEntryToSTATSTG( + This->ancestorStorage, pstatstg, &currentEntry, grfStatFlag); @@ -3241,14 +3242,10 @@ BOOL StorageImpl_ReadDirEntry( if (SUCCEEDED(readRes)) { - /* replace the name of root entry (often "Root Entry") by the file name */ - WCHAR *entryName = (index == This->base.storageDirEntry) ? - This->filename : (WCHAR *)currentEntry+OFFSET_PS_NAME; - memset(buffer->name, 0, sizeof(buffer->name)); memcpy( buffer->name, - entryName, + (WCHAR *)currentEntry+OFFSET_PS_NAME, DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); @@ -3750,7 +3747,8 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Copy the information to the return buffer. */ - StorageUtl_CopyDirEntryToSTATSTG(currentReturnStruct, + StorageUtl_CopyDirEntryToSTATSTG(This->parentStorage, + currentReturnStruct, &currentEntry, STATFLAG_DEFAULT); @@ -4179,25 +4177,38 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value) } void StorageUtl_CopyDirEntryToSTATSTG( + StorageImpl* storage, STATSTG* destination, const DirEntry* source, int statFlags) { + LPCWSTR entryName; + + if (source->stgType == STGTY_ROOT) + { + /* replace the name of root entry (often "Root Entry") by the file name */ + entryName = storage->filename; + } + else + { + entryName = source->name; + } + /* * The copy of the string occurs only when the flag is not set */ if( ((statFlags & STATFLAG_NONAME) != 0) || - (source->name == NULL) || - (source->name[0] == 0) ) + (entryName == NULL) || + (entryName[0] == 0) ) { destination->pwcsName = 0; } else { destination->pwcsName = - CoTaskMemAlloc((lstrlenW(source->name)+1)*sizeof(WCHAR)); + CoTaskMemAlloc((lstrlenW(entryName)+1)*sizeof(WCHAR)); - strcpyW(destination->pwcsName, source->name); + strcpyW(destination->pwcsName, entryName); } switch (source->stgType) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4a953c1..508bd70 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -428,8 +428,8 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset, const ULARGE_INTEGER *value); void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value); -void StorageUtl_CopyDirEntryToSTATSTG(STATSTG* destination, const DirEntry* source, - int statFlags); +void StorageUtl_CopyDirEntryToSTATSTG(StorageImpl *storage,STATSTG* destination, + const DirEntry* source, int statFlags); /**************************************************************************** * BlockChainStream definitions.

1 0

Rob Shearman : ole32: Fix error code returned by CoGetClassObject/ CoCreateInstance in CLSCTX_REMOTE_SERVER case.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 9943facb260e6b33d8ba33e575a43607206e5358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9943facb260e6b33d8ba33e57… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 23 21:52:27 2009 +0000 ole32: Fix error code returned by CoGetClassObject/CoCreateInstance in CLSCTX_REMOTE_SERVER case. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/tests/compobj.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7dc1568..321f2e9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2380,7 +2380,7 @@ HRESULT WINAPI CoGetClassObject( if (CLSCTX_REMOTE_SERVER & dwClsContext) { FIXME ("CLSCTX_REMOTE_SERVER not supported\n"); - hres = E_NOINTERFACE; + hres = REGDB_E_CLASSNOTREG; } if (FAILED(hres)) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 21293bc..9d469b4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -270,7 +270,6 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_LOCAL_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered local server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = CoCreateInstance(&CLSID_non_existent, NULL, CLSCTX_REMOTE_SERVER, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance for non-registered remote server should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk);

1 0

Marcus Meissner : wined3d: Handle NULL ptrs (Coverity).
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: a7e599db450ccd6a8dad83bf802f30022d1df772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e599db450ccd6a8dad83bf8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 22:35:15 2009 +0100 wined3d: Handle NULL ptrs (Coverity). --- dlls/wined3d/volume.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index bb5827e..5a80cb6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -187,11 +187,13 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REF if (!ppContainer) { ERR("Called without a valid ppContainer.\n"); + return E_FAIL; } /* Although surfaces can be standalone, volumes can't */ if (!This->container) { ERR("Volume without an container. Should not happen.\n"); + return E_FAIL; } TRACE("Relaying to QueryInterface\n");

1 0

Paul Vriens : advapi32/tests: Fix an intermittent crash on NT4.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 91648ff4beaf8bf6e90c9e9b2caaf19da16c641f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91648ff4beaf8bf6e90c9e9b2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 24 08:53:18 2009 +0100 advapi32/tests: Fix an intermittent crash on NT4. --- dlls/advapi32/tests/eventlog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index e71f823..c6272ff 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -733,6 +733,13 @@ static void test_readwrite(void) * but succeed on all others, hence it's not part of the struct. */ handle = OpenEventLogA(NULL, eventlogname); + if (!handle) + { + /* Intermittently seen on NT4 when tests are run immediately after boot */ + win_skip("Could not get a handle to the eventlog\n"); + HeapFree(GetProcessHeap(), 0, user); + return; + } SetLastError(0xdeadbeef); ret = ReportEvent(handle, 0x20, 0, 0, NULL, 0, 0, NULL, NULL);

1 0

Vincent Povirk : ole32: Allocate the StorageImpl in StorageImpl_Construct.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 9da3365e840466aa55a4cc248e7a7c0c5aa54ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da3365e840466aa55a4cc248… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 23 17:49:32 2009 -0600 ole32: Allocate the StorageImpl in StorageImpl_Construct. This makes cleanup after errors much easier, as we can just use the regular destructor. --- dlls/ole32/storage32.c | 122 +++++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 68 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d4c6527..089206d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2233,14 +2233,15 @@ static const IStorageVtbl Storage32Impl_Vtbl = }; static HRESULT StorageImpl_Construct( - StorageImpl* This, HANDLE hFile, LPCOLESTR pwcsName, ILockBytes* pLkbyt, DWORD openFlags, BOOL fileBased, - BOOL create) + BOOL create, + StorageImpl** result) { + StorageImpl* This; HRESULT hr = S_OK; DirEntry currentEntry; BOOL readSuccessful; @@ -2249,6 +2250,10 @@ static HRESULT StorageImpl_Construct( if ( FAILED( validateSTGM(openFlags) )) return STG_E_INVALIDFLAG; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); + if (!This) + return E_OUTOFMEMORY; + memset(This, 0, sizeof(StorageImpl)); list_init(&This->base.strmHead); @@ -2259,6 +2264,7 @@ static HRESULT StorageImpl_Construct( This->base.pssVtbl = &IPropertySetStorage_Vtbl; This->base.v_destructor = StorageImpl_Destroy; This->base.openFlags = (openFlags & ~STGM_CREATE); + This->base.ref = 1; This->create = create; /* @@ -2273,7 +2279,10 @@ static HRESULT StorageImpl_Construct( This->pwcsName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwcsName)+1)*sizeof(WCHAR)); if (!This->pwcsName) - return STG_E_INSUFFICIENTMEMORY; + { + hr = STG_E_INSUFFICIENTMEMORY; + goto end; + } strcpyW(This->pwcsName, pwcsName); } @@ -2289,7 +2298,10 @@ static HRESULT StorageImpl_Construct( fileBased); if (This->bigBlockFile == 0) - return E_FAIL; + { + hr = E_FAIL; + goto end; + } if (create) { @@ -2341,9 +2353,7 @@ static HRESULT StorageImpl_Construct( if (FAILED(hr)) { - BIGBLOCKFILE_Destructor(This->bigBlockFile); - - return hr; + goto end; } } @@ -2362,12 +2372,18 @@ static HRESULT StorageImpl_Construct( */ if(!(This->rootBlockChain = BlockChainStream_Construct(This, &This->rootStartBlock, DIRENTRY_NULL))) - return STG_E_READFAULT; + { + hr = STG_E_READFAULT; + goto end; + } if(!(This->smallBlockDepotChain = BlockChainStream_Construct(This, &This->smallBlockDepotStart, DIRENTRY_NULL))) - return STG_E_READFAULT; + { + hr = STG_E_READFAULT; + goto end; + } /* * Write the root storage entry (memory only) @@ -2420,8 +2436,8 @@ static HRESULT StorageImpl_Construct( if (!readSuccessful) { - /* TODO CLEANUP */ - return STG_E_READFAULT; + hr = STG_E_READFAULT; + goto end; } /* @@ -2429,7 +2445,18 @@ static HRESULT StorageImpl_Construct( */ if(!(This->smallBlockRootChain = BlockChainStream_Construct(This, NULL, This->base.storageDirEntry))) - return STG_E_READFAULT; + { + hr = STG_E_READFAULT; + } + +end: + if (FAILED(hr)) + { + IStorage_Release((IStorage*)This); + *result = NULL; + } + else + *result = This; return hr; } @@ -2447,7 +2474,8 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) BlockChainStream_Destroy(This->rootBlockChain); BlockChainStream_Destroy(This->smallBlockDepotChain); - BIGBLOCKFILE_Destructor(This->bigBlockFile); + if (This->bigBlockFile) + BIGBLOCKFILE_Destructor(This->bigBlockFile); HeapFree(GetProcessHeap(), 0, This); } @@ -5663,36 +5691,25 @@ HRESULT WINAPI StgCreateDocfile( /* * Allocate and initialize the new IStorage32object. */ - newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - - if (newStorage == 0) - { - hr = STG_E_INSUFFICIENTMEMORY; - goto end; - } - hr = StorageImpl_Construct( - newStorage, hFile, pwcsName, NULL, grfMode, TRUE, - TRUE); + TRUE, + &newStorage); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, newStorage); goto end; } /* * Get an "out" pointer for the caller. */ - hr = StorageBaseImpl_QueryInterface( - (IStorage*)newStorage, - &IID_IStorage, - (void**)ppstgOpen); + *ppstgOpen = (IStorage*)newStorage; + end: TRACE("<-- %p r = %08x\n", *ppstgOpen, hr); @@ -5947,27 +5964,17 @@ HRESULT WINAPI StgOpenStorage( /* * Allocate and initialize the new IStorage32object. */ - newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - - if (newStorage == 0) - { - hr = STG_E_INSUFFICIENTMEMORY; - goto end; - } - - /* Initialize the storage */ hr = StorageImpl_Construct( - newStorage, hFile, pwcsName, NULL, grfMode, TRUE, - FALSE ); + FALSE, + &newStorage); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, newStorage); /* * According to the docs if the file is not a storage, return STG_E_FILEALREADYEXISTS */ @@ -5984,10 +5991,7 @@ HRESULT WINAPI StgOpenStorage( /* * Get an "out" pointer for the caller. */ - hr = StorageBaseImpl_QueryInterface( - (IStorage*)newStorage, - &IID_IStorage, - (void**)ppstgOpen); + *ppstgOpen = (IStorage*)newStorage; end: TRACE("<-- %08x, IStorage %p\n", hr, ppstgOpen ? *ppstgOpen : NULL); @@ -6012,33 +6016,24 @@ HRESULT WINAPI StgCreateDocfileOnILockBytes( /* * Allocate and initialize the new IStorage object. */ - newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - - if (newStorage == 0) - return STG_E_INSUFFICIENTMEMORY; - hr = StorageImpl_Construct( - newStorage, 0, 0, plkbyt, grfMode, FALSE, - TRUE); + TRUE, + &newStorage); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, newStorage); return hr; } /* * Get an "out" pointer for the caller. */ - hr = StorageBaseImpl_QueryInterface( - (IStorage*)newStorage, - &IID_IStorage, - (void**)ppstgOpen); + *ppstgOpen = (IStorage*)newStorage; return hr; } @@ -6068,33 +6063,24 @@ HRESULT WINAPI StgOpenStorageOnILockBytes( /* * Allocate and initialize the new IStorage object. */ - newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageImpl)); - - if (newStorage == 0) - return STG_E_INSUFFICIENTMEMORY; - hr = StorageImpl_Construct( - newStorage, 0, 0, plkbyt, grfMode, FALSE, - FALSE); + FALSE, + &newStorage); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, newStorage); return hr; } /* * Get an "out" pointer for the caller. */ - hr = StorageBaseImpl_QueryInterface( - (IStorage*)newStorage, - &IID_IStorage, - (void**)ppstgOpen); + *ppstgOpen = (IStorage*)newStorage; return hr; }

1 0

Rob Shearman : ole32: Add test for CoLockObjectExternal with fLastUnlockReleases as FALSE.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: bcf0be6a995f5b336d7287d9111336ff531a7755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf0be6a995f5b336d7287d91… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 23 15:07:20 2009 +0000 ole32: Add test for CoLockObjectExternal with fLastUnlockReleases as FALSE. --- dlls/ole32/tests/marshal.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 4239b55..93fd9a6 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1257,7 +1257,7 @@ static void test_lock_object_external(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoReleaseMarshalData(pStream); ok_ole_success(hr, CoReleaseMarshalData); - IStream_Release(pStream); + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); ok_more_than_one_lock(); @@ -1268,6 +1268,42 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, TRUE); ok_no_locks(); + + /* test CoLockObjectExternal releases reference to object with + * fLastUnlockReleases as TRUE and there are only strong references on + * the object */ + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, TRUE, FALSE); + + ok_more_than_one_lock(); + + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, FALSE); + + todo_wine + ok_no_locks(); + if (cLocks > 0) + CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); + + /* test CoLockObjectExternal doesn't release the last reference to an + * object with fLastUnlockReleases as TRUE and there is a weak reference + * on the object */ + hr = CoMarshalInterface(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + ok_ole_success(hr, CoMarshalInterface); + + ok_more_than_one_lock(); + + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, TRUE, FALSE); + + ok_more_than_one_lock(); + + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, FALSE); + + ok_more_than_one_lock(); + + CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); + + ok_no_locks(); + + IStream_Release(pStream); } /* tests disconnecting stubs */

1 0