August 2016 - Wine-commits - list.winehq.org

Daniel Lehman : msvcp140: Load critical_section functions from concrt140.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: d12235ab79d5cf2538a12ccd15e780787f089e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12235ab79d5cf2538a12ccd1… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 26 17:49:43 2016 -0700 msvcp140: Load critical_section functions from concrt140. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 50 ++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index c9a72d2..377ae01 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -71,6 +71,7 @@ MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #define VERSION_STRING(ver) #ver #if _MSVCP_VER >= 140 #define MSVCRT_NAME(ver) "ucrtbase.dll" +#define CONCRT_NAME(ver) "concrt" VERSION_STRING(ver) ".dll" #else #define MSVCRT_NAME(ver) "msvcr" VERSION_STRING(ver) ".dll" #endif @@ -132,6 +133,9 @@ int __cdecl sprintf(char *buf, const char *fmt, ...) static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); +#if _MSVCP_VER >= 110 + HMODULE hcon = hmod; +#endif if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); @@ -139,44 +143,50 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); + + hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); + if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) ); #else if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K(a)ZP6AH0@Z(a)Z"); - -#if _MSVCP_VER >= 110 - critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); - critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QEAA(a)XZ"); - critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QEAAXXZ"); - critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QEAAXXZ"); - critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QEAA_NXZ"); -#endif } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z"); + } +#endif #if _MSVCP_VER >= 110 + if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ + { + critical_section_ctor = (void*)GetProcAddress(hcon, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hcon, "??1critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hcon, "?lock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hcon, "?unlock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hcon, "?try_lock(a)critical_section@Concurrency@@QEAA_NXZ"); + } + else + { #ifdef __arm__ - critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAA(a)XZ"); - critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAA(a)XZ"); - critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAAXXZ"); - critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAAXXZ"); - critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAA_NXZ"); + critical_section_ctor = (void*)GetProcAddress(hcon, "??0critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hcon, "??1critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hcon, "?lock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hcon, "?unlock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hcon, "?try_lock(a)critical_section@Concurrency@@QAA_NXZ"); #else - critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAE(a)XZ"); - critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAE(a)XZ"); - critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAEXXZ"); - critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAEXXZ"); - critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAE_NXZ"); + critical_section_ctor = (void*)GetProcAddress(hcon, "??0critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hcon, "??1critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hcon, "?lock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_unlock = (void*)GetProcAddress(hcon, "?unlock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_trylock = (void*)GetProcAddress(hcon, "?try_lock(a)critical_section@Concurrency@@QAE_NXZ"); #endif -#endif /* _MSVCP_VER >= 110 */ } -#endif +#endif /* _MSVCP_VER >= 110 */ } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Daniel Lehman : msvcp140: Take _Mtx_t and _Cnd_t directly.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 236b5f5887ee9bea04347f0a098a10304adfda78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236b5f5887ee9bea04347f0a0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 26 20:27:53 2016 -0700 msvcp140: Take _Mtx_t and _Cnd_t directly. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 102 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 41 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 52bc608..18b6a19 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -468,6 +468,16 @@ typedef struct DWORD count; } *_Mtx_t; +#if _MSVCP_VER >= 140 +typedef _Mtx_t _Mtx_arg_t; +#define MTX_T_FROM_ARG(m) (m) +#define MTX_T_TO_ARG(m) (m) +#else +typedef _Mtx_t *_Mtx_arg_t; +#define MTX_T_FROM_ARG(m) (*(m)) +#define MTX_T_TO_ARG(m) (&(m)) +#endif + int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) { if(flags & ~MTX_MULTI_LOCK) @@ -481,57 +491,57 @@ int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) return 0; } -void __cdecl _Mtx_destroy(_Mtx_t *mtx) +void __cdecl _Mtx_destroy(_Mtx_arg_t mtx) { - call_func1(critical_section_dtor, &(*mtx)->cs); - MSVCRT_operator_delete(*mtx); + call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs); + MSVCRT_operator_delete(MTX_T_FROM_ARG(mtx)); } -int __cdecl _Mtx_current_owns(_Mtx_t *mtx) +int __cdecl _Mtx_current_owns(_Mtx_arg_t mtx) { - return (*mtx)->thread_id == GetCurrentThreadId(); + return MTX_T_FROM_ARG(mtx)->thread_id == GetCurrentThreadId(); } -int __cdecl _Mtx_lock(_Mtx_t *mtx) +int __cdecl _Mtx_lock(_Mtx_arg_t mtx) { - if((*mtx)->thread_id != GetCurrentThreadId()) { - call_func1(critical_section_lock, &(*mtx)->cs); - (*mtx)->thread_id = GetCurrentThreadId(); - }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { + call_func1(critical_section_lock, &MTX_T_FROM_ARG(mtx)->cs); + MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { return MTX_LOCKED; } - (*mtx)->count++; + MTX_T_FROM_ARG(mtx)->count++; return 0; } -int __cdecl _Mtx_unlock(_Mtx_t *mtx) +int __cdecl _Mtx_unlock(_Mtx_arg_t mtx) { - if(--(*mtx)->count) + if(--MTX_T_FROM_ARG(mtx)->count) return 0; - (*mtx)->thread_id = -1; - call_func1(critical_section_unlock, &(*mtx)->cs); + MTX_T_FROM_ARG(mtx)->thread_id = -1; + call_func1(critical_section_unlock, &MTX_T_FROM_ARG(mtx)->cs); return 0; } -int __cdecl _Mtx_trylock(_Mtx_t *mtx) +int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) { - if((*mtx)->thread_id != GetCurrentThreadId()) { - if(!call_func1(critical_section_trylock, &(*mtx)->cs)) + if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { + if(!call_func1(critical_section_trylock, &MTX_T_FROM_ARG(mtx)->cs)) return MTX_LOCKED; - (*mtx)->thread_id = GetCurrentThreadId(); - }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { return MTX_LOCKED; } - (*mtx)->count++; + MTX_T_FROM_ARG(mtx)->count++; return 0; } -critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) +critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_arg_t mtx) { - return &(*mtx)->cs; + return &MTX_T_FROM_ARG(mtx)->cs; } static inline LONG interlocked_dec_if_nonzero( LONG *dest ) @@ -552,6 +562,16 @@ typedef struct CONDITION_VARIABLE cv; } *_Cnd_t; +#if _MSVCP_VER >= 140 +typedef _Cnd_t _Cnd_arg_t; +#define CND_T_FROM_ARG(c) (c) +#define CND_T_TO_ARG(c) (c) +#else +typedef _Cnd_t *_Cnd_arg_t; +#define CND_T_FROM_ARG(c) (*(c)) +#define CND_T_TO_ARG(c) (&(c)) +#endif + static HANDLE keyed_event; int __cdecl _Cnd_init(_Cnd_t *cnd) @@ -570,9 +590,9 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) return 0; } -int __cdecl _Cnd_wait(_Cnd_t *cnd, _Mtx_t *mtx) +int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) { - CONDITION_VARIABLE *cv = &(*cnd)->cv; + CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); _Mtx_unlock(mtx); @@ -583,9 +603,9 @@ int __cdecl _Cnd_wait(_Cnd_t *cnd, _Mtx_t *mtx) return 0; } -int __cdecl _Cnd_timedwait(_Cnd_t *cnd, _Mtx_t *mtx, const xtime *xt) +int __cdecl _Cnd_timedwait(_Cnd_arg_t cnd, _Mtx_arg_t mtx, const xtime *xt) { - CONDITION_VARIABLE *cv = &(*cnd)->cv; + CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; LARGE_INTEGER timeout; NTSTATUS status; @@ -604,28 +624,28 @@ int __cdecl _Cnd_timedwait(_Cnd_t *cnd, _Mtx_t *mtx, const xtime *xt) return status ? CND_TIMEDOUT : 0; } -int __cdecl _Cnd_broadcast(_Cnd_t *cnd) +int __cdecl _Cnd_broadcast(_Cnd_arg_t cnd) { - CONDITION_VARIABLE *cv = &(*cnd)->cv; + CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; LONG val = InterlockedExchange( (LONG *)&cv->Ptr, 0 ); while (val-- > 0) NtReleaseKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); return 0; } -int __cdecl _Cnd_signal(_Cnd_t *cnd) +int __cdecl _Cnd_signal(_Cnd_arg_t cnd) { - CONDITION_VARIABLE *cv = &(*cnd)->cv; + CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; if (interlocked_dec_if_nonzero( (LONG *)&cv->Ptr )) NtReleaseKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); return 0; } -void __cdecl _Cnd_destroy(_Cnd_t *cnd) +void __cdecl _Cnd_destroy(_Cnd_arg_t cnd) { if(cnd) { _Cnd_broadcast(cnd); - MSVCRT_operator_delete(*cnd); + MSVCRT_operator_delete(CND_T_FROM_ARG(cnd)); } } #endif @@ -969,7 +989,7 @@ _Pad* __thiscall _Pad_ctor(_Pad *this) _Cnd_init(&this->cnd); _Mtx_init(&this->mtx, 0); this->launched = FALSE; - _Mtx_lock(&this->mtx); + _Mtx_lock(MTX_T_TO_ARG(this->mtx)); return this; } @@ -1004,9 +1024,9 @@ void __thiscall _Pad_dtor(_Pad *this) { TRACE("(%p)\n", this); - _Mtx_unlock(&this->mtx); - _Mtx_destroy(&this->mtx); - _Cnd_destroy(&this->cnd); + _Mtx_unlock(MTX_T_TO_ARG(this->mtx)); + _Mtx_destroy(MTX_T_TO_ARG(this->mtx)); + _Cnd_destroy(CND_T_TO_ARG(this->cnd)); } DEFINE_THISCALL_WRAPPER(_Pad__Go, 4) @@ -1031,7 +1051,7 @@ void __thiscall _Pad__Launch(_Pad *this, _Thrd_t *thr) TRACE("(%p %p)\n", this, thr); _Thrd_start(thr, launch_thread_proc, this); - _Cnd_wait(&this->cnd, &this->mtx); + _Cnd_wait(CND_T_TO_ARG(this->cnd), MTX_T_TO_ARG(this->mtx)); } /* ?_Release(a)_Pad@std@@QAEXXZ */ @@ -1041,10 +1061,10 @@ void __thiscall _Pad__Release(_Pad *this) { TRACE("(%p)\n", this); - _Mtx_lock(&this->mtx); + _Mtx_lock(MTX_T_TO_ARG(this->mtx)); this->launched = TRUE; - _Cnd_signal(&this->cnd); - _Mtx_unlock(&this->mtx); + _Cnd_signal(CND_T_TO_ARG(this->cnd)); + _Mtx_unlock(MTX_T_TO_ARG(this->mtx)); } #endif

