April 2013 - Wine-commits - list.winehq.org

Austin English : msvcr110: Forward __crtSetUnhandledExceptionFilter to kernel32. SetUnhandledExceptionFilter.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 852e0457aabd121a64f22f84898b02c4813693c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852e0457aabd121a64f22f848… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 18 00:59:58 2013 -0700 msvcr110: Forward __crtSetUnhandledExceptionFilter to kernel32.SetUnhandledExceptionFilter. --- dlls/msvcr110/msvcr110.c | 5 +++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index ba943b0..1049e2a 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -39,3 +39,8 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) +{ + return SetUnhandledExceptionFilter(filter); +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 29c7186..40f1470 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -928,7 +928,7 @@ @ stub -arch=i386,win64 __crtLCMapStringEx @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub -arch=i386,win64 __crtSetThreadStackGuarantee -@ stub __crtSetUnhandledExceptionFilter +@ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ stub -arch=i386,win64 __crtTerminateProcess @ stub -arch=i386,win64 __crtUnhandledException @ cdecl __daylight() msvcrt.__daylight

1 0

Michael Stefaniuc : mlang: Remove left over "stub" from a TRACE().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 5de81e24bb7d5920fa5a8b762afe91fd7605bdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de81e24bb7d5920fa5a8b762… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 18 11:53:27 2013 +0200 mlang: Remove left over "stub" from a TRACE(). --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 63e35e9..6ebe627 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1764,7 +1764,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, EnumScript_impl *es; UINT i; - TRACE("%p, %08x, %04x, %p: stub!\n", mlang, dwFlags, LangId, ppEnumScript); + TRACE("%p, %08x, %04x, %p\n", mlang, dwFlags, LangId, ppEnumScript); if (!dwFlags) /* enumerate all available scripts */ dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM;

1 0

Nikolay Sivov : ole32: Move share/access modes to static arrays.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: a90c1efe51491415039dbbd8e17ce73ac45bdbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90c1efe51491415039dbbd8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 17 23:55:14 2013 +0400 ole32: Move share/access modes to static arrays. --- dlls/ole32/tests/storage32.c | 83 +++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d99bda6..b9d41cd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1808,32 +1808,36 @@ static const struct access_res create_close[16] = { TRUE, ERROR_SUCCESS } }; +static const DWORD access_modes[4] = { + 0, + GENERIC_READ, + GENERIC_WRITE, + GENERIC_READ | GENERIC_WRITE +}; + +static const DWORD share_modes[4] = { + 0, + FILE_SHARE_READ, + FILE_SHARE_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE +}; + static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD line) { - DWORD access = 0, share = 0; - DWORD lasterr; - HANDLE hfile; int i, j, idx = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < sizeof(access_modes)/sizeof(access_modes[0]); i++) { - if (i == 0) access = 0; - if (i == 1) access = GENERIC_READ; - if (i == 2) access = GENERIC_WRITE; - if (i == 3) access = GENERIC_READ | GENERIC_WRITE; - - for (j = 0; j < 4; j++) + for (j = 0; j < sizeof(share_modes)/sizeof(share_modes[0]); j++) { + DWORD lasterr; + HANDLE hfile; + if (ares[idx].ignore) continue; - if (j == 0) share = 0; - if (j == 1) share = FILE_SHARE_READ; - if (j == 2) share = FILE_SHARE_WRITE; - if (j == 3) share = FILE_SHARE_READ | FILE_SHARE_WRITE; - SetLastError(0xdeadbeef); - hfile = CreateFileA(file, access, share, NULL, OPEN_EXISTING, + hfile = CreateFileA(file, access_modes[i], share_modes[j], NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); lasterr = GetLastError(); @@ -1857,32 +1861,30 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD static void test_access(void) { + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const char fileA[] = "winetest"; IStorage *stg; HRESULT hr; - static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; - /* STGM_TRANSACTED */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_DIRECT */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1892,70 +1894,67 @@ static void test_access(void) hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_NONE */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_NONE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_READ */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_READ | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_WRITE */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); } static void test_readonly(void)

1 0

Nikolay Sivov : ole32: Accept STGM_DIRECT_SWMR mode.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: c29f3dff8c05d45115627fdd25fcdd29795b9bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29f3dff8c05d45115627fdd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 01:25:23 2013 +0400 ole32: Accept STGM_DIRECT_SWMR mode. --- dlls/ole32/storage32.c | 11 ++++++++++- dlls/ole32/tests/storage32.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1d64ab0..249d4d2 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7604,7 +7604,16 @@ HRESULT WINAPI StgOpenStorage( /* * Validate the sharing mode */ - if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) + if (grfMode & STGM_DIRECT_SWMR) + { + if ((STGM_SHARE_MODE(grfMode) != STGM_SHARE_DENY_WRITE) && + (STGM_SHARE_MODE(grfMode) != STGM_SHARE_DENY_NONE)) + { + hr = STG_E_INVALIDFLAG; + goto end; + } + } + else if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) switch(STGM_SHARE_MODE(grfMode)) { case STGM_SHARE_EXCLUSIVE: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b9d41cd..d6640c2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1889,7 +1889,7 @@ static void test_access(void) STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1955,6 +1955,21 @@ static void test_access(void) test_file_access(fileA, create_close); DeleteFileA(fileA); + + /* STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE - reader mode for direct SWMR mode */ + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_TRANSACTED, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + IStorage_Release(stg); + + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + test_file_access(fileA, create); + + IStorage_Release(stg); + test_file_access(fileA, create_close); + + DeleteFileA(fileA); } static void test_readonly(void)

1 0

Nikolay Sivov : ole32: Stub for IDirectWriterLock.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: a06db6cce5f75339082ef6cd8156e65154ee3817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06db6cce5f75339082ef6cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 10:04:40 2013 +0400 ole32: Stub for IDirectWriterLock. --- dlls/ole32/storage32.c | 65 ++++++++++++++++++++++++++++++++++++++++- dlls/ole32/storage32.h | 1 + dlls/ole32/tests/storage32.c | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 249d4d2..aa82b66 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -71,6 +71,11 @@ static inline StorageBaseImpl *impl_from_IStorage( IStorage *iface ) return CONTAINING_RECORD(iface, StorageBaseImpl, IStorage_iface); } +static inline StorageBaseImpl *impl_from_IDirectWriterLock( IDirectWriterLock *iface ) +{ + return CONTAINING_RECORD(iface, StorageBaseImpl, IDirectWriterLock_iface); +} + /**************************************************************************** * Storage32InternalImpl definitions. * @@ -380,6 +385,12 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( { *ppvObject = &This->IPropertySetStorage_iface; } + /* locking interface is report for writer only */ + else if (IsEqualGUID(&IID_IDirectWriterLock, riid) && + (This->openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE))) + { + *ppvObject = &This->IDirectWriterLock_iface; + } else return E_NOINTERFACE; @@ -2648,6 +2659,55 @@ static HRESULT StorageImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) return hr; } +static HRESULT WINAPI directwriterlock_QueryInterface(IDirectWriterLock *iface, REFIID riid, void **obj) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_QueryInterface(&This->IStorage_iface, riid, obj); +} + +static ULONG WINAPI directwriterlock_AddRef(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_AddRef(&This->IStorage_iface); +} + +static ULONG WINAPI directwriterlock_Release(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_Release(&This->IStorage_iface); +} + +static HRESULT WINAPI directwriterlock_WaitForWriteAccess(IDirectWriterLock *iface, DWORD timeout) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p)->(%d): stub\n", This, timeout); + return E_NOTIMPL; +} + +static HRESULT WINAPI directwriterlock_ReleaseWriteAccess(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI directwriterlock_HaveWriteAccess(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IDirectWriterLockVtbl DirectWriterLockVtbl = +{ + directwriterlock_QueryInterface, + directwriterlock_AddRef, + directwriterlock_Release, + directwriterlock_WaitForWriteAccess, + directwriterlock_ReleaseWriteAccess, + directwriterlock_HaveWriteAccess +}; + /* * Virtual function table for the IStorage32Impl class. */ @@ -2719,6 +2779,7 @@ static HRESULT StorageImpl_Construct( This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; + This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; This->base.baseVtbl = &StorageImpl_BaseVtbl; This->base.openFlags = (openFlags & ~STGM_CREATE); This->base.ref = 1; @@ -7631,10 +7692,10 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* shared reading requires transacted mode */ + /* shared reading requires transacted or single writer mode */ if( STGM_SHARE_MODE(grfMode) == STGM_SHARE_DENY_WRITE && STGM_ACCESS_MODE(grfMode) == STGM_READWRITE && - !(grfMode&STGM_TRANSACTED) ) + !(grfMode & STGM_TRANSACTED) && !(grfMode & STGM_DIRECT_SWMR)) { hr = STG_E_INVALIDFLAG; goto end; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index f2061f3..b037847 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -177,6 +177,7 @@ struct StorageBaseImpl { IStorage IStorage_iface; IPropertySetStorage IPropertySetStorage_iface; /* interface for adding a properties stream */ + IDirectWriterLock IDirectWriterLock_iface; LONG ref; /* diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d6640c2..4f12d8b 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3046,6 +3046,55 @@ static void test_convert(void) DeleteFileW(filename); } +static void test_direct_swmr(void) +{ + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + IDirectWriterLock *dwlock; + ULONG ref, ref2; + IStorage *stg; + HRESULT hr; + + /* it's possible to create in writer mode */ + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_DIRECT_SWMR, 0, &stg); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); +if (hr == S_OK) { + IStorage_Release(stg); + DeleteFileW(fileW); +} + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_TRANSACTED, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + IStorage_Release(stg); + + /* reader mode */ + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IStorage_Release(stg); + + /* writer mode */ + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + ref = IStorage_AddRef(stg); + IStorage_Release(stg); + + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == S_OK, "got %08x\n", hr); + + ref2 = IStorage_AddRef(stg); + IStorage_Release(stg); + ok(ref2 == ref + 1, "got %u\n", ref2); + + IDirectWriterLock_Release(dwlock); + IStorage_Release(stg); + + DeleteFileW(fileW); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3090,4 +3139,5 @@ START_TEST(storage32) test_copyto_recursive(); test_hglobal_storage_creation(); test_convert(); + test_direct_swmr(); }

