June 2022 - Wine-commits - list.winehq.org

Robert Wilhelm : vbscript: Implement IsDate().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: f3ea0996b1bb9b675363ab329404bb659fb95657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ea0996b1bb9b675363ab32… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Jun 4 20:45:41 2022 +0200 vbscript: Implement IsDate(). Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..731a062dea2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -935,8 +935,13 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_DATE ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..b9c2149aa56 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,20 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(#1/1/2000#), "isDate(#1/1/2000#) is not true?") +Call ok(not isDate(empty), "isDate(empty) is true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(not isDate(true), "isDate(true) is true?") +Call ok(not isDate(4), "isDate(4) is true?") +Call ok(not isDate("4"), "isDate(""4"") is true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?")

1 0

Gabriel Ivăncescu : mshtml: Expose IE10+ XMLHttpRequest props via private interface.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 29e0b0be7ea6e1829a7460811687dfcf3b71c308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e0b0be7ea6e1829a746081… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:09 2022 +0300 mshtml: Expose IE10+ XMLHttpRequest props via private interface. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> 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/mshtml_private_iface.idl | 46 +++++++ dlls/mshtml/tests/documentmode.js | 10 ++ dlls/mshtml/xmlhttprequest.c | 243 +++++++++++++++++++++++++++++++++++ 4 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29e0b0be7ea6e1829a74…

1 0

Gabriel Ivăncescu : mshtml: Implement onabort for XMLHttpRequest.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 6e2a6cdcad871b4339d807584f01110bdbf6956a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2a6cdcad871b4339d80758… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 15:24:10 2022 +0300 mshtml: Implement onabort for XMLHttpRequest. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 2 ++ dlls/mshtml/tests/xhr.js | 20 ++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 9 +++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 401e130d7fd..e3688242715 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3079,6 +3079,8 @@ static void report_data(ProtocolHandler *This) hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, (void**)&http_negotiate); IServiceProvider_Release(service_provider); + if(This->delay && hres == E_FAIL) /* aborted too quickly */ + return; ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08lx\n", hres); hres = IUri_GetDisplayUri(This->uri, &url); diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 6228f732c6d..dd86331872c 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -41,6 +41,25 @@ function test_xhr() { xhr.send("Testing..."); } +function test_abort() { + var xhr = new XMLHttpRequest(); + if(!("onabort" in xhr)) { next_test(); return; } + + xhr.onreadystatechange = function() { + if(xhr.readyState != 4) + return; + todo_wine_if(v < 10). + ok(v >= 10, "onreadystatechange called"); + } + xhr.onload = function() { ok(false, "onload called"); } + xhr.onabort = function(e) { next_test(); } + + xhr.open("POST", "echo.php?delay", true); + xhr.setRequestHeader("X-Test", "True"); + xhr.send("Abort Test"); + xhr.abort(); +} + function test_timeout() { var xhr = new XMLHttpRequest(); var v = document.documentMode; @@ -74,5 +93,6 @@ function test_timeout() { var tests = [ test_xhr, + test_abort, test_timeout ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 12356f1ccd2..54e84cf6121 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -97,6 +97,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) static const eventid_t events[] = { EVENTID_READYSTATECHANGE, EVENTID_LOAD, + EVENTID_ABORT, EVENTID_ERROR, EVENTID_TIMEOUT, }; @@ -982,18 +983,18 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onabort(IWineXMLHttpRequest { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return set_event_handler(&This->event_target, EVENTID_ABORT, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_private_get_onabort(IWineXMLHttpRequestPrivate *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + return get_event_handler(&This->event_target, EVENTID_ABORT, p); } static HRESULT WINAPI HTMLXMLHttpRequest_private_put_onprogress(IWineXMLHttpRequestPrivate *iface, VARIANT v)

1 0

Nikolay Sivov : windows.gaming.input: Fix a leak on error path (Coverity).
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: ea4c506cd75feb6a5c4791c7f7cc453237249c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4c506cd75feb6a5c4791c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 5 10:03:47 2022 +0300 windows.gaming.input: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windows.gaming.input/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 2cb6e51c9c5..8483f301b83 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -335,6 +335,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper IInspectable *outer, IWineAsyncInfoImpl **out ) { struct async_info *impl; + HRESULT hr; if (!(impl = calloc( 1, sizeof(struct async_info) ))) return E_OUTOFMEMORY; impl->IWineAsyncInfoImpl_iface.lpVtbl = &async_impl_vtbl; @@ -346,7 +347,11 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper impl->handler = HANDLER_NOT_SET; impl->status = Started; if (!(impl->async_run_work = CreateThreadpoolWork( async_info_callback, &impl->IWineAsyncInfoImpl_iface, NULL ))) - return HRESULT_FROM_WIN32( GetLastError() ); + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + free( impl ); + return hr; + } if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param );