1 0

Daniel Lehman : msvcp140: Add _Mtx_init/destroy_in_situ.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 4b41672f9f48395254eaa91c98594a02b6430340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b41672f9f48395254eaa91c9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 26 20:52:21 2016 -0700 msvcp140: Add _Mtx_init/destroy_in_situ. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 05d62be..fedb05f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3675,10 +3675,10 @@ @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns @ cdecl _Mtx_destroy(ptr) _Mtx_destroy -@ stub _Mtx_destroy_in_situ +@ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs @ cdecl _Mtx_init(ptr long) _Mtx_init -@ stub _Mtx_init_in_situ +@ cdecl _Mtx_init_in_situ(ptr long) _Mtx_init_in_situ @ cdecl _Mtx_lock(ptr) _Mtx_lock @ stub _Mtx_reset_owner @ stub _Mtx_timedlock diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 18b6a19..322e937 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -478,19 +478,29 @@ typedef _Mtx_t *_Mtx_arg_t; #define MTX_T_TO_ARG(m) (&(m)) #endif -int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags) { if(flags & ~MTX_MULTI_LOCK) FIXME("unknown flags ignored: %x\n", flags); + mtx->flags = flags; + call_func1(critical_section_ctor, &mtx->cs); + mtx->thread_id = -1; + mtx->count = 0; +} + +int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +{ *mtx = MSVCRT_operator_new(sizeof(**mtx)); - (*mtx)->flags = flags; - call_func1(critical_section_ctor, &(*mtx)->cs); - (*mtx)->thread_id = -1; - (*mtx)->count = 0; + _Mtx_init_in_situ(*mtx, flags); return 0; } +void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx) +{ + call_func1(critical_section_dtor, &mtx->cs); +} + void __cdecl _Mtx_destroy(_Mtx_arg_t mtx) { call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs);

