July 2015 - Wine-commits - list.winehq.org

Hans Leidekker : msi/tests: Avoid another test failure on win2k3.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: dfae842cca0427421684573bb68d8a6005382aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfae842cca0427421684573bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:15:35 2015 +0200 msi/tests: Avoid another test failure on win2k3. --- dlls/msi/tests/msi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3ae3901..b98a8c2 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -50,6 +50,8 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); +static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) + (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentA) (LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentW) @@ -92,6 +94,7 @@ static void init_functionpointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(hmsi, MsiGetComponentPathA) + GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiProvideComponentA) GET_PROC(hmsi, MsiProvideComponentW) GET_PROC(hmsi, MsiGetFileHashA) @@ -14425,7 +14428,8 @@ START_TEST(msi) test_lastusedsource(); test_setpropertyfolder(); test_sourcedir_props(); - test_concurrentinstall(); + if (pMsiGetComponentPathExA) + test_concurrentinstall(); test_command_line_parsing(); SetCurrentDirectoryA(prev_path);

1 0

Iván Matellanes : msvcirt: Implement ios locking control.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 9d0b679c1bc7187288d86cf996d1708cdc52c94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0b679c1bc7187288d86cf99… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:00 2015 +0200 msvcirt: Implement ios locking control. --- dlls/msvcirt/msvcirt.c | 15 +++++++++++---- dlls/msvcirt/tests/msvcirt.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index c740049..48fd682 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -854,7 +854,11 @@ void __thiscall ios_clear(ios *this, int state) /* ?clrlock(a)ios@@QEAAXXZ */ void __cdecl ios_clrlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock <= 0) + this->do_lock++; + if (this->sb) + streambuf_clrlock(this->sb); } /* ?delbuf(a)ios@@QAEXH(a)Z */ @@ -1002,8 +1006,8 @@ void __cdecl ios_lockc(void) DEFINE_THISCALL_WRAPPER(ios_lockptr, 4) CRITICAL_SECTION* __thiscall ios_lockptr(ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return &this->lock; } /* ?oct@@YAAAVios@@AAV1@@Z */ @@ -1081,7 +1085,10 @@ LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask) /* ?setlock(a)ios@@QEAAXXZ */ void __cdecl ios_setlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + this->do_lock--; + if (this->sb) + streambuf_setlock(this->sb); } /* ?sync_with_stdio(a)ios@@SAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index bb5a5ed..62e1be9 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -128,6 +128,8 @@ static ios* (*__thiscall p_ios_sb_ctor)(ios*, streambuf*); static ios* (*__thiscall p_ios_assign)(ios*, const ios*); static void (*__thiscall p_ios_init)(ios*, streambuf*); static void (*__thiscall p_ios_dtor)(ios*); +static void (*__cdecl p_ios_clrlock)(ios*); +static void (*__cdecl p_ios_setlock)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -230,6 +232,8 @@ static BOOL init(void) SET(p_ios_assign, "??4ios@@IEAAAEAV0(a)AEBV0@@Z"); SET(p_ios_init, "?init(a)ios@@IEAAXPEAVstreambuf@@@Z"); SET(p_ios_dtor, "??1ios@@UEAA(a)XZ"); + SET(p_ios_clrlock, "?clrlock(a)ios@@QEAAXXZ"); + SET(p_ios_setlock, "?setlock(a)ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -262,6 +266,8 @@ static BOOL init(void) SET(p_ios_assign, "??4ios@@IAEAAV0(a)ABV0@@Z"); SET(p_ios_init, "?init(a)ios@@IAEXPAVstreambuf@@@Z"); SET(p_ios_dtor, "??1ios@@UAE(a)XZ"); + SET(p_ios_clrlock, "?clrlock(a)ios@@QAAXXZ"); + SET(p_ios_setlock, "?setlock(a)ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -861,7 +867,6 @@ static void test_ios(void) call_func2(p_ios_init, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state); - ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); /* copy constructor */ @@ -895,7 +900,27 @@ static void test_ios(void) ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); - ios_obj.delbuf = 0; + + /* locking */ + ios_obj.sb = psb; + ios_obj.do_lock = 1; + ios_obj.sb->do_lock = 0; + p_ios_clrlock(&ios_obj); + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock); + ios_obj.do_lock = 0; + p_ios_clrlock(&ios_obj); + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock); + p_ios_setlock(&ios_obj); + ok(ios_obj.do_lock == 0, "expected 0 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 0, "expected 0 got %d\n", ios_obj.sb->do_lock); + ios_obj.do_lock = -1; + p_ios_setlock(&ios_obj); + ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == -1, "expected -1 got %d\n", ios_obj.sb->do_lock); + + ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); }

1 0

Iván Matellanes : msvcirt: Implement ios object locking.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 57fb458774d30935426800457861f70aaa007c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb458774d30935426800457… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:04 2015 +0200 msvcirt: Implement ios object locking. --- dlls/msvcirt/msvcirt.c | 8 ++++++-- dlls/msvcirt/tests/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 48fd682..f3c8c3c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -985,7 +985,9 @@ LONG* __thiscall ios_iword(const ios *this, int index) /* ?lock(a)ios@@QEAAXXZ */ void __cdecl ios_lock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock < 0) + EnterCriticalSection(&this->lock); } /* ?lockbuf(a)ios@@QAAXXZ */ @@ -1119,7 +1121,9 @@ ostream* __thiscall ios_tie_get(const ios *this) /* ?unlock(a)ios@@QEAAXXZ */ void __cdecl ios_unlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock < 0) + LeaveCriticalSection(&this->lock); } /* ?unlockbuf(a)ios@@QAAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 62e1be9..db0df5e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -130,6 +130,8 @@ static void (*__thiscall p_ios_init)(ios*, streambuf*); static void (*__thiscall p_ios_dtor)(ios*); static void (*__cdecl p_ios_clrlock)(ios*); static void (*__cdecl p_ios_setlock)(ios*); +static void (*__cdecl p_ios_lock)(ios*); +static void (*__cdecl p_ios_unlock)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -234,6 +236,8 @@ static BOOL init(void) SET(p_ios_dtor, "??1ios@@UEAA(a)XZ"); SET(p_ios_clrlock, "?clrlock(a)ios@@QEAAXXZ"); SET(p_ios_setlock, "?setlock(a)ios@@QEAAXXZ"); + SET(p_ios_lock, "?lock(a)ios@@QEAAXXZ"); + SET(p_ios_unlock, "?unlock(a)ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -268,6 +272,8 @@ static BOOL init(void) SET(p_ios_dtor, "??1ios@@UAE(a)XZ"); SET(p_ios_clrlock, "?clrlock(a)ios@@QAAXXZ"); SET(p_ios_setlock, "?setlock(a)ios@@QAAXXZ"); + SET(p_ios_lock, "?lock(a)ios@@QAAXXZ"); + SET(p_ios_unlock, "?unlock(a)ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -811,10 +817,30 @@ static void test_streambuf(void) CloseHandle(thread); } +struct ios_lock_arg +{ + ios *ios_obj; + HANDLE lock; + HANDLE release; +}; + +static DWORD WINAPI lock_ios(void *arg) +{ + struct ios_lock_arg *lock_arg = arg; + p_ios_lock(lock_arg->ios_obj); + SetEvent(lock_arg->lock); + WaitForSingleObject(lock_arg->release, INFINITE); + p_ios_unlock(lock_arg->ios_obj); + return 0; +} + static void test_ios(void) { ios ios_obj, ios_obj2; streambuf *psb; + struct ios_lock_arg lock_arg; + HANDLE thread; + BOOL locked; memset(&ios_obj, 0xab, sizeof(ios)); memset(&ios_obj2, 0xab, sizeof(ios)); @@ -920,9 +946,27 @@ static void test_ios(void) ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); ok(ios_obj.sb->do_lock == -1, "expected -1 got %d\n", ios_obj.sb->do_lock); + lock_arg.ios_obj = &ios_obj; + lock_arg.lock = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.lock != NULL, "CreateEventW failed\n"); + lock_arg.release = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release != NULL, "CreateEventW failed\n"); + thread = CreateThread(NULL, 0, lock_ios, (void*)&lock_arg, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(lock_arg.lock, INFINITE); + + locked = TryEnterCriticalSection(&ios_obj.lock); + ok(locked == 0, "the ios object was not locked before\n"); + + SetEvent(lock_arg.release); + WaitForSingleObject(thread, INFINITE); + ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + CloseHandle(lock_arg.lock); + CloseHandle(lock_arg.release); + CloseHandle(thread); } START_TEST(msvcirt)

1 0

Iván Matellanes : msvcirt: Implement ios stream locking.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 22f28d2923811b85024f63ce43e41966a864ecd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f28d2923811b85024f63ce4… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:09 2015 +0200 msvcirt: Implement ios stream locking. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f3c8c3c..9c6b991 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -994,7 +994,8 @@ void __cdecl ios_lock(ios *this) /* ?lockbuf(a)ios@@QEAAXXZ */ void __cdecl ios_lockbuf(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + streambuf_lock(this->sb); } /* ?lockc(a)ios@@KAXXZ */ @@ -1130,7 +1131,8 @@ void __cdecl ios_unlock(ios *this) /* ?unlockbuf(a)ios@@QEAAXXZ */ void __cdecl ios_unlockbuf(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + streambuf_unlock(this->sb); } /* ?unlockc(a)ios@@KAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index db0df5e..944c024 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -132,6 +132,8 @@ static void (*__cdecl p_ios_clrlock)(ios*); static void (*__cdecl p_ios_setlock)(ios*); static void (*__cdecl p_ios_lock)(ios*); static void (*__cdecl p_ios_unlock)(ios*); +static void (*__cdecl p_ios_lockbuf)(ios*); +static void (*__cdecl p_ios_unlockbuf)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -238,6 +240,8 @@ static BOOL init(void) SET(p_ios_setlock, "?setlock(a)ios@@QEAAXXZ"); SET(p_ios_lock, "?lock(a)ios@@QEAAXXZ"); SET(p_ios_unlock, "?unlock(a)ios@@QEAAXXZ"); + SET(p_ios_lockbuf, "?lockbuf(a)ios@@QEAAXXZ"); + SET(p_ios_unlockbuf, "?unlockbuf(a)ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -274,6 +278,8 @@ static BOOL init(void) SET(p_ios_setlock, "?setlock(a)ios@@QAAXXZ"); SET(p_ios_lock, "?lock(a)ios@@QAAXXZ"); SET(p_ios_unlock, "?unlock(a)ios@@QAAXXZ"); + SET(p_ios_lockbuf, "?lockbuf(a)ios@@QAAXXZ"); + SET(p_ios_unlockbuf, "?unlockbuf(a)ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -821,15 +827,18 @@ struct ios_lock_arg { ios *ios_obj; HANDLE lock; - HANDLE release; + HANDLE release[2]; }; static DWORD WINAPI lock_ios(void *arg) { struct ios_lock_arg *lock_arg = arg; p_ios_lock(lock_arg->ios_obj); + p_ios_lockbuf(lock_arg->ios_obj); SetEvent(lock_arg->lock); - WaitForSingleObject(lock_arg->release, INFINITE); + WaitForSingleObject(lock_arg->release[0], INFINITE); + p_ios_unlockbuf(lock_arg->ios_obj); + WaitForSingleObject(lock_arg->release[1], INFINITE); p_ios_unlock(lock_arg->ios_obj); return 0; } @@ -949,23 +958,29 @@ static void test_ios(void) lock_arg.ios_obj = &ios_obj; lock_arg.lock = CreateEventW(NULL, FALSE, FALSE, NULL); ok(lock_arg.lock != NULL, "CreateEventW failed\n"); - lock_arg.release = CreateEventW(NULL, FALSE, FALSE, NULL); - ok(lock_arg.release != NULL, "CreateEventW failed\n"); + lock_arg.release[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release[0] != NULL, "CreateEventW failed\n"); + lock_arg.release[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release[1] != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, lock_ios, (void*)&lock_arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(lock_arg.lock, INFINITE); locked = TryEnterCriticalSection(&ios_obj.lock); ok(locked == 0, "the ios object was not locked before\n"); + locked = TryEnterCriticalSection(&ios_obj.sb->lock); + ok(locked == 0, "the streambuf was not locked before\n"); - SetEvent(lock_arg.release); + SetEvent(lock_arg.release[0]); + SetEvent(lock_arg.release[1]); WaitForSingleObject(thread, INFINITE); ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); CloseHandle(lock_arg.lock); - CloseHandle(lock_arg.release); + CloseHandle(lock_arg.release[0]); + CloseHandle(lock_arg.release[1]); CloseHandle(thread); }

1 0

Sebastian Lackner : vcomp: Implement omp_get_max_threads and omp_set_num_threads.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4dea3e071d8de2742862009e021bce7504f92646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dea3e071d8de2742862009e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:39:33 2015 +0200 vcomp: Implement omp_get_max_threads and omp_set_num_threads. --- dlls/vcomp/main.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab2a372..5a50486 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static int vcomp_max_threads; +static int vcomp_num_threads; + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); @@ -37,8 +40,8 @@ int CDECL omp_get_dynamic(void) int CDECL omp_get_max_threads(void) { - TRACE("stub\n"); - return 1; + TRACE("()\n"); + return vcomp_max_threads; } int CDECL omp_get_nested(void) @@ -83,7 +86,9 @@ void CDECL omp_set_nested(int nested) void CDECL omp_set_num_threads(int num_threads) { - TRACE("(%d): stub\n", num_threads); + TRACE("(%d)\n", num_threads); + if (num_threads >= 1) + vcomp_num_threads = num_threads; } void CDECL _vcomp_barrier(void) @@ -107,17 +112,25 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", instance, reason, reserved); - switch (fdwReason) + switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); + { + SYSTEM_INFO sysinfo; + DisableThreadLibraryCalls(instance); + + GetSystemInfo(&sysinfo); + vcomp_max_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_threads = sysinfo.dwNumberOfProcessors; break; + } } return TRUE;

1 0

Sebastian Lackner : vcomp: Implement omp_{get,set}_nested.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 800ca050dfeea9f08bb35b5aac87ca7856ef2218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800ca050dfeea9f08bb35b5aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:39:46 2015 +0200 vcomp: Implement omp_{get,set}_nested. --- dlls/vcomp/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 5a50486..b827920 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); static int vcomp_max_threads; static int vcomp_num_threads; +static BOOL vcomp_nested_fork = FALSE; int CDECL omp_get_dynamic(void) { @@ -47,7 +48,7 @@ int CDECL omp_get_max_threads(void) int CDECL omp_get_nested(void) { TRACE("stub\n"); - return 0; + return vcomp_nested_fork; } int CDECL omp_get_num_procs(void) @@ -81,7 +82,8 @@ void CDECL omp_set_dynamic(int val) void CDECL omp_set_nested(int nested) { - TRACE("(%d): stub\n", nested); + TRACE("(%d)\n", nested); + vcomp_nested_fork = (nested != 0); } void CDECL omp_set_num_threads(int num_threads)

1 0

Sebastian Lackner : vcomp: Implement _vcomp_set_num_threads and omp_get_thread_num.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f59551c22209e8b4116a5ccfdfb6c28c6144cbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59551c22209e8b4116a5ccfd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:40:10 2015 +0200 vcomp: Implement _vcomp_set_num_threads and omp_get_thread_num. --- dlls/vcomp/main.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index b827920..8ec3616 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,10 +29,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static int vcomp_max_threads; static int vcomp_num_threads; static BOOL vcomp_nested_fork = FALSE; +struct vcomp_thread_data +{ + int thread_num; + int fork_threads; +}; + +static inline struct vcomp_thread_data *vcomp_get_thread_data(void) +{ + return (struct vcomp_thread_data *)TlsGetValue(vcomp_context_tls); +} + +static inline void vcomp_set_thread_data(struct vcomp_thread_data *thread_data) +{ + TlsSetValue(vcomp_context_tls, thread_data); +} + +static struct vcomp_thread_data *vcomp_init_thread_data(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + if (thread_data) return thread_data; + + if (!(thread_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*thread_data)))) + { + ERR("could not create thread data\n"); + ExitProcess(1); + } + + thread_data->thread_num = 0; + thread_data->fork_threads = 0; + + vcomp_set_thread_data(thread_data); + return thread_data; +} + +static void vcomp_free_thread_data(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + if (!thread_data) return; + + HeapFree(GetProcessHeap(), 0, thread_data); + vcomp_set_thread_data(NULL); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); @@ -65,8 +109,8 @@ int CDECL omp_get_num_threads(void) int CDECL omp_get_thread_num(void) { - TRACE("stub\n"); - return 0; + TRACE("()\n"); + return vcomp_init_thread_data()->thread_num; } /* Time in seconds since "some time in the past" */ @@ -100,7 +144,9 @@ void CDECL _vcomp_barrier(void) void CDECL _vcomp_set_num_threads(int num_threads) { - TRACE("(%d): stub\n", num_threads); + TRACE("(%d)\n", num_threads); + if (num_threads >= 1) + vcomp_init_thread_data()->fork_threads = num_threads; } int CDECL _vcomp_single_begin(int flags) @@ -126,13 +172,35 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: { SYSTEM_INFO sysinfo; - DisableThreadLibraryCalls(instance); + + if ((vcomp_context_tls = TlsAlloc()) == TLS_OUT_OF_INDEXES) + { + ERR("Failed to allocate TLS index\n"); + return FALSE; + } GetSystemInfo(&sysinfo); vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; break; } + + case DLL_PROCESS_DETACH: + { + if (reserved) break; + if (vcomp_context_tls != TLS_OUT_OF_INDEXES) + { + vcomp_free_thread_data(); + TlsFree(vcomp_context_tls); + } + break; + } + + case DLL_THREAD_DETACH: + { + vcomp_free_thread_data(); + break; + } } return TRUE;

