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

Iván Matellanes : msvcirt: Implement ios::flags.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 6f89103b72138215ec83755fde73b631c4e8fc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f89103b72138215ec83755fd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 16 13:12:35 2015 +0200 msvcirt: Implement ios::flags. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- dlls/msvcirt/tests/msvcirt.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e46f574..0a9dc34 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -937,8 +937,12 @@ char __thiscall ios_fill_get(const ios *this) DEFINE_THISCALL_WRAPPER(ios_flags_set, 8) LONG __thiscall ios_flags_set(ios *this, LONG flags) { - FIXME("(%p %x) stub\n", this, flags); - return 0; + LONG prev = this->flags; + + TRACE("(%p %x)\n", this, flags); + + this->flags = flags; + return prev; } /* ?flags(a)ios@@QBEJXZ */ @@ -946,8 +950,8 @@ LONG __thiscall ios_flags_set(ios *this, LONG flags) DEFINE_THISCALL_WRAPPER(ios_flags_get, 4) LONG __thiscall ios_flags_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->flags; } /* ?good(a)ios@@QBEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 523fb45..faddae1 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -137,6 +137,8 @@ static void (*__cdecl p_ios_unlockbuf)(ios*); static CRITICAL_SECTION *p_ios_static_lock; static void (*__cdecl p_ios_lockc)(void); static void (*__cdecl p_ios_unlockc)(void); +static LONG (*__thiscall p_ios_flags_set)(ios*, LONG); +static LONG (*__thiscall p_ios_flags_get)(const ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -245,6 +247,8 @@ static BOOL init(void) SET(p_ios_unlock, "?unlock(a)ios@@QEAAXXZ"); SET(p_ios_lockbuf, "?lockbuf(a)ios@@QEAAXXZ"); SET(p_ios_unlockbuf, "?unlockbuf(a)ios@@QEAAXXZ"); + SET(p_ios_flags_set, "?flags(a)ios@@QEAAJJ(a)Z"); + SET(p_ios_flags_get, "?flags(a)ios@@QEBAJXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -283,6 +287,8 @@ static BOOL init(void) SET(p_ios_unlock, "?unlock(a)ios@@QAAXXZ"); SET(p_ios_lockbuf, "?lockbuf(a)ios@@QAAXXZ"); SET(p_ios_unlockbuf, "?unlockbuf(a)ios@@QAAXXZ"); + SET(p_ios_flags_set, "?flags(a)ios@@QAEJJ(a)Z"); + SET(p_ios_flags_get, "?flags(a)ios@@QBEJXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -859,6 +865,7 @@ static void test_ios(void) struct ios_lock_arg lock_arg; HANDLE thread; BOOL locked; + LONG ret; memset(&ios_obj, 0xab, sizeof(ios)); memset(&ios_obj2, 0xab, sizeof(ios)); @@ -984,6 +991,17 @@ static void test_ios(void) locked = TryEnterCriticalSection(p_ios_static_lock); ok(locked == 0, "the static critical section was not locked before\n"); + /* flags */ + ios_obj.flags = 0x8000; + ret = (LONG) call_func1(p_ios_flags_get, &ios_obj); + ok(ret == 0x8000, "expected %x got %x\n", 0x8000, ret); + ret = (LONG) call_func2(p_ios_flags_set, &ios_obj, 0x444); + ok(ret == 0x8000, "expected %x got %x\n", 0x8000, ret); + ok(ios_obj.flags == 0x444, "expected %x got %x\n", 0x444, ios_obj.flags); + ret = (LONG) call_func2(p_ios_flags_set, &ios_obj, 0); + ok(ret == 0x444, "expected %x got %x\n", 0x444, ret); + ok(ios_obj.flags == 0, "expected %x got %x\n", 0, ios_obj.flags); + SetEvent(lock_arg.release[0]); SetEvent(lock_arg.release[1]); SetEvent(lock_arg.release[2]);

