September 2016 - Wine-Commits

Aric Stewart : winebus.sys: Add initial udev stub driver.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 6d3e5f8441136d359274af7791c787eb5d205cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3e5f8441136d359274af779… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 8 10:12:50 2016 +0200 winebus.sys: Add initial udev stub driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 107 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 ++++++ dlls/winebus.sys/Makefile.in | 2 + dlls/winebus.sys/bus.h | 23 ++++++++++ dlls/winebus.sys/bus_udev.c | 60 ++++++++++++++++++++++++ dlls/winebus.sys/main.c | 34 ++++++++++++++ include/config.h.in | 6 +++ 7 files changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d3e5f8441136d359274a…

1 0

Sebastian Lackner : oledb32/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 81f110cc3659c99998c44a740825be6da53e46e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f110cc3659c99998c44a740… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 12:20:46 2016 +0200 oledb32/tests: Fix incorrect usage of broken() function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 46719b1..de852da 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1351,7 +1351,7 @@ static void test_converttowstr(void) ((LARGE_INTEGER*)src)->QuadPart = 4321; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - ok(broken(DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); + ok(broken(hr == DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); ok(broken(dst_status == DBSTATUS_E_BADACCESSOR) || dst_status == DBSTATUS_S_OK /* W2K+ */, "got %08x\n", dst_status); ok(broken(dst_len == 0x1234) || dst_len == 8 /* W2K+ */, "got %ld\n", dst_len); ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); @@ -1359,7 +1359,7 @@ static void test_converttowstr(void) memset(src, 0, sizeof(src)); ((ULARGE_INTEGER*)src)->QuadPart = 4321; hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - ok(broken(DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); + ok(broken(hr == DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); ok(broken(dst_status == DBSTATUS_E_BADACCESSOR) || dst_status == DBSTATUS_S_OK /* W2K+ */, "got %08x\n", dst_status); ok(broken(dst_len == 0x1234) || dst_len == 8 /* W2K+ */, "got %ld\n", dst_len); ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); @@ -1838,7 +1838,7 @@ static void test_converttostr(void) ((LARGE_INTEGER*)src)->QuadPart = 4321; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - ok(broken(DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); + ok(broken(hr == DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); ok(broken(dst_status == DBSTATUS_E_BADACCESSOR) || dst_status == DBSTATUS_S_OK /* W2K+ */, "got %08x\n", dst_status); ok(broken(dst_len == 0x1234) || dst_len == 4 /* W2K+ */, "got %ld\n", dst_len); ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst); @@ -1847,7 +1847,7 @@ static void test_converttostr(void) ((ULARGE_INTEGER*)src)->QuadPart = 4321; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI8, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - ok(broken(DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); + ok(broken(hr == DB_E_UNSUPPORTEDCONVERSION) || hr == S_OK /* W2K+ */, "got %08x\n", hr); ok(broken(dst_status == DBSTATUS_E_BADACCESSOR) || dst_status == DBSTATUS_S_OK /* W2K+ */, "got %08x\n", dst_status); ok(broken(dst_len == 0x1234) || dst_len == 4 /* W2K+ */, "got %ld\n", dst_len); ok(!lstrcmpA(dst, fourthreetwoone), "got %s\n", dst);

1 0

Jacek Caban : winhttp: Added WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER options stub.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 9bc3e9614f59619c409658da11285ffa758b0611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bc3e9614f59619c409658da1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 18:57:30 2016 +0200 winhttp: Added WINHTTP_OPTION_MAX_CONNS_PER_SERVER and WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER options stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 600624c..4813a3f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -205,6 +205,12 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); session->unload_event = *(HANDLE *)buffer; return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: + FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); + return TRUE; + case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: + FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

Sebastian Lackner : user32: Add missing call to GlobalUnlock in render_synthesized_enhmetafile.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 4e63a5bf8fa76e145fbd83ba8a8bcd22cedd57f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e63a5bf8fa76e145fbd83ba8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 20:52:49 2016 +0200 user32: Add missing call to GlobalUnlock in render_synthesized_enhmetafile. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 135790a..d11dd23 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -348,6 +348,8 @@ static HANDLE render_synthesized_enhmetafile( HANDLE data ) ret = SetWinMetaFileBits( size, bits, NULL, pict ); HeapFree( GetProcessHeap(), 0, bits ); } + + GlobalUnlock( data ); return ret; }

