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

Hugh McMaster : regedit: Do not abort if the /m switch is used.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 4339f4015451a1c642b7f189e11f9f247c30acac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4339f4015451a1c642b7f189e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Nov 23 12:13:10 2017 +0000 regedit: Do not abort if the /m switch is used. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2d724f9..fe0163c 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -209,6 +209,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; case 'C': case 'L': + case 'M': case 'R': /* unhandled */; break;

1 0

Hugh McMaster : reg/tests: Properly escape the backslashes in an export test.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 7fb9cdf60ff9dfc507bcc949d263e4638af61a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb9cdf60ff9dfc507bcc949d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Nov 23 12:13:08 2017 +0000 reg/tests: Properly escape the backslashes in an export test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e0ff5f0..0bab8bc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4391,7 +4391,7 @@ static void test_export(void) run_reg_exe("reg export /?", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r);

1 0

David Collett : kernel32: Adjust data directories in UpdateResource API.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: ea640e1aa7033a694eb8474c8cb69ecbbc160671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea640e1aa7033a694eb8474c8… Author: David Collett <david.collett(a)gmail.com> Date: Thu Nov 23 16:02:55 2017 +1100 kernel32: Adjust data directories in UpdateResource API. When adding resources to a PE file using the UpdateResource API and the resource section is not the last section (i.e. we had to move existing sections), ensure any data directory entries pointing into moved sections is adjusted. Signed-off-by: David Collett <david.collett(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/resource.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c88c921..73f3cca 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1435,7 +1435,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) { static const WCHAR prefix[] = { 'r','e','s','u',0 }; WCHAR tempdir[MAX_PATH], tempfile[MAX_PATH]; - DWORD section_size; + DWORD i, section_size; BOOL ret = FALSE; IMAGE_SECTION_HEADER *sec; IMAGE_NT_HEADERS32 *nt; @@ -1619,11 +1619,19 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt64->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt64->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt64->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } else { nt->OptionalHeader.SizeOfImage += rva_delta; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + + for (i=0; i<nt->OptionalHeader.NumberOfRvaAndSizes; i++) + if (nt->OptionalHeader.DataDirectory[i].VirtualAddress > sec->VirtualAddress) + nt->OptionalHeader.DataDirectory[i].VirtualAddress += rva_delta; } }

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3:: compareDocumentPosition implementation.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 664e861cdafbf3e6b34a1dab9428d2c234a9eb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664e861cdafbf3e6b34a1dab9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:37:03 2017 +0100 mshtml: Added IHTMLDOMNode3::compareDocumentPosition implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/elements.js | 27 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 70b8758..0aad491 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1341,8 +1341,25 @@ static HRESULT WINAPI HTMLDOMNode3_isSameNode(IHTMLDOMNode3 *iface, IHTMLDOMNode static HRESULT WINAPI HTMLDOMNode3_compareDocumentPosition(IHTMLDOMNode3 *iface, IHTMLDOMNode *otherNode, USHORT *flags) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + HTMLDOMNode *other; + UINT16 position; + nsresult nsres; + + TRACE("(%p)->()\n", This); + + other = get_node_obj(otherNode); + if(!other) + return E_INVALIDARG; + + nsres = nsIDOMNode_CompareDocumentPosition(This->nsnode, other->nsnode, &position); + IHTMLDOMNode_Release(&other->IHTMLDOMNode_iface); + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + return E_FAIL; + } + + *flags = position; + return S_OK; } static HRESULT WINAPI HTMLDOMNode3_isSupported(IHTMLDOMNode3 *iface, BSTR feature, VARIANT version, VARIANT_BOOL *pfisSupported) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 3912e9a..6e193ee 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -148,11 +148,36 @@ function test_query_selector() { next_test(); } +function test_compare_position() { + document.body.innerHTML = '<div><div></div><div></div></div>'; + + var parent = document.body.firstChild; + var child1 = parent.firstChild; + var child2 = child1.nextSibling; + var elem = document.createElement("div"); + + function compare_position(node1, node2, expected_result, ignore_mask) { + var cmp = node1.compareDocumentPosition(node2); + ok((cmp & ~ignore_mask) == expected_result, + "compareDocumentPosition returned " + cmp + " expected " + expected_result); + } + + compare_position(child1, child2, 4); + compare_position(child2, child1, 2); + compare_position(parent, child1, 0x14); + compare_position(parent, child2, 0x14); + compare_position(parent, elem, 0x21, 6); + compare_position(elem, parent, 0x21, 6); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, test_getElementsByClassName, test_head, - test_query_selector + test_query_selector, + test_compare_position ];

