November 2017 - Wine-Commits

Andrey Gusev : kernel32: Add CreateThreadpoolIo stub.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: cf415c62ed648037114b132a387cf438e19365e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf415c62ed648037114b132a3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 22 21:18:42 2017 +0200 kernel32: Add CreateThreadpoolIo stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 2 +- .../api-ms-win-core-threadpool-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/thread.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec index dcf954a..4f4580a 100644 --- a/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-1-0/api-ms-win-core-threadpool-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec index 870becc..dc110ef 100644 --- a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec +++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index cf27aea..2c719d4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -333,7 +333,7 @@ @ stdcall CreateThread(ptr long ptr long long ptr) @ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() -# @ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @ stdcall CreateThreadpoolWait(ptr ptr ptr) @ stdcall CreateThreadpoolWork(ptr ptr ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index a30428f..6a89993 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -1001,6 +1001,16 @@ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) } /*********************************************************************** + * CreateThreadpoolIo (KERNEL32.@) + */ +PTP_IO WINAPI CreateThreadpoolIo( HANDLE handle, PTP_WIN32_IO_CALLBACK callback, + PVOID userdata, TP_CALLBACK_ENVIRON *environment ) +{ + FIXME("(%p, %p, %p, %p): stub\n", handle, callback, userdata, environment); + return FALSE; +} + +/*********************************************************************** * CreateThreadpoolTimer (KERNEL32.@) */ PTP_TIMER WINAPI CreateThreadpoolTimer( PTP_TIMER_CALLBACK callback, PVOID userdata, diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1e57fe8..b9eb4fc 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -225,7 +225,7 @@ @ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread @ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup -@ stub CreateThreadpoolIo +@ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) kernel32.CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer @ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork diff --git a/include/winbase.h b/include/winbase.h index a4d545e..cc719c6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1832,6 +1832,7 @@ WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup(void); +WINBASEAPI PTP_IO WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_TIMER WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WAIT WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON);

1 0

Lucian Poston : shell32: Stub GetRedirectionCapabilities with S_OK.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: 349064216a606c9c16be05da71ab5923a63d7c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349064216a606c9c16be05da7… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Wed Nov 22 12:20:46 2017 -0800 shell32: Stub GetRedirectionCapabilities with S_OK. Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 6 ++++-- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c5ba629..4f1cdc0 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5555,8 +5555,10 @@ static HRESULT WINAPI knownfolder_GetRedirectionCapabilities( IKnownFolder *iface, KF_REDIRECTION_CAPABILITIES *pCapabilities) { - FIXME("%p\n", pCapabilities); - return E_NOTIMPL; + FIXME("%p stub\n", pCapabilities); + if(!pCapabilities) return E_INVALIDARG; + *pCapabilities = KF_REDIRECTION_CAPABILITIES_DENY_ALL; + return S_OK; } static HRESULT WINAPI knownfolder_GetFolderDefinition( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9fea876..387eecb 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2121,7 +2121,6 @@ static void test_knownFolders(void) CoTaskMemFree(folderPath); hr = IKnownFolder_GetRedirectionCapabilities(folder, &redirectionCapabilities); - todo_wine ok(hr == S_OK, "failed to get redirection capabilities: 0x%08x\n", hr); todo_wine ok(redirectionCapabilities==0, "invalid redirection capabilities returned: %d\n", redirectionCapabilities);

1 0

Hans Leidekker : advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: 5bc2e83c7ab550e27b2659fb3614db754054f636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc2e83c7ab550e27b2659fb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:33:00 2017 +0100 advapi32: Fix size returned from ConvertStringSecurityDescriptorToSecurityDescriptor on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7281e01..f0c133e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4652,7 +4652,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = sizeof(SECURITY_DESCRIPTOR); + *cBytes = sizeof(SECURITY_DESCRIPTOR_RELATIVE); tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR));

1 0

