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

Hans Leidekker : msi/tests: Mark a test result on win2k3 as broken.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 78349835410b071e76d3148ba1040188bd2d7402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78349835410b071e76d3148ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:52 2015 +0200 msi/tests: Mark a test result on win2k3 as broken. --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 28d3e54..41f0f9f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3414,7 +3414,7 @@ static void test_states(void) /* reinstall the product */ r = MsiInstallProductA(msifile3, "REINSTALL=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE) /* win2k3 */, "Expected ERROR_SUCCESS, got %d\n", r); state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state);

1 0

Piotr Caban : winemac.drv: Release mouse capture when destroying window specified in SetCapture call.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: a90592c8d29d3b145eada90c297405cbd8a9277f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90592c8d29d3b145eada90c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 12:54:54 2015 +0200 winemac.drv: Release mouse capture when destroying window specified in SetCapture call. --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c67ccd0..9d996ec 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1274,6 +1274,8 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; + if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); + if (data->gl_view) macdrv_dispose_view(data->gl_view); destroy_cocoa_window(data);

1 0

Hans Leidekker : wininet/tests: Include the error code in a failure message.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 6ab6c23707e436d75632526a838a8cb3147e1a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab6c23707e436d75632526a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:38:21 2015 +0200 wininet/tests: Include the error code in a failure message. --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b841795..6b018de 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2888,7 +2888,7 @@ static void test_header_handling_order(int port) data_len = sizeof(data); memset(data, 'a', sizeof(data)); ret = HttpSendRequestA(request, connection, ~0u, data, data_len); - ok(ret, "HttpSendRequest failed\n"); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); status = 0; size = sizeof(status);

1 0

Hans Leidekker : user32: Add a stub implementation of UnregisterPowerSettingNotification.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 4ad09a150ea91bafaa28aac9b79b5d9a3297b1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad09a150ea91bafaa28aac9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:36:35 2015 +0200 user32: Add a stub implementation of UnregisterPowerSettingNotification. --- dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index b3615e8..5d2042a 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -721,6 +721,15 @@ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUI } /********************************************************************** + * UnregisterPowerSettingNotification [USER32.@] + */ +BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p): stub\n", handle); + return TRUE; +} + +/********************************************************************** * SetGestureConfig [USER32.@] */ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5cc0f55..204ccd4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -736,6 +736,7 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) # @ stub UnregisterMessagePumpHook +@ stdcall UnregisterPowerSettingNotification(ptr) # @ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) diff --git a/include/winuser.h b/include/winuser.h index 118aa73..06ca054 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4027,6 +4027,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); #define UnregisterClass WINELIB_NAME_AW(UnregisterClass) WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); +WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); WINUSERAPI UINT WINAPI UserRealizePalette(HDC);

1 0

Hans Leidekker : ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 05d6003147e08ce54e71ea4fe02f3c5abb126fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d6003147e08ce54e71ea4fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:36:07 2015 +0200 ieframe: Never pass a NULL string pointer with DISPID_STATUSTEXTCHANGE. --- dlls/ieframe/navigate.c | 2 +- dlls/ieframe/tests/webbrowser.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 2eaf200..b1753a6 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -115,7 +115,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR } V_VT(&arg) = VT_BSTR; - V_BSTR(&arg) = str ? SysAllocString(buffer) : NULL; + V_BSTR(&arg) = str ? SysAllocString(buffer) : SysAllocString(emptyW); TRACE("=> %s\n", debugstr_w(V_BSTR(&arg))); call_sink(This->doc_host->cps.wbe2, DISPID_STATUSTEXTCHANGE, &dispparams); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4d3ab24..a70428f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -833,6 +833,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); ok(V_VT(pDispParams->rgvarg) == VT_BSTR, "V_VT(pDispParams->rgvarg)=%d, expected VT_BSTR\n", V_VT(pDispParams->rgvarg)); + ok(V_BSTR(pDispParams->rgvarg) != NULL, "V_BSTR(pDispParams->rgvarg) is NULL\n"); /* TODO: Check text */ break;

1 0

Huw Davies : mshtml/tests: Fix a crash on Win 2008.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 1e263612ff63e8f98d815c0a2586dc6c11c26f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e263612ff63e8f98d815c0a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 17 10:32:15 2015 +0100 mshtml/tests: Fix a crash on Win 2008. --- dlls/mshtml/tests/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 0a9824d..a9a6a3c 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -395,6 +395,7 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) return; } + VariantInit(&var); hres = IHTMLWindow5_get_XMLHttpRequest(window5, &var); IHTMLWindow5_Release(window5); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres);

1 0

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

July 17, 2015