1 0

Jacek Caban : mshtml: Removed no longer needed flush_pending_tasks.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: deee158c00155b406d56e4a8f323b9eee2ea1333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deee158c00155b406d56e4a8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:36:44 2017 +0100 mshtml: Removed no longer needed flush_pending_tasks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/task.c | 19 ------------------- 3 files changed, 22 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cd8017b..ea81fde 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1144,7 +1144,6 @@ HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; -void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 8edf177..f0819d6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -270,8 +270,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event DOMEvent *load_event; HRESULT hres; - flush_pending_tasks(doc->basedoc.task_magic); - hres = create_document_event(doc, EVENTID_LOAD, &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->node.event_target, load_event); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 07f6875..f1fb30a 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -102,25 +102,6 @@ static void release_task_timer(HWND thread_hwnd, task_timer_t *timer) heap_free(timer); } -void flush_pending_tasks(LONG target) -{ - thread_data_t *thread_data = get_thread_data(FALSE); - struct list *liter, *ltmp; - task_t *task; - - if(!thread_data) - return; - - LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->task_list) { - task = LIST_ENTRY(liter, task_t, entry); - if(task->target_magic == target) { - list_remove(&task->entry); - task->proc(task); - task->destr(task); - } - } -} - void remove_target_tasks(LONG target) { thread_data_t *thread_data = get_thread_data(FALSE);

1 0

Jacek Caban : mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument.
by Alexandre Julliard Nov. 23, 2017

Nov. 23, 2017

Module: wine Branch: master Commit: 52a5acaefbc106ece88299f74519fee29cce3314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a5acaefbc106ece88299f74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 23 17:36:51 2017 +0100 mshtml: Store task_magic in HTMLDocumentObj instead of HTMLDocument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 14 ++++---------- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/persist.c | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b64b35a..8323a77 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1291,7 +1291,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) if(doc->basedoc.window->mon) { /* FIXME: We should find nicer way to do this */ - remove_target_tasks(doc->basedoc.task_magic); + remove_target_tasks(doc->task_magic); mon = doc->basedoc.window->mon; IMoniker_AddRef(mon); diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5899b84..c9f21fa 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4858,7 +4858,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->outer_unk = outer; doc->dispex = dispex; - doc->task_magic = get_task_target_magic(); HTMLDocument_Persist_Init(doc); HTMLDocument_OleCmd_Init(doc); @@ -4869,13 +4868,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocument_cpc); } -static void destroy_htmldoc(HTMLDocument *This) -{ - remove_target_tasks(This->task_magic); - - ConnectionPointContainer_Destroy(&This->cp_container); -} - static inline HTMLDocumentNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLDocumentNode, node); @@ -4925,7 +4917,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) } heap_free(This->event_vector); - destroy_htmldoc(&This->basedoc); + ConnectionPointContainer_Destroy(&This->basedoc.cp_container); } static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -5298,7 +5290,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) DestroyWindow(This->hwnd); heap_free(This->mime); - destroy_htmldoc(&This->basedoc); + remove_target_tasks(This->task_magic); + ConnectionPointContainer_Destroy(&This->basedoc.cp_container); release_dispex(&This->dispex); if(This->nscontainer) @@ -5429,6 +5422,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->is_mhtml = is_mhtml; doc->usermode = UNKNOWN_USERMODE; + doc->task_magic = get_task_target_magic(); init_binding_ui(doc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ea81fde..69fe90c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -602,8 +602,6 @@ struct HTMLDocument { HTMLOuterWindow *window; - LONG task_magic; - ConnectionPointContainer cp_container; }; @@ -672,6 +670,7 @@ struct HTMLDocumentObj { LPWSTR mime; DWORD update; + LONG task_magic; }; typedef struct nsWeakReference nsWeakReference; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a34ff51..25767ef 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -424,7 +424,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind task = heap_alloc(sizeof(docobj_task_t)); task->doc = doc_obj; - hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->basedoc.task_magic); + hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->task_magic); if(FAILED(hres)) { CoTaskMemFree(url); return hres; @@ -435,7 +435,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind download_task->doc = doc_obj; download_task->set_download = set_download; download_task->url = url; - return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->basedoc.task_magic); + return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->task_magic); } return S_OK;

