June 2014 - Wine-commits - list.winehq.org

Piotr Caban : msvcp110: Add missing exports to msvcp110.spec file.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 1211ffd76e375b17cb2b5f3ed67a33b12579a3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1211ffd76e375b17cb2b5f3ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 14:59:06 2014 +0200 msvcp110: Add missing exports to msvcp110.spec file. --- dlls/msvcp110/msvcp110.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 40f5577..331df11 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2372,7 +2372,7 @@ @ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEBAPEAGXZ(ptr) basic_streambuf_wchar_epptr @ cdecl -arch=arm ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBAPA_WXZ(ptr) basic_streambuf_wchar_epptr @ thiscall -arch=i386 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEPA_WXZ(ptr) basic_streambuf_wchar_epptr -@ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IcoutEBAPEA_WXZ(ptr) basic_streambuf_wchar_epptr +@ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEBAPEA_WXZ(ptr) basic_streambuf_wchar_epptr @ cdecl -arch=arm ?exceptions(a)ios_base@std@@QAAXH(a)Z(ptr long) ios_base_exceptions_set @ thiscall -arch=i386 ?exceptions(a)ios_base@std@@QAEXH(a)Z(ptr long) ios_base_exceptions_set @ cdecl -arch=win64 ?exceptions(a)ios_base@std@@QEAAXH(a)Z(ptr long) ios_base_exceptions_set @@ -3822,9 +3822,11 @@ @ stub _Mtx_destroy @ stub _Mtx_getconcrtcs @ stub _Mtx_init +@ stub _Mtx_lock @ stub _Mtx_reset_owner @ stub _Mtx_timedlock @ stub _Mtx_trylock +@ stub _Mtx_unlock @ stub _Mtxdst @ stub _Mtxinit @ stub _Mtxlock

1 0

Vincent Povirk : windowscodecs: Fix interlaced PNG writing.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: e2d6b28a1b2ed064fe14409220e9fce3c0573987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d6b28a1b2ed064fe1440922… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 20 15:11:01 2014 -0500 windowscodecs: Fix interlaced PNG writing. --- dlls/windowscodecs/pngformat.c | 58 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 57 ++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2d6b28a1b2ed064fe144…

1 0

Akihiro Sagawa : jscript: Improve CollectGarbage stub.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: e29fd5429234a3e03a58ec146ccfe0b9290a0213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29fd5429234a3e03a58ec146… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 23:16:39 2014 +0900 jscript: Improve CollectGarbage stub. --- dlls/jscript/global.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 64546bd..4d1350f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -753,8 +753,10 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + static int once = 0; + if (!once++) + FIXME(": stub\n"); + return S_OK; } static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Sebastian Lackner : user32/tests: Add a missing call to ReleaseActCtx().
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 34f8053efe0c1e7ec11fd98e3de78e07cad6d335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f8053efe0c1e7ec11fd98e3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 06:29:09 2014 +0200 user32/tests: Add a missing call to ReleaseActCtx(). --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66b9c7e..6badca1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7024,6 +7024,7 @@ static void test_interthread_messages(void) ret = pGetCurrentActCtx(&handle); ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); + pReleaseActCtx(handle); /* destination window will test for active context */ ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0);

1 0