Hans Leidekker : advapi32/tests: Add tests for MakeSelfRelativeSD.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: 84a95032986c925c364952d6d2906310cde02774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a95032986c925c364952d6d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:32:59 2017 +0100 advapi32/tests: Add tests for MakeSelfRelativeSD. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 48 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e86fe21..51dcf90 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2731,12 +2731,12 @@ static void test_LookupAccountName(void) static void test_security_descriptor(void) { - SECURITY_DESCRIPTOR sd; + SECURITY_DESCRIPTOR sd, *sd_rel, *sd_rel2, *sd_abs; char buf[8192]; - DWORD size; + DWORD size, size_dacl, size_sacl, size_owner, size_group; BOOL isDefault, isPresent, ret; - PACL pacl; - PSID psid; + PACL pacl, dacl, sacl; + PSID psid, owner, group; SetLastError(0xdeadbeef); ret = InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION); @@ -2774,6 +2774,46 @@ static void test_security_descriptor(void) expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); } + + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SYG:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)" + "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" + "(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, (void **)&sd_rel, NULL); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_rel, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_BAD_DESCRIPTOR_FORMAT, "got %u\n", GetLastError()); + + /* convert to absolute form */ + size = size_dacl = size_sacl = size_owner = size_group = 0; + ret = MakeAbsoluteSD(sd_rel, NULL, &size, NULL, &size_dacl, NULL, &size_sacl, NULL, &size_owner, NULL, + &size_group); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + sd_abs = HeapAlloc(GetProcessHeap(), 0, size + size_dacl + size_sacl + size_owner + size_group); + dacl = (PACL)(sd_abs + 1); + sacl = (PACL)((char *)dacl + size_dacl); + owner = (PSID)((char *)sacl + size_sacl); + group = (PSID)((char *)owner + size_owner); + ret = MakeAbsoluteSD(sd_rel, sd_abs, &size, dacl, &size_dacl, sacl, &size_sacl, owner, &size_owner, + group, &size_group); + ok(ret, "got %u\n", GetLastError()); + + size = 0; + ret = MakeSelfRelativeSD(sd_abs, NULL, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size == 184, "got %u\n", size); + + size += 4; + sd_rel2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = MakeSelfRelativeSD(sd_abs, sd_rel2, &size); + ok(ret, "got %u\n", GetLastError()); + ok(size == 188, "got %u\n", size); + + HeapFree(GetProcessHeap(), 0, sd_abs); + HeapFree(GetProcessHeap(), 0, sd_rel2); + LocalFree(sd_rel); } #define TEST_GRANTED_ACCESS(a,b) test_granted_access(a,b,0,__LINE__)

1 0