1 0

Sebastian Lackner : mshtml/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 01581bfc48161c3c55027334b1ecb9e909873a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01581bfc48161c3c55027334b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 11:17:15 2016 +0200 mshtml/tests: Fix incorrect usage of broken() function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 92a6f67..e8b3d19 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1968,7 +1968,7 @@ static void test_func(IDispatchEx *obj) memset(&ei, 0, sizeof(ei)); VariantInit(&var); hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); - ok(hres == S_OK || broken(E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { DISPID named_args[2] = { DISPID_THIS, 0xdeadbeef }; VARIANT args[2];

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_r8 and add tests.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 0c4c6d603bad5c24ccf54439ae9e5c2f6c436f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4c6d603bad5c24ccf54439a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 08:22:11 2016 +0200 vcomp: Implement _vcomp_reduction_r8 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 13 +++++++++++-- dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d4c9366..34e327e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -894,6 +894,46 @@ void CDECL _vcomp_atomic_sub_r8(double *dest, double val) while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); } +static void CDECL _vcomp_atomic_bool_and_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = (*(double *)&old != 0.0) ? (val != 0.0) : 0.0; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = (*(double *)&old != 0.0) ? *(double *)&old : (val != 0.0); + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) +{ + static void (CDECL * const funcs[])(double *, double) = + { + _vcomp_atomic_add_r8, + _vcomp_atomic_add_r8, + _vcomp_atomic_mul_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_and_r8, + _vcomp_atomic_bool_or_r8, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 15fc473..96a3d9c 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -108,6 +108,7 @@ static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, sh static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); static void (CDECL *p_vcomp_reduction_i8)(unsigned int flags, LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_reduction_r4)(unsigned int flags, float *dest, float val); +static void (CDECL *p_vcomp_reduction_r8)(unsigned int flags, double *dest, double val); static void (CDECL *p_vcomp_reduction_u1)(unsigned int flags, unsigned char *dest, unsigned char val); static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); @@ -358,6 +359,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_reduction_i4); VCOMP_GET_PROC(_vcomp_reduction_i8); VCOMP_GET_PROC(_vcomp_reduction_r4); + VCOMP_GET_PROC(_vcomp_reduction_r8); VCOMP_GET_PROC(_vcomp_reduction_u1); VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); @@ -2110,7 +2112,7 @@ static void test_reduction_integer64(void) } } -static void test_reduction_float(void) +static void test_reduction_float_double(void) { static const struct { @@ -2161,6 +2163,13 @@ static void test_reduction_float(void) ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); } + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + double val = tests[i].v1; + p_vcomp_reduction_r8(tests[i].flags, &val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } } START_TEST(vcomp) @@ -2191,7 +2200,7 @@ START_TEST(vcomp) test_reduction_integer16(); test_reduction_integer32(); test_reduction_integer64(); - test_reduction_float(); + test_reduction_float_double(); release_vcomp(); } diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 22f06cb..f2231c0 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) @ cdecl _vcomp_reduction_i8(long ptr int64) @ cdecl _vcomp_reduction_r4(long ptr float) -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) @ cdecl _vcomp_reduction_u1(long ptr long) _vcomp_reduction_i1 @ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 @ cdecl _vcomp_reduction_u4(long ptr long) _vcomp_reduction_i4 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index b87bd8b..afea2f2 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index b87bd8b..afea2f2 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_r4 and add tests.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 363d8d2140e6750c6093f4e9a62043f240cacc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d8d2140e6750c6093f4e9a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 11:48:32 2016 +0200 vcomp: Implement _vcomp_reduction_r4 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8523155..d4c9366 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -810,6 +810,46 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) while (interlocked_cmpxchg((int *)dest, new, old) != old); } +static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = (*(float *)&old != 0.0) ? (val != 0.0) : 0.0; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = (*(float *)&old != 0.0) ? *(float *)&old : (val != 0.0); + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) +{ + static void (CDECL * const funcs[])(float *, float) = + { + _vcomp_atomic_add_r4, + _vcomp_atomic_add_r4, + _vcomp_atomic_mul_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_and_r4, + _vcomp_atomic_bool_or_r4, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + void CDECL _vcomp_atomic_add_r8(double *dest, double val) { LONG64 old, new; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 088f256..15fc473 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -107,6 +107,7 @@ static void (CDECL *p_vcomp_reduction_i1)(unsigned int flags, char *dest, cha static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, short val); static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); static void (CDECL *p_vcomp_reduction_i8)(unsigned int flags, LONG64 *dest, LONG64 val); +static void (CDECL *p_vcomp_reduction_r4)(unsigned int flags, float *dest, float val); static void (CDECL *p_vcomp_reduction_u1)(unsigned int flags, unsigned char *dest, unsigned char val); static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); @@ -356,6 +357,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_reduction_i2); VCOMP_GET_PROC(_vcomp_reduction_i4); VCOMP_GET_PROC(_vcomp_reduction_i8); + VCOMP_GET_PROC(_vcomp_reduction_r4); VCOMP_GET_PROC(_vcomp_reduction_u1); VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); @@ -2108,6 +2110,59 @@ static void test_reduction_integer64(void) } } +static void test_reduction_float(void) +{ + static const struct + { + unsigned int flags; + float v1, v2, expected; + } + tests[] = + { + { 0x000, 42.0, 17.0, 42.0 + 17.0 }, + { VCOMP_REDUCTION_FLAGS_ADD, 42.0, 17.0, 42.0 + 17.0 }, + { VCOMP_REDUCTION_FLAGS_MUL, 42.0, 17.0, 42.0 * 17.0 }, + { 0x300, 0.0, 2.0, 1.0 }, + { 0x400, 0.0, 2.0, 1.0 }, + { 0x500, 0.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, -0.0, 1.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 0.0, 2.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, -0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 1.0e-5, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 2.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 2.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, -0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, -0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 1.0e-5, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 1.0, 0.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 1.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 2.0, 0.0, 2.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 2.0, 2.0, 2.0 }, + { 0x800, 0.0, 2.0, 1.0 }, + { 0x900, 0.0, 2.0, 1.0 }, + { 0xa00, 0.0, 2.0, 1.0 }, + { 0xb00, 0.0, 2.0, 1.0 }, + { 0xc00, 0.0, 2.0, 1.0 }, + { 0xd00, 0.0, 2.0, 1.0 }, + { 0xe00, 0.0, 2.0, 1.0 }, + { 0xf00, 0.0, 2.0, 1.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + float val = tests[i].v1; + p_vcomp_reduction_r4(tests[i].flags, &val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -2136,6 +2191,7 @@ START_TEST(vcomp) test_reduction_integer16(); test_reduction_integer32(); test_reduction_integer64(); + test_reduction_float(); release_vcomp(); } diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 6f57746..22f06cb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) @ cdecl _vcomp_reduction_i4(long ptr long) @ cdecl _vcomp_reduction_i8(long ptr int64) -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) _vcomp_reduction_i1 @ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 564b3d7..b87bd8b 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 564b3d7..b87bd8b 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_{u, i}8 and add tests.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 38c29640df85e43e058e3905e61edf6c1fd76e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c29640df85e43e058e3905e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 08:21:06 2016 +0200 vcomp: Implement _vcomp_reduction_{u,i}8 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 30 +++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 54 ++++++++++++++++++++++++++++++++++++++++++--- dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp120/vcomp120.spec | 4 ++-- dlls/vcomp140/vcomp140.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 8 files changed, 93 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38c29640df85e43e058e3…

1 0

Sebastian Lackner : shell32/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: f89c3d58df5721cac880789bb80681752829a54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89c3d58df5721cac880789bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 11:23:38 2016 +0200 shell32/tests: Fix incorrect usage of broken() function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 2 +- dlls/shell32/tests/shfldr_special.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9a47c67..70146cb 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -346,7 +346,7 @@ static void test_items(void) ok(r == S_OK, "Folder::Items failed: %08x\n", r); ok(!!items, "items is null\n"); r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); - ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); + ok(r == S_OK || broken(r == E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 6d61220..dd4cc04 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -166,7 +166,7 @@ if (0) details.str.u.pOleStr = NULL; hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); - ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); /* test every column if method is implemented */

