May 2013 - Wine-Devel - list.winehq.org

Re: msvcrt: remove hack

by Christian Costa

Le 30/05/2013 09:54, Marcus Meissner a écrit : > On Wed, May 29, 2013 at 10:23:29PM -0700, Austin English wrote: >> This was added 12 years ago in 1db20bfd33f9c1486a1a662c2f78f45d00caf24b >> >> but clang doesn't like it: >> clang -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ >> -D_MT -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing >> -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers >> -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith >> -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -o process.o >> process.c >> process.c:363:10: warning: explicitly assigning a variable of type >> 'int' to itself [-Wself-assign] >> action = action; /* Remove warning */ >> ~~~~~~ ^ ~~~~~~ >> 1 warning generated. >> >> and no modern gcc/other compiler that I can find cares. > It was probably added because of a tool that warned of the unused > parameter ... So it all goes in circles. ;) > > Ciao, Marcus > > > So what about action = NULL instead?

May 30, 2013

Re: msvcrt: remove hack

by Marcus Meissner

On Wed, May 29, 2013 at 10:23:29PM -0700, Austin English wrote: > This was added 12 years ago in 1db20bfd33f9c1486a1a662c2f78f45d00caf24b > > but clang doesn't like it: > clang -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ > -D_MT -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing > -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers > -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith > -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -o process.o > process.c > process.c:363:10: warning: explicitly assigning a variable of type > 'int' to itself [-Wself-assign] > action = action; /* Remove warning */ > ~~~~~~ ^ ~~~~~~ > 1 warning generated. > > and no modern gcc/other compiler that I can find cares. It was probably added because of a tool that warned of the unused parameter ... So it all goes in circles. ;) Ciao, Marcus

May 30, 2013

Re: dinput: Update existing joystick values after setting the range property

by Austin English

On Sun, Apr 14, 2013 at 2:25 PM, Bassi, Gurmail <Gurmail.Bassi(a)mottmac.com> wrote: > ePSXe polls the joystick immediately after setting the axis range property, and uses the returned values as its 'centered' calibrated values - therefore the existing joystick state values must be remapped to the new range (or else the joystick may not have the full range of motion) > > > This patch has been tested on Ubuntu 12.04.1 LTS x86-64, and the behaviour confirmed to match Microsoft's DirectInput implementation on Windows XP 32-bit (Microsoft's DirectInput seems to update the existing joystick values to the new range prior to polling even if the joystick hasn't been moved) > > > --- > dlls/dinput/joystick.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 47 insertions(+) Hi Gurmail, This appears to have caused a regression, see http://bugs.winehq.org/show_bug.cgi?id=33496 (normally I'd cc you on the bug, but you don't seem to have a bugzilla account). -- -Austin

May 30, 2013

Re: [PATCH] slc: Fix return type

by Christian Costa

