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

Nikolay Sivov : dwrite: Fix IsColorFont() return type for IDWriteFont2.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: e1f353663acd5fe32b2292ae3cb3bd86a8d92f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f353663acd5fe32b2292ae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:45:14 2015 +0300 dwrite: Fix IsColorFont() return type for IDWriteFont2. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1f4e565..93aae86 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1405,7 +1405,7 @@ static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) return IDWriteFontFace2_IsMonospacedFont(fontface); } -static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) +static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); IDWriteFontFace2 *fontface; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) - return hr; + return FALSE; return IDWriteFontFace2_IsColorFont(fontface); }

1 0

Damjan Jovanovic : winex11: Only send WM_DROPFILES if there is no drop target.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: b78a9f1aa14d2d43ee7e62f617a3c7bdf576dd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78a9f1aa14d2d43ee7e62f61… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 7 04:17:40 2015 +0200 winex11: Only send WM_DROPFILES if there is no drop target. Windows doesn't send WM_DROPFILES to a window if a drop target is registered on that window. Some apps that support both even duplicate dropped files if we send it and a drop target is registered. --- dlls/winex11.drv/xdnd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index f6ce5e9..9944dab 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -378,10 +378,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("\n"); - /* If we have a HDROP type we send a WM_ACCEPTFILES.*/ - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) - X11DRV_XDND_SendDropFiles( hWnd ); - /* Notify OLE of Drop */ dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); if (dropTarget) @@ -407,6 +403,13 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) WARN("drop failed, error 0x%08X\n", hr); IDropTarget_Release(dropTarget); } + else + { + /* Only send WM_DROPFILES if there is no drop target. Doing both + * causes winamp to duplicate the dropped files (#29081) */ + if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) + X11DRV_XDND_SendDropFiles( hWnd ); + } X11DRV_XDND_FreeDragDropOp();

1 0

Damjan Jovanovic : winex11: Use the correct drop effect for WM_DROPFILES.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 3f99e71fde8231524597901e512e5c1909a82e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f99e71fde8231524597901e5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 7 04:21:27 2015 +0200 winex11: Use the correct drop effect for WM_DROPFILES. Tests show that on Windows, for a window to indicate it will accept a file drop or to actually accept it, it must have WS_EX_ACCEPTFILES in its style, contain DROPEFFECT_COPY (which will be chosen if offered among several drop effects), and be offered the HDROP format. --- dlls/winex11.drv/xdnd.c | 67 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9944dab..72758a0 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,8 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); -static void X11DRV_XDND_SendDropFiles(HWND hwnd); +static BOOL X11DRV_XDND_HasHDROP(void); +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static CRITICAL_SECTION xdnd_cs; @@ -338,8 +339,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) + else if (dropTarget == NULL && + (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { accept = 1; + effect = DROPEFFECT_COPY; + XDNDDropEffect = effect; + } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", event->data.l[4], accept, XDNDxy.x, XDNDxy.y); @@ -407,8 +415,17 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if there is no drop target. Doing both * causes winamp to duplicate the dropped files (#29081) */ - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) - X11DRV_XDND_SendDropFiles( hWnd ); + if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { + HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + if (SUCCEEDED(hr)) + { + accept = 1; + effect = DROPEFFECT_COPY; + } + } } X11DRV_XDND_FreeDragDropOp(); @@ -552,9 +569,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents /************************************************************************** - * X11DRV_XDND_SendDropFiles + * X11DRV_XDND_HasHDROP */ -static void X11DRV_XDND_SendDropFiles(HWND hwnd) +static BOOL X11DRV_XDND_HasHDROP(void) { LPXDNDDATA current = NULL; BOOL found = FALSE; @@ -571,10 +588,33 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) } } + LeaveCriticalSection(&xdnd_cs); + + return found; +} + +/************************************************************************** + * X11DRV_XDND_SendDropFiles + */ +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) +{ + HRESULT hr; + LPXDNDDATA current = NULL; + BOOL found = FALSE; + + EnterCriticalSection(&xdnd_cs); + + LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + { + if (current->cf_win == CF_HDROP) + { + found = TRUE; + break; + } + } if (found) { HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); - if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); @@ -587,12 +627,23 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); - if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + if (PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + hr = S_OK; + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); GlobalFree(dropHandle); + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); } + else + hr = E_FAIL; LeaveCriticalSection(&xdnd_cs); + + return hr; }

1 0

Sebastian Lackner : vcomp: Also initialize dynamic_type in _vcomp_fork.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 2c8f5e09ed2b4514b3e1059a5319f2b309594c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8f5e09ed2b4514b3e1059a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:20:11 2015 +0200 vcomp: Also initialize dynamic_type in _vcomp_fork. --- dlls/vcomp/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 748899d..42b116b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -857,6 +857,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) thread_data.fork_threads = 0; thread_data.section = 1; thread_data.dynamic = 1; + thread_data.dynamic_type = 0; list_init(&thread_data.entry); InitializeConditionVariable(&thread_data.cond); @@ -876,6 +877,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->fork_threads = 0; data->section = 1; data->dynamic = 1; + data->dynamic_type = 0; list_remove(&data->entry); list_add_tail(&thread_data.entry, &data->entry); WakeAllConditionVariable(&data->cond); @@ -898,6 +900,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->fork_threads = 0; data->section = 1; data->dynamic = 1; + data->dynamic_type = 0; InitializeConditionVariable(&data->cond); thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL);

