April 2018 - Wine-commits - list.winehq.org

Hans Leidekker : wtsapi32: Improve the stub for WTSQuerySessionInformationW.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: a389b33c25ca93a8a265ae6dd079e002bf4ea27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a389b33c25ca93a8a265ae6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 11 12:05:48 2018 +0200 wtsapi32: Improve the stub for WTSQuerySessionInformationW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/Makefile.in | 1 + dlls/wtsapi32/tests/wtsapi.c | 16 ++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 13 +++++++++++++ include/wtsapi32.h | 1 + 4 files changed, 31 insertions(+) diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index 784a91c..e54c088 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -1,5 +1,6 @@ MODULE = wtsapi32.dll IMPORTLIB = wtsapi32 +IMPORTS = advapi32 C_SRCS = \ wtsapi32.c diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 3b7aa1b..341d9e6 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,7 +90,23 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } +static void test_WTSQuerySessionInformationW(void) +{ + BOOL ret; + WCHAR *buf; + DWORD count; + + count = 0; + buf = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); + WTSFreeMemory(buf); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); + test_WTSQuerySessionInformationW(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 736e199..5569502 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -233,6 +233,19 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (WTSInfoClass == WTSUserName) + { + WCHAR *username; + DWORD count = 0; + + GetUserNameW(NULL, &count); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &count); + *Buffer = username; + *BytesReturned = count * sizeof(WCHAR); + return TRUE; + } return FALSE; } diff --git a/include/wtsapi32.h b/include/wtsapi32.h index 304a418..f329bd5 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -136,6 +136,7 @@ DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) #define WTS_CURRENT_SERVER_HANDLE ((HANDLE)NULL) +#define WTS_CURRENT_SESSION (~0u) void WINAPI WTSCloseServer(HANDLE); BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL);

1 0

Hans Leidekker : crypt32: Return success from the CERT_STORE_CTRL_NOTIFY_CHANGE stub.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: 8ee5d18b422d6fb043ad2ddcaef074c6695af3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee5d18b422d6fb043ad2ddc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 11 12:05:46 2018 +0200 crypt32: Return success from the CERT_STORE_CTRL_NOTIFY_CHANGE stub. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/regstore.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 5a39a26..9b81e01 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -453,7 +453,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { WINE_REGSTOREINFO *store = hCertStore; - BOOL ret; + BOOL ret = TRUE; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, pvCtrlPara); @@ -469,7 +469,6 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, CRYPT_RegReadFromReg(store->key, memStore); I_CertUpdateStore(store->memStore, memStore, 0, 0); CertCloseStore(memStore, 0); - ret = TRUE; break; } case CERT_STORE_CTRL_COMMIT: @@ -478,10 +477,12 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, break; case CERT_STORE_CTRL_AUTO_RESYNC: FIXME("CERT_STORE_CTRL_AUTO_RESYNC: stub\n"); - ret = TRUE; + break; + case CERT_STORE_CTRL_NOTIFY_CHANGE: + FIXME("CERT_STORE_CTRL_NOTIFY_CHANGE: stub\n"); break; default: - FIXME("%d: stub\n", dwCtrlType); + FIXME("%u: stub\n", dwCtrlType); ret = FALSE; } return ret;

1 0

Józef Kucia : user32: Add stub for EnableMouseInPointer().
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: 9a95f10249101600bf19476df68c93c861ff926e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a95f10249101600bf19476d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 11 15:24:23 2018 +0200 user32: Add stub for EnableMouseInPointer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +- dlls/user32/input.c | 11 +++++++++++ dlls/user32/user32.spec | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec index 1e9fa50..72cfe3d 100644 --- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EnableMouseInPointer +@ stdcall EnableMouseInPointer(long) user32.EnableMouseInPointer @ stub GetCurrentInputMessageSource @ stub GetPointerCursorId @ stub GetPointerDevice diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ce4b13f..19d1ec9 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1514,3 +1514,14 @@ int WINAPI GetMouseMovePointsEx(UINT size, LPMOUSEMOVEPOINT ptin, LPMOUSEMOVEPOI SetLastError(ERROR_POINT_NOT_FOUND); return -1; } + +/*********************************************************************** + * EnableMouseInPointer (USER32.@) + */ +BOOL WINAPI EnableMouseInPointer(BOOL enable) +{ + FIXME("(%#x) stub\n", enable); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e990951..bdecc6e 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -203,6 +203,7 @@ @ stdcall EditWndProc(long long long long) EditWndProcA @ stdcall EmptyClipboard() @ stdcall EnableMenuItem(long long long) +@ stdcall EnableMouseInPointer(long) @ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long)