Hans Leidekker : ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: fdc51fc27835b411b3af976e6011fa7226939fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc51fc27835b411b3af976e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 24 11:32:58 2017 +0100 ntdll: Fix size returned from RtlMakeSelfRelativeSD on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 1 + dlls/ntdll/tests/rtl.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c858b5..02fc77d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -860,6 +860,7 @@ NTSTATUS WINAPI RtlMakeSelfRelativeSD( return STATUS_INVALID_PARAMETER; length = RtlLengthSecurityDescriptor(pAbs); + if (!(pAbs->Control & SE_SELF_RELATIVE)) length -= (sizeof(*pAbs) - sizeof(*pRel)); if (*lpdwBufferLength < length) { *lpdwBufferLength = length; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7333ab8..2e3a7de 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -99,6 +99,8 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); +static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -153,6 +155,8 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD"); + pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -2209,6 +2213,52 @@ static void test_LdrEnumerateLoadedModules(void) ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got 0x%08x\n", status); } +static void test_RtlMakeSelfRelativeSD(void) +{ + char buf[sizeof(SECURITY_DESCRIPTOR_RELATIVE) + 4]; + SECURITY_DESCRIPTOR_RELATIVE *sd_rel = (SECURITY_DESCRIPTOR_RELATIVE *)buf; + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + DWORD len; + + if (!pRtlMakeSelfRelativeSD || !pRtlAbsoluteToSelfRelativeSD) + { + win_skip( "RtlMakeSelfRelativeSD/RtlAbsoluteToSelfRelativeSD not available\n" ); + return; + } + + memset( &sd, 0, sizeof(sd) ); + sd.Revision = SECURITY_DESCRIPTOR_REVISION; + + len = 0; + status = pRtlMakeSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + len = 0; + status = pRtlAbsoluteToSelfRelativeSD( &sd, NULL, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %08x\n", status ); + ok( len == sizeof(*sd_rel), "got %u\n", len ); + + len += 4; + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + sd.Control = SE_SELF_RELATIVE; + status = pRtlMakeSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status ); + ok( len == sizeof(*sd_rel) + 4, "got %u\n", len ); + + status = pRtlAbsoluteToSelfRelativeSD( &sd, sd_rel, &len ); + ok( status == STATUS_BAD_DESCRIPTOR_FORMAT, "got %08x\n", status ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -2242,4 +2292,5 @@ START_TEST(rtl) test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); + test_RtlMakeSelfRelativeSD(); }

1 0

Stanislav Motylkov : rasapi32: Add stub for RasGetConnectionStatistics.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: 290aec59aa18e0bdd481c9ae36e24a75e1254bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=290aec59aa18e0bdd481c9ae3… Author: Stanislav Motylkov <x86corez(a)gmail.com> Date: Wed Nov 22 22:31:50 2017 +0300 rasapi32: Add stub for RasGetConnectionStatistics. Signed-off-by: Stanislav Motylkov <x86corez(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ras-rasapi32-l1-1-0.spec | 2 +- dlls/rasapi32/rasapi.c | 6 ++++++ dlls/rasapi32/rasapi32.spec | 1 + include/raserror.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec index bb73c8a..f215a57 100644 --- a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) rasapi32.RasEnumEntriesW @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressA @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressW -@ stub RasGetConnectionStatistics +@ stdcall RasGetConnectionStatistics(ptr ptr) rasapi32.RasGetConnectionStatistics @ stdcall RasGetConnectStatusW(ptr ptr) rasapi32.RasGetConnectStatusW @ stub RasGetCredentialsW @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) rasapi32.RasGetEntryDialParamsW diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index b1721c6..791b0da 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -547,3 +547,9 @@ DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *s FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); return 0; } + +DWORD WINAPI RasGetConnectionStatistics(HRASCONN connection, RAS_STATS *statistics) +{ + FIXME("(%p,%p), stub!\n", connection, statistics); + return ERROR_UNKNOWN; +} diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 66b21a6..e8a28a8 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -33,6 +33,7 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +@ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA diff --git a/include/raserror.h b/include/raserror.h index 1735936..549b424 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -23,6 +23,7 @@ #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) #define ERROR_BUFFER_INVALID (RASBASE+10) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_UNKNOWN (RASBASE+35) #define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111)

1 0

Francois Gouget : testbot: Fix the $Tunnel configuration setting prefix.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: tools Branch: master Commit: c9ccc6cd895aa33004f761fb9d796678370e8a4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9ccc6cd895aa33004f761fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 09:59:32 2017 +0100 testbot: Fix the $Tunnel configuration setting prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 1b1a62e..6ac6b44 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -90,7 +90,7 @@ $WineTestBot::Config::AgentPort = undef; # - If set to an SSH URI, then tunneling is performed using these parameters. # - Any other setting disables SSH tunneling. In particular to disable # tunneling for SSH VirtURIs it is recommended to set this to 'never'. -$Tunnel = undef; +$WineTestBot::Config::Tunnel = undef; # If set this specifies the SSH tunnel parameters to be used for the # TestAgent connection. This is mostly useful for parameters that cannot be

1 0

