wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Piotr Caban : dwrite: Fix features dumping in analyzer_dump_user_features.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 71b3ba57f76dca83666fa4f8d69103cc81a5c393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b3ba57f76dca83666fa4f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 6 17:12:27 2018 +0200 dwrite: Fix features dumping in analyzer_dump_user_features. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov<nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b20bafa..8d553c6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1140,7 +1140,7 @@ static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **feat if (!TRACE_ON(dwrite) || !features) return; - for (i = 0, start = 0; i < feature_ranges; i++, start += feature_range_lengths[i]) { + for (i = 0, start = 0; i < feature_ranges; start += feature_range_lengths[i++]) { TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); for (j = 0; j < features[i]->featureCount; j++) TRACE("feature %s, parameter %u\n", debugstr_an((char *)&features[i]->features[j].nameTag, 4),

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

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: 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

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

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

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

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 : wtsapi32: Implement WTSFreeMemory.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: 90681e3a764ded7d73f77ab469cba1d4fd86ad32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90681e3a764ded7d73f77ab4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 11 12:05:47 2018 +0200 wtsapi32: Implement WTSFreeMemory. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 10 +++++----- dlls/wtsapi32/wtsapi32.c | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index e8dced7..3b7aa1b 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -47,21 +47,21 @@ static void test_WTSEnumerateProcessesW(void) ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); @@ -73,7 +73,7 @@ static void test_WTSEnumerateProcessesW(void) ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); count = 0; info = NULL; @@ -87,7 +87,7 @@ static void test_WTSEnumerateProcessesW(void) } todo_wine ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname)); - if (info) WTSFreeMemory(info); + WTSFreeMemory(info); } START_TEST (wtsapi) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index aeb4b65..736e199 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "wtsapi32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -168,9 +169,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - static int once; - - if (!once++) FIXME("Stub %p\n", pMemory); + heap_free(pMemory); } /************************************************************

1 0

Hans Leidekker : kernel32: Add stub implementations of GetNamedPipeClient/ ServerSessionId.
by Alexandre Julliard 11 Apr '18

11 Apr '18

Module: wine Branch: master Commit: f297fd800b98dff23a6be2296c172f169161cd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f297fd800b98dff23a6be229… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 11 14:32:57 2018 +0200 kernel32: Add stub implementations of GetNamedPipeClient/ServerSessionId. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 24 +++++++ dlls/kernel32/tests/pipe.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fb8d4c0..7470d2b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -728,12 +728,12 @@ # @ stub GetNamedPipeClientComputerNameA # @ stub GetNamedPipeClientComputerNameW @ stdcall GetNamedPipeClientProcessId(long ptr) -# @ stub GetNamedPipeClientSessionId +@ stdcall GetNamedPipeClientSessionId(long ptr) @ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNamedPipeServerProcessId(long ptr) -# @ stub GetNamedPipeServerSessionId +@ stdcall GetNamedPipeServerSessionId(long ptr) @ stdcall GetNativeSystemInfo(ptr) @ stdcall -arch=x86_64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 04e9779..343998e 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1827,6 +1827,30 @@ BOOL WINAPI GetNamedPipeServerProcessId( HANDLE pipe, ULONG *id ) } /*********************************************************************** + * GetNamedPipeClientSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeClientSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** + * GetNamedPipeServerSessionId (KERNEL32.@) + */ +BOOL WINAPI GetNamedPipeServerSessionId( HANDLE pipe, ULONG *id ) +{ + FIXME( "%p, %p\n", pipe, id ); + + if (!id) return FALSE; + *id = NtCurrentTeb()->Peb->SessionId; + return TRUE; +} + +/*********************************************************************** * GetNamedPipeHandleStateA (KERNEL32.@) */ BOOL WINAPI GetNamedPipeHandleStateA( diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 62f2ee3..13570b0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -40,6 +40,8 @@ static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); +static BOOL (WINAPI *pGetNamedPipeServerSessionId)(HANDLE,ULONG*); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param) @@ -3449,6 +3451,147 @@ static void test_namedpipe_process_id(void) CloseHandle(server); } +static void child_process_check_session_id(DWORD server_id) +{ + DWORD current; + HANDLE pipe; + ULONG id; + BOOL ret; + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + pipe = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x\n", id); + + id = 0; + ret = pGetNamedPipeServerSessionId(pipe, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == server_id, "got %04x expected %04x\n", id, server_id); + CloseHandle(pipe); +} + +static void test_namedpipe_session_id(void) +{ + HANDLE client, server, process; + OVERLAPPED overlapped; + DWORD current; + ULONG id; + BOOL ret; + + if (!pGetNamedPipeClientSessionId) + { + win_skip("GetNamedPipeClientSessionId not available\n"); + return; + } + + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &current); + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(server, NULL); + ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %u expected %u\n", id, current); + + /* closed client handle */ + CloseHandle(client); + + id = 0; + ret = pGetNamedPipeClientSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(server); + + /* disconnected server */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + DisconnectNamedPipe(server); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_NOT_FOUND, "got %u\n", GetLastError()); + + id = 0; + ret = pGetNamedPipeServerSessionId(server, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetNamedPipeServerSessionId(client, &id); + todo_wine ok(!ret, "success\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_NOT_CONNECTED, "got %u\n", GetLastError()); + CloseHandle(client); + CloseHandle(server); + + /* closed server handle */ + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + CloseHandle(server); + + id = 0; + ret = pGetNamedPipeClientSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + + id = 0; + ret = pGetNamedPipeServerSessionId(client, &id); + ok(ret, "got %u\n", GetLastError()); + ok(id == current, "got %04x expected %04x\n", id, current); + CloseHandle(client); + + /* different process */ + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + server = create_overlapped_server( &overlapped ); + ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); + + process = create_check_id_process("checksessionid", current); + winetest_wait_child_process(process); + + CloseHandle(overlapped.hEvent); + CloseHandle(process); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3462,6 +3605,8 @@ START_TEST(pipe) pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); + pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); + pGetNamedPipeServerSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeServerSessionId"); argc = winetest_get_mainargs(&argv); @@ -3481,6 +3626,14 @@ START_TEST(pipe) child_process_check_pid(pid); return; } + if (!strcmp(argv[2], "checksessionid")) + { + DWORD id; + ProcessIdToSessionId(GetProcessId(GetCurrentProcess()), &id); + sscanf(argv[3], "%x", &id); + child_process_check_session_id(id); + return; + } } if (test_DisconnectNamedPipe()) @@ -3503,4 +3656,5 @@ START_TEST(pipe) test_overlapped_transport(FALSE, FALSE); test_TransactNamedPipe(); test_namedpipe_process_id(); + test_namedpipe_session_id(); }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018