Nikolay Sivov : scrrun: Implement SerialNumber property.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 5af5e4010383909ff79c9fd8691fb5fcfb0280c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af5e4010383909ff79c9fd86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 21:54:50 2014 +0400 scrrun: Implement SerialNumber property. --- dlls/scrrun/filesystem.c | 11 +++++++++-- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c85fe63..4d3c117 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -978,8 +978,15 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, serial); - return E_NOTIMPL; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, serial); + + if (!serial) + return E_POINTER; + + ret = GetVolumeInformationW(This->root, NULL, 0, (DWORD*)serial, NULL, NULL, NULL, 0); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_IsReady(IDrive *iface, VARIANT_BOOL *ready) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c9b41c0..7b9354e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1790,6 +1790,41 @@ static void test_GetDriveName(void) } } +static void test_SerialNumber(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + VARIANT var; + LONG serial; + HRESULT hr; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_SerialNumber(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + serial = 0xdeadbeef; + hr = IDrive_get_SerialNumber(drive, &serial); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(serial != 0xdeadbeef, "got %x\n", serial); + + IDrive_Release(drive); + IEnumVARIANT_Release(iter); + IDriveCollection_Release(drives); +} + START_TEST(filesystem) { HRESULT hr; @@ -1823,6 +1858,7 @@ START_TEST(filesystem) test_ReadAll(); test_Read(); test_GetDriveName(); + test_SerialNumber(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : scrrun: Implement FileSystem property.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 6a2e1b3f31bf3f6745fe26583620be03c5db0bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2e1b3f31bf3f6745fe26583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 22:05:26 2014 +0400 scrrun: Implement FileSystem property. --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4d3c117..fc8531c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -971,8 +971,19 @@ static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, fs); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, fs); + + if (!fs) + return E_POINTER; + + *fs = NULL; + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + if (ret) + *fs = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 7b9354e..ac78483 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1798,6 +1798,7 @@ static void test_SerialNumber(void) VARIANT var; LONG serial; HRESULT hr; + BSTR name; hr = IFileSystem3_get_Drives(fs3, &drives); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1820,6 +1821,15 @@ static void test_SerialNumber(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(serial != 0xdeadbeef, "got %x\n", serial); + hr = IDrive_get_FileSystem(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_FileSystem(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Piotr Caban : msvcr100: Add _SpinWait implementation.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: cda83f9c3342532e5557d6fbb7a3c878f9d6f68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda83f9c3342532e5557d6fbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 21 14:22:28 2014 +0200 msvcr100: Add _SpinWait implementation. --- dlls/msvcr100/msvcr100.spec | 66 ++++++++--------- dlls/msvcr110/msvcr110.spec | 98 ++++++++++++------------- dlls/msvcrt/lock.c | 172 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 4 files changed, 255 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cda83f9c3342532e5557d…

1 0

Piotr Caban : msvcr100/tests: Add _SpinWait tests.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: b2d22ecb074e7c6fc0a701e5e85f00dcfd029841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d22ecb074e7c6fc0a701e5e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 21 14:22:37 2014 +0200 msvcr100/tests: Add _SpinWait tests. --- dlls/msvcr100/tests/msvcr100.c | 146 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 7550eb9..a998fb5 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -51,6 +51,7 @@ }while(0) DEFINE_EXPECT(invalid_parameter_handler); +DEFINE_EXPECT(yield_func); static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); @@ -66,6 +67,73 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); } +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static ULONG_PTR (WINAPI *call_thiscall_func1)( void *func, void *this ); +static ULONG_PTR (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +typedef unsigned char MSVCRT_bool; + +typedef enum +{ + SPINWAIT_INIT, + SPINWAIT_SPIN, + SPINWAIT_YIELD, + SPINWAIT_DONE +} SpinWait_state; + +typedef void (__cdecl *yield_func)(void); + +typedef struct +{ + ULONG spin; + ULONG unknown; + SpinWait_state state; + yield_func yield_func; +} SpinWait; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -77,6 +145,14 @@ static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); static int (__cdecl *p_atoi)(const char*); +static SpinWait* (__thiscall *pSpinWait_ctor_yield)(SpinWait*, yield_func); +static void (__thiscall *pSpinWait_dtor)(SpinWait*); +static void (__thiscall *pSpinWait__DoYield)(SpinWait*); +static ULONG (__thiscall *pSpinWait__NumberOfSpins)(SpinWait*); +static void (__thiscall *pSpinWait__SetSpinCount)(SpinWait*, unsigned int); +static MSVCRT_bool (__thiscall *pSpinWait__ShouldSpinAgain)(SpinWait*); +static MSVCRT_bool (__thiscall *pSpinWait__SpinOnce)(SpinWait*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -107,6 +183,25 @@ static BOOL init(void) SET(p__aligned_msize, "_aligned_msize"); SET(p_atoi, "atoi"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QEAA(a)P6AXXZ@Z"); + SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QEAAXXZ"); + SET(pSpinWait__DoYield, "?_DoYield@?$_SpinWait@$00(a)details@Concurrency@@IEAAXXZ"); + SET(pSpinWait__NumberOfSpins, "?_NumberOfSpins@?$_SpinWait@$00(a)details@Concurrency@@IEAAKXZ"); + SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QEAAXI(a)Z"); + SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IEAA_NXZ"); + SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QEAA_NXZ"); + } else { + SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); + SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); + SET(pSpinWait__DoYield, "?_DoYield@?$_SpinWait@$00(a)details@Concurrency@@IAEXXZ"); + SET(pSpinWait__NumberOfSpins, "?_NumberOfSpins@?$_SpinWait@$00(a)details@Concurrency@@IAEKXZ"); + SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z"); + SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IAE_NXZ"); + SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QAE_NXZ"); + } + + init_thiscall_thunk(); return TRUE; } @@ -377,6 +472,56 @@ static void test_atoi(void) ok(r == 2147483647, "atoi(4294967296) = %d\n", r); } +static void __cdecl test_yield_func(void) +{ + CHECK_EXPECT(yield_func); +} + +static void test__SpinWait(void) +{ + SpinWait sp; + ULONG ul; + MSVCRT_bool b; + + call_func2(pSpinWait_ctor_yield, &sp, test_yield_func); + + SET_EXPECT(yield_func); + call_func1(pSpinWait__DoYield, &sp); + CHECK_CALLED(yield_func); + + ul = call_func1(pSpinWait__NumberOfSpins, &sp); + ok(ul == 1, "_SpinWait::_NumberOfSpins returned %u\n", ul); + + sp.spin = 2; + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(!b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == -1, "sp.spin = %u\n", sp.spin); + + call_func2(pSpinWait__SetSpinCount, &sp, 2); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + SET_EXPECT(yield_func); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + CHECK_CALLED(yield_func); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(!b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin==0 || sp.spin==4000, "sp.spin = %u\n", sp.spin); + + call_func1(pSpinWait_dtor, &sp); +} + START_TEST(msvcr100) { if (!init()) @@ -387,4 +532,5 @@ START_TEST(msvcr100) test_fread_s(); test__aligned_msize(); test_atoi(); + test__SpinWait(); }