1 0

Iván Matellanes : msvcp90: Set the correct vtable for basic_iostream_char.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 9bc7aea4f8a783a6b57d85b12c5227285194caf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc7aea4f8a783a6b57d85b12… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Aug 6 14:46:58 2016 +0100 msvcp90: Set the correct vtable for basic_iostream_char. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 482729c..fbbb320 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11106,10 +11106,9 @@ basic_iostream_char* __thiscall basic_iostream_char_ctor(basic_iostream_char *th basic_ios = basic_istream_char_get_basic_ios(&this->base1); } - basic_ios->base.vtable = &MSVCP_basic_iostream_char_vtable; - basic_istream_char_ctor(&this->base1, strbuf, FALSE, FALSE); basic_ostream_char_ctor_uninitialized(&this->base2, 0, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_iostream_char_vtable; return this; }

1 0

Matt Robinson : ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 4a6bd3d2008f6ab4d91fcbeb6c410099932c97e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6bd3d2008f6ab4d91fcbeb6… Author: Matt Robinson <git(a)nerdoftheherd.com> Date: Sat Aug 6 23:00:21 2016 +0100 ntdll: Catch page fault in RtlWow64EnableFsRedirectionEx. Signed-off-by: Matt Robinson <git(a)nerdoftheherd.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 13 +++++++++++-- dlls/ntdll/tests/directory.c | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4a34475..a945e11 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -106,6 +106,7 @@ #include "wine/list.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(file); @@ -2996,9 +2997,17 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) { if (!is_wow64) return STATUS_NOT_IMPLEMENTED; - if (((ULONG_PTR)old_value >> 16) == 0) return STATUS_ACCESS_VIOLATION; - *old_value = !ntdll_get_thread_data()->wow64_redir; + __TRY + { + *old_value = !ntdll_get_thread_data()->wow64_redir; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY + ntdll_get_thread_data()->wow64_redir = !disable; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index a135d4f..d39b488 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -861,6 +861,8 @@ static void test_redirection(void) ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)0xDEADBEEF ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); status = pRtlWow64EnableFsRedirection( FALSE ); ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status );