1 0

Jactry Zeng : gdi32: Add multiple font replacement support.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: c015447d074c535349e42ac3faa2384f8b46a231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c015447d074c535349e42ac3f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 8 21:54:05 2015 +0800 gdi32: Add multiple font replacement support. --- dlls/gdi32/freetype.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e20e390..e57d1a9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2292,12 +2292,24 @@ static void LoadReplaceList(void) dlen = datalen; vlen = valuelen; - while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, - &dlen) == ERROR_SUCCESS) { - TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); + while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) + { /* "NewName"="Oldname" */ if(!find_family_from_any_name(value)) - map_font_family(value, data); + { + if (type == REG_MULTI_SZ) + { + WCHAR *replace = data; + while(*replace) + { + if (map_font_family(value, replace)) + break; + replace += strlenW(replace) + 1; + } + } + else + map_font_family(value, data); + } else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value));

1 0

Jactry Zeng : gdi32: Add a helper to map font replacement.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: cb59350ed9e0eee83284bcd1f889315c9ea8607e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb59350ed9e0eee83284bcd1f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 8 21:53:52 2015 +0800 gdi32: Add a helper to map font replacement. --- dlls/gdi32/freetype.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 73824ea..e20e390 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2240,6 +2240,27 @@ static void DumpFontList(void) } } +static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) +{ + Family *family = find_family_from_any_name(repl); + if (family != NULL) + { + Family *new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); + if (new_family != NULL) + { + TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); + new_family->FamilyName = strdupW(orig); + new_family->EnglishName = NULL; + list_init(&new_family->faces); + new_family->replacement = &family->faces; + list_add_tail(&font_list, &new_family->entry); + return TRUE; + } + } + TRACE("%s is not available. Skip this replacement.\n", debugstr_w(repl)); + return FALSE; +} + /*********************************************************** * The replacement list is a way to map an entire font * family onto another family. For example adding @@ -2276,30 +2297,10 @@ static void LoadReplaceList(void) TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); /* "NewName"="Oldname" */ if(!find_family_from_any_name(value)) - { - Family * const family = find_family_from_any_name(data); - if (family != NULL) - { - Family * const new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); - if (new_family != NULL) - { - TRACE("mapping %s to %s\n", debugstr_w(data), debugstr_w(value)); - new_family->FamilyName = strdupW(value); - new_family->EnglishName = NULL; - list_init(&new_family->faces); - new_family->replacement = &family->faces; - list_add_tail(&font_list, &new_family->entry); - } - } - else - { - TRACE("%s is not available. Skip this replacement.\n", debugstr_w(data)); - } - } + map_font_family(value, data); else - { TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - } + /* reset dlen and vlen */ dlen = datalen; vlen = valuelen;

1 0