1 0

Nikolay Sivov : mshtml: Make sure actual host length matches returned BSTR length.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 0592537862c3b3abfcc187bf9f6e2ec9aa09b10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0592537862c3b3abfcc187bf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 22 17:55:07 2017 +0300 mshtml: Make sure actual host length matches returned BSTR length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 7 +++++-- dlls/mshtml/tests/htmllocation.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5..59b20f6 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ee241e7..458960a 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -168,10 +168,15 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_host(loc, &str); ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); - if(hres == S_OK) + if(hres == S_OK){ + int len = test->host ? strlen(test->host) : 0; ok(str_eq_wa(str, test->host), "%s: expected retrieved host to be L\"%s\", was: %s\n", test->name, test->host, wine_dbgstr_w(str)); + ok(SysStringLen(str) == len, "%s: unexpected string length %u, expected %u\n", + test->name, SysStringLen(str), len); + } + SysFreeString(str); }

1 0

Jacek Caban : mshtml: Get rid of unneeded parent from NSContainer.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 0f487987bc104d20b89f879eea27ea9ca6ff8085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f487987bc104d20b89f879ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 22 16:16:00 2017 +0100 mshtml: Get rid of unneeded parent from NSContainer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 91685e2..cd8017b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -697,7 +697,6 @@ struct NSContainer { nsWeakReference *weak_reference; - NSContainer *parent; HTMLDocumentObj *doc; nsIURIContentListener *content_listener; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index a72a587..4db61dc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1336,8 +1336,6 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->parent) - nsIWebBrowserChrome_Release(&This->parent->nsIWebBrowserChrome_iface); if(This->weak_reference) { This->weak_reference->nscontainer = NULL; nsIWeakReference_Release(&This->weak_reference->nsIWeakReference_iface);

1 0

Jacek Caban : mshtml: Store IOleAdviseHolder in HTMLDocumentObj instead of HTMLDocument.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 4a13190da433dc94af43898c7dcbed3268900c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a13190da433dc94af43898c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 22 16:15:38 2017 +0100 mshtml: Store IOleAdviseHolder in HTMLDocumentObj instead of HTMLDocument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/oleobj.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1a11ffd..5899b84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5274,8 +5274,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.window->doc_obj = NULL; IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); } - if(This->basedoc.advise_holder) - IOleAdviseHolder_Release(This->basedoc.advise_holder); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); if(This->view_sink) IAdviseSink_Release(This->view_sink); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 39c9efe..1cf43f5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -605,7 +605,6 @@ struct HTMLDocument { LONG task_magic; ConnectionPointContainer cp_container; - IOleAdviseHolder *advise_holder; }; static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) @@ -648,6 +647,7 @@ struct HTMLDocumentObj { IUnknown *webbrowser; ITravelLog *travel_log; IUnknown *browser_service; + IOleAdviseHolder *advise_holder; DOCHOSTUIINFO hostinfo; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index c782729..bb54ead 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -490,8 +490,8 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) HTMLDocument_LockContainer(This->doc_obj, FALSE); - if(This->advise_holder) - IOleAdviseHolder_SendOnClose(This->advise_holder); + if(This->doc_obj->advise_holder) + IOleAdviseHolder_SendOnClose(This->doc_obj->advise_holder); return S_OK; } @@ -632,13 +632,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, return E_INVALIDARG; } - if(!This->advise_holder) { - CreateOleAdviseHolder(&This->advise_holder); - if(!This->advise_holder) + if(!This->doc_obj->advise_holder) { + CreateOleAdviseHolder(&This->doc_obj->advise_holder); + if(!This->doc_obj->advise_holder) return E_OUTOFMEMORY; } - return IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + return IOleAdviseHolder_Advise(This->doc_obj->advise_holder, pAdvSink, pdwConnection); } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) @@ -646,22 +646,22 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) HTMLDocument *This = impl_from_IOleObject(iface); TRACE("(%p)->(%d)\n", This, dwConnection); - if(!This->advise_holder) + if(!This->doc_obj->advise_holder) return OLE_E_NOCONNECTION; - return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); + return IOleAdviseHolder_Unadvise(This->doc_obj->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { HTMLDocument *This = impl_from_IOleObject(iface); - if(!This->advise_holder) { + if(!This->doc_obj->advise_holder) { *ppenumAdvise = NULL; return S_OK; } - return IOleAdviseHolder_EnumAdvise(This->advise_holder, ppenumAdvise); + return IOleAdviseHolder_EnumAdvise(This->doc_obj->advise_holder, ppenumAdvise); } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)

1 0

Jactry Zeng : wintrust: Update version to 6.1.7601.23769.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 567ad03310314b3eee4a8cfdf11919b539109ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567ad03310314b3eee4a8cfdf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Nov 22 16:45:27 2017 +0800 wintrust: Update version to 6.1.7601.23769. Installer of Google drive will check wintrust's version to make sure Windows security update was installed. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/version.rc b/dlls/wintrust/version.rc index bcff809..773f00e 100644 --- a/dlls/wintrust/version.rc +++ b/dlls/wintrust/version.rc @@ -19,9 +19,9 @@ */ #define WINE_FILENAME_STR "wintrust.dll" -#define WINE_FILEVERSION 5,131,2195,6824 -#define WINE_FILEVERSION_STR "5.131.2195.6824" -#define WINE_PRODUCTVERSION 5,131,2195,6824 -#define WINE_PRODUCTVERSION_STR "5.131.2195.6824" +#define WINE_FILEVERSION 6,1,7601,23769 +#define WINE_FILEVERSION_STR "6.1.7601.23769" +#define WINE_PRODUCTVERSION 6,1,7601,23769 +#define WINE_PRODUCTVERSION_STR "6.1.7601.23769" #include "wine/wine_common_ver.rc"

1 0

Jacek Caban : mshtml: Pass document as HTMLDocumentObj to update_doc.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 3dd152dc59f6a5c2958ac17d2e758bd5fea7561a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd152dc59f6a5c2958ac17d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 22 16:15:48 2017 +0100 mshtml: Pass document as HTMLDocumentObj to update_doc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 44 ++++++++++++++++++++++---------------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/view.c | 12 ++++++------ 6 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd152dc59f6a5c2958ac…

1 0

Huw Davies : ole32: Rename structure member to target device size.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: wine Branch: master Commit: 32766b5253b36b407e0a68452a292312fd65c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32766b5253b36b407e0a68452… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 22 08:30:51 2017 +0000 ole32: Rename structure member to target device size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 5 +++-- dlls/ole32/tests/ole2.c | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 48453b4..0256957 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -79,7 +79,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -808,7 +809,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (cache_entry->fmtetc.ptd) FIXME("ptd not serialized\n"); - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; header.advf = cache_entry->advise_flags; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 07157a7..a72985e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -143,7 +143,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -1279,7 +1280,7 @@ static void test_OleLoad(IStorage *pStorage) break; } - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; header.advf = 1 << i; @@ -3691,7 +3692,7 @@ static void test_data_cache_save(void) hr = IStream_Write(stm, clipformat, sizeof(clipformat), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = DVASPECT_CONTENT; hdr.lindex = -1; hdr.advf = ADVF_PRIMEFIRST; @@ -3966,8 +3967,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ ok(bytes >= 24, "read %u bytes\n", bytes); if (winetest_debug > 1) - trace("header: unknown3 %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", - header.unknown3, header.dvAspect, header.lindex, header.advf, header.unknown7, + trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", + header.tdSize, header.dvAspect, header.lindex, header.advf, header.unknown7, header.dwObjectExtentX, header.dwObjectExtentY, header.dwSize); } @@ -4049,7 +4050,7 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) } ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = stg_def->stream[i].dvAspect; hdr.lindex = -1; hdr.advf = stg_def->stream[i].advf;

1 0

Francois Gouget : testbot/web: Allow administrators to retrieve the Engine log.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: tools Branch: master Commit: c5db3541484dfc7716c6c9614605fdb69e804a50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c5db3541484dfc7716c6c961… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 16:36:43 2017 +0100 testbot/web: Allow administrators to retrieve the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 3 + testbot/lib/WineTestBot/Log.pm | 8 +- testbot/web/admin/Log.pl | 103 +++++++++++++++++++ testbot/web/admin/SendLog.pl | 173 ++++++++++++++++++++++++++++++++ 4 files changed, 286 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 04759ca..4ae190e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -298,6 +298,9 @@ EOF print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/BranchesList.pl"), "'>Branches</a></p></li>\n"; + print " <li class='divider'> </li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/Log.pl"), + "'>Engine Log</a></p></li>\n"; print " <li class='bot'> </li>\n"; } diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 7abf2cb..f1499dd 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&LogMsg &Time &Elapsed); +(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed); my $logfile; my $logprefix; @@ -58,6 +58,12 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } +sub OpenLog() +{ + my $Handle; + return open($Handle, "<", "$LogDir/log") ? $Handle : undef; +} + =pod =over 12 diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl new file mode 100644 index 0000000..b9754bd --- /dev/null +++ b/testbot/web/admin/Log.pl @@ -0,0 +1,103 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Let the administrator download an excerpt of the Engine log +# +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package LogPage; + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::CGI::FreeFormPage; +use WineTestBot::Config; +use WineTestBot::Log; + +(a)LogPage::ISA = qw(ObjectModel::CGI::FreeFormPage); + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Hours", "Hours", !1, !1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); +} + +sub GetPropertyValue($$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + return 1 if ($PropertyName eq "Hours"); # Provides a default value + + return $self->SUPER::GetPropertyValue($PropertyDescriptor); +} + +sub GetHeaderText($) +{ + #my ($self) = @_; + return "Specify how many hours of log messages to get."; +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push(@$Actions, "Download"); + + return $Actions; +} + +sub OnDownload($) +{ + my ($self) = @_; + $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return + exit; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + return $self->OnDownload() if ($Action eq "Download"); + return $self->SUPER::OnAction($Action); +} + +sub GenerateBody($) +{ + my ($self) = @_; + + my $Log = OpenLog(); + if (defined $Log) + { + my $Size = (stat($Log))[7]; + $Size = int($Size / 1024 / 1024); + print "<div class='Content'><p>Log size: $Size MB</p></div>\n\n"; + close($Log); + } + $self->SUPER::GenerateBody(); +} + + +package main; + +my $Request = shift; + +my $LogPage = LogPage->new($Request, "admin"); +$LogPage->GeneratePage(); diff --git a/testbot/web/admin/SendLog.pl b/testbot/web/admin/SendLog.pl new file mode 100644 index 0000000..7044c33 --- /dev/null +++ b/testbot/web/admin/SendLog.pl @@ -0,0 +1,173 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Sends an excerpt of the TestBot Engine log +# +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +use HTTP::Date; + +use Apache2::Const -compile => qw(REDIRECT); +use CGI; +use CGI::Cookie; +use URI::Escape; +use WineTestBot::Config; +use WineTestBot::CGI::Sessions; +use WineTestBot::Log; + + +sub GetStartPosition($$) +{ + my ($Log, $Hours) = @_; + + # The log file can be pretty long so do a binary search to figure out where + # the oldest log line less than $Hours old is. + my $Cutoff = time() - 3600 * $Hours; + my $Size = (stat($Log))[7]; + my ($Min, $Max) = (0, $Size); + while ($Min < $Max) + { + my $Middle = int(($Min + $Max) / 2); + seek($Log, $Middle, 0); + + # Ignore the first line which we assume is going to be incomplete (even + # if by chance it start with a timestamp there is no way to know if that + # timestamp is at the beginning of the line). Also adjust $Middle so it + # always points to the start of a line. + my $Line = <$Log>; + $Middle += length($Line); + if ($Middle >= $Size) + { + # There is no line less than $Hours old so it would make sense to + # return $Size. But instead return $Min so the administrator at + # least sees the last line. + return ($Min, 0); + } + if ($Middle >= $Max) + { + # There is only one line between $Min and $Max. Determine whether to + # include it or not. + $Middle = $Min; + seek($Log, $Middle, 0); + } + my $Current = $Middle; + while ($Line = <$Log>) + { + # Note that the log file may have lines with no timestamp + if ($Line =~ /^(\w{3} \w{3} [0-9 ]\d \d{2}:\d{2}:\d{2} \d{4}) /) + { + my $Time = str2time($1); + if ($Time < $Cutoff) + { + # This line is too old + $Current += length($Line); + if ($Current >= $Size) + { + # See the $Middle == $Size comment. Note that this may return more + # than one line. + return ($Min, 0); + } + $Min = $Current; + } + else + { + # Consider that lines with no timestamp are less than $Hours old too + $Max = $Middle; + } + last; + } + $Current += length($Line); + if ($Current >= $Max) + { + # Consider that lines with no timestamp are less than $Hours old too + $Max = $Middle; + last; + } + } + return $Min if (!defined $Line); + } + return ($Min, 1); +} + +sub PrintLog($) +{ + my ($Request) = @_; + + my $CGIObj = CGI->new($Request); + my $Hours = $CGIObj->param("Hours"); + if (!defined $Hours or $Hours !~ /^(\d\d?)$/) + { + $Request->headers_out->set("Location", "/"); + $Request->status(Apache2::Const::REDIRECT); + exit; + } + $Hours = $1; + + # Text file + $Request->content_type("text/plain"); + + my $Log = OpenLog(); + if (defined $Log) + { + binmode($Log); + if ($Hours > 0) + { + my ($Position, $Found) = GetStartPosition($Log, $Hours); + if (!$Found) + { + print "There is no log entry less than $Hours hour(s) old.\n"; + print "Here are the last few lines:\n"; + } + seek($Log, $Position, 0); + } + + binmode(STDOUT); + while (1) + { + my $Block; + my $Len = sysread($Log, $Block, 16384); + last if (!$Len); + print $Block; + } + close($Log); + } + else + { + print "Could not open the log file!\n"; + } +} + +my $Request = shift; + +my %Cookies = CGI::Cookie->fetch($Request); +my $IsAdmin; +if (defined $Cookies{"SessionId"}) +{ + my $Session = CreateSessions()->GetItem($Cookies{"SessionId"}->value); + $IsAdmin = $Session->User->HasRole("admin") if ($Session); + +} +if (!$IsAdmin) +{ + $Request->headers_out->set("Location", "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"})); + $Request->status(Apache2::Const::REDIRECT); + exit; +} + +PrintLog($Request); + +exit;

1 0

Francois Gouget : testbot: Always create the Task directory even if there is nothing to stage.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: tools Branch: master Commit: 14de13e34f5b8f4fe7201e2501372bed0be9c7ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=14de13e34f5b8f4fe7201e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 11:24:33 2017 +0100 testbot: Always create the Task directory even if there is nothing to stage. Otherwise the Engine will have nowhere to put the error log when forking the Task's child process. This particularly impacts the Reconfig Tasks since they neither have a patch nor executable to stage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 8c5d4ec..95c0a45 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -87,10 +87,9 @@ sub HandleStaging($$) { my ($self) = @_; - if (! $self->InStaging) - { - return undef; - } + # Always at least create the step's directory + my $StepDir = $self->CreateDir(); + return undef if (! $self->InStaging); my $FileName = $self->FileName; if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) @@ -99,9 +98,7 @@ sub HandleStaging($$) } my $BaseName = $1; my $StagingFileName = "$DataDir/staging/$FileName"; - my $StepDir = $self->CreateDir(); - my $FinalFileName = "$StepDir/$BaseName"; - if (!move($StagingFileName, $FinalFileName)) + if (!move($StagingFileName, "$StepDir/$BaseName")) { return "Could not move the staging file: $!"; }

1 0

Francois Gouget : testbot: Fix compatibility with older File:: Path versions.
by Alexandre Julliard Nov. 22, 2017

Nov. 22, 2017

Module: tools Branch: master Commit: 12bc87810865a310f27ae0f9de991c3df8aef1e1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12bc87810865a310f27ae0f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 11:23:55 2017 +0100 testbot: Fix compatibility with older File::Path versions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b34b31e..0144dde 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -95,7 +95,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -103,7 +103,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub Status($;$) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 4161f0b..8c5d4ec 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -72,7 +72,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -80,7 +80,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub HandleStaging($$) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index efe1b21..b3b6ae3 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -71,7 +71,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -79,7 +79,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub _SetupTask($$)

1 0