wine-devel February 2017

wine-devel@winehq.org

70 participants
300 discussions

Re: [PATCH 5/5] ddraw: Update the primary surface format when changing the display mode.
by Stefan Dösinger 01 Feb '17

01 Feb '17

Am 2017-02-01 um 11:02 schrieb Henri Verbeet: > hr = set_display_mode(ddraw, 640, 480); > ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); > > + memset(&surface_desc, 0, sizeof(surface_desc)); > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(primary, &surface_desc); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + ok(surface_desc.dwWidth == 640, "Got unexpected surface width %u.\n", surface_desc.dwWidth); > + ok(surface_desc.dwHeight == 480, "Got unexpected surface height %u.\n", surface_desc.dwHeight); > + ok(U1(surface_desc.ddpfPixelFormat).dwRGBBitCount == 32 > + || U1(surface_desc.ddpfPixelFormat).dwRGBBitCount == 24, > + "Got unexpected bit count %u.\n", U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); Since we know ddraw does magic on WM_DISPLAYCHANGE messages: Does this also happen when you change the mode behind ddraw's back with ChangeDisplaySettings?

2 1

Re: xmllite: Add Unknown to map (Coverity)
by Nikolay Sivov 01 Feb '17

01 Feb '17

On 31.01.2017 1:11, André Hentschel wrote: > CID 1364307 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/xmllite/reader.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c > index 1e3c7aa..f99ea66 100644 > --- a/dlls/xmllite/reader.c > +++ b/dlls/xmllite/reader.c > @@ -85,6 +85,7 @@ typedef enum > > static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; > static const WCHAR utf8W[] = {'U','T','F','-','8',0}; > +static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; > > static const WCHAR dblquoteW[] = {'\"',0}; > static const WCHAR quoteW[] = {'\'',0}; > @@ -151,8 +152,9 @@ struct xml_encoding_data > }; > > static const struct xml_encoding_data xml_encoding_map[] = { > - { utf16W, XmlEncoding_UTF16, ~0 }, > - { utf8W, XmlEncoding_UTF8, CP_UTF8 } > + { utf16W, XmlEncoding_UTF16, ~0 }, > + { utf8W, XmlEncoding_UTF8, CP_UTF8 }, > + { unknownW, XmlEncoding_Unknown, ~0 }, > }; > > const WCHAR *get_encoding_name(xml_encoding encoding) > I don't think this fixes anything in a sense of making xmllite more compliant. We probably should just fail at CreateXmlWriterOutputWithEncodingName() and print encoding string that made it fail.

2 1

Re: [PATCH v3] user32: Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests
by Alexandre Julliard 01 Feb '17

01 Feb '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c > index 59fcd9c488..a4d59713c9 100644 > --- a/dlls/user32/menu.c > +++ b/dlls/user32/menu.c > @@ -3077,7 +3077,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, > break; > } > > - TranslateMessage( &msg ); > + /* Don't translate escape-keydown message because it leads to an unexpected WM_CHAR */ > + if( !(msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE) ) > + TranslateMessage( &msg ); > mt.pt = msg.pt; You could do it like that, but I think it would be cleaner to move this into the part that checks keyboard messages, and call TranslateMessage for messages that have not been handled otherwise. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.
by Marvin 01 Feb '17

01 Feb '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=28186 Your paranoid android. === w8 (32 bit gameexplorer) === Found no trace of the test summary line or of a crash

2 1

Re: [PATCH 2/7] regedit: Use FormatMessage() for optimal memory usage (v2)
by Alexandre Julliard 01 Feb '17

01 Feb '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/edit.c | 14 +++++++++----- > programs/regedit/regedit.rc | 12 ++++++------ > 2 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c > index a223535..3f2b7a4 100644 > --- a/programs/regedit/edit.c > +++ b/programs/regedit/edit.c > @@ -49,15 +49,19 @@ struct edit_params > static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) > { > WCHAR title[256]; > - WCHAR errfmt[1024]; > - WCHAR errstr[1024]; > + WCHAR fmt[1024]; > + WCHAR *str; > + int ret; > > LoadStringW(hInst, titleId, title, COUNT_OF(title)); > - LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt)); > + LoadStringW(hInst, resId, fmt, COUNT_OF(fmt)); > > - vsnprintfW(errstr, COUNT_OF(errstr), errfmt, ap); > + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, > + fmt, 0, 0, (WCHAR *)&str, 0, &ap); > + ret = MessageBoxW(hwnd, str, title, buttons); > + LocalFree(str); > > - return MessageBoxW(hwnd, errstr, title, buttons); > + return ret; > } You have to use __ms_va_list with FormatMessage. Check how this is done in regedit.c. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] ucrtbase/tests: Add tests for __conio_common_vcprintf()/_vcwprintf()
by Piotr Caban 01 Feb '17