Alex Henrie : user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 5caa651732beb7996ee8397929a0805ae2f45882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caa651732beb7996ee839792… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 16 03:30:30 2015 -0600 user32: Scroll listbox item completely into view on LB_SETCURSEL. --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index ed60a19..2902ac9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2855,7 +2855,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; - LISTBOX_SetCaretIndex( descr, wParam, FALSE ); + LISTBOX_SetCaretIndex( descr, wParam, TRUE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); if (ret != LB_ERR) ret = descr->selected_item; return ret; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d99a82c..79d18e7 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -349,7 +349,7 @@ static void test_ownerdraw(void) ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); -static void test_selection(void) +static void test_LB_SELITEMRANGE(void) { static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; @@ -429,6 +429,34 @@ static void test_selection(void) DestroyWindow(hLB); } +static void test_LB_SETCURSEL(void) +{ + HWND parent, hLB; + INT ret; + + trace("testing LB_SETCURSEL\n"); + + parent = create_parent(); + assert(parent); + + hLB = create_listbox(LBS_NOINTEGRALHEIGHT | WS_CHILD, parent); + assert(hLB); + + SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 0, "expected vscroll 0, got %d\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); + ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 1, "expected vscroll 1, got %d\n", ret); + + DestroyWindow(hLB); +} + static void test_listbox_height(void) { HWND hList; @@ -1766,7 +1794,8 @@ START_TEST(listbox) check_item_height(); test_ownerdraw(); - test_selection(); + test_LB_SELITEMRANGE(); + test_LB_SETCURSEL(); test_listbox_height(); test_itemfrompoint(); test_listbox_item_data();

1 0

Hans Leidekker : user32: Return a fake handle from RegisterPowerSettingNotification.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 80cee36b6a0155373888ed22270e163e259331f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cee36b6a0155373888ed222… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:01 2015 +0200 user32: Return a fake handle from RegisterPowerSettingNotification. --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5d2042a..e395d2f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -717,7 +717,7 @@ BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUID *guid, DWORD flags) { FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); - return NULL; + return (HPOWERNOTIFY)0xdeadbeef; } /**********************************************************************

1 0

Sebastian Lackner : vcomp: Implement _vcomp_sections_init and _vcomp_sections_next.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: c019ebc82f397d1f5c195d6bfc24697260290f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019ebc82f397d1f5c195d6bf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:01:33 2015 +0200 vcomp: Implement _vcomp_sections_init and _vcomp_sections_next. --- dlls/vcomp/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index f085f7c..0f8a272 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -58,6 +58,9 @@ struct vcomp_thread_data /* only used for concurrent tasks */ struct list entry; CONDITION_VARIABLE cond; + + /* section */ + unsigned int section; }; struct vcomp_team_data @@ -74,6 +77,11 @@ struct vcomp_team_data /* barrier */ unsigned int barrier; int barrier_count; + + /* section */ + unsigned int section; + int num_sections; + int section_index; }; #if defined(__i386__) @@ -301,6 +309,42 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } +void CDECL _vcomp_sections_init(int n) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + + TRACE("(%d)\n", n); + + EnterCriticalSection(&vcomp_section); + thread_data->section++; + if ((int)(thread_data->section - team_data->section) > 0) + { + team_data->section = thread_data->section; + team_data->num_sections = n; + team_data->section_index = 0; + } + LeaveCriticalSection(&vcomp_section); +} + +int CDECL _vcomp_sections_next(void) +{ + struct vcomp_thread_data *thread_data = vcomp_get_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + int i = -1; + + TRACE("()\n"); + + EnterCriticalSection(&vcomp_section); + if (thread_data->section == team_data->section && + team_data->section_index != team_data->num_sections) + { + i = team_data->section_index++; + } + LeaveCriticalSection(&vcomp_section); + return i; +} + static DWORD WINAPI _vcomp_fork_worker(void *param) { struct vcomp_thread_data *thread_data = param; @@ -368,10 +412,12 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) __ms_va_start(team_data.valist, wrapper); team_data.barrier = 0; team_data.barrier_count = 0; + team_data.section = 0; thread_data.team = &team_data; thread_data.thread_num = 0; thread_data.fork_threads = 0; + thread_data.section = 1; list_init(&thread_data.entry); InitializeConditionVariable(&thread_data.cond); @@ -387,6 +433,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->thread_num = team_data.num_threads++; data->fork_threads = 0; + data->section = 1; list_remove(&data->entry); list_add_tail(&thread_data.entry, &data->entry); WakeAllConditionVariable(&data->cond); @@ -405,6 +452,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->thread_num = team_data.num_threads; data->fork_threads = 0; + data->section = 1; InitializeConditionVariable(&data->cond); thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index d446574..dfbd184 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) +@ cdecl _vcomp_sections_next() @ cdecl _vcomp_set_num_threads(long) @ cdecl _vcomp_single_begin(long) @ cdecl _vcomp_single_end() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 2c04e91..6eb6ae5 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 2c04e91..6eb6ae5 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -83,8 +83,8 @@ @ stub _vcomp_reduction_u2 @ stub _vcomp_reduction_u4 @ stub _vcomp_reduction_u8 -@ stub _vcomp_sections_init -@ stub _vcomp_sections_next +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next @ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end