1 0

Bernhard Übelacker : usp10/tests: Reserve for InClass a byte for every character in teststr.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: d900c758b79da723e5da5f63dc94fd2d556daa7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d900c758b79da723e5da5f63d… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Aug 5 22:43:31 2016 +0200 usp10/tests: Reserve for InClass a byte for every character in teststr. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6b2152f..aed0620 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2899,8 +2899,8 @@ static void test_ScriptString(HDC hdc) int Charset; DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - const int Dx[5] = {10, 10, 10, 10, 10}; - const BYTE InClass = 0; + static const int Dx[(sizeof(teststr) / sizeof(WCHAR)) - 1]; + static const BYTE InClass[(sizeof(teststr) / sizeof(WCHAR)) - 1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int X = 10; @@ -2919,26 +2919,26 @@ static void test_ScriptString(HDC hdc) /* Test without hdc to get E_PENDING */ hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* Test that 0 length string returns E_INVALIDARG */ hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ScriptStringFree(&ssa); /* test makes sure that a call with a valid pssa still works */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); @@ -2982,7 +2982,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) int Charset = -1; /* unicode */ DWORD Flags = SSA_GLYPHS; int ReqWidth = 100; - const BYTE InClass = 0; + static const BYTE InClass[(sizeof(teststr1)/sizeof(WCHAR))-1]; SCRIPT_STRING_ANALYSIS ssa = NULL; int Ch; /* Character position in string */ @@ -2999,7 +2999,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, NULL, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK || hr == E_INVALIDARG, /* NT */ "ScriptStringAnalyse should return S_OK or E_INVALIDARG not %08x\n", hr); @@ -3139,7 +3139,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) */ hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, NULL, NULL, - &InClass, &ssa); + InClass, &ssa); ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); /*

1 0

André Hentschel : kernel32/tests: Explicitly set SizeOfRawData.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: e685bed6cce88e496e6cb069e61d3ce16ab7a219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e685bed6cce88e496e6cb069e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 22:15:45 2016 +0200 kernel32/tests: Explicitly set SizeOfRawData. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0b38445..f59f674 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -143,9 +143,9 @@ static const IMAGE_NT_HEADERS nt_header_template = static IMAGE_SECTION_HEADER section = { ".rodata", /* Name */ - { 0x10 }, /* Misc */ + { 0 }, /* Misc */ 0, /* VirtualAddress */ - 0x0a, /* SizeOfRawData */ + 0, /* SizeOfRawData */ 0, /* PointerToRawData */ 0, /* PointerToRelocations */ 0, /* PointerToLinenumbers */ @@ -196,6 +196,8 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, assert(nt_header->FileHeader.NumberOfSections <= 1); if (nt_header->FileHeader.NumberOfSections) { + section.SizeOfRawData = 10; + if (nt_header->OptionalHeader.SectionAlignment >= page_size) { section.PointerToRawData = dos_size; @@ -2722,7 +2724,8 @@ static void test_ResolveDelayLoadedAPI(void) /* sections */ section.PointerToRawData = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; section.VirtualAddress = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress; - section.Misc.VirtualSize = nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size; + section.Misc.VirtualSize = 2 * sizeof(idd); + section.SizeOfRawData = section.Misc.VirtualSize; section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); @@ -2734,6 +2737,7 @@ static void test_ResolveDelayLoadedAPI(void) section.Misc.VirtualSize = sizeof(test_dll) + sizeof(hint) + sizeof(test_func) + sizeof(HMODULE) + 2 * (i + 1) * sizeof(IMAGE_THUNK_DATA); ok(section.Misc.VirtualSize <= 0x1000, "Too much tests, add a new section!\n"); + section.SizeOfRawData = section.Misc.VirtualSize; section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; SetLastError(0xdeadbeef); ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL);