Le 29/05/2013 12:06, Detlef Riekenberg a écrit : > -- > By by ... Detlef > --- > dlls/slc/slc.c | 31 +++++++++++++++++++++++-------- > include/slpublic.h | 2 +- > 2 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c > index e7416f1..7fc9b93 100644 > --- a/dlls/slc/slc.c > +++ b/dlls/slc/slc.c > @@ -1,6 +1,7 @@ > /* > * > * Copyright 2008 Alistair Leslie-Hughes > + * Copyright 2010 Detlef Riekenberg > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -28,15 +29,8 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(slc); > > -DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) > -{ > - FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); > - > - return SL_E_RIGHT_NOT_GRANTED; > -} > - > /*********************************************************************** > - * DllMain (CLUSAPI.@) > + * DllMain (slc.@) > * > */ > BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > @@ -51,3 +45,24 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > } > return TRUE; > } > + > +/*********************************************************************** > + * SLGetWindowsInformationDWORD (slc.@) > + * > + * check the license and return the value for the given name > + * > + * PARAMS > + * name [i] application related value name to check > + * pvalue [o] ptr, where the value for the given name should be saved > + * > + * RETURNS > + * Success: S_OK > + * Failure: A HRESULT error code > + * > + */ > +HRESULT WINAPI SLGetWindowsInformationDWORD(PCWSTR name, DWORD *pvalue) > +{ > + FIXME("(%s, %p) stub\n", debugstr_w(name), pvalue); > + > + return SL_E_RIGHT_NOT_GRANTED; > +} > diff --git a/include/slpublic.h b/include/slpublic.h > index a2c6d42..5553787 100644 > --- a/include/slpublic.h > +++ b/include/slpublic.h > @@ -29,7 +29,7 @@ extern "C" { > #define SLCAPI DECLSPEC_IMPORT > #endif > > -SLCAPI DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue); > +SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(PCWSTR, DWORD *); > > > #ifdef __cplusplus I think s/PCWSTR/const WCHAR */ and s/pvalue/value/ would be better. :)

May 29, 2013

Re: (try 2)macdrv: rework the way we handle cursor position and composition text

by Ken Thomases

On May 29, 2013, at 1:11 PM, Aric Stewart wrote: > --- > dlls/winemac.drv/cocoa_window.m | 9 +---- > dlls/winemac.drv/event.c | 5 --- > dlls/winemac.drv/ime.c | 85 +++++++++++++---------------------------- > dlls/winemac.drv/macdrv.h | 1 - > dlls/winemac.drv/macdrv_cocoa.h | 6 +-- > 5 files changed, 29 insertions(+), 77 deletions(-) > > > <0014-macdrv-rework-the-way-we-handle-cursor-position-and-co.txt> Looks good to me. -Ken

May 29, 2013

Re: macdrv: rework the way we handle cursor position and composition text

by Aric Stewart

ok, resent. -aric On 5/29/13 12:38 PM, Ken Thomases wrote: > On May 29, 2013, at 10:37 AM, Aric Stewart wrote: > >> --- >> dlls/winemac.drv/cocoa_window.m | 9 +---- >> dlls/winemac.drv/event.c | 3 -- >> dlls/winemac.drv/ime.c | 85 +++++++++++++---------------------------- >> dlls/winemac.drv/macdrv.h | 1 - >> dlls/winemac.drv/macdrv_cocoa.h | 5 +-- >> 5 files changed, 29 insertions(+), 74 deletions(-) > > I know I reviewed this several times, but I failed to notice until now: you didn't remove the definition of IM_SET_CURSOR_POS in the enum and the entry in the table in dbgstr_event(). > > -Ken >

May 29, 2013

Re: macdrv: rework the way we handle cursor position and composition text

by Ken Thomases

On May 29, 2013, at 10:37 AM, Aric Stewart wrote: > --- > dlls/winemac.drv/cocoa_window.m | 9 +---- > dlls/winemac.drv/event.c | 3 -- > dlls/winemac.drv/ime.c | 85 +++++++++++++---------------------------- > dlls/winemac.drv/macdrv.h | 1 - > dlls/winemac.drv/macdrv_cocoa.h | 5 +-- > 5 files changed, 29 insertions(+), 74 deletions(-) I know I reviewed this several times, but I failed to notice until now: you didn't remove the definition of IM_SET_CURSOR_POS in the enum and the entry in the table in dbgstr_event(). -Ken

May 29, 2013

Re: GSoC 2013 has begun!

by Austin English

On Tue, May 28, 2013 at 2:50 PM, Austin English <austinenglish(a)gmail.com> wrote: > Howdy, > > Wine has accepted 4 student proposals for Google Summer of Code 2013: > George Stephanos, "Registry - implement merging between HKCR and > HKCU\Software\Classes" mentored by Detlef Riekenberg > Jactry Zeng, "Implement ITextDocument in Richedit" mentored by Huw Davies > John Chadwick, "MSXML - Implement XPATH without libxml2" mentored by > Nikolay Sivov > Zhan Jianyu, "Improve and add missing feature of vbscript component" > mentored by Jacek Caban > > Welcome to Wine and good luck on your projects! > > As a reminder, here are the next few big dates: > May 27th - June 17: community bonding period. Students/mentors should > use this time to iron out details of the project, learn the code base > and get to know others on the project. > > June 17: coding officially begins > > July 29th - Aug 2nd: mid-term reviews are submitted. > > Mentors/students, please feel free to contact me or André Hentschel if > you have any GSoC administrative/procedural questions. Otherwise use > wine-devel or ask your mentor for help with learning the Wine > development process/codebase/etc. > > -- > -Austin A quick follow up. If anyone would like to assist mentoring any of the accepted projects, please let me know and I'll add you as an additional mentor. -- -Austin

May 29, 2013

Re: [1/3] DWrite: Added missing JUSTIFIED text alignment mode.

by Nikolay Sivov

Hi, Fabian. You forgot to attach patches 2 and 3.

May 29, 2013

Re: [PATCH (try 2)] dsound: Copy SetFormat format more directly if we're not in PRIMARYWRITE mode

by Andrew Eikum

On Wed, May 29, 2013 at 01:10:56PM +0200, Maarten Lankhorst wrote: > NAK. > > + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); > + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); > Copy to a tmp buffer first and return E_OUTOFMEMORY instead of reassigning primary_pwfx to NULL? > CopyFormat will only return NULL if HeapAlloc fails (actually, CopyFormat will probably crash). I've stopped caring about out of memory conditions since they add way too much error handling code and we can't reasonably recover from them anyway. Andrew

May 29, 2013