Module: wine Branch: master Commit: c8368cf43ba6a4165791eef75268342202654ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8368cf43ba6a4165791eef75… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 16 13:12:45 2015 +0200 msvcirt: Implement ios::unsetf. --- dlls/msvcirt/msvcirt.c | 10 ++++++++-- dlls/msvcirt/tests/msvcirt.c | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f0ae115..a0d670f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1176,8 +1176,14 @@ void __cdecl ios_unlockc(void) DEFINE_THISCALL_WRAPPER(ios_unsetf, 8) LONG __thiscall ios_unsetf(ios *this, LONG flags) { - FIXME("(%p %x) stub\n", this, flags); - return 0; + LONG prev = this->flags; + + TRACE("(%p %x)\n", this, flags); + + ios_lock(this); + this->flags &= ~flags; + ios_unlock(this); + return prev; } /* ?width(a)ios@@QAEHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 05fb84c..1b730b9 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -141,6 +141,7 @@ static LONG (*__thiscall p_ios_flags_set)(ios*, LONG); static LONG (*__thiscall p_ios_flags_get)(const ios*); static LONG (*__thiscall p_ios_setf)(ios*, LONG); static LONG (*__thiscall p_ios_setf_mask)(ios*, LONG, LONG); +static LONG (*__thiscall p_ios_unsetf)(ios*, LONG); /* Emulate a __thiscall */ #ifdef __i386__ @@ -253,6 +254,7 @@ static BOOL init(void) SET(p_ios_flags_get, "?flags(a)ios@@QEBAJXZ"); SET(p_ios_setf, "?setf(a)ios@@QEAAJJ(a)Z"); SET(p_ios_setf_mask, "?setf(a)ios@@QEAAJJJ(a)Z"); + SET(p_ios_unsetf, "?unsetf(a)ios@@QEAAJJ(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -295,6 +297,7 @@ static BOOL init(void) SET(p_ios_flags_get, "?flags(a)ios@@QBEJXZ"); SET(p_ios_setf, "?setf(a)ios@@QAEJJ(a)Z"); SET(p_ios_setf_mask, "?setf(a)ios@@QAEJJJ(a)Z"); + SET(p_ios_unsetf, "?unsetf(a)ios@@QAEJJ(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -1020,6 +1023,14 @@ static void test_ios(void) ret = (LONG) call_func3(p_ios_setf_mask, &ios_obj, 0x111, 0x105); ok(ret == 0x8444, "expected %x got %x\n", 0x8444, ret); ok(ios_obj.flags == 0x8541, "expected %x got %x\n", 0x8541, ios_obj.flags); + + /* unsetf */ + ret = (LONG) call_func2(p_ios_unsetf, &ios_obj, 0x1111); + ok(ret == 0x8541, "expected %x got %x\n", 0x8541, ret); + ok(ios_obj.flags == 0x8440, "expected %x got %x\n", 0x8440, ios_obj.flags); + ret = (LONG) call_func2(p_ios_unsetf, &ios_obj, 0x8008); + ok(ret == 0x8440, "expected %x got %x\n", 0x8440, ret); + ok(ios_obj.flags == 0x440, "expected %x got %x\n", 0x440, ios_obj.flags); ios_obj.do_lock = -1; SetEvent(lock_arg.release[0]);

1 0

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

July 17, 2015