1 0

Nikolay Sivov : dxgi: Added partial implementation of GetDC()/ReleaseDC().
by Alexandre Julliard Sept. 8, 2016

Sept. 8, 2016

Module: wine Branch: master Commit: 4cffa0e2636b75e14fc3ef44b360f1b66b9f7b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cffa0e2636b75e14fc3ef44b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 8 13:26:52 2016 +0300 dxgi: Added partial implementation of GetDC()/ReleaseDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 6 +++--- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/surface.c | 32 ++++++++++++++++++++++++++++---- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f70b4ff..6007a3b 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -720,7 +720,7 @@ static void test_getdc(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); /* One more time. */ dc = (HDC)0xdeadbeef; @@ -729,7 +729,7 @@ static void test_getdc(void) ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); hr = IDXGISurface1_ReleaseDC(surface1, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); hr = IDXGISurface1_ReleaseDC(surface1, NULL); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43e43db..b53de3b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8426,10 +8426,10 @@ static void test_getdc(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGISurface1_GetDC(surface, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); hr = IDXGISurface1_ReleaseDC(surface, NULL); - todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); IDXGISurface1_Release(surface); ID3D11Texture2D_Release(texture); @@ -8481,7 +8481,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDXGISurface1_GetDC(surface, FALSE, &dc); - todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); + ok(SUCCEEDED(hr), "Got unexpected hr %#x for format %s.\n", hr, testdata[i].name); if (FAILED(hr)) { diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 86ba34a..06892e2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -184,6 +184,7 @@ struct dxgi_surface struct wined3d_private_store private_store; IDXGIDevice *device; struct wined3d_texture *wined3d_texture; + HDC dc; }; HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 687caaa..36fc1e6 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -197,16 +197,39 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) /* IDXGISurface1 methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDC(IDXGISurface1 *iface, BOOL discard, HDC *hdc) { - FIXME("iface %p, discard %d, hdc %p stub!\n", iface, discard, hdc); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, discard %d, hdc %p semi-stub!\n", iface, discard, hdc); + + if (!hdc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + hr = wined3d_texture_get_dc(surface->wined3d_texture, 0, hdc); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + surface->dc = *hdc; + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_surface_ReleaseDC(IDXGISurface1 *iface, RECT *dirty_rect) { - FIXME("iface %p, rect %p stub!\n", iface, dirty_rect); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, rect %s\n", iface, wine_dbgstr_rect(dirty_rect)); + + if (!IsRectEmpty(dirty_rect)) + FIXME("dirty rectangle is ignored.\n"); + + wined3d_mutex_lock(); + hr = wined3d_texture_release_dc(surface->wined3d_texture, 0, surface->dc); + wined3d_mutex_unlock(); + + return hr; } static const struct IDXGISurface1Vtbl dxgi_surface_vtbl = @@ -249,6 +272,7 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; surface->wined3d_texture = wined3d_texture; + surface->dc = NULL; return S_OK; }

1 0