Francois Gouget : testbot: Don' t check idle and off VMs on the Engine shutdown.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: tools Branch: master Commit: cef9778f92efcff5c08ddfadb4a128db9203eea5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cef9778f92efcff5c08ddfad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 09:59:13 2017 +0100 testbot: Don't check idle and off VMs on the Engine shutdown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 598d2bd..ad492f6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -96,9 +96,9 @@ In all other cases the VM is powered off and marked as such. =back =cut -sub Cleanup(;$$) +sub Cleanup($;$$) { - my ($KillTasks, $KillVMs) = @_; + my ($Starting, $KillTasks, $KillVMs) = @_; # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. @@ -128,7 +128,7 @@ sub Cleanup(;$$) } elsif ($KillTasks) { - # We will kill the Task's process so requeue the Task. + # We will kill the child process so requeue the Task. $Requeue = 1; } else @@ -193,7 +193,7 @@ sub Cleanup(;$$) } # else let the process finish its work } - else + elsif ($Starting) { if ($VM->Status eq "idle") { @@ -241,7 +241,7 @@ sub HandleShutdown($$) return "0Invalid KillVMs shutdown parameter\n"; } - Cleanup($KillTasks, $KillVMs); + Cleanup(0, $KillTasks, $KillVMs); $RunEngine = 0; LogMsg "Waiting for the last clients to disconnect...\n"; @@ -715,7 +715,7 @@ sub main() LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } $MaxVMsWhenIdle ||= $MaxActiveVMs; - Cleanup(); + Cleanup(1); # Check for patches that arrived while the server was off. HandleWinePatchMLSubmission();

1 0

Francois Gouget : testbot: Improve the $VM::GetHost() documentation.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: tools Branch: master Commit: 011f01d4a353c8779fc83432a3452660d8b7b922 URL: http://source.winehq.org/git/tools.git/?a=commit;h=011f01d4a353c8779fc83432… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 24 10:00:04 2017 +0100 testbot: Improve the $VM::GetHost() documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7bd6d64..b931342 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -179,7 +179,9 @@ sub GetHost($) { my ($self) = @_; - # The URI is of the form protocol://user(a)hostname/hypervisor-specific-data + # VirtURI is of the form proto://user(a)hostname:port/hypervisor-specific-data + # This returns the 'hostname:port' part. Note that the port can be used to + # tunnel connections to different VM hosts and thus must be included. return $1 if ($self->VirtURI =~ m%^[^:]+://(?:[^/@]*@)?([^/]+)/%); return "localhost"; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 1ae40d910781e5ea16de44c9e712f741179122a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae40d910781e5ea16de44c9e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 23 16:43:36 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 58 +++++++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1056482..e6df9de 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8914,10 +8914,8 @@ msgid " sec" msgstr " s" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Valitse kansio" +msgstr "Valitse lähde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10576,6 +10574,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Luo symbolinen linkki.\n" +"\n" +"Syntaksi: MKLINK [valitsimet] linkin_nimi kohde\n" +"\n" +"Valitsimet:\n" +"/d Luo symbolinen linkki hakemistoon.\n" +"/h Luo kova linkki.\n" +"/j Luo hakemistoliitos.\n" +"linkin_nimi on uuden symbolisen linkin nimi.\n" +"kohde on polku, johon linkki osoittaa.\n" #: cmd.rc:312 msgid "" @@ -10586,47 +10594,6 @@ msgstr "" "komentoriville, jolta kutsuit cmd:tä.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10685,6 +10652,7 @@ msgstr "" "FTYPE\t\tNäytä tai muuta tiedostotyyppeihin liitettyjä avoimia komentoja\n" "HELP\t\tNäytä aiheeseen liittyviä lyhyitä yksityiskohtia\n" "MD (MKDIR)\tLuo alihakemisto\n" +"MKLINK\t\tLuo symbolinen linkki\n" "MORE\t\tNäytä tuloste sivuina\n" "MOVE\t\tSiirrä tiedostoa, tiedostojoukkoa tai hakemistopuuta\n" "PATH\t\tAseta tai näytä hakupolku\n" @@ -14961,7 +14929,7 @@ msgstr "Miinoja" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Kaikki tulokset hävitetään. Oletko varma?" #: winemine.rc:30 msgid "WineMine"

1 0