September 2019 - Wine-commits

Alexandre Julliard : kernel32: Move QueryPerformanceCounter/ Frequency functions to ntdll.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: a311140f93fbcb4512e2cd31be027be31b4f4072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a311140f93fbcb4512e2cd31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 12:08:27 2019 +0200 kernel32: Move QueryPerformanceCounter/Frequency functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 45 ----------------------------------------- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/registry.c | 3 +-- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/time.c | 17 ++++++++++++++++ include/winternl.h | 2 ++ 7 files changed, 26 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 3f4f6c6..b360463 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,51 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); -/**************************************************************************** - * QueryPerformanceCounter (KERNEL32.@) - * - * Get the current value of the performance counter. - * - * PARAMS - * counter [O] Destination for the current counter reading - * - * RETURNS - * Success: TRUE. counter contains the current reading - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceFrequency. - */ -BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER counter) -{ - NtQueryPerformanceCounter( counter, NULL ); - return TRUE; -} - - -/**************************************************************************** - * QueryPerformanceFrequency (KERNEL32.@) - * - * Get the resolution of the performance counter. - * - * PARAMS - * frequency [O] Destination for the counter resolution - * - * RETURNS - * Success. TRUE. Frequency contains the resolution of the counter. - * Failure: FALSE. - * - * SEE ALSO - * See QueryPerformanceCounter. - */ -BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER frequency) -{ - LARGE_INTEGER counter; - NtQueryPerformanceCounter( &counter, frequency ); - return TRUE; -} - - /*********************************************************************** * GetSystemInfo [KERNEL32.@] * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c2cd10..566dfb3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1169,8 +1169,8 @@ @ stdcall -import QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord -@ stdcall QueryPerformanceCounter(ptr) -@ stdcall QueryPerformanceFrequency(ptr) +@ stdcall -import QueryPerformanceCounter(ptr) +@ stdcall -import QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fbeb58c..ee064c3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1204,8 +1204,8 @@ # @ stub QueryInterruptTimePrecise @ stdcall QueryMemoryResourceNotification(ptr ptr) # @ stub QueryOptionalDelayLoadedAPI -@ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter -@ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency +@ stdcall QueryPerformanceCounter(ptr) ntdll.RtlQueryPerformanceCounter +@ stdcall QueryPerformanceFrequency(ptr) ntdll.RtlQueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode @ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index adf9ef6..30c5e9f 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1368,8 +1368,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD pdb->HeaderLength = sizeof(*pdb); pdb->NumObjectTypes = 0; pdb->DefaultObject = 0; - QueryPerformanceCounter(&pdb->PerfTime); - QueryPerformanceFrequency(&pdb->PerfFreq); + NtQueryPerformanceCounter( &pdb->PerfTime, &pdb->PerfFreq ); data = pdb + 1; pdb->SystemNameOffset = sizeof(*pdb); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94e70e5..98a423a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -850,6 +850,8 @@ @ stub RtlQueryInformationActiveActivationContext @ stub RtlQueryInterfaceMemoryStream @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryPerformanceCounter(ptr) +@ stdcall RtlQueryPerformanceFrequency(ptr) @ stub RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627..91e5887 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -552,6 +552,23 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER return STATUS_SUCCESS; } +/****************************************************************************** + * RtlQueryPerformanceCounter [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceCounter( LARGE_INTEGER *counter ) +{ + counter->QuadPart = monotonic_counter(); + return TRUE; +} + +/****************************************************************************** + * RtlQueryPerformanceFrequency [NTDLL.@] + */ +BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceFrequency( LARGE_INTEGER *frequency ) +{ + frequency->QuadPart = TICKSPERSEC; + return TRUE; +} /****************************************************************************** * NtGetTickCount (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 4715b05..3f2e07b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2799,6 +2799,8 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PU NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceCounter(LARGE_INTEGER*); +NTSYSAPI BOOL WINAPI RtlQueryPerformanceFrequency(LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER); NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGISTRY_TABLE, PVOID, PVOID); NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*);

1 0

Alexandre Julliard : kernel32: Move environment functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 3e6b961f006bffff86f1ce34dd24ecc5a16d1562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b961f006bffff86f1ce34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 13:18:48 2019 +0200 kernel32: Move environment functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/environ.c | 308 ---------------------------------------- dlls/kernel32/kernel32.spec | 22 +-- dlls/kernelbase/kernelbase.spec | 26 ++-- dlls/kernelbase/process.c | 225 +++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e6b961f006bffff86f1…

1 0

Alexandre Julliard : kernel32: Move process startup information functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 911e50849a9bc05ab11d896a3b7f7a3b3462fabd URL: https://source.winehq.org/git/wine.git/?a=commit;h=911e50849a9bc05ab11d896a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 13:44:53 2019 +0200 kernel32: Move process startup information functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/environ.c | 104 ---------------------------------- dlls/kernel32/kernel32.spec | 12 ++-- dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/kernelbase.spec | 12 ++-- dlls/kernelbase/main.c | 19 ++++++- dlls/kernelbase/process.c | 121 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=911e50849a9bc05ab11d…

1 0

Alexandre Julliard : ntdll: Allocate environment blocks from the process heap.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 44efb1a0261d62c9cb52c2c4133583f939ffeeef URL: https://source.winehq.org/git/wine.git/?a=commit;h=44efb1a0261d62c9cb52c2c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 12:54:43 2019 +0200 ntdll: Allocate environment blocks from the process heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 7 +--- dlls/ntdll/env.c | 101 +++++++++++++++++------------------------------- include/winbase.h | 1 + 3 files changed, 37 insertions(+), 72 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index def1f8a..2781414 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -472,12 +472,7 @@ static BOOL build_initial_environment(void) } size *= sizeof(WCHAR); - /* Now allocate the environment */ - ptr = NULL; - if (NtAllocateVirtualMemory(NtCurrentProcess(), &ptr, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE) != STATUS_SUCCESS) - return FALSE; - + if (!(ptr = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return FALSE; NtCurrentTeb()->Peb->ProcessParameters->Environment = p = ptr; endptr = p + size / sizeof(WCHAR); diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 367d083..724faf0 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -41,6 +41,13 @@ static WCHAR empty[] = {0}; static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; +static inline SIZE_T get_env_length( const WCHAR *env ) +{ + const WCHAR *end = env; + while (*end) end += strlenW(end) + 1; + return end + 1 - env; +} + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -68,40 +75,21 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx(PUNICODE_STRING name, L */ NTSTATUS WINAPI RtlCreateEnvironment(BOOLEAN inherit, PWSTR* env) { - NTSTATUS nts; + SIZE_T size; TRACE("(%u,%p)!\n", inherit, env); if (inherit) { - MEMORY_BASIC_INFORMATION mbi; - RtlAcquirePebLock(); - - nts = NtQueryVirtualMemory(NtCurrentProcess(), - NtCurrentTeb()->Peb->ProcessParameters->Environment, - 0, &mbi, sizeof(mbi), NULL); - if (nts == STATUS_SUCCESS) - { - *env = NULL; - nts = NtAllocateVirtualMemory(NtCurrentProcess(), (void**)env, 0, &mbi.RegionSize, - MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - if (nts == STATUS_SUCCESS) - memcpy(*env, NtCurrentTeb()->Peb->ProcessParameters->Environment, mbi.RegionSize); - else *env = NULL; - } + size = get_env_length( NtCurrentTeb()->Peb->ProcessParameters->Environment ) * sizeof(WCHAR); + if ((*env = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + memcpy( *env, NtCurrentTeb()->Peb->ProcessParameters->Environment, size ); RtlReleasePebLock(); } - else - { - SIZE_T size = 1; - PVOID addr = NULL; - nts = NtAllocateVirtualMemory(NtCurrentProcess(), &addr, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - if (nts == STATUS_SUCCESS) *env = addr; - } + else *env = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) ); - return nts; + return *env ? STATUS_SUCCESS : STATUS_NO_MEMORY; } /****************************************************************************** @@ -109,11 +97,8 @@ NTSTATUS WINAPI RtlCreateEnvironment(BOOLEAN inherit, PWSTR* env) */ NTSTATUS WINAPI RtlDestroyEnvironment(PWSTR env) { - SIZE_T size = 0; - - TRACE("(%p)!\n", env); - - return NtFreeVirtualMemory(NtCurrentProcess(), (void**)&env, &size, MEM_RELEASE); + RtlFreeHeap( GetProcessHeap(), 0, env ); + return STATUS_SUCCESS; } static LPCWSTR ENV_FindVariable(PCWSTR var, PCWSTR name, unsigned namelen) @@ -205,7 +190,6 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, INT len, old_size; LPWSTR p, env; NTSTATUS nts = STATUS_VARIABLE_NOT_FOUND; - MEMORY_BASIC_INFORMATION mbi; TRACE("(%p, %s, %s)\n", penv, debugstr_us(name), debugstr_us(value)); @@ -224,9 +208,7 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, env = NtCurrentTeb()->Peb->ProcessParameters->Environment; } else env = *penv; - /* compute current size of environment */ - for (p = env; *p; p += strlenW(p) + 1); - old_size = p + 1 - env; + old_size = get_env_length( env ); /* Find a place to insert the string */ for (p = env; *p; p += strlenW(p) + 1) @@ -245,20 +227,16 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, memmove(next + len, next, (old_size - (next - env)) * sizeof(WCHAR)); } - nts = NtQueryVirtualMemory(NtCurrentProcess(), env, 0, - &mbi, sizeof(mbi), NULL); - if (nts != STATUS_SUCCESS) goto done; - - if ((old_size + len) * sizeof(WCHAR) > mbi.RegionSize) + if ((old_size + len) * sizeof(WCHAR) > RtlSizeHeap( GetProcessHeap(), 0, env )) { - LPWSTR new_env; - SIZE_T new_size = (old_size + len) * sizeof(WCHAR); - - new_env = NULL; - nts = NtAllocateVirtualMemory(NtCurrentProcess(), (void**)&new_env, 0, - &new_size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - if (nts != STATUS_SUCCESS) goto done; + SIZE_T new_size = max( old_size * 2, old_size + len ) * sizeof(WCHAR); + LPWSTR new_env = RtlAllocateHeap( GetProcessHeap(), 0, new_size ); + if (!new_env) + { + nts = STATUS_NO_MEMORY; + goto done; + } memmove(new_env, env, (p - env) * sizeof(WCHAR)); assert(len > 0); memmove(new_env + (p - env) + len, p, (old_size - (p - env)) * sizeof(WCHAR)); @@ -282,6 +260,8 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name, memcpy( p, value->Buffer, value->Length ); p[value->Length / sizeof(WCHAR)] = 0; } + nts = STATUS_SUCCESS; + done: if (!penv) RtlReleasePebLock(); @@ -465,7 +445,6 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu const RTL_USER_PROCESS_PARAMETERS *cur_params; SIZE_T size, env_size = 0; void *ptr; - const WCHAR *env; NTSTATUS status = STATUS_SUCCESS; RtlAcquirePebLock(); @@ -488,13 +467,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; - if (Environment) - { - env = Environment; - while (*env) env += strlenW(env) + 1; - env++; - env_size = ROUND_SIZE( (env - Environment) * sizeof(WCHAR) ); - } + if (Environment) env_size = get_env_length( Environment ) * sizeof(WCHAR); size = (sizeof(RTL_USER_PROCESS_PARAMETERS) + ROUND_SIZE( ImagePathName->MaximumLength ) @@ -506,7 +479,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE(env_size) ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; params->AllocationSize = size; @@ -524,8 +497,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) - params->Environment = memcpy( ptr, Environment, (env - Environment) * sizeof(WCHAR) ); + if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } @@ -579,9 +551,8 @@ static inline void get_unicode_string( UNICODE_STRING *str, WCHAR **src, UINT le */ void init_user_process_params( SIZE_T data_size ) { - void *ptr; WCHAR *src; - SIZE_T info_size, env_size, alloc_size; + SIZE_T info_size, env_size; NTSTATUS status; startup_info_t *info; RTL_USER_PROCESS_PARAMETERS *params = NULL; @@ -658,13 +629,11 @@ void init_user_process_params( SIZE_T data_size ) params->wShowWindow = info->show; /* environment needs to be a separate memory block */ - ptr = NULL; - alloc_size = max( 1, env_size ); - status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &alloc_size, - MEM_COMMIT, PAGE_READWRITE ); - if (status != STATUS_SUCCESS) goto done; - memcpy( ptr, (char *)info + info_size, env_size ); - params->Environment = ptr; + if ((params->Environment = RtlAllocateHeap( GetProcessHeap(), 0, max( env_size, sizeof(WCHAR) )))) + { + if (env_size) memcpy( params->Environment, (char *)info + info_size, env_size ); + else params->Environment[0] = 0; + } done: RtlFreeHeap( GetProcessHeap(), 0, info ); diff --git a/include/winbase.h b/include/winbase.h index 7c2d680..3a213df 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2663,6 +2663,7 @@ WINADVAPI BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PS WINADVAPI BOOL WINAPI SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR,PSID,BOOL); WINADVAPI BOOL WINAPI SetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); WINBASEAPI BOOL WINAPI SetStdHandle(DWORD,HANDLE); +WINBASEAPI BOOL WINAPI SetStdHandleEx(DWORD,HANDLE,HANDLE*); #define SetSwapAreaSize(w) (w) WINBASEAPI BOOL WINAPI SetSystemPowerState(BOOL,BOOL); WINBASEAPI BOOL WINAPI SetSystemTime(const SYSTEMTIME*);

1 0

Gabriel Ivăncescu : vbscript/tests: Test lack of newline parsing before End statements.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 848c6e4f93b75f14e1e0e4f32c35d424255c6799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=848c6e4f93b75f14e1e0e4f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 6 18:03:00 2019 +0300 vbscript/tests: Test lack of newline parsing before End statements. 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/vbscript/tests/lang.vbs | 28 ++++++++++++++++++++++ dlls/vbscript/tests/run.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6b45865..5d9fb80 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1429,4 +1429,32 @@ sub test_dotIdentifiers end sub call test_dotIdentifiers +' Test End statements not required to be preceeded by a newline or separator +Sub EndTestSub + x = 1 End Sub + +Sub EndTestSubWithCall + x = 1 + Call ok(x = 1, "x = " & x)End Sub +Call EndTestSubWithCall() + +Function EndTestFunc(x) + Call ok(x > 0, "x = " & x)End Function +EndTestFunc(1) + +Class EndTestClassWithStorageId + Public x End Class + +Class EndTestClassWithDim + Dim x End Class + +Class EndTestClassWithFunc + Function test(ByVal x) + x = 0 End Function End Class + +Class EndTestClassWithProperty + Public x + Public default Property Get defprop + defprop = x End Property End Class + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 15a8f10..f10a42b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2077,6 +2077,62 @@ static void test_gc(void) IActiveScriptParse_Release(parser); } +static void test_parse_errors(void) +{ + static const char *invalid_scripts[] = + { + /* If...End If */ + "If 0 > 1 Then\n" + " x = 0 End If\n", + + /* While...End While */ + "While False\n" + " x = 0 End While\n", + + /* While...Wend */ + "While False\n" + " x = 0 Wend\n", + + /* Do While...Loop */ + "Do While False\n" + " x = 0 Loop\n", + + /* Do Until...Loop */ + "Do Until True\n" + " x = 0 Loop\n", + + /* Do...Loop While */ + "Do\n" + " x = 0 Loop While False\n", + + /* Do...Loop Until */ + "Do\n" + " x = 0 Loop Until True\n", + + /* Select...End Select */ + "x = False\n" + "Select Case 42\n" + " Case 0\n" + " Call ok(False, \"unexpected case\")\n" + " Case 42\n" + " x = True End Select\n" + "Call ok(x, \"wrong case\")\n", + + /* Class...End Class (empty) */ + "Class C End Class" + }; + HRESULT hres; + UINT i; + + for (i = 0; i < ARRAY_SIZE(invalid_scripts); i++) + { + SET_EXPECT(OnScriptError); + hres = parse_script_ar(invalid_scripts[i]); + ok(FAILED(hres), "[%u] script did not fail\n", i); + todo_wine CHECK_CALLED(OnScriptError); + } +} + static void test_msgbox(void) { HRESULT hres; @@ -2500,6 +2556,7 @@ static void run_tests(void) test_procedures(); test_gc(); test_msgbox(); + test_parse_errors(); test_parse_context(); }

1 0

Andrey Gusev : dxgi: Add IDXGIDevice3 stub.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: eb0a01f750af91b9bebf2d77fe7874a5daf9d714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0a01f750af91b9bebf2d77… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Sep 7 00:09:18 2019 +0300 dxgi: Add IDXGIDevice3 stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 8 ++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5500452..4b23155 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -42,6 +42,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) || IsEqualGUID(riid, &IID_IDXGIDevice2) + || IsEqualGUID(riid, &IID_IDXGIDevice3) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -321,6 +322,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *if return E_NOTIMPL; } +static void STDMETHODCALLTYPE dxgi_device_Trim(IWineDXGIDevice *iface) +{ + FIXME("iface %p stub!\n", iface); +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -376,6 +382,8 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_OfferResources, dxgi_device_ReclaimResources, dxgi_device_EnqueueSetEvent, + /* IDXGIDevice3 methods */ + dxgi_device_Trim, /* IWineDXGIDevice methods */ dxgi_device_create_surface, }; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 610b7c0..070ac2f 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -42,7 +42,7 @@ interface IWineDXGISwapChainFactory : IUnknown local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice2 +interface IWineDXGIDevice : IDXGIDevice3 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture,