1 0

Sebastian Lackner : vcomp: Add multithreaded implementation for _vcomp_fork.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: ee34265f8f7a45a998ef076bbb5967637347f635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee34265f8f7a45a998ef076bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:00:20 2015 +0200 vcomp: Add multithreaded implementation for _vcomp_fork. --- dlls/vcomp/main.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 93d418e..3830879 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -4,6 +4,7 @@ * * Copyright 2011 Austin English * Copyright 2012 Dan Kegel + * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,22 +24,52 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static struct list vcomp_idle_threads = LIST_INIT(vcomp_idle_threads); static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; +static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; static BOOL vcomp_nested_fork = FALSE; +static RTL_CRITICAL_SECTION vcomp_section; +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &vcomp_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": vcomp_section") } +}; +static RTL_CRITICAL_SECTION vcomp_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + struct vcomp_thread_data { + struct vcomp_team_data *team; int thread_num; int fork_threads; + + /* only used for concurrent tasks */ + struct list entry; + CONDITION_VARIABLE cond; +}; + +struct vcomp_team_data +{ + CONDITION_VARIABLE cond; + int num_threads; + int finished_threads; + + /* callback arguments */ + int nargs; + void *wrapper; + __ms_va_list valist; }; #if defined(__i386__) @@ -145,8 +176,9 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) ExitProcess(1); } - thread_data->thread_num = 0; - thread_data->fork_threads = 0; + thread_data->team = NULL; + thread_data->thread_num = 0; + thread_data->fork_threads = 0; vcomp_set_thread_data(thread_data); return thread_data; @@ -187,8 +219,9 @@ int CDECL omp_get_num_procs(void) int CDECL omp_get_num_threads(void) { - TRACE("stub\n"); - return 1; + struct vcomp_team_data *team_data = vcomp_init_thread_data()->team; + TRACE("()\n"); + return team_data ? team_data->num_threads : 1; } int CDECL omp_get_thread_num(void) @@ -244,15 +277,145 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } +static DWORD WINAPI _vcomp_fork_worker(void *param) +{ + struct vcomp_thread_data *thread_data = param; + vcomp_set_thread_data(thread_data); + + TRACE("starting worker thread for %p\n", thread_data); + + EnterCriticalSection(&vcomp_section); + for (;;) + { + struct vcomp_team_data *team = thread_data->team; + if (team != NULL) + { + LeaveCriticalSection(&vcomp_section); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + EnterCriticalSection(&vcomp_section); + + thread_data->team = NULL; + list_remove(&thread_data->entry); + list_add_tail(&vcomp_idle_threads, &thread_data->entry); + if (++team->finished_threads >= team->num_threads) + WakeAllConditionVariable(&team->cond); + } + + if (!SleepConditionVariableCS(&thread_data->cond, &vcomp_section, 5000) && + GetLastError() == ERROR_TIMEOUT && !thread_data->team) + { + break; + } + } + list_remove(&thread_data->entry); + LeaveCriticalSection(&vcomp_section); + + TRACE("terminating worker thread for %p\n", thread_data); + + HeapFree(GetProcessHeap(), 0, thread_data); + vcomp_set_thread_data(NULL); + FreeLibraryAndExitThread(vcomp_module, 0); + return 0; +} + void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) { - __ms_va_list valist; + struct vcomp_thread_data *prev_thread_data = vcomp_init_thread_data(); + struct vcomp_thread_data thread_data; + struct vcomp_team_data team_data; + int num_threads; TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); - __ms_va_start(valist, wrapper); - _vcomp_fork_call_wrapper(wrapper, nargs, valist); - __ms_va_end(valist); + if (!ifval) + num_threads = 1; + else if (prev_thread_data->team && !vcomp_nested_fork) + num_threads = 1; + else if (prev_thread_data->fork_threads) + num_threads = prev_thread_data->fork_threads; + else + num_threads = vcomp_num_threads; + + InitializeConditionVariable(&team_data.cond); + team_data.num_threads = 1; + team_data.finished_threads = 0; + team_data.nargs = nargs; + team_data.wrapper = wrapper; + __ms_va_start(team_data.valist, wrapper); + + thread_data.team = &team_data; + thread_data.thread_num = 0; + thread_data.fork_threads = 0; + list_init(&thread_data.entry); + InitializeConditionVariable(&thread_data.cond); + + if (num_threads > 1) + { + struct list *ptr; + EnterCriticalSection(&vcomp_section); + + /* reuse existing threads (if any) */ + while (team_data.num_threads < num_threads && (ptr = list_head(&vcomp_idle_threads))) + { + struct vcomp_thread_data *data = LIST_ENTRY(ptr, struct vcomp_thread_data, entry); + data->team = &team_data; + data->thread_num = team_data.num_threads++; + data->fork_threads = 0; + list_remove(&data->entry); + list_add_tail(&thread_data.entry, &data->entry); + WakeAllConditionVariable(&data->cond); + } + + /* spawn additional threads */ + while (team_data.num_threads < num_threads) + { + struct vcomp_thread_data *data; + HMODULE module; + HANDLE thread; + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + if (!data) break; + + data->team = &team_data; + data->thread_num = team_data.num_threads; + data->fork_threads = 0; + InitializeConditionVariable(&data->cond); + + thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL); + if (!thread) + { + HeapFree(GetProcessHeap(), 0, data); + break; + } + + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (const WCHAR *)vcomp_module, &module); + team_data.num_threads++; + list_add_tail(&thread_data.entry, &data->entry); + CloseHandle(thread); + } + + LeaveCriticalSection(&vcomp_section); + } + + vcomp_set_thread_data(&thread_data); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + vcomp_set_thread_data(prev_thread_data); + prev_thread_data->fork_threads = 0; + + if (team_data.num_threads > 1) + { + EnterCriticalSection(&vcomp_section); + + team_data.finished_threads++; + while (team_data.finished_threads < team_data.num_threads) + SleepConditionVariableCS(&team_data.cond, &vcomp_section, INFINITE); + + LeaveCriticalSection(&vcomp_section); + assert(list_empty(&thread_data.entry)); + } + + __ms_va_end(team_data.valist); } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) @@ -275,6 +438,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) } GetSystemInfo(&sysinfo); + vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; break;

