February 2017 - Wine-Devel - list.winehq.org

Re: gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.

by Huw Davies

> On 1 Feb 2017, at 13:21, Marvin <testbot(a)winehq.org> wrote: > > 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 Apparently the crash on Windows 10 was successfully avoided, only to crash on Windows 8... ;-/ Huw.

Feb. 1, 2017

Re: gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.

by Marvin

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

Feb. 1, 2017

Re: [PATCH 2/7] regedit: Use FormatMessage() for optimal memory usage (v2)

by Hugh McMaster

> On 1 Feb 2017, at 9:44 pm, Alexandre Julliard wrote: > > You have to use __ms_va_list with FormatMessage. Check how this is done > in regedit.c. Sorry. I completely forgot about using __ms_va_list and friends. I've resent the patch series. -- Hugh McMaster

Feb. 1, 2017

Re: [PATCH 2/7] regedit: Use FormatMessage() for optimal memory usage (v2)

by Alexandre Julliard

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

Feb. 1, 2017

Re: [PATCH 2/2] ucrtbase/tests: Add tests for __conio_common_vcprintf()/_vcwprintf()

by Piotr Caban

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

Feb. 1, 2017

Re: [PATCH 2/2] winspool+localspl: Move AddPrinterW implementation to localspl

by Huw Davies

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.

Feb. 1, 2017

Re: [PATCH] comctl32/tests: Use HGLOBAL stream to Read/Write tests on imagelists

by Dmitry Timoshkov

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.

Feb. 1, 2017

Re: [v3 PATCH 04/10] x86/insn-kernel: Add a function to obtain register offset in ModRM

by Ricardo Neri

On Fri, 2017-01-27 at 16:53 +0900, Masami Hiramatsu wrote: > On Wed, 25 Jan 2017 22:07:16 -0800 > Ricardo Neri <ricardo.neri-calderon(a)linux.intel.com> wrote: > > > Hi Masami, > > > > On Thu, 2017-01-26 at 11:11 +0900, Masami Hiramatsu wrote: > > > On Wed, 25 Jan 2017 12:23:47 -0800 > > > Ricardo Neri <ricardo.neri-calderon(a)linux.intel.com> wrote: > > > > > > > The function insn_get_reg_offset requires a type to indicate whether > > > > the returned offset is that given by by the ModRM or the SIB byte. > > > > Callers of this function would need the definition of the type struct. > > > > This is not needed. Instead, auxiliary functions can be defined for > > > > this purpose. > > > > > > > > When the operand is a register, the emulation code for User-Mode > > > > Instruction Prevention needs to know the offset of the register indicated > > > > in the r/m part of the ModRM byte. Thus, start by adding an auxiliary > > > > function for this purpose. > > > > > > Hmm, why wouldn't you just rename it to insn_get_reg_offset() and export it? > > > > Do you mean exporting the structure that I mention above? The problem > > that I am trying to solve is that callers sometimes want to know the > > offset of the register encoded in the SiB or the ModRM bytes. I could > > use something > > > > insn_get_reg_offset(insn, regs, INSN_TYPE_MODRM) > > insn_get_reg_offset(insn, regs, INSN_TYPE_SIB) > > > > Instead, I opted for > > > > insn_get_reg_offset_rm(insn, regs) > > insn_get_reg_offset_sib(insn, regs) > > > > to avoid exposing an enum with the INSN_TYPE_MODRM, INSN_TYPE_SIB. > > OK, if so, I think you should export both of them at once, not only > insn_get_reg_offset_rm(). Sure, I will include both functions. Thanks and BR, Ricardo > > Thank you, > > > > > If you feel that the former makes more sense, I can change the > > implementation. > > > > Thanks and BR, > > Ricardo > > > > > > Thank you, > > > > > > > > > > > Cc: Dave Hansen <dave.hansen(a)linux.intel.com> > > > > Cc: Adam Buchbinder <adam.buchbinder(a)gmail.com> > > > > Cc: Colin Ian King <colin.king(a)canonical.com> > > > > Cc: Lorenzo Stoakes <lstoakes(a)gmail.com> > > > > Cc: Qiaowei Ren <qiaowei.ren(a)intel.com> > > > > Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com> > > > > Cc: Masami Hiramatsu <mhiramat(a)kernel.org> > > > > Cc: Adrian Hunter <adrian.hunter(a)intel.com> > > > > Cc: Kees Cook <keescook(a)chromium.org> > > > > Cc: Thomas Garnier <thgarnie(a)google.com> > > > > Cc: Peter Zijlstra <peterz(a)infradead.org> > > > > Cc: Borislav Petkov <bp(a)suse.de> > > > > Cc: Dmitry Vyukov <dvyukov(a)google.com> > > > > Cc: Ravi V. Shankar <ravi.v.shankar(a)intel.com> > > > > Cc: x86(a)kernel.org > > > > Signed-off-by: Ricardo Neri <ricardo.neri-calderon(a)linux.intel.com> > > > > --- > > > > arch/x86/include/asm/insn-kernel.h | 1 + > > > > arch/x86/lib/insn-kernel.c | 5 +++++ > > > > 2 files changed, 6 insertions(+) > > > > > > > > diff --git a/arch/x86/include/asm/insn-kernel.h b/arch/x86/include/asm/insn-kernel.h > > > > index aef416a..3f34649 100644 > > > > --- a/arch/x86/include/asm/insn-kernel.h > > > > +++ b/arch/x86/include/asm/insn-kernel.h > > > > @@ -12,5 +12,6 @@ > > > > #include <asm/ptrace.h> > > > > > > > > void __user *insn_get_addr_ref(struct insn *insn, struct pt_regs *regs); > > > > +int insn_get_reg_offset_rm(struct insn *insn, struct pt_regs *regs); > > > > > > > > #endif /* _ASM_X86_INSN_KERNEL_H */ > > > > diff --git a/arch/x86/lib/insn-kernel.c b/arch/x86/lib/insn-kernel.c > > > > index 8072abe..267cab4 100644 > > > > --- a/arch/x86/lib/insn-kernel.c > > > > +++ b/arch/x86/lib/insn-kernel.c > > > > @@ -95,6 +95,11 @@ static int get_reg_offset(struct insn *insn, struct pt_regs *regs, > > > > return regoff[regno]; > > > > } > > > > > > > > +int insn_get_reg_offset_rm(struct insn *insn, struct pt_regs *regs) > > > > +{ > > > > + return get_reg_offset(insn, regs, REG_TYPE_RM); > > > > +} > > > > + > > > > /* > > > > * return the address being referenced be instruction > > > > * for rm=3 returning the content of the rm reg > > > > -- > > > > 2.9.3 > > > > > > > > > > > > > > > >

Feb. 1, 2017

Re: [PATCH] fix command line argument escaping in build_command_line

by Fabian Maurer

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.

Feb. 1, 2017