1 0

Thomas Faber : rpcrt4: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 8fe759dfae41f518940764788ebbd3544c2541b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe759dfae41f518940764788… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jun 21 18:44:57 2014 +0200 rpcrt4: Do not omit mandatory argument to VirtualProtect. --- dlls/rpcrt4/cproxy.c | 3 ++- dlls/rpcrt4/cstub.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b1acbb0..7513b19 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -192,13 +192,14 @@ static const struct thunk *allocate_block( unsigned int num ) { unsigned int i; struct thunk *prev, *block; + DWORD oldprot; block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); if (!block) return NULL; for (i = 0; i < BLOCK_SIZE; i++) init_thunk( &block[i], BLOCK_SIZE * num + i + 3 ); - VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, &oldprot ); prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); if (prev) /* someone beat us to it */ { diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 680b22e..0ddb1aa 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -194,6 +194,7 @@ static const vtbl_method_t *allocate_block( unsigned int num ) { unsigned int i; vtbl_method_t *prev, *block; + DWORD oldprot; block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); @@ -204,7 +205,7 @@ static const vtbl_method_t *allocate_block( unsigned int num ) memcpy( &block[i], opcodes, sizeof(opcodes) ); block[i].offset = (BLOCK_SIZE * num + i + 3) * sizeof(void *); } - VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, &oldprot ); prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); if (prev) /* someone beat us to it */ {

1 0

Sebastian Lackner : server: Grab borrowed debugger reference while handling wake_up() events. ( Valgrind).
by Alexandre Julliard 23 Jun '14

23 Jun '14

Module: wine Branch: master Commit: 3447567b42fc5ea7ccf80876ad68ca4afb49e291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447567b42fc5ea7ccf80876a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 21 22:56:22 2014 +0200 server: Grab borrowed debugger reference while handling wake_up() events. (Valgrind). --- server/debugger.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/debugger.c b/server/debugger.c index 3315f6e..3ccec29 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -241,7 +241,13 @@ static void link_event( struct debug_event *event ) assert( debug_ctx ); grab_object( event ); list_add_tail( &debug_ctx->event_queue, &event->entry ); - if (!event->sender->debug_event) wake_up( &debug_ctx->obj, 0 ); + if (!event->sender->debug_event) + { + /* grab reference since debugger could be killed while trying to wake up */ + grab_object( debug_ctx ); + wake_up( &debug_ctx->obj, 0 ); + release_object( debug_ctx ); + } } /* find the next event that we can send to the debugger */

1 0