1 0

Daniel Lehman : wininet: Support large downloads.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: e07efbd9197a4628024dce9338bc3c947280662c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07efbd9197a4628024dce93… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Sep 6 21:57:48 2019 -0700 wininet: Support large downloads. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 25 ++++++++++++++----------- dlls/wininet/internet.h | 6 +++--- dlls/wininet/tests/http.c | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fccbb02..ad01420 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -52,7 +52,6 @@ #include "winternl.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG -#define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI #include "shlwapi.h" #include "sspi.h" @@ -2442,7 +2441,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return; @@ -2646,7 +2645,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, B int len, res; size_t size; - if(netconn_stream->content_length == ~0u) + if(netconn_stream->content_length == ~0) return WSAEISCONN; while(netconn_stream->content_read < netconn_stream->content_length) { @@ -2752,7 +2751,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, TRACE("reading %u byte chunk\n", chunked_stream->chunk_size); chunked_stream->buf_size++; chunked_stream->buf_pos--; - if(req->contentLength == ~0u) req->contentLength = chunked_stream->chunk_size; + if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size; else req->contentLength += chunked_stream->chunk_size; chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE; } @@ -2874,6 +2873,7 @@ static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; static const WCHAR headW[] = {'H','E','A','D',0}; + WCHAR contentLength[32]; WCHAR encoding[20]; DWORD size; @@ -2882,10 +2882,13 @@ static DWORD set_content_length(http_request_t *request) return ERROR_SUCCESS; } - size = sizeof(request->contentLength); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &request->contentLength, &size, NULL) != ERROR_SUCCESS) - request->contentLength = ~0u; + size = sizeof(contentLength); + if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONTENT_LENGTH, + contentLength, &size, NULL) != ERROR_SUCCESS || + !StrToInt64ExW(contentLength, STIF_DEFAULT, (LONGLONG*)&request->contentLength)) { + request->contentLength = ~0; + } + request->netconn_stream.content_length = request->contentLength; request->netconn_stream.content_read = request->read_size; @@ -2911,7 +2914,7 @@ static DWORD set_content_length(http_request_t *request) } request->data_stream = &chunked_stream->data_stream; - request->contentLength = ~0u; + request->contentLength = ~0; } if(request->hdr.decoding) { @@ -3301,7 +3304,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->hdr.dwFlags = dwFlags; request->hdr.dwContext = dwContext; request->hdr.decoding = session->hdr.decoding; - request->contentLength = ~0u; + request->contentLength = ~0; request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl; request->data_stream = &request->netconn_stream.data_stream; @@ -4925,7 +4928,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; if(redirected) { - request->contentLength = ~0u; + request->contentLength = ~0; request->bytesToWrite = 0; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index f712fb6..40e51be 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -335,8 +335,8 @@ typedef struct { typedef struct { data_stream_t data_stream; - DWORD content_length; - DWORD content_read; + ULONGLONG content_length; + ULONGLONG content_read; } netconn_stream_t; #define READ_BUFFER_SIZE 8192 @@ -372,7 +372,7 @@ typedef struct struct HttpAuthInfo *proxyAuthInfo; CRITICAL_SECTION read_section; /* section to protect the following fields */ - DWORD contentLength; /* total number of bytes to be read */ + ULONGLONG contentLength; /* total number of bytes to be read */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fcbd95b..a4521a9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5545,7 +5545,9 @@ static void test_large_content(int port) }; test_request_t req; DWORD sizelen, len; + DWORD read_size; DWORD64 len64; + char buf[16]; BOOL ret; size_t i; @@ -5594,6 +5596,24 @@ static void test_large_content(int port) ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); close_request(&req); + + /* test internal use of HttpQueryInfo on large size */ + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 4294967296\r\n" + "\r\n" + "xx"); + read_expect_async(req.request, buf, 4, &read_size, "xx"); + send_response_and_wait("yy1234567890", FALSE, buf, &read_size, "xxyy", 4, 0, 2); + read_expect_sync_data(req.request, buf, 10, "1234567890"); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + close_connection(); } static void test_http_connection(void)

1 0

Daniel Lehman : ntdll/tests: Adjust timing on RtlWaitOnAddress tests.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 3462b4d1f2f9e11cc154e91400fc2eb41e32b2b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3462b4d1f2f9e11cc154e914… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Sep 6 22:07:38 2019 -0700 ntdll/tests: Adjust timing on RtlWaitOnAddress tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 931628b..c17b6ff 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2115,7 +2115,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2130,7 +2130,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 100 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status);

1 0

Alistair Leslie-Hughes : wineqtdecoder: Add missing header.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 14ea43083cb606aa1f0b275be8a8d84c412ee3dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ea43083cb606aa1f0b275b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 7 08:31:10 2019 +0000 wineqtdecoder: Add missing header. Fixes MacOS build issue. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 61ebeab..5fe58cd 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -118,6 +118,7 @@ #include "winuser.h" #include "dshow.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h"

1 0

Francois Gouget : dinput8/tests: A spelling fix in a comment.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 1bc90ab80231fb8ab5cf04f597c9b378b87f3f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc90ab80231fb8ab5cf04f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:19:53 2019 +0200 dinput8/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 0bf6936..f3e7b54 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -109,7 +109,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 17; i++) if (event_type == INPUT_KEYBOARD) {

1 0