1 0

Sebastian Lackner : shell32: Ensure that commandline is null-terminated when no parameters are given.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 7d3f13a129e4c0dd410208b03bf2adfae5398731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f13a129e4c0dd410208b03… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 17 04:54:24 2015 +0200 shell32: Ensure that commandline is null-terminated when no parameters are given. --- dlls/shell32/shlexec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 3196149..ba83a57 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1774,6 +1774,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wcmd+1, wszApplicationName, len * sizeof(WCHAR)); len++; wcmd[len++] = '\"'; + wcmd[len] = 0; if (sei_tmp.lpParameters[0]) { wcmd[len++] = ' '; strcpyW(wcmd+len, wszParameters);

1 0

Dan Kegel : vcomp: Implement stub for _vcomp_fork.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: ad1077f94bfe5b8b762f30b1d2174cce61dfbb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1077f94bfe5b8b762f30b1d… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jul 16 15:00:07 2015 +0200 vcomp: Implement stub for _vcomp_fork. --- dlls/vcomp/main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 4 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8ec3616..93d418e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -3,6 +3,7 @@ * vcomp implementation * * Copyright 2011 Austin English + * Copyright 2012 Dan Kegel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +41,89 @@ struct vcomp_thread_data int fork_threads; }; +#if defined(__i386__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "movl 12(%ebp),%edx\n\t" + "movl %esp,%edi\n\t" + "shll $2,%edx\n\t" + "jz 1f\n\t" + "subl %edx,%edi\n\t" + "andl $~15,%edi\n\t" + "movl %edi,%esp\n\t" + "movl 12(%ebp),%ecx\n\t" + "movl 16(%ebp),%esi\n\t" + "cld\n\t" + "rep; movsl\n" + "1:\tcall *8(%ebp)\n\t" + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) + +#elif defined(__x86_64__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "pushq %rsi\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") + "pushq %rdi\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + "movq %rcx,%rax\n\t" + "movq $4,%rcx\n\t" + "cmp %rcx,%rdx\n\t" + "cmovgq %rdx,%rcx\n\t" + "leaq 0(,%rcx,8),%rdx\n\t" + "subq %rdx,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movq %rsp,%rdi\n\t" + "movq %r8,%rsi\n\t" + "rep; movsq\n\t" + "movq 0(%rsp),%rcx\n\t" + "movq 8(%rsp),%rdx\n\t" + "movq 16(%rsp),%r8\n\t" + "movq 24(%rsp),%r9\n\t" + "callq *%rax\n\t" + "leaq -16(%rbp),%rsp\n\t" + "popq %rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") + "popq %rsi\n\t" + __ASM_CFI(".cfi_same_value %rsi\n\t") + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret") + +#else + +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +{ + ERR("Not implemented for this architecture\n"); +} + +#endif + static inline struct vcomp_thread_data *vcomp_get_thread_data(void) { return (struct vcomp_thread_data *)TlsGetValue(vcomp_context_tls); @@ -160,6 +244,17 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) +{ + __ms_va_list valist; + + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); + + __ms_va_start(valist, wrapper); + _vcomp_fork_call_wrapper(wrapper, nargs, valist); + __ms_va_end(valist); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", instance, reason, reserved); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 306dd15..d446574 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 39cf91c..2c04e91 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 39cf91c..2c04e91 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -64,7 +64,7 @@ @ stub _vcomp_for_static_init_i8 @ stub _vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 -@ stub _vcomp_fork +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier

