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

Thomas Faber : msvcrt: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 1ab9c79dcae558da0f3c5c65bbef1b2f7cfacd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c79dcae558da0f3c5c65b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 22 15:15:10 2014 +0200 msvcrt: Do not omit mandatory argument to VirtualProtect. --- dlls/msvcrt/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c07005a..4e67cba 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -394,9 +394,10 @@ unsigned int CDECL _set_output_format(unsigned int new_output_format) int CDECL MSVCRT__resetstkoflw(void) { int stack_addr; + DWORD oldprot; /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */ - return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL ); + return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } /*********************************************************************

1 0

Sebastian Lackner : server: Grab borrowed debugger reference while handling wake_up() events. ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

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

Thomas Faber : rpcrt4: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard June 23, 2014

June 23, 2014

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

Piotr Caban : msvcr100/tests: Add _SpinWait tests.
by Alexandre Julliard June 23, 2014

June 23, 2014

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

Alexandre Julliard : libwine: Update the codepage tables to Unicode 7.0.0.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 500bbb3e9aafd4591cecc0d03163fd3bc967f340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500bbb3e9aafd4591cecc0d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 16:05:36 2014 +0200 libwine: Update the codepage tables to Unicode 7.0.0. --- dlls/kernel32/tests/locale.c | 2 + libs/wine/c_10003.c | 69 ++++++++++++++-------- libs/wine/c_10007.c | 100 +++++++++++++++++++++----------- libs/wine/c_10008.c | 73 ++++++++++++++--------- libs/wine/c_10017.c | 100 +++++++++++++++++++++----------- libs/wine/c_20866.c | 100 +++++++++++++++++++++----------- libs/wine/c_20932.c | 71 +++++++++++++++-------- libs/wine/c_21866.c | 100 +++++++++++++++++++++----------- libs/wine/c_28595.c | 100 +++++++++++++++++++++----------- libs/wine/c_855.c | 100 +++++++++++++++++++++----------- libs/wine/c_866.c | 100 +++++++++++++++++++++----------- libs/wine/c_878.c | 100 +++++++++++++++++++++----------- libs/wine/casemap.c | 64 ++++++++++++--------- libs/wine/wctype.c | 134 +++++++++++++++++++++---------------------- loader/l_intl.nls | Bin 6086 -> 6118 bytes 15 files changed, 765 insertions(+), 448 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500bbb3e9aafd4591cecc…

1 0

Sebastian Lackner : ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 2fcecdb72e11b7adb03dc797c2ccc60fcb487fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcecdb72e11b7adb03dc797c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 22:25:52 2014 +0200 ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind). --- dlls/ntdll/thread.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6e2ed67..c8461b0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -520,8 +520,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * frame->ActivationContext = actctx; frame->Flags = 0; teb->ActivationContextStack.ActiveFrame = frame; - - RtlAddRefActivationContext(actctx); } info = (struct startup_info *)(teb + 1);

1 0

André Hentschel : Add WWN 371
by Jeremy Newman June 22, 2014

June 22, 2014

Module: website Branch: master Commit: def3736c5f344830bd6226f9b17cfd40e783c194 URL: http://source.winehq.org/git/website.git/?a=commit;h=def3736c5f344830bd6226… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 21 14:15:38 2014 +0200 Add WWN 371 --- news/de/2014062001.xml | 10 + news/en/2014062001.xml | 10 + wwn/en/wn20140620_371.xml | 1047 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1067 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=def3736c5f344830bd…

1 0

Francois Gouget : packager/tests: Make the IStorage methods static.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 889cce442ed24ed8eadd09af46464b31ba57f715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889cce442ed24ed8eadd09af4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 20 18:23:50 2014 +0200 packager/tests: Make the IStorage methods static. --- dlls/packager/tests/oleobj.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index f81dc22..1f81cb5 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -177,7 +177,7 @@ static IStream ole10native_stream = { &ole10native_stream_vtbl }; -HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, +static HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, void **ppvObject) { ok(0, "queryinterface: %s\n", wine_dbgstr_guid(riid)); @@ -207,7 +207,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; @@ -220,14 +220,14 @@ HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, return S_OK; } -HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage **ppstg) { ok(0, "createstorage\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg) { @@ -235,73 +235,73 @@ HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, +static HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, const IID *rgiidExclude, SNB snbExclude, IStorage *pstgDest) { ok(0, "copyto\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgDest, LPCOLESTR pwcsNewName, DWORD grfFlags) { ok(0, "moveelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) +static HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) { ok(0, "commit\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Revert(IStorage* This) +static HRESULT WINAPI stg_Revert(IStorage* This) { ok(0, "revert\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, +static HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, void *reserved2, DWORD reserved3, IEnumSTATSTG **ppenum) { ok(0, "enumelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) +static HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) { ok(0, "destroyelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, +static HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, LPCOLESTR pwcsNewName) { ok(0, "renamelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, const FILETIME *pctime, const FILETIME *patime, const FILETIME *pmtime) { ok(0, "setelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) +static HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) { ok(0, "setclass\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, +static HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, DWORD grfMask) { ok(0, "setstate\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) +static HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) { memset(pstatstg, 0, sizeof(*pstatstg)); pstatstg->clsid = CLSID_Package;

1 0

Sebastian Lackner : ntdll/tests: Add more tests for debug string events.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 99ac786c6989a7962eed4c15e7ef8673f6988ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ac786c6989a7962eed4c15e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 21:19:38 2014 +0200 ntdll/tests: Add more tests for debug string events. This patch adds additional tests, to check how debuggers handle OUTPUT_DEBUG_STRING_EVENT events. --- dlls/ntdll/tests/exception.c | 44 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 623a25e..5fc21de 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -943,6 +943,31 @@ static void test_debugger(void) ok(!status, "NtSetContextThread failed with 0x%x\n", status); } } + else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) + { + int stage; + char buffer[64]; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + ok(!de.u.DebugString.fUnicode, "unepxected unicode debug string event\n"); + ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", + de.u.DebugString.nDebugStringLength); + + memset(buffer, 0, sizeof(buffer)); + status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer, + de.u.DebugString.nDebugStringLength, &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 3 || stage == 4) + ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer); + else /* ignore unrelated debug strings like 'SHIMVIEW: ShimInfo(Complete)' */ + ok(strstr(buffer, "SHIMVIEW") != NULL, "unexpected stage %x, got debug string event '%s'\n", stage, buffer); + + if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1668,7 +1693,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce return EXCEPTION_CONTINUE_SEARCH; } -static void test_outputdebugstring(void) +static void test_outputdebugstring(DWORD numexc, BOOL todo) { PVOID vectored_handler; @@ -1683,8 +1708,13 @@ static void test_outputdebugstring(void) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - ok(outputdebugstring_exceptions == 1, "OutputDebugStringA generated %d exceptions, expected one\n", - outputdebugstring_exceptions); + if (todo) + todo_wine + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); + else + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -1758,6 +1788,10 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; + test_outputdebugstring(0, FALSE); + test_stage = 4; + test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ } else skip( "RtlRaiseException not found\n" ); @@ -1769,7 +1803,7 @@ START_TEST(exception) test_unwind(); test_exceptions(); test_rtlraiseexception(); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1786,7 +1820,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Sebastian Lackner : server: Remove output_debug_string request.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 2f9fdec310a69aa0d8773c923fd58df1b40a83ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9fdec310a69aa0d8773c923… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 20 15:23:04 2014 +0200 server: Remove output_debug_string request. --- include/wine/server_protocol.h | 24 +----------------------- server/debugger.c | 20 +------------------- server/protocol.def | 13 ------------- server/request.h | 5 ----- server/trace.c | 14 -------------- 5 files changed, 2 insertions(+), 74 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d69ad3..a5ecb20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,12 +115,6 @@ typedef union struct { int code; - data_size_t length; - client_ptr_t string; - } output_string; - struct - { - int code; int error; int type; } rip_info; @@ -2261,19 +2255,6 @@ struct get_exception_status_reply -struct output_debug_string_request -{ - struct request_header __header; - data_size_t length; - client_ptr_t string; -}; -struct output_debug_string_reply -{ - struct reply_header __header; -}; - - - struct continue_debug_event_request { struct request_header __header; @@ -5171,7 +5152,6 @@ enum request REQ_wait_debug_event, REQ_queue_exception_event, REQ_get_exception_status, - REQ_output_debug_string, REQ_continue_debug_event, REQ_debug_process, REQ_debug_break, @@ -5433,7 +5413,6 @@ union generic_request struct wait_debug_event_request wait_debug_event_request; struct queue_exception_event_request queue_exception_event_request; struct get_exception_status_request get_exception_status_request; - struct output_debug_string_request output_debug_string_request; struct continue_debug_event_request continue_debug_event_request; struct debug_process_request debug_process_request; struct debug_break_request debug_break_request; @@ -5693,7 +5672,6 @@ union generic_reply struct wait_debug_event_reply wait_debug_event_reply; struct queue_exception_event_reply queue_exception_event_reply; struct get_exception_status_reply get_exception_status_reply; - struct output_debug_string_reply output_debug_string_reply; struct continue_debug_event_reply continue_debug_event_reply; struct debug_process_reply debug_process_reply; struct debug_break_reply debug_break_reply; @@ -5862,6 +5840,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 454 +#define SERVER_PROTOCOL_VERSION 455 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 0bb9fb8..3315f6e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -209,13 +209,6 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) return 1; } -static int fill_output_debug_string_event( struct debug_event *event, const void *arg ) -{ - const debug_event_t *data = arg; - event->data.output_string = data->output_string; - return 1; -} - typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); #define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ @@ -228,8 +221,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = fill_exit_thread_event, /* EXIT_THREAD_DEBUG_EVENT */ fill_exit_process_event, /* EXIT_PROCESS_DEBUG_EVENT */ fill_load_dll_event, /* LOAD_DLL_DEBUG_EVENT */ - fill_unload_dll_event, /* UNLOAD_DLL_DEBUG_EVENT */ - fill_output_debug_string_event /* OUTPUT_DEBUG_STRING_EVENT */ + fill_unload_dll_event /* UNLOAD_DLL_DEBUG_EVENT */ }; @@ -695,16 +687,6 @@ DECL_HANDLER(get_exception_status) } } -/* send an output string to the debugger */ -DECL_HANDLER(output_debug_string) -{ - debug_event_t data; - - data.output_string.string = req->string; - data.output_string.length = req->length; - generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); -} - /* simulate a breakpoint in a process */ DECL_HANDLER(debug_break) { diff --git a/server/protocol.def b/server/protocol.def index fec5e75..61b9ed5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -130,12 +130,6 @@ typedef union } unload_dll; struct { - int code; /* OUTPUT_DEBUG_STRING_EVENT */ - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ - } output_string; - struct - { int code; /* RIP_EVENT */ int error; /* ??? */ int type; /* ??? */ @@ -1728,13 +1722,6 @@ enum char_info_mode @END -/* Send an output string to the debugger */ -(a)REQ(output_debug_string) - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ -(a)END - - /* Continue a debug event */ @REQ(continue_debug_event) process_id_t pid; /* process id to continue */ diff --git a/server/request.h b/server/request.h index 8e35b0d..e25e327 100644 --- a/server/request.h +++ b/server/request.h @@ -194,7 +194,6 @@ DECL_HANDLER(next_thread); DECL_HANDLER(wait_debug_event); DECL_HANDLER(queue_exception_event); DECL_HANDLER(get_exception_status); -DECL_HANDLER(output_debug_string); DECL_HANDLER(continue_debug_event); DECL_HANDLER(debug_process); DECL_HANDLER(debug_break); @@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_wait_debug_event, (req_handler)req_queue_exception_event, (req_handler)req_get_exception_status, - (req_handler)req_output_debug_string, (req_handler)req_continue_debug_event, (req_handler)req_debug_process, (req_handler)req_debug_break, @@ -1228,9 +1226,6 @@ C_ASSERT( sizeof(struct queue_exception_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_request) == 16 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index b792494..0887daf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,11 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; - case OUTPUT_DEBUG_STRING_EVENT: - fprintf( stderr, "%s{output_string", prefix ); - dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",len=%u}", event.output_string.length ); - break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, event.rip_info.error, event.rip_info.type ); @@ -2174,12 +2169,6 @@ static void dump_get_exception_status_reply( const struct get_exception_status_r dump_varargs_context( " context=", cur_size ); } -static void dump_output_debug_string_request( const struct output_debug_string_request *req ) -{ - fprintf( stderr, " length=%u", req->length ); - dump_uint64( ", string=", &req->string ); -} - static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4184,7 +4173,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_wait_debug_event_request, (dump_func)dump_queue_exception_event_request, (dump_func)dump_get_exception_status_request, - (dump_func)dump_output_debug_string_request, (dump_func)dump_continue_debug_event_request, (dump_func)dump_debug_process_request, (dump_func)dump_debug_break_request, @@ -4444,7 +4432,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_reply, NULL, NULL, - NULL, (dump_func)dump_debug_break_reply, NULL, (dump_func)dump_read_process_memory_reply, @@ -4700,7 +4687,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "wait_debug_event", "queue_exception_event", "get_exception_status", - "output_debug_string", "continue_debug_event", "debug_process", "debug_break",

1 0