1 0

Louis Lenders : wine.inf: Create catroot directory.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: c06d362b68e19ff0db50e484467ba40e48148e82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06d362b68e19ff0db50e484… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 11 15:47:00 2018 +0200 wine.inf: Create catroot directory. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c55125..0df7622 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2580,6 +2580,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,inf, 10,logs, 10,temp, +11,catroot, 11,mui, 11,tasks, 11,spool\drivers\color,

1 0

Jacek Caban : jscript: Properly support overloaded values in to_int32.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: f96aa1f32c57db449bd2be53fed13d633c171352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96aa1f32c57db449bd2be53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 11 19:36:00 2018 +0200 jscript: Properly support overloaded values in to_int32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 9 ++++++++- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4556ec4..9020611 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -659,11 +659,18 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) double n; HRESULT hres; + const double p32 = (double)0xffffffff + 1; + hres = to_number(ctx, v, &n); if(FAILED(hres)) return hres; - *ret = is_finite(n) ? n : 0; + if(is_finite(n)) + n = n > 0 ? fmod(n, p32) : -fmod(-n, p32); + else + n = 0; + + *ret = (UINT32)n; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ef4c316..9350200 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -632,6 +632,12 @@ tmp = 10; ok((tmp |= 0x10) === 26, "tmp(10) |= 0x10 !== 26"); ok(getVT(tmp) === "VT_I4", "getVT(tmp |= 10) = " + getVT(tmp)); +tmp = (123 * Math.pow(2,32) + 2) | 0; +ok(tmp === 2, "123*2^32+2 | 0 = " + tmp); + +tmp = (-123 * Math.pow(2,32) + 2) | 0; +ok(tmp === 2, "123*2^32+2 | 0 = " + tmp); + tmp = 3 & 5; ok(tmp === 1, "3 & 5 !== 1"); ok(getVT(tmp) === "VT_I4", "getVT(3|5) = " + getVT(tmp));

1 0

Jacek Caban : jscript: Properly parse large hexadecimal listerals.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: 4fde6d413862b0510ff68ecdb0804e292f6e3104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fde6d413862b0510ff68ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 11 19:36:11 2018 +0200 jscript: Properly parse large hexadecimal listerals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index b4f6d95..b4cc82a 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -487,18 +487,18 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) HRESULT hres; if(*ctx->ptr == '0') { - LONG d, l = 0; - ctx->ptr++; if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { + double r = 0; + int d; if(++ctx->ptr == ctx->end) { ERR("unexpected end of file\n"); return FALSE; } while(ctx->ptr < ctx->end && (d = hex_to_int(*ctx->ptr)) != -1) { - l = l*16 + d; + r = r*16 + d; ctx->ptr++; } @@ -508,7 +508,7 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) return FALSE; } - *ret = l; + *ret = r; return TRUE; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9350200..e6ff4dd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -48,6 +48,9 @@ tmp = 07777777777777777777777; ok(typeof(tmp) === "number" && tmp > 0xffffffff, "tmp = " + tmp); tmp = 07777777779777777777777; ok(typeof(tmp) === "number" && tmp > 0xffffffff, "tmp = " + tmp); +ok(0xffffffff === 4294967295, "0xffffffff = " + 0xffffffff); +tmp = 0x10000000000000000000000000000000000000000000000000000000000000000; +ok(tmp === Math.pow(2, 256), "0x1000...00 != 2^256"); ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false");