1 0

Andrew Cook : server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 453458f2946edeb4744d40ca6e80a49947cf221b URL: http://source.winehq.org/git/wine.git/?a=commit;h=453458f2946edeb4744d40ca6… Author: Andrew Cook <ariscop(a)gmail.com> Date: Fri Jul 17 06:17:08 2015 +0200 server: Implement JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE. --- dlls/kernel32/tests/process.c | 1 - server/process.c | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4145dce..9f62e13 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2452,7 +2452,6 @@ static void test_KillOnJobClose(void) CloseHandle(job); dwret = WaitForSingleObject(pi.hProcess, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); diff --git a/server/process.c b/server/process.c index 569a8fe..0bf7194 100644 --- a/server/process.c +++ b/server/process.c @@ -140,6 +140,7 @@ static void job_dump( struct object *obj, int verbose ); static struct object_type *job_get_type( struct object *obj ); static int job_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int job_map_access( struct object *obj, unsigned int access ); +static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void job_destroy( struct object *obj ); struct job @@ -170,7 +171,7 @@ static const struct object_ops job_ops = default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ - no_close_handle, /* close_handle */ + job_close_handle, /* close_handle */ job_destroy /* destroy */ }; @@ -287,6 +288,19 @@ static void terminate_job( struct job *job, int exit_code ) wake_up( &job->obj, 0 ); } +static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + struct job *job = (struct job *)obj; + assert( obj->ops == &job_ops ); + + if (obj->handle_count == 1) /* last handle */ + { + if (job->limit_flags & JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE) + terminate_job( job, 0 ); + } + return 1; +} + static void job_destroy( struct object *obj ) { struct job *job = (struct job *)obj;

1 0