1 0

Piotr Caban : wow64: Fix NtQueryDirectoryObject wrapper.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 70d119b7b4f379a2d040ebefa5b79ce2606cdb0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d119b7b4f379a2d040ebef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 4 20:18:02 2022 +0200 wow64: Fix NtQueryDirectoryObject wrapper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wow64/sync.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index d4122ddf3f3..578ef57201f 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -769,26 +769,32 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) BOOLEAN restart = get_ulong( &args ); ULONG *context = get_ptr( &args ); ULONG *retlen = get_ptr( &args ); + ULONG retsize; NTSTATUS status; DIRECTORY_BASIC_INFORMATION *info; - ULONG size = size32 + sizeof(*info) - sizeof(*info32); + ULONG size = size32 + 2 * sizeof(*info) - 2 * sizeof(*info32); if (!single_entry) FIXME( "not implemented\n" ); info = Wow64AllocateTemp( size ); - status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, NULL ); + status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, &retsize ); if (!status) { - info32->ObjectName.Buffer = PtrToUlong( info32 + 1 ); + info32->ObjectName.Buffer = PtrToUlong( info32 + 2 ); info32->ObjectName.Length = info->ObjectName.Length; info32->ObjectName.MaximumLength = info->ObjectName.MaximumLength; info32->ObjectTypeName.Buffer = info32->ObjectName.Buffer + info->ObjectName.MaximumLength; info32->ObjectTypeName.Length = info->ObjectTypeName.Length; info32->ObjectTypeName.MaximumLength = info->ObjectTypeName.MaximumLength; + memset( info32 + 1, 0, sizeof(*info32) ); size = info->ObjectName.MaximumLength + info->ObjectTypeName.MaximumLength; - memcpy( info32 + 1, info + 1, size ); - if (retlen) *retlen = sizeof(*info32) + size; + memcpy( info32 + 2, info + 2, size ); + if (retlen) *retlen = 2 * sizeof(*info32) + size; } + else if (retlen && status == STATUS_BUFFER_TOO_SMALL) + *retlen = retsize - 2 * sizeof(*info) + 2 * sizeof(*info32); + else if (retlen && status == STATUS_NO_MORE_ENTRIES) + *retlen = 0; return status; }

1 0

Nikolay Sivov : secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity).
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: e44a9d2c2f26bac43321433ff6fc027373119852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44a9d2c2f26bac43321433f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 4 18:05:53 2022 +0300 secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bc0867ca94b..5b4fb196aca 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -589,8 +589,9 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, } params.key_size = key_size; params.key_blob = key_blob; - if (GNUTLS_CALL( allocate_certificate_credentials, &params )) goto fail; + status = GNUTLS_CALL( allocate_certificate_credentials, &params ); free(key_blob); + if (status) goto fail; handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); if (handle == SCHAN_INVALID_HANDLE) goto fail; @@ -609,7 +610,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, fail: free(creds); - free(key_blob); return SEC_E_INTERNAL_ERROR; }

1 0