1 0

Jacek Caban : jscript: Added Date.prototype.toISOString implementation.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: aa27dd07aa55301f3e23acf9f74daa0f465e7b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa27dd07aa55301f3e23acf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 11 19:36:25 2018 +0200 jscript: Added Date.prototype.toISOString implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 35 ++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index f784d51..28ad23d 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -49,6 +49,7 @@ typedef struct { static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static const WCHAR toISOStringW[] = {'t','o','I','S','O','S','t','r','i','n','g',0}; static const WCHAR toUTCStringW[] = {'t','o','U','T','C','S','t','r','i','n','g',0}; static const WCHAR toGMTStringW[] = {'t','o','G','M','T','S','t','r','i','n','g',0}; static const WCHAR toDateStringW[] = {'t','o','D','a','t','e','S','t','r','i','n','g',0}; @@ -632,6 +633,52 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } +static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + DateInstance *date; + WCHAR buf[64], *p = buf; + double year; + + static const WCHAR short_year_formatW[] = {'%','0','4','d',0}; + static const WCHAR long_year_formatW[] = {'%','0','6','d',0}; + static const WCHAR formatW[] = {'-','%','0','2','d','-','%','0','2','d', + 'T','%','0','2','d',':','%','0','2','d',':','%','0','2','d','.','%','0','3','d','Z',0}; + + TRACE("\n"); + + if(!(date = date_this(jsthis))) + return throw_type_error(ctx, JS_E_DATE_EXPECTED, NULL); + + year = year_from_time(date->time); + if(isnan(year) || year > 999999 || year < -999999) { + FIXME("year %lf should throw an exception\n", year); + return E_FAIL; + } + + if(year < 0) { + *p++ = '-'; + p += sprintfW(p, long_year_formatW, -(int)year); + }else if(year > 9999) { + *p++ = '+'; + p += sprintfW(p, long_year_formatW, (int)year); + }else { + p += sprintfW(p, short_year_formatW, (int)year); + } + + sprintfW(p, formatW, (int)month_from_time(date->time) + 1, (int)date_from_time(date->time), + (int)hour_from_time(date->time), (int)min_from_time(date->time), + (int)sec_from_time(date->time), (int)ms_from_time(date->time)); + + if(r) { + jsstr_t *ret; + if(!(ret = jsstr_alloc(buf))) + return E_OUTOFMEMORY; + *r = jsval_string(ret); + } + return S_OK; +} + static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1923,6 +1970,7 @@ static const builtin_prop_t Date_props[] = { {setYearW, Date_setYear, PROPF_METHOD|1}, {toDateStringW, Date_toDateString, PROPF_METHOD}, {toGMTStringW, Date_toGMTString, PROPF_METHOD}, + {toISOStringW, Date_toISOString, PROPF_METHOD|PROPF_ES5}, {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, {toLocaleStringW, Date_toLocaleString, PROPF_METHOD}, {toLocaleTimeStringW, Date_toLocaleTimeString, PROPF_METHOD}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 21a3582..3fbb2fb 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -80,6 +80,7 @@ function test_window_props() { var v = document.documentMode; + test_exposed("postMessage", true); test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); @@ -136,6 +137,7 @@ function test_javascript() { test_exposed("JSON", g, v >= 8); test_exposed("now", Date, true); + test_exposed("toISOString", Date.prototype, v >= 9); test_exposed("isArray", Array, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 9b0dc21..d539557 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -27,6 +27,40 @@ function test_date_now() { next_test(); } +function test_toISOString() { + var s; + + function expect(date, expected) { + var s = date.toISOString(); + ok(s === expected, "toISOString returned " + s + " expected " + expected); + } + + function expect_exception(func) { + try { + func(); + }catch(e) { + return; + } + ok(false, "expected exception"); + } + + expect(new Date(0), "1970-01-01T00:00:00.000Z"); + expect(new Date(0xdeadbeef), "1970-02-13T05:45:28.559Z"); + expect(new Date(10928309128301), "2316-04-22T01:25:28.301Z"); + expect(new Date(-1), "1969-12-31T23:59:59.999Z"); + expect(new Date(-62167219200000), "0000-01-01T00:00:00.000Z"); + expect(new Date(-62167219200001), "-000001-12-31T23:59:59.999Z"); + expect(new Date(-6216721920000100), "-195031-12-03T23:59:59.900Z"); + expect(new Date(1092830912830100), "+036600-06-07T22:27:10.100Z"); + + trace("" + 0xdeadbeef); + + expect_exception(function() { new Date(NaN).toISOString(); }); + expect_exception(function() { new Date(31494784780800001).toISOString(); }); + + next_test(); +} + function test_indexOf() { function expect(array, args, exr) { var r = Array.prototype.indexOf.apply(array, args); @@ -115,6 +149,7 @@ function test_identifier_keywords() { var tests = [ test_date_now, + test_toISOString, test_indexOf, test_isArray, test_identifier_keywords

1 0

Rosanne DiMesio : Re-enable staging checkbox for new test reports
by Jeremy Newman 11 Apr '18

11 Apr '18

Module: appdb Branch: master Commit: fdbd6540fdf1c922f7afeed34230ac49515e802c URL: https://source.winehq.org/git/appdb.git/?a=commit;h=fdbd6540fdf1c922f7afeed… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Apr 11 08:54:06 2018 -0500 Re-enable staging checkbox for new test reports Reverts 6150f43320843dd39da749437a7d73a9374a609e. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/testData.php b/include/testData.php index cec7fec..2b6dbff 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,14 +921,11 @@ class testData{ echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; // Checkbox for Wine-staging echo '<label class="btn btn-secondary">'; - if($this->sState != 'accepted') - echo '<input type="checkbox" name="iStaging" value="1" disabled>'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; else - if($this->iStaging != 0) - echo '<input type="checkbox" name="iStaging" value="1" checked>'; - else - echo '<input type="checkbox" name="iStaging" value="1">'; - echo ' Wine-staging <i>(discontinued; last official release was 2.21)</i>'; + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; echo '</label>'; echo '</td></tr>',"\n";

1 0

Józef Kucia : libs/vkd3d: Fix copying descriptors with NULL destination range sizes.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: vkd3d Branch: master Commit: 28e0ab6481713830571347014c491e16680cea71 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=28e0ab64817138305713470… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 11 13:21:39 2018 +0200 libs/vkd3d: Fix copying descriptors with NULL destination range sizes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 57b94b6..0dc13cb 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1682,8 +1682,8 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, { struct d3d12_device *device = impl_from_ID3D12Device(iface); unsigned int dst_range_idx, dst_idx, src_range_idx, src_idx; + unsigned int dst_range_size, src_range_size; const struct d3d12_desc *src; - unsigned int src_range_size; struct d3d12_desc *dst; TRACE("iface %p, dst_descriptor_range_count %u, dst_descriptor_range_offsets %p, " @@ -1703,21 +1703,23 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, dst_range_idx = dst_idx = 0; dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[0]); + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[0] : 1; for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) { src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; for (src_idx = 0; src_idx < src_range_size; ++src_idx) { - if (dst_idx >= dst_descriptor_range_sizes[dst_range_idx]) + if (dst_idx >= dst_range_size) { + dst_idx = 0; ++dst_range_idx; dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); - dst_idx = 0; + dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } assert(dst_range_idx < dst_descriptor_range_count); - assert(dst_idx < dst_descriptor_range_sizes[dst_range_idx]); + assert(dst_idx < dst_range_size); d3d12_desc_copy(dst++, src++, device); @@ -1725,7 +1727,7 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, } } - assert(dst_idx == dst_descriptor_range_sizes[dst_range_idx]); + assert(dst_idx == dst_range_size); assert(dst_range_idx == dst_descriptor_range_count - 1); }

1 0

Józef Kucia : tests: Add additional test for copying descriptors with NULL range sizes.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: vkd3d Branch: master Commit: 69e6382880d6fcc44e0d5373b4c39a39cadbc077 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=69e6382880d6fcc44e0d537… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 11 13:21:40 2018 +0200 tests: Add additional test for copying descriptors with NULL range sizes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0f858ff..7dfee87 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10836,6 +10836,170 @@ static void test_copy_descriptors(void) destroy_test_context(&context); } +static void test_copy_descriptors_range_sizes(void) +{ + D3D12_CPU_DESCRIPTOR_HANDLE dst_handles[1], src_handles[1]; + D3D12_CPU_DESCRIPTOR_HANDLE green_handle, blue_handle; + ID3D12Resource *green_texture, *blue_texture; + UINT dst_range_sizes[1], src_range_sizes[1]; + ID3D12GraphicsCommandList *command_list; + ID3D12DescriptorHeap *cpu_heap; + struct test_context_desc desc; + D3D12_SUBRESOURCE_DATA data; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + RECT rect; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 32.0f; + p.y = position.y / 32.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x7a0c3929, 0x75ff3ca4, 0xccb318b2, 0xe6965b4c, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, + 0x3d000000, 0x3d000000, 0x00000000, 0x00000000, 0x8b000045, 0x800000c2, 0x00155543, 0x001020f2, + 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 blue = {0.0f, 0.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = desc.rt_height = 6; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 10); + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 8); + + green_handle = get_cpu_descriptor_handle(&context, cpu_heap, 0); + blue_handle = get_cpu_descriptor_handle(&context, cpu_heap, 1); + + green_texture = create_texture(context.device, + 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = &green; + data.RowPitch = sizeof(green); + data.SlicePitch = data.RowPitch; + upload_texture_data(green_texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, green_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(device, green_texture, NULL, green_handle); + + blue_texture = create_texture(context.device, + 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = &blue; + data.RowPitch = sizeof(blue); + data.SlicePitch = data.RowPitch; + upload_texture_data(blue_texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, blue_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(device, blue_texture, NULL, blue_handle); + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 0, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + /* copy descriptors */ + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 1); + dst_range_sizes[0] = 1; + src_handles[0] = blue_handle; + src_range_sizes[0] = 1; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes, + 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 2); + dst_range_sizes[0] = 1; + src_handles[0] = green_handle; + src_range_sizes[0] = 1; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes, + 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 3); + src_handles[0] = blue_handle; + src_range_sizes[0] = 1; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL, + 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 4); + src_handles[0] = green_handle; + src_range_sizes[0] = 1; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL, + 1, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 5); + src_handles[0] = blue_handle; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL, + 1, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 0); + src_handles[0] = green_handle; + ID3D12Device_CopyDescriptors(device, 1, dst_handles, NULL, + 1, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + for (i = 0; i < desc.rt_width; ++i) + { + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, i)); + set_viewport(&context.viewport, i, 0.0f, 1.0f, desc.rt_height, 0.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + } + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + for (i = 0; i < desc.rt_width; ++i) + { + set_rect(&rect, i, 0, i + 1, desc.rt_height); + check_readback_data_uint(&rb, &rect, i % 2 ? 0xffff0000 : 0xff00ff00, 0); + } + release_resource_readback(&rb); + + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(blue_texture); + ID3D12Resource_Release(green_texture); + destroy_test_context(&context); +} + static void test_descriptors_visibility(void) { ID3D12Resource *vs_raw_buffer, *ps_raw_buffer; @@ -16991,6 +17155,7 @@ START_TEST(d3d12) run_test(test_update_descriptor_heap_after_closing_command_list); run_test(test_update_compute_descriptor_tables); run_test(test_copy_descriptors); + run_test(test_copy_descriptors_range_sizes); run_test(test_descriptors_visibility); run_test(test_null_descriptors); run_test(test_get_copyable_footprints);

1 0