September 2019 - Wine-Commits

Alistair Leslie-Hughes : wineqtdecoder: Add missing header.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Andrey Gusev : dxgi: Add IDXGIDevice3 stub.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Gabriel Ivăncescu : vbscript/tests: Test lack of newline parsing before End statements.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Alexandre Julliard : ntdll: Allocate environment blocks from the process heap.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Marcus Meissner : iphlpapi: Fixed size to MultiByteToWideChar.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: e7007ee81471e59d265f59fbe0ddbb9017ecb5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7007ee81471e59d265f59fb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 8 17:43:19 2019 +0200 iphlpapi: Fixed size to MultiByteToWideChar. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d4b1100..1b0bc93 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2331,7 +2331,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; @@ -2357,7 +2357,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99;

1 0

Francois Gouget : ddraw/tests: Spelling fixes in ok() messages.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: ed75c597f92af58d20c9e320bf49f93a7d375fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed75c597f92af58d20c9e320… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:20:12 2019 +0200 ddraw/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cc22802..a23e76e1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2745,7 +2745,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2758,7 +2758,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 595157b..2156bd5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2856,7 +2856,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2869,7 +2869,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 567a8f3..fdcf6df 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3010,7 +3010,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -3023,7 +3023,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 116e34a..279263f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2684,7 +2684,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2697,7 +2697,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);

1 0

Alexandre Julliard : kernel32: Move debugger functions to kernelbase.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

Module: wine Branch: master Commit: 3b002685fe18ca3985af744d8f147f29b2c588f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b002685fe18ca3985af744d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:51:50 2019 +0200 kernel32: Move debugger functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 417 ---------------------------------------- dlls/kernel32/kernel32.spec | 16 +- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/debug.c | 358 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 18 +- 5 files changed, 376 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b002685fe18ca3985af…

1 0

Alexandre Julliard : kernel32: Move process startup information functions to kernelbase.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Daniel Lehman : ntdll/tests: Adjust timing on RtlWaitOnAddress tests.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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

Francois Gouget : dinput8/tests: A spelling fix in a comment.
by Alexandre Julliard Sept. 9, 2019

Sept. 9, 2019

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