February 2019 - Wine-devel - list.winehq.org

[PATCH] wbemprox/tests: Add a simple test for semi-synchronous mode behaviour.
by Nikolay Sivov 18 Feb '19

18 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index ae0106a341..e8ddbccbe6 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1084,6 +1084,34 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } +static void test_query_semisync( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','D','u','m','m','y',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + ULONG count; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, + NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 1; + obj = (void *)0xdeadbeef; + hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); +todo_wine + ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); + ok( count == 0, "Unexpected count %u.\n", count ); + ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); + + IEnumWbemClassObject_Release( result ); + + SysFreeString( wql ); + SysFreeString( query ); +} + static void test_GetNames( IWbemServices *services ) { static const WCHAR queryW[] = @@ -1950,6 +1978,7 @@ START_TEST(query) test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_query_semisync( services ); test_GetNames( services ); test_SystemSecurity( services ); test_Win32_OperatingSystem( services ); -- 2.20.1

2 1

[PATCH] comctl32/updown: Make sure buttons rectangles are consistent with each other.
by Nikolay Sivov 18 Feb '19

18 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 8dec7a4807..a48f1e437c 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -170,13 +171,16 @@ static BOOL UPDOWN_HasBuddyBorder(const UPDOWN_INFO *infoPtr) * rect - will hold the rectangle * arrow - FLAG_INCR to get the "increment" rect (up or right) * FLAG_DECR to get the "decrement" rect (down or left) - * If both flags are present, the envelope is returned. */ -static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arrow) +static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, unsigned int arrow) { HTHEME theme = GetWindowTheme (infoPtr->Self); const int border = theme ? DEFAULT_BUDDYBORDER_THEMED : DEFAULT_BUDDYBORDER; const int spacer = theme ? DEFAULT_BUDDYSPACER_THEMED : DEFAULT_BUDDYSPACER; + int size; + + assert(arrow && (arrow & (FLAG_INCR | FLAG_DECR)) != (FLAG_INCR | FLAG_DECR)); + GetClientRect (infoPtr->Self, rect); /* @@ -200,21 +204,20 @@ static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arr /* * We're calculating the midpoint to figure-out where the - * separation between the buttons will lay. We make sure that we - * round the uneven numbers by adding 1. + * separation between the buttons will lay. */ if (infoPtr->dwStyle & UDS_HORZ) { - int len = rect->right - rect->left + 1; /* compute the width */ + size = (rect->right - rect->left) / 2; if (arrow & FLAG_INCR) - rect->left = rect->left + len/2; - if (arrow & FLAG_DECR) - rect->right = rect->left + len/2 - (theme ? 0 : 1); + rect->left = rect->right - size; + else if (arrow & FLAG_DECR) + rect->right = rect->left + size; } else { - int len = rect->bottom - rect->top + 1; /* compute the height */ + size = (rect->bottom - rect->top) / 2; if (arrow & FLAG_INCR) - rect->bottom = rect->top + len/2 - (theme ? 0 : 1); - if (arrow & FLAG_DECR) - rect->top = rect->top + len/2; + rect->bottom = rect->top + size; + else if (arrow & FLAG_DECR) + rect->top = rect->bottom - size; } } -- 2.20.1

1 0

[PATCH v4] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 18 Feb '19

18 Feb '19

2 5

[PATCH v5] po: Update Sinhala translation.
by Isira Seneviratne 18 Feb '19

18 Feb '19

1 0

Hangover 0.4.0 release
by André Hentschel 18 Feb '19

18 Feb '19

Hi all, Stefan and I want to announce the first Hangover alpha release 0.4.0 (shifted from the corresponding Wine version) The release can be found at github: https://github.com/AndreRH/hangover/releases It is still highly experimental and won't run most applications. Features: * Running x86 and x86_64 applications on arm64 * That happens automagically when qemu is at C:\x86\qemu-x86_64.exe.so * Android support (currently first starts native cmd, then x86_64 notepad++) * D3D support (not on Android, because Wine cannot fully deal with GLES yet) For more infos, see: https://github.com/AndreRH/hangover/blob/master/README https://wiki.winehq.org/Emulation#Hangover

2 1

[PATCH resend] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 17 Feb '19

17 Feb '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 102 +++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec78f4bc46..e15a75a810 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3224,6 +3225,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3247,28 +3326,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + perform_relocations(module, nt->OptionalHeader.SizeOfImage); } /* make sure imports are relocated too */ -- 2.17.1

2 2

[PATCH] msi: Prevent uninitialized variable usage
by Mark Jansen 17 Feb '19

17 Feb '19

Observed with Lync 2010 setup in ReactOS. The embedded Silverlight setup hits this case. (No LASTUSEDSOURCE in the registry)

1 0

winehq 32bit configuration doesn't work on WLinux
by Dr. Makoto Sakurai 17 Feb '19

17 Feb '19

Dear all, it says config.status: executing include/stamp-h commands config.status: executing tools/makedep commands config.status: executing Makefile commands ./config.status: line 551: tools/makedep: cannot execute binary file: Exec format error config.status: error: could not create Makefile This seems to be an unknown error case. Sincerely yours, Makoto Sakurai

2 1

winehq 32bit configuration doesn't work on WLinux
by Dr. Makoto Sakurai 17 Feb '19

17 Feb '19

Dear all, it says config.status: executing include/stamp-h commands config.status: executing tools/makedep commands config.status: executing Makefile commands ./config.status: line 551: tools/makedep: cannot execute binary file: Exec format error config.status: error: could not create Makefile This seems to be an unknown error case. Sincerely yours, Makoto Sakurai

1 0

Wine staging 4.2 release
by Alistair Leslie-Hughes 17 Feb '19

17 Feb '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.2 (798 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette. * windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided. * windowscodecs/tests: Add a bunch of new tests for indexed format conversions. * windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format. * windowscodecs/tests: Add a missing check for IWICBitmapFrameDecode::GetPixelFormat return value. * ntoskrnl.exe: Implement ExInitializeNPagedLookasideList. * ntoskrnl.exe: Implement NtBuildNumber. * wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry(). * d3d8: Improve ValidateVertexShader stub. * ntdll: Improve speed of LdrGetDllHandle when searching for the basename of modules that are not loaded. * include: Add more VSS_* typedefs * include: Add VSS writer enum * include: Convert header vswriter to an idl. * include: Add vsbackup.idl * vssapi: Add CreateVssBackupComponentsInternal stub * vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub * wined3d: Return stream frequency of 1 if it was not set. * tools/make_unicode: Implement full Unicode character decomposition. * tools/make_unicode: Implement canonical composition for use in normalization. * kernel32: Implement NormalizeString API function. * libs: Generated make_unicode files * ntdll: Check architecture before loading module. * ntdll: Add a futex-based condition variable implementation. * bcrypt: Implement BCryptDeriveKeyPBKDF2 and add test vectors. * bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. * mfplat: Implement MFGetSystemTime. * wineps.drv: Add stubs for escapes required by Adobe PageMaker. * wineps.drv: PostScript header should be written by StartDoc instead of StartPage. Added: * [19153] ddraw: Return correct devices based off requested DirectX version. * [34579] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing problem. * [35331] gdi32: fix for rotated ellipse. Updated: * uxtheme-GTK_Theming. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0