wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

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

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: 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: 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

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

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

Austin English : kernel32: Fix a typo in a comment.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 758911a8da976e5f3c39f5dd67d08305e6a96446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758911a8da976e5f3c39f5dd6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 17 14:54:42 2013 -0700 kernel32: Fix a typo in a comment. --- dlls/kernel32/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1cfd850..63d977b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1641,8 +1641,8 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) * GetSystemWow64DirectoryW (KERNEL32.@) * * As seen on MSDN - * - On Win32 we should returns ERROR_CALL_NOT_IMPLEMENTED - * - On Win64 we should returns the SysWow64 (system64) directory + * - On Win32 we should return ERROR_CALL_NOT_IMPLEMENTED + * - On Win64 we should return the SysWow64 (system64) directory */ UINT WINAPI GetSystemWow64DirectoryW( LPWSTR path, UINT count ) {

1 0

Zhan Jianyu : vbscript: Fix a typo: jscript -> vbscript.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: a8e70fa8838433cd7cad10747fc984de54ff2ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e70fa8838433cd7cad10747… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Wed Apr 17 21:46:13 2013 +0800 vbscript: Fix a typo: jscript -> vbscript. --- dlls/vbscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c index c74ded5..ede9364 100644 --- a/dlls/vbscript/regexp.c +++ b/dlls/vbscript/regexp.c @@ -38,7 +38,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c)

1 0

Dmitry Timoshkov : kernel32: Count precise amount of child process failures .
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: b632f0966d5a51f85e791b990493ec46864972de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b632f0966d5a51f85e791b990… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:43 2013 +0900 kernel32: Count precise amount of child process failures. --- dlls/kernel32/tests/loader.c | 30 +++++++++++++++++++++++++----- include/wine/test.h | 7 +++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ca33ef7..20ae3ec 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1615,7 +1615,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1628,7 +1632,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1641,7 +1649,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 197, "expected exit code 197, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1654,7 +1666,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1668,7 +1684,11 @@ static void test_ExitProcess(void) GetExitCodeProcess(pi.hProcess, &ret); todo_wine ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/include/wine/test.h b/include/wine/test.h index 0bd4db5..373fe76 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); +extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); @@ -434,6 +435,12 @@ LONG winetest_get_failures(void) return failures; } +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} + void winetest_wait_child_process( HANDLE process ) { DWORD exit_code = 1;

1 0

Dmitry Timoshkov : kernel32: Add more process shutdown tests.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 3de89e8500ce753a06943846a2f4262b2ae0529e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de89e8500ce753a06943846a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:16 2013 +0900 kernel32: Add more process shutdown tests. --- dlls/kernel32/tests/loader.c | 134 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 458b836..ca33ef7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1042,6 +1042,7 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static DWORD attached_thread_count; +static LONG noop_thread_started; static int test_dll_phase; static DWORD WINAPI mutex_thread_proc(void *param) @@ -1082,6 +1083,14 @@ static DWORD WINAPI semaphore_thread_proc(void *param) return 196; } +static DWORD WINAPI noop_thread_proc(void *param) +{ + InterlockedIncrement(&noop_thread_started); + + trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + return 196; +} + static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { DWORD ret; @@ -1098,6 +1107,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) case DLL_PROCESS_DETACH: { DWORD code, expected_code, i; + HANDLE handle, process; + void *addr; + SIZE_T size; + LARGE_INTEGER offset; + DEBUG_EVENT de; trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); @@ -1160,12 +1174,123 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it. + */ + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + CloseHandle(handle); + } + + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId()); + ok(process != NULL, "OpenProcess error %d\n", GetLastError()); + + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + } + + SetLastError(0xdeadbeef); + handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(handle != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + addr = NULL; + size = 0; + ret = pNtMapViewOfSection(handle, process, &addr, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(ret == STATUS_SUCCESS, "NtMapViewOfSection error %#x\n", ret); + ret = pNtUnmapViewOfSection(process, addr); + ok(ret == STATUS_SUCCESS, "NtUnmapViewOfSection error %#x\n", ret); + + CloseHandle(handle); + CloseHandle(process); + + SetLastError(0xdeadbeef); + handle = GetModuleHandle("winver.exe"); + ok(!handle, "winver.exe shouldn't be loaded yet\n"); + handle = LoadLibrary("winver.exe"); + ok(handle != 0, "LoadLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = FreeLibrary(handle); + ok(ret, "LoadLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DebugActiveProcess(GetCurrentProcessId()); + ok(!ret, "DebugActiveProcess should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "expected ERROR_SEM_TIMEOUT, got %d\n", GetLastError()); + if (test_dll_phase == 2) { trace("dll: call ExitProcess()\n"); *child_failures = winetest_get_failures(); ExitProcess(197); } + trace("dll: %p, DLL_PROCESS_DETACH, %p => DONE\n", hinst, param); break; } case DLL_THREAD_ATTACH: @@ -1185,7 +1310,14 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it, and DLL_THREAD_DETACH is + * sent on thread exit, but DLL_THREAD_ATTACH is never received. + */ + if (noop_thread_started) + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + else + ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); break; default:

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013