Nikolay Sivov : kernelbase/tests: Move VirtualAllocFromApp() tests.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 3dcb85f56d4c5489a1010feebaa59bf5b8162ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb85f56d4c5489a1010fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 13:04:33 2022 +0300 kernelbase/tests: Move VirtualAllocFromApp() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 36 --------------------------- dlls/kernelbase/tests/process.c | 54 ++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6d4d34e2e81..9b3c8228a3f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -50,7 +50,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); /* ############################### */ @@ -454,39 +453,6 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -static void test_VirtualAllocFromApp(void) -{ - void *p; - BOOL ret; - if (!pVirtualAllocFromApp) - { - win_skip("VirtualAllocFromApp is not available.\n"); - return; - } - - p = GetProcAddress(hkernel32, "VirtualAllocFromApp"); - ok(!p, "Found VirtualAllocFromApp in kernel32.dll.\n"); - - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); - ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %lu.\n", p, GetLastError()); - ret = VirtualFree(p, 0, MEM_RELEASE); - ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); - - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); -} - static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; @@ -4304,7 +4270,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pVirtualAllocFromApp = (void *)GetProcAddress( hkernelbase, "VirtualAllocFromApp" ); GetSystemInfo(&si); trace("system page size %#lx\n", si.dwPageSize); @@ -4319,7 +4284,6 @@ START_TEST(virtual) test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); - test_VirtualAllocFromApp(); test_MapViewOfFile(); test_NtAreMappedFilesTheSame(); test_CreateFileMapping(); diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index b83a25015b2..90c4c4c26e1 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -34,6 +34,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, SIZE_T size, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); +static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static void test_CompareObjectHandles(void) { @@ -194,20 +195,55 @@ static void test_VirtualAlloc2(void) VirtualFree(placeholder2, 0, MEM_RELEASE); } -START_TEST(process) +static void test_VirtualAllocFromApp(void) { - HMODULE hmod; + BOOL ret; + void *p; - hmod = GetModuleHandleA("kernel32.dll"); - pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); - ok(!pCompareObjectHandles, "expected CompareObjectHandles only in kernelbase.dll\n"); + if (!pVirtualAllocFromApp) + { + win_skip("VirtualAllocFromApp is not available.\n"); + return; + } - hmod = GetModuleHandleA("kernelbase.dll"); - pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); - pMapViewOfFile3 = (void *)GetProcAddress(hmod, "MapViewOfFile3"); - pVirtualAlloc2 = (void *)GetProcAddress(hmod, "VirtualAlloc2"); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); + ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %lu.\n", p, GetLastError()); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); +} + +static void init_funcs(void) +{ + HMODULE hmod = GetModuleHandleA("kernelbase.dll"); + +#define X(f) { p##f = (void*)GetProcAddress(hmod, #f); } + X(CompareObjectHandles); + X(MapViewOfFile3); + X(VirtualAlloc2); + X(VirtualAllocFromApp); +#undef X +} + +START_TEST(process) +{ + init_funcs(); test_CompareObjectHandles(); test_MapViewOfFile3(); test_VirtualAlloc2(); + test_VirtualAllocFromApp(); }

1 0

Francois Gouget : testbot/web: Only link to the VM details page for administrators.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: c134dc1579cc697df495adc533434a2123d13b8d URL: https://source.winehq.org/git/tools.git/?a=commit;h=c134dc1579cc697df495adc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:20:14 2022 +0200 testbot/web: Only link to the VM details page for administrators. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b07b39d..21ee5fe 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -176,6 +176,15 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +sub GetDetailsPage($) +{ + my ($self) = @_; + my $Session = $self->{EnclosingPage}->GetCurrentSession(); + my $CurrentUser = $Session->User if (defined $Session); + return (!$CurrentUser or !$CurrentUser->HasRole("admin")) ? undef : + "/admin/VMDetails.pl"; +} + sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Francois Gouget : testbot/orm: Protect DBIBackend::LoadItem() from invalid keys.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: dc8da3cac05d6b1b5c98cdec6c086d97f27c6986 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc8da3cac05d6b1b5c98cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:21:44 2022 +0200 testbot/orm: Protect DBIBackend::LoadItem() from invalid keys. Check that the requested key has the right number of parts to avoid a crash during the SQL execution. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 07b838d..62332c1 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -169,22 +169,19 @@ sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; + # Faster than join+map+grep + my $PartCount; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { - if ($PropertyDescriptor->GetIsKey()) + next if (!$PropertyDescriptor->GetIsKey()); + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - if ($Where ne "") - { - $Where .= " AND "; - } - $Where .= "$ColName = ?"; - } + $Where .= " AND " if ($Where ne ""); + $Where .= "$ColName = ?"; + $PartCount++; } } - - return $Where; + return ($PartCount, $Where); } =pod @@ -422,8 +419,10 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); - push @Data, $Collection->SplitKey($RequestedKey); + (my $PartCount, $Where) = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); + my @KeyParts = $Collection->SplitKey($RequestedKey); + return undef if ($PartCount != @KeyParts); + push @Data, @KeyParts; my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); if ($Where ne "") @@ -572,7 +571,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -713,7 +712,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); + (my $_PartCount, $Where) = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " .

1 0

Francois Gouget : testbot/orm: Fix multi-column key support in Item::Compare().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 4a9e60c2ce8626b618241663d3fd697d155857a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a9e60c2ce8626b61824166… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 3 19:22:51 2022 +0200 testbot/orm: Fix multi-column key support in Item::Compare(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Item.pm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 7d36ffa..0b1da92 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -422,22 +422,27 @@ sub Compare($$) { my $ColName = $ColNames->[0]; my $ColType = $PropertyDescriptor->GetType(); - return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? - $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : - $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + my $Cmp = ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); } - if ($PropertyDescriptor->GetClass() eq "Enum") + elsif ($PropertyDescriptor->GetClass() eq "Enum") { my $ColName = $ColNames->[0]; - return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; - } - - # A Detailref cannot be a key so this is an Itemref - foreach my $ColName (@$ColNames) - { my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } + else + { + # A Detailref cannot be a key so this is an Itemref. Note that its + # underlying column types are unknown so treat them as strings. + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } } return 0; }

1 0