1 0

Dmitry Timoshkov : ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 21c37248135f6379e6af7aa3ec29997314e5c52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c37248135f6379e6af7aa3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 14 16:36:12 2015 +0800 ntdll: Cache contents of IMAGE_TLS_DIRECTORY instead of saving a directory pointer. --- dlls/ntdll/loader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 921bf57..bef0ab1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -94,7 +94,7 @@ static struct builtin_load_info *builtin_load_info = &default_load_info; static HANDLE main_exe_file; static UINT tls_module_count; /* number of modules with TLS directory */ -static const IMAGE_TLS_DIRECTORY **tls_dirs; /* array of TLS directories */ +static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; @@ -772,7 +772,12 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) size = dir->EndAddressOfRawData - dir->StartAddressOfRawData; if (!size && !dir->SizeOfZeroFill && !dir->AddressOfCallBacks) return -1; - for (i = 0; i < tls_module_count; i++) if (!tls_dirs[i]) break; + for (i = 0; i < tls_module_count; i++) + { + if (!tls_dirs[i].StartAddressOfRawData && !tls_dirs[i].EndAddressOfRawData && + !tls_dirs[i].SizeOfZeroFill && !tls_dirs[i].AddressOfCallBacks) + break; + } TRACE( "module %p data %p-%p zerofill %u index %p callback %p flags %x -> slot %u\n", mod->BaseAddress, (void *)dir->StartAddressOfRawData, (void *)dir->EndAddressOfRawData, dir->SizeOfZeroFill, @@ -824,7 +829,7 @@ static SHORT alloc_tls_slot( LDR_MODULE *mod ) } *(DWORD *)dir->AddressOfIndex = i; - tls_dirs[i] = dir; + tls_dirs[i] = *dir; return i; } @@ -841,7 +846,7 @@ static void free_tls_slot( LDR_MODULE *mod ) if (mod->TlsIndex == -1) return; assert( i < tls_module_count ); - tls_dirs[i] = NULL; + memset( &tls_dirs[i], 0, sizeof(tls_dirs[i]) ); } @@ -987,7 +992,7 @@ static NTSTATUS alloc_thread_tls(void) for (i = 0; i < tls_module_count; i++) { - const IMAGE_TLS_DIRECTORY *dir = tls_dirs[i]; + const IMAGE_TLS_DIRECTORY *dir = &tls_dirs[i]; if (!dir) continue; size = dir->EndAddressOfRawData - dir->StartAddressOfRawData;

1 0

Alexandre Julliard : winebuild: Add DllMain to the list of functions that should be private.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 8935863f550fd26e8cc111dd92a90d4c9b15ef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8935863f550fd26e8cc111dd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 15:57:51 2015 +0900 winebuild: Add DllMain to the list of functions that should be private. --- dlls/acledit/acledit.spec | 2 +- dlls/gpkcsp/gpkcsp.spec | 2 +- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_4/xinput1_4.spec | 2 +- tools/winebuild/parser.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index e1a30a1..7343290 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,7 +1,7 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall DllMain(long long ptr) +4 stdcall -private DllMain(long long ptr) 5 stdcall FMExtensionProcW(long long long) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index af3cdee..7b21641 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -21,6 +21,6 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stdcall DllMain(ptr long ptr) +@ stdcall -private DllMain(ptr long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 5b7f1b9..af4f1e0 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) 3 stdcall XInputSetState(long ptr) 4 stdcall XInputGetCapabilities(long long ptr) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index a911666..9d08286 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState 3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9252ee8..1d7b84e 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -603,6 +603,7 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) { if (!strcmp( odp->name, "DllRegisterServer" ) || !strcmp( odp->name, "DllUnregisterServer" ) || + !strcmp( odp->name, "DllMain" ) || !strcmp( odp->name, "DllGetClassObject" ) || !strcmp( odp->name, "DllGetVersion" ) || !strcmp( odp->name, "DllInstall" ) ||

1 0

Sebastian Lackner : server: Avoid sending unexpected wakeup with uninitialized cookie value.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 3db6d1acafab6fbb22b5bcefee99099779653b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6d1acafab6fbb22b5bcefe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 15 06:19:54 2015 +0200 server: Avoid sending unexpected wakeup with uninitialized cookie value. The code for SELECT_SIGNAL_AND_WAIT in select_on() calls signal_object(). This might wake up the same thread which is currently in the wineserver call. The value for current->wait->cookie is initialized at the end of the function, and not defined yet at this point. --- server/thread.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index 6c5d12d..8471651 100644 --- a/server/thread.c +++ b/server/thread.c @@ -601,6 +601,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj wait->count = count; wait->flags = flags; wait->select = select_op->op; + wait->cookie = 0; wait->user = NULL; wait->timeout = timeout; wait->abandoned = 0; @@ -719,7 +720,7 @@ int wake_thread( struct thread *thread ) cookie = thread->wait->cookie; if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); - if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ + if (cookie && send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ { if (!count) count = -1; break; @@ -749,7 +750,7 @@ int wake_thread_queue_entry( struct wait_queue_entry *entry ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); - if (send_thread_wakeup( thread, cookie, signaled ) != -1) + if (!cookie || send_thread_wakeup( thread, cookie, signaled ) != -1) wake_thread( thread ); /* check other waits too */ return 1; @@ -768,6 +769,8 @@ static void thread_timeout( void *ptr ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id ); end_wait( thread ); + + assert( cookie ); if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return; /* check if other objects have become signaled in the meantime */ wake_thread( thread ); @@ -1429,6 +1432,12 @@ DECL_HANDLER(select) set_error( STATUS_INVALID_PARAMETER ); return; } + if (!req->cookie) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); memset( &select_op, 0, sizeof(select_op) ); memcpy( &select_op, result + 1, op_size );

1 0