Module: wine Branch: master Commit: 968d07dd7bac357a1dcdcb20b7f490de07433da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968d07dd7bac357a1dcdcb20b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jul 16 13:12:40 2015 +0200 msvcirt: Implement ios::setf. --- dlls/msvcirt/msvcirt.c | 22 ++++++++++++++++++---- dlls/msvcirt/tests/msvcirt.c | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0a9dc34..f0ae115 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -82,6 +82,8 @@ typedef struct { } ios; ios* __thiscall ios_assign(ios*, const ios*); +void __cdecl ios_lock(ios*); +void __cdecl ios_unlock(ios*); /* class ostream */ typedef struct _ostream { @@ -1086,8 +1088,14 @@ int __thiscall ios_rdstate(const ios *this) DEFINE_THISCALL_WRAPPER(ios_setf, 8) LONG __thiscall ios_setf(ios *this, LONG flags) { - FIXME("(%p %x) stub\n", this, flags); - return 0; + LONG prev = this->flags; + + TRACE("(%p %x)\n", this, flags); + + ios_lock(this); + this->flags |= flags; + ios_unlock(this); + return prev; } /* ?setf(a)ios@@QAEJJJ(a)Z */ @@ -1095,8 +1103,14 @@ LONG __thiscall ios_setf(ios *this, LONG flags) DEFINE_THISCALL_WRAPPER(ios_setf_mask, 12) LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask) { - FIXME("(%p %x %x) stub\n", this, flags, mask); - return 0; + LONG prev = this->flags; + + TRACE("(%p %x %x)\n", this, flags, mask); + + ios_lock(this); + this->flags = (this->flags & (~mask)) | (flags & mask); + ios_unlock(this); + return prev; } /* ?setlock(a)ios@@QAAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index faddae1..05fb84c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -139,6 +139,8 @@ 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*); +static LONG (*__thiscall p_ios_setf)(ios*, LONG); +static LONG (*__thiscall p_ios_setf_mask)(ios*, LONG, LONG); /* Emulate a __thiscall */ #ifdef __i386__ @@ -249,6 +251,8 @@ static BOOL init(void) 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"); + SET(p_ios_setf, "?setf(a)ios@@QEAAJJ(a)Z"); + SET(p_ios_setf_mask, "?setf(a)ios@@QEAAJJJ(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -289,6 +293,8 @@ static BOOL init(void) 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_setf, "?setf(a)ios@@QAEJJ(a)Z"); + SET(p_ios_setf_mask, "?setf(a)ios@@QAEJJJ(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -1002,6 +1008,20 @@ static void test_ios(void) ok(ret == 0x444, "expected %x got %x\n", 0x444, ret); ok(ios_obj.flags == 0, "expected %x got %x\n", 0, ios_obj.flags); + /* setf */ + ios_obj.do_lock = 0; + ios_obj.flags = 0x8400; + ret = (LONG) call_func2(p_ios_setf, &ios_obj, 0x444); + ok(ret == 0x8400, "expected %x got %x\n", 0x8400, ret); + ok(ios_obj.flags == 0x8444, "expected %x got %x\n", 0x8444, ios_obj.flags); + ret = (LONG) call_func3(p_ios_setf_mask, &ios_obj, 0x111, 0); + ok(ret == 0x8444, "expected %x got %x\n", 0x8444, ret); + ok(ios_obj.flags == 0x8444, "expected %x got %x\n", 0x8444, ios_obj.flags); + ret = (LONG) call_func3(p_ios_setf_mask, &ios_obj, 0x111, 0x105); + ok(ret == 0x8444, "expected %x got %x\n", 0x8444, ret); + ok(ios_obj.flags == 0x8541, "expected %x got %x\n", 0x8541, ios_obj.flags); + ios_obj.do_lock = -1; + SetEvent(lock_arg.release[0]); SetEvent(lock_arg.release[1]); SetEvent(lock_arg.release[2]);

1 0

Aaryaman Vasishta : d3drm/tests: Fix leaks while creating device in tests (Valgrind).
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 9939ac8fe0def693107cf4e470d8f6ac4a052d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9939ac8fe0def693107cf4e47… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 16 21:56:07 2015 +0530 d3drm/tests: Fix leaks while creating device in tests (Valgrind). --- dlls/d3drm/tests/d3drm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1816214..1c80536 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1999,10 +1999,14 @@ static void test_create_device_from_clipper(void) hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, 0, &device2); todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); @@ -2197,6 +2201,8 @@ static void test_create_device_from_surface(void) hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); todo_wine ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr); IDirectDrawSurface_Release(surface); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);

1 0

Sebastian Lackner : vcomp/tests: Add tests for vcomp sections.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 57cbcec0c28260458996dd31a0cebc4c628b9b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cbcec0c28260458996dd31a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:01:45 2015 +0200 vcomp/tests: Add tests for vcomp sections. --- 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 a9b975d..c433991 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -33,6 +33,8 @@ static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_barrier)(void); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +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 *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); @@ -169,6 +171,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_sections_init); + VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); @@ -342,6 +346,52 @@ static void test_vcomp_fork(void) pomp_set_num_threads(max_threads); } +static void CDECL section_cb(LONG *a, LONG *b, LONG *c) +{ + int i; + + p_vcomp_sections_init(20); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(a); + Sleep(1); + } + + p_vcomp_sections_init(30); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(b); + Sleep(1); + } + + p_vcomp_sections_init(40); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(c); + Sleep(1); + } +} + +static void test_vcomp_sections_init(void) +{ + LONG a, b, c; + int max_threads = pomp_get_max_threads(); + int i; + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = 0; + p_vcomp_fork(TRUE, 3, section_cb, &a, &b, &c); + ok(a == 20, "expected a = 20, got %d\n", a); + ok(b == 30, "expected b = 30, got %d\n", b); + ok(c == 40, "expected c = 40, got %d\n", c); + } + + pomp_set_num_threads(max_threads); +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -350,6 +400,7 @@ START_TEST(vcomp) test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork(); + test_vcomp_sections_init(); release_vcomp(); }

1 0