1 0

Nikolay Sivov : ole32: Merge release code to Release method.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 1b4f3ca6f75dc89d65d4c9396368ebb1dda5a1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4f3ca6f75dc89d65d4c9396… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 10:16:44 2013 +0400 ole32: Merge release code to Release method. --- dlls/ole32/stg_stream.c | 62 ++++++++++++++-------------------------------- 1 files changed, 19 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e9fc0c0..d7abd0e 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -43,40 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); - -/*** - * This is the destructor of the StgStreamImpl class. - * - * This method will clean-up all the resources used-up by the given StgStreamImpl - * class. The pointer passed-in to this function will be freed and will not - * be valid anymore. - */ -static void StgStreamImpl_Destroy(StgStreamImpl* This) -{ - TRACE("(%p)\n", This); - - /* - * Release the reference we are holding on the parent storage. - * IStorage_Release(&This->parentStorage->IStorage_iface); - * - * No, don't do this. Some apps call IStorage_Release without - * calling IStream_Release first. If we grab a reference the - * file is not closed, and the app fails when it tries to - * reopen the file (Easy-PC, for example). Just inform the - * storage that we have closed the stream - */ - - if(This->parentStorage) { - - StorageBaseImpl_RemoveStream(This->parentStorage, This); - - } - - This->parentStorage = 0; - - HeapFree(GetProcessHeap(), 0, This); -} - /*** * This implements the IUnknown method QueryInterface for this * class @@ -126,17 +92,27 @@ static ULONG WINAPI StgStreamImpl_Release( IStream* iface) { StgStreamImpl* This = impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); - ULONG ref; + if (!ref) + { + TRACE("(%p)\n", This); - ref = InterlockedDecrement(&This->ref); + /* + * Release the reference we are holding on the parent storage. + * IStorage_Release(&This->parentStorage->IStorage_iface); + * + * No, don't do this. Some apps call IStorage_Release without + * calling IStream_Release first. If we grab a reference the + * file is not closed, and the app fails when it tries to + * reopen the file (Easy-PC, for example). Just inform the + * storage that we have closed the stream + */ - /* - * If the reference count goes down to 0, perform suicide. - */ - if (ref==0) - { - StgStreamImpl_Destroy(This); + if (This->parentStorage) + StorageBaseImpl_RemoveStream(This->parentStorage, This); + This->parentStorage = 0; + HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Michael Stefaniuc : dplayx: Assimilate the IDirectPlayLobby3 methods.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 0870290ca6716838b7ae8ec05b751d02430ccc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0870290ca6716838b7ae8ec05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:07:06 2013 +0200 dplayx: Assimilate the IDirectPlayLobby3 methods. --- dlls/dplayx/dplobby.c | 160 +++++++++++++++++-------------------------------- 1 files changed, 56 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0870290ca6716838b7ae8…

1 0

Michael Stefaniuc : dplayx: Get rid of the LPDIRECTPLAYLOBBY usage.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: f6e4aa77626849f0589a63c0439e3a5675fbc81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e4aa77626849f0589a63c04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:09:15 2013 +0200 dplayx: Get rid of the LPDIRECTPLAYLOBBY usage. --- dlls/dplayx/dplobby.c | 31 ++++++++++++------------------- dlls/dplayx/tests/dplayx.c | 6 +++--- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index ea4ecfe..c6b02c8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1365,9 +1365,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ConnectEx( IDirectPlayLobby3 *iface, return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); } -static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx( IDirectPlayLobby3A *iface, DWORD dwFlags, + REFIID riid, void **lplpDP, IUnknown *pUnk ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); @@ -1380,8 +1379,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_RegisterApplication( IDirectPlayLobb return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, LPDPAPPLICATIONDESC lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, DPAPPLICATIONDESC *appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1394,8 +1393,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_UnregisterApplication( IDirectPlayLo return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFGUID lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, REFGUID appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1418,8 +1417,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_WaitForConnectionSettings( IDirectPl return hr; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings( IDirectPlayLobby3A *iface, + DWORD dwFlags ) { HRESULT hr = DP_OK; BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL); @@ -1518,11 +1517,8 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) * DirectPlayLobbyCreateA (DPLAYX.4) * */ -HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBYA *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); @@ -1550,11 +1546,8 @@ HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, * DirectPlayLobbyCreateW (DPLAYX.5) * */ -HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBY *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateW( GUID *lpGUIDDSP, IDirectPlayLobby **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 991b3c6..d22583e 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -652,7 +652,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W DPCOMPOUNDADDRESSELEMENT addressElements[3]; LPVOID pAddress = NULL; DWORD dwAddressSize = 0; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, @@ -799,7 +799,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, { lpCallbackData callbackData = lpContext; - LPDIRECTPLAYLOBBY pDPL; + IDirectPlayLobby *pDPL; HRESULT hr; @@ -2877,7 +2877,7 @@ static void test_GetPlayerAddress(void) { IDirectPlay4 *pDP[2]; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; CallbackData callbackData;

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayLobbyImpl aliases.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: d9d1b6ade71f92b4323ecae5f500781e7afb16fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d1b6ade71f92b4323ecae5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:08 2013 +0200 dplayx: Get rid of the IDirectPlayLobbyImpl aliases. --- dlls/dplayx/dplobby.c | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index c6b02c8..85a9ea2 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -36,16 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl; - /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface )DECLSPEC_HIDDEN; @@ -102,7 +92,7 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); if ( This->dpl == NULL ) @@ -117,7 +107,7 @@ static BOOL DPL_CreateLobby1( LPVOID lpDPL ) static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; if( This->dpl->dwMsgThread ) { @@ -259,12 +249,8 @@ static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) * Returns an IDirectPlay interface. * */ -static HRESULT DPL_ConnectEx -( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, - REFIID riid, - LPVOID* lplpDP, - IUnknown* pUnk) +static HRESULT DPL_ConnectEx( IDirectPlayLobbyImpl *This, DWORD dwFlags, REFIID riid, void **lplpDP, + IUnknown* pUnk) { HRESULT hr; DWORD dwOpenFlags = 0; @@ -789,7 +775,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ReceiveLobbyMessage( IDirectPlayLobb typedef struct tagRunApplicationEnumStruct { - IDirectPlayLobbyAImpl* This; + IDirectPlayLobbyImpl *This; GUID appGUID; LPSTR lpszPath;

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: ffdeda566c7dc2457ca0e0c1a27b1bf3deedd8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdeda566c7dc2457ca0e0c1a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:53 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby. --- dlls/dplayx/dplobby.c | 151 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 6 +- 2 files changed, 151 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdeda566c7dc2457ca0e…

1 0