1 0

Sebastian Lackner : vcomp: Implement _vcomp_master_begin and _vcomp_master_end.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: bf4daa339563f2bce883e7210d54cea331f7867c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4daa339563f2bce883e7210… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:20:27 2015 +0200 vcomp: Implement _vcomp_master_begin and _vcomp_master_end. --- dlls/vcomp/main.c | 12 ++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 42b116b..1e69e31 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -489,6 +489,18 @@ void CDECL _vcomp_set_num_threads(int num_threads) vcomp_init_thread_data()->fork_threads = num_threads; } +int CDECL _vcomp_master_begin(void) +{ + TRACE("()\n"); + return !vcomp_init_thread_data()->thread_num; +} + +void CDECL _vcomp_master_end(void) +{ + TRACE("()\n"); + /* nothing to do here */ +} + int CDECL _vcomp_single_begin(int flags) { TRACE("(%x): stub\n", flags); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 6e2fcec..3167839 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() +@ cdecl _vcomp_master_end() @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 5373420..ef8222f 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -69,8 +69,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_master_begin and _vcomp_master_end.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 0ff9a68af3fb1971253dc0c0af9508d82d5f5c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff9a68af3fb1971253dc0c0a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:21:09 2015 +0200 vcomp/tests: Add tests for _vcomp_master_begin and _vcomp_master_end. --- dlls/vcomp/tests/vcomp.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 5dbe166..99c98ef 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -60,6 +60,8 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static int (CDECL *p_vcomp_master_begin)(void); +static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); @@ -228,6 +230,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_master_begin); + VCOMP_GET_PROC(_vcomp_master_end); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); @@ -1122,6 +1126,48 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void CDECL master_cb(HANDLE semaphore) +{ + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + + if (p_vcomp_master_begin()) + { + ok(thread_num == 0, "expected thread_num == 0, got %d\n", thread_num); + if (num_threads >= 2) + { + DWORD result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + p_vcomp_master_end(); + } + + if (thread_num == 1) + ReleaseSemaphore(semaphore, 1, NULL); +} + +static void test_vcomp_master_begin(void) +{ + int max_threads = pomp_get_max_threads(); + HANDLE semaphore; + int i; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + master_cb(semaphore); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 1, master_cb, semaphore); + p_vcomp_fork(FALSE, 1, master_cb, semaphore); + } + + CloseHandle(semaphore); + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1238,6 +1284,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_master_begin(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0

Sebastian Lackner : vcomp: Implement _vcomp_single_begin and _vcomp_single_end.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: ea188ea0541e6c2dcf035ed547cef37d5e018a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea188ea0541e6c2dcf035ed54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:21:36 2015 +0200 vcomp: Implement _vcomp_single_begin and _vcomp_single_end. --- dlls/vcomp/main.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1e69e31..1d9765f 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -67,6 +67,9 @@ struct vcomp_thread_data struct list entry; CONDITION_VARIABLE cond; + /* single */ + unsigned int single; + /* section */ unsigned int section; @@ -95,6 +98,9 @@ struct vcomp_team_data struct vcomp_task_data { + /* single */ + unsigned int single; + /* section */ unsigned int section; int num_sections; @@ -218,6 +224,7 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) ExitProcess(1); } + data->task.single = 0; data->task.section = 0; data->task.dynamic = 0; @@ -227,6 +234,7 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) thread_data->thread_num = 0; thread_data->parallel = FALSE; thread_data->fork_threads = 0; + thread_data->single = 1; thread_data->section = 1; thread_data->dynamic = 1; thread_data->dynamic_type = 0; @@ -503,13 +511,28 @@ void CDECL _vcomp_master_end(void) int CDECL _vcomp_single_begin(int flags) { - TRACE("(%x): stub\n", flags); - return TRUE; + struct vcomp_thread_data *thread_data = vcomp_init_thread_data(); + struct vcomp_task_data *task_data = thread_data->task; + int ret = FALSE; + + TRACE("(%x): semi-stub\n", flags); + + EnterCriticalSection(&vcomp_section); + thread_data->single++; + if ((int)(thread_data->single - task_data->single) > 0) + { + task_data->single = thread_data->single; + ret = TRUE; + } + LeaveCriticalSection(&vcomp_section); + + return ret; } void CDECL _vcomp_single_end(void) { - TRACE("stub\n"); + TRACE("()\n"); + /* nothing to do here */ } void CDECL _vcomp_sections_init(int n) @@ -859,6 +882,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) team_data.barrier = 0; team_data.barrier_count = 0; + task_data.single = 0; task_data.section = 0; task_data.dynamic = 0; @@ -867,6 +891,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) thread_data.thread_num = 0; thread_data.parallel = ifval || prev_thread_data->parallel; thread_data.fork_threads = 0; + thread_data.single = 1; thread_data.section = 1; thread_data.dynamic = 1; thread_data.dynamic_type = 0; @@ -887,6 +912,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->thread_num = team_data.num_threads++; data->parallel = thread_data.parallel; data->fork_threads = 0; + data->single = 1; data->section = 1; data->dynamic = 1; data->dynamic_type = 0; @@ -910,6 +936,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->thread_num = team_data.num_threads; data->parallel = thread_data.parallel; data->fork_threads = 0; + data->single = 1; data->section = 1; data->dynamic = 1; data->dynamic_type = 0;

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_single_begin and _vcomp_single_end.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 89b383740cd48ff97b25e8bb5798ad58344d4388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b383740cd48ff97b25e8bb5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:22:19 2015 +0200 vcomp/tests: Add tests for _vcomp_single_begin and _vcomp_single_end. Yes, its intentional that the call to p_vcomp_single_end() is after the if-block. Somehow MS made a difference here between the master and the single directive... --- dlls/vcomp/tests/vcomp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 99c98ef..e5617d8 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -65,6 +65,8 @@ static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); +static int (CDECL *p_vcomp_single_begin)(int flags); +static void (CDECL *p_vcomp_single_end)(void); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); static int (CDECL *pomp_get_num_threads)(void); @@ -235,6 +237,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); + VCOMP_GET_PROC(_vcomp_single_begin); + VCOMP_GET_PROC(_vcomp_single_end); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); VCOMP_GET_PROC(omp_get_num_threads); @@ -1168,6 +1172,53 @@ static void test_vcomp_master_begin(void) pomp_set_num_threads(max_threads); } +static void CDECL single_cb(int flags, HANDLE semaphore) +{ + int num_threads = pomp_get_num_threads(); + + if (p_vcomp_single_begin(flags)) + { + if (num_threads >= 2) + { + DWORD result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + } + p_vcomp_single_end(); + + if (p_vcomp_single_begin(flags)) + { + if (num_threads >= 2) + ReleaseSemaphore(semaphore, 1, NULL); + } + p_vcomp_single_end(); +} + +static void test_vcomp_single_begin(void) +{ + int max_threads = pomp_get_max_threads(); + HANDLE semaphore; + int i; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + single_cb(0, semaphore); + single_cb(1, semaphore); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 2, single_cb, 0, semaphore); + p_vcomp_fork(TRUE, 2, single_cb, 1, semaphore); + p_vcomp_fork(FALSE, 2, single_cb, 0, semaphore); + p_vcomp_fork(FALSE, 2, single_cb, 1, semaphore); + } + + CloseHandle(semaphore); + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1285,6 +1336,7 @@ START_TEST(vcomp) test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); test_vcomp_master_begin(); + test_vcomp_single_begin(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0

Sebastian Lackner : vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: b0e4fd05e57100ce8d2275560eefb9a9d83ccef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e4fd05e57100ce8d2275560… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:22:51 2015 +0200 vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect. --- dlls/vcomp/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1d9765f..10ac465 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -979,6 +979,40 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) __ms_va_end(team_data.valist); } +void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect) +{ + TRACE("(%p)\n", critsect); + + if (!*critsect) + { + CRITICAL_SECTION *new_critsect; + if (!(new_critsect = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_critsect)))) + { + ERR("could not allocate critical section\n"); + ExitProcess(1); + } + + InitializeCriticalSection(new_critsect); + new_critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); + + if (interlocked_cmpxchg_ptr((void **)critsect, new_critsect, NULL) != NULL) + { + /* someone beat us to it */ + new_critsect->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(new_critsect); + HeapFree(GetProcessHeap(), 0, new_critsect); + } + } + + EnterCriticalSection(*critsect); +} + +void CDECL _vcomp_leave_critsect(CRITICAL_SECTION *critsect) +{ + TRACE("(%p)\n", critsect); + LeaveCriticalSection(critsect); +} + 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 3167839..55b699f 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() @ cdecl _vcomp_master_end() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 38578b9..7bf6238 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index ef8222f..c84e44c 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -54,7 +54,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -67,7 +67,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 38578b9..7bf6238 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -53,7 +53,7 @@ @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ stub _vcomp_enter_critsect +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect @ stub _vcomp_flush @ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init @ stub _vcomp_for_dynamic_init_i8 @@ -66,7 +66,7 @@ @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num -@ stub _vcomp_leave_critsect +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin @ cdecl _vcomp_master_end() vcomp._vcomp_master_end

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_enter_critsect and _vcomp_leave_critsect.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 7fd7bcf00e940a5d3e7ed2d24ba69a384997bf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd7bcf00e940a5d3e7ed2d24… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:23:18 2015 +0200 vcomp/tests: Add tests for _vcomp_enter_critsect and _vcomp_leave_critsect. --- dlls/vcomp/tests/vcomp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index e5617d8..26b50a7 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -51,6 +51,7 @@ static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); +static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); @@ -60,6 +61,7 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); @@ -226,12 +228,14 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_atomic_sub_r8); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); + VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_for_dynamic_init); VCOMP_GET_PROC(_vcomp_for_dynamic_next); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); VCOMP_GET_PROC(_vcomp_sections_init); @@ -1219,6 +1223,52 @@ static void test_vcomp_single_begin(void) pomp_set_num_threads(max_threads); } +static void CDECL critsect_cb(LONG *a) +{ + static CRITICAL_SECTION *critsect; + LONG tmp; + + p_vcomp_enter_critsect(&critsect); + tmp = *a; + Sleep(50); + *a = tmp + 1; + p_vcomp_leave_critsect(critsect); + + ok(critsect != NULL, "expected critsect != NULL\n"); + + EnterCriticalSection(critsect); + tmp = *a; + Sleep(50); + *a = tmp + 1; + LeaveCriticalSection(critsect); +} + +static void test_vcomp_enter_critsect(void) +{ + int max_threads = pomp_get_max_threads(); + LONG a; + int i; + + a = 0; + critsect_cb(&a); + ok(a == 2, "expected a == 2, got %d\n", a); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = 0; + p_vcomp_fork(TRUE, 1, critsect_cb, &a); + ok(a == 2 * i, "expected a == %d, got %d\n", 2 * i, a); + + a = 0; + p_vcomp_fork(FALSE, 1, critsect_cb, &a); + ok(a == 2, "expected a == 2, got %d\n", a); + } + + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1337,6 +1387,7 @@ START_TEST(vcomp) test_vcomp_for_dynamic_init(); test_vcomp_master_begin(); test_vcomp_single_begin(); + test_vcomp_enter_critsect(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0