1 0

André Hentschel : kernel32/tests: Use SetFilePointer instead of GetFileSize with WriteFile.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: c5868eed11e3ff49b1f70b28c57431dd68a6fb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5868eed11e3ff49b1f70b28c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 22:15:56 2016 +0200 kernel32/tests: Use SetFilePointer instead of GetFileSize with WriteFile. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f59f674..9aaecc2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2744,12 +2744,7 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, - nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress - file_size, - &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress, NULL, SEEK_SET ); /* delay data */ idd.Attributes.AllAttributes = 1; @@ -2770,10 +2765,7 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to extended delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.DllNameRVA - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, idd.DllNameRVA, NULL, SEEK_SET ); /* extended delay data */ SetLastError(0xdeadbeef); @@ -2810,10 +2802,8 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to eof */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, section.VirtualAddress + section.Misc.VirtualSize - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, section.VirtualAddress + section.Misc.VirtualSize, NULL, SEEK_SET ); + SetEndOfFile( hfile ); CloseHandle(hfile); SetLastError(0xdeadbeef);

1 0

André Hentschel : kernel32/tests: Remove superfluous filler definitions.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: 2ecbdb85827fa28ac4037af32670855881bc2438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecbdb85827fa28ac4037af32… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 22:16:09 2016 +0200 kernel32/tests: Remove superfluous filler definitions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9aaecc2..6ee9e38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2128,7 +2128,6 @@ static void test_ExitProcess(void) } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" - static const char filler[0x1000]; DWORD dummy, file_align; HANDLE file, thread, process, hmap, hmap_dup; char temp_path[MAX_PATH], dll_name[MAX_PATH], cmdline[MAX_PATH * 2]; @@ -2630,7 +2629,6 @@ static void test_ResolveDelayLoadedAPI(void) { static const char test_dll[] = "secur32.dll"; static const char test_func[] = "SealMessage"; - static const char filler[0x1000]; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; IMAGE_DELAYLOAD_DESCRIPTOR idd, *delaydir;

1 0

Nikolay Sivov : powrprof: Added PowerDeterminePlatformRole() stub.
by Alexandre Julliard 08 Aug '16

08 Aug '16

Module: wine Branch: master Commit: c98ec64a9ee509ed7e7bef02412764c792b82c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98ec64a9ee509ed7e7bef024… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 20:29:22 2016 +0300 powrprof: Added PowerDeterminePlatformRole() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 3 +++ include/winnt.h | 13 +++++++++++++ 4 files changed, 23 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index a1d1092..685b663 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -315,6 +315,12 @@ DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID return ERROR_CALL_NOT_IMPLEMENTED; } +POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) +{ + FIXME("stub\n"); + return PlatformRoleDesktop; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index f513f04..c90fafc 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -10,6 +10,7 @@ @ stdcall IsPwrHibernateAllowed () @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () +@ stdcall PowerDeterminePlatformRole () @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 5fed4ae..239044e 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -137,6 +137,9 @@ BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI WritePwrScheme(PUINT, LPWSTR, LPWSTR, PPOWER_POLICY); +/* Power scheme */ +POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void); + #ifdef __cplusplus } #endif diff --git a/include/winnt.h b/include/winnt.h index 96722a4..72c399b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4947,6 +4947,19 @@ typedef enum _POWER_ACTION { } POWER_ACTION, *PPOWER_ACTION; +typedef enum _POWER_PLATFORM_ROLE { + PlatformRoleUnspecified, + PlatformRoleDesktop, + PlatformRoleMobile, + PlatformRoleWorkstation, + PlatformRoleEnterpriseServer, + PlatformRoleSOHOServer, + PlatformRoleAppliancePC, + PlatformRolePerformanceServer, + PlatformRoleSlate, + PlatformRoleMaximum +} POWER_PLATFORM_ROLE, *PPOWER_PLATFORM_ROLE; + typedef enum _SYSTEM_POWER_STATE { PowerSystemUnspecified = 0, PowerSystemWorking = 1,

1 0