01 Feb '17

Hi, this tests will not work when there's no console window. It will break the tests under wine when running them this way: wine ucrtbase_test.exe.so printf &>log I think it's OK if we test only print functions that work on strings/file descriptors so we don't spam test output. Thanks, Piotr

1 0

Re: [PATCH 2/2] winspool+localspl: Move AddPrinterW implementation to localspl
by Huw Davies 01 Feb '17

01 Feb '17

On Thu, Jan 26, 2017 at 06:24:38PM +0100, Detlef Riekenberg wrote: > We need to move AddPrinter to allow importing CUPS printers > centralized in the spooler service. (bug 3507, bug 10358) > > localspl will be used from the application (through winspool.drv) > and from the spooler service (through spoolss.dll) > > The changes before and after the code move are as minimal as possible Hi Detlef, Could you explain a bit more about where this going? How much more will need to move to localspl to enable this to happen? Is it possible for the spooler service to use winspool.drv instead of spoolss.dll? I've also inlined a few comments below. > diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c > index f359b73..9b12c63 100644 > --- a/dlls/localspl/provider.c > +++ b/dlls/localspl/provider.c > @@ -93,13 +93,22 @@ static monitor_t * pm_localport; > -static const WCHAR spoolW[] = {'\\','s','p','o','o','l',0}; > -static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > +static const WCHAR printer_driverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; > +static const WCHAR priorityW[] = {'P','r','i','o','r','i','t','y',0}; > +static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; providerW is unused. > +static HKEY localspl_OpenDriverReg(LPCWSTR pEnvironment) > +{ > + HKEY retval = NULL; > + LPWSTR buffer; > + const printenv_t * env; > + > + TRACE("(%s)\n", debugstr_w(pEnvironment)); > + > + env = validate_envW(pEnvironment); > + if (!env) return NULL; > + > + buffer = heap_alloc((strlenW(fmt_driversW) + strlenW(env->envname) + strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); > + > + if(buffer) { I know this is copied from winspool.drv, but let's try to be consistent with the formatting and put that brace on a new line. Same for other K&R style hunks below. > +static WINAPI DEVMODEW * get_default_devmode(LPWSTR printername, LPWSTR drivername) > +{ > + > + LONG size; > + HMODULE hwinspool; > + DEVMODEW * dm = NULL; > + LONG (WINAPI * pDocumentPropertiesW)(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, > + LPDEVMODEW pDevModeOutput, LPDEVMODEW pDevModeInput, DWORD fMode); > + > + TRACE("printername: %s, drivername: %s\n", debugstr_w(printername), debugstr_w(drivername)); > + > + hwinspool = LoadLibraryW(winspooldrvW); > + if (!hwinspool) return NULL; > + > + pDocumentPropertiesW = (void *) GetProcAddress(hwinspool, "DocumentPropertiesW"); Calling back to winspool.drv seems awkward. You could simply have winspool.drv set pi->pDevMode before calling localspl. Of course, that leaves the question of what spoolss should do, but that depends on what your answers are to the first questions. Huw.

1 0

Re: [PATCH] comctl32/tests: Use HGLOBAL stream to Read/Write tests on imagelists
by Dmitry Timoshkov 01 Feb '17

01 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > dlls/comctl32/tests/imagelist.c | 120 ++++++++++++++++++---------------------- > 1 file changed, 53 insertions(+), 67 deletions(-) ... > -struct my_IStream > +struct memstream > { > IStream IStream_iface; > - char *iml_data; /* written imagelist data */ > - ULONG iml_data_size; > + IStream *stream; > }; > > -static struct my_IStream *impl_from_IStream(IStream *iface) > +static struct memstream *impl_from_IStream(IStream *iface) > { > - return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); > + return CONTAINING_RECORD(iface, struct memstream, IStream_iface); > } You could at least try to avoid unecessary structure renaming. > static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, > @@ -709,34 +708,15 @@ static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) > static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, > ULONG *pcbRead) > { > - ok(0, "unexpected call\n"); > - return E_NOTIMPL; > -} This is not an improvement. The patch neither simplifies the code nor makes it more readable. Besides the test is no longer able to detect that Read method should not be called. What is the idea behind this? -- Dmitry.

1 0

[v3 PATCH 00/10] x86: Enable User-Mode Instruction Prevention
by Ricardo Neri 01 Feb '17

01 Feb '17

This is v3 of this series. Again, it took me a while to complete the updates as support for virtual-8086 mode required extra rework. The two previous submissions can be found here [1] and here [2]. User-Mode Instruction Prevention (UMIP) is a security feature present in new Intel Processors. If enabled, it prevents the execution of certain instructions if the Current Privilege Level (CPL) is greater than 0. If these instructions were executed while in CPL > 0, user space applications could have access to system-wide settings such as the global and local descriptor tables, the segment selectors to the current task state and the local descriptor table. These are the instructions covered by UMIP: * SGDT - Store Global Descriptor Table * SIDT - Store Interrupt Descriptor Table * SLDT - Store Local Descriptor Table * SMSW - Store Machine Status Word * STR - Store Task Register If any of these instructions is executed with CPL > 0, a general protection exception is issued when UMIP is enabled. There is a caveat, however. Certain applications rely on some of these instructions to function. An example of this are applications that use WineHQ[3]. For instance, these applications rely on sidt returning a non- accesible memory location[4]. During the discussions, it was proposed that the fault could be relied to the user-space and perform the emulation in user-mode. However, this would break existing applications until, for instance, they update to a new WineHQ version. However, this approach would require UMIP to be disabled by default. The concensus in this forum is to always enable it. This patchset initially treated tasks running in virtual-8086 mode as a special case. However, I received clarification that DOSEMU[5] does not support applications that use these instructions. It relies on WineHQ for this[6]. Furthermore, the applications for which the concern was raised run in protected mode [4]. This version keeps UMIP enabled at all times and by default. If a general protection fault caused by the instructions protected by UMIP is detected, such fault will be fixed-up by returning dummy values as follows: * SGDT and SIDT return hard-coded dummy values as the base of the global descriptor and interrupt descriptor tables. These hard-coded values are located within a memory map hole in x86_64. For x86_32, the same values are used but truncated to 4 bytes. This is also the case for virtual- 8086 mode tasks, in which the base is truncated to 3 bytes. In all cases, the limit of the table is set to 0. * STR and SLDT return 0 as the segment selector. This looks appropriate since we are providing a dummy value as the base address of the global descriptor table. * SMSW returns the value with which the CR0 register is programmed in head_32/64.S at boot time. This is, the following bits are enabed: CR0.0 for Protection Enable, CR.1 for Monitor Coprocessor, CR.4 for Extension Type, which will always be 1 in recent processors with UMIP; CR.5 for Numeric Error, CR0.16 for Write Protect, CR0.18 for Alignment Mask. Additionally, in x86_64, CR0.31 for Paging is set. The proposed emulation code is handles faults that happens in both protected and virtual-8086 mode. I found very useful the code for Intel MPX (Memory Protection Extensions) used to parse opcodes and the memory locations contained in the general purpose registers when used as operands. I put some of this code in a separate library file that both MPX and UMIP can access and avoid code duplication. While here, I fixed two small bugs that I found in the MPX implementation. This new library was also extended to handle 16-bit address encodings as those found in virtual-8086 mode tasks. A set of representative selftests for virtual-8086 mode tasks are included as part of this series. The tested uses use displacements, registers to indicate memory addresses as well as the use as registers as operands. Extensive test cases were performed to test the page fault that is emulated when memory to write the instructions results is not accesible[7], to tests almost all combinations of operands (ModRM, SiB, REX prefix and displacements) in protected mode[8] and to test almost all the combinations of operands in virtual-8086 mode[9]. If there is interest, this could could also be submitted for the kernel selftests. [1]. https://lwn.net/Articles/705877/ [2]. https://lkml.org/lkml/2016/12/23/265 [3]. https://www.winehq.org/ [4]. https://www.winehq.org/pipermail/wine-devel/2016-November/115320.html [5]. http://www.dosemu.org/ [6]. http://marc.info/?l=linux-kernel&m=147876798717927&w=2 [7]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-core/um… [8]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-core/um… [9]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-kernel/… Thanks and BR, Ricardo Changes since V2: * Added new utility functions to decode the memory addresses contained in registers when the 16-bit addressing encodings are used. This includes code to obtain and compute memory addresses using segment selectors for real-mode address translation. * Added support to emulate UMIP-protected instructions for virtual-8086 tasks. * Added selftests for virtual-8086 mode that contains representative use cases: address represented as a displacement, address in registers and registers as operands. * Instead of maintaining a static variable for the dummy base addresses of the IDT and GDT, a hard-coded value is used. * The emulated SMSW instructions now return the value with which the CR0 register is programmed in head_32/64.S This is: PE | MP | ET | NE | WP | AM. For x86_64, PG is also enabled. * The new file arch/x86/lib/insn-utils.c is now renamed as arch/x86/lib/ insn-kernel.c. It also has its own header. This helps keep in sync the the kernel and objtool instruction decoders. Also, the new insn-kernel.c contains utility functions that are only relevant in a kernel context. * Removed printed warnings for errors that occur when decoding instructions with invalid operands. * Added more comments on fixes in the instruction-decoding MPX functions. * Now user_64bit_mode(regs) is used instead of test_thread_flag(TIF_IA32) to determine if the task is 32-bit or 64-bit. * Found and fixed a bug in insn-decoder in which X86_MODRM_RM was incorrectly used to obtain the mod part of the ModRM byte. * Added more explanatory code in emulation and instruction decoding code. This includes a comment regarding that copy_from_user could fail if there exists a memory protection key in place. * Tested code with CONFIG_X86_DECODER_SELFTEST=y and everything passes now. * Prefixed get_reg_offset_rm with insn_ as this function is exposed via a header file. For clarity, this function was added in a separate patch. Changes since V1: * Virtual-8086 mode tasks are not treated in a special manner. All code for this purpose was removed. * Instead of attempting to disable UMIP during a context switch or when entering virtual-8086 mode, UMIP remains enabled all the time. General protection faults that occur are fixed-up by returning dummy values as detailed above. * Removed umip= kernel parameter in favor of using clearcpuid=514 to disable UMIP. * Removed selftests designed to detect the absence of SIGSEGV signals when running in virtual-8086 mode. * Reused code from MPX to decode instructions operands. For this purpose code was put in a common location. * Fixed two bugs in MPX code that decodes operands. Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Borislav Petkov <bp(a)suse.de> Cc: Brian Gerst <brgerst(a)gmail.com> Cc: Chen Yucong <slaoub(a)gmail.com> Cc: Chris Metcalf <cmetcalf(a)mellanox.com> Cc: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Huang Rui <ray.huang(a)amd.com> Cc: Jiri Slaby <jslaby(a)suse.cz> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: Paul Gortmaker <paul.gortmaker(a)windriver.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ravi V. Shankar <ravi.v.shankar(a)intel.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Liang Z Li <liang.z.li(a)intel.com> Cc: x86(a)kernel.org Cc: linux-msdos(a)vger.kernel.org Ricardo Neri (10): x86/mpx: Do not use SIB index if index points to R/ESP x86/mpx: Fail decoding when SIB baseR/EBP is and no displacement is used x86/mpx, x86/insn: Relocate insn util functions to a new insn-kernel x86/insn-kernel: Add a function to obtain register offset in ModRM x86/insn-kernel: Add support to resolve 16-bit addressing encodings x86/cpufeature: Add User-Mode Instruction Prevention definitions x86: Add emulation code for UMIP instructions x86/traps: Fixup general protection faults caused by UMIP x86: Enable User-Mode Instruction Prevention selftests/x86: Add tests for User-Mode Instruction Prevention arch/x86/Kconfig | 10 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/insn-kernel.h | 17 ++ arch/x86/include/asm/umip.h | 15 ++ arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 16 +- arch/x86/kernel/traps.c | 4 + arch/x86/kernel/umip.c | 251 +++++++++++++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/insn-kernel.c | 344 ++++++++++++++++++++++++++ arch/x86/mm/mpx.c | 120 +-------- tools/testing/selftests/x86/entry_from_vm86.c | 39 ++- 14 files changed, 708 insertions(+), 122 deletions(-) create mode 100644 arch/x86/include/asm/insn-kernel.h create mode 100644 arch/x86/include/asm/umip.h create mode 100644 arch/x86/kernel/umip.c create mode 100644 arch/x86/lib/insn-kernel.c -- 2.9.3

4 24

Re: [PATCH] fix command line argument escaping in build_command_line
by Fabian Maurer 01 Feb '17

01 Feb '17

On Tuesday, January 31, 2017 3:42:45 PM CET Jacob Lifshay wrote: > [PATCH] fix command line argument escaping in build_command_line Please change the commit message to include "kernel32: " at the beginning.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2017