October 2012 - Wine-devel - list.winehq.org

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ClientToScreen( HWND wnd, LPPOINT point ) > { > - MapWindowPoints( hwnd, 0, lppnt, 1 ); > + DWORD error = GetLastError(); > + > + if (!wnd) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + > + SetLastError( 0xdeadbeef ); > + MapWindowPoints( wnd, 0, point, 1 ); > + > + if (GetLastError() != 0xdeadbeef) > + return FALSE; > + > + SetLastError(error); > return TRUE; > } All this logic with saving/restoring last error code is wrong (here and in another places), there is no need for that. -- Dmitry.

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ScreenToClient( HWND wnd, LPPOINT point ) Please stick to commonly used 'hwnd' for a window handle, renaming 'lppnt' to 'point' is also not justified. -- Dmitry.

2 1

Re: [PATCH 6/6] dsound: remove now unused variables
by Andrew Eikum 19 Oct '12

19 Oct '12

Be nice if you could split this up and squash it into the previous patches. Andrew On Tue, Oct 16, 2012 at 02:06:30PM +0200, Maarten Lankhorst wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > No longer influence anything, so zap them. > --- > dlls/dsound/dsound_main.c | 17 ----------------- > dlls/dsound/dsound_private.h | 4 ---- > 2 files changed, 21 deletions(-) > > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..607c3d4 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -29,7 +29,6 @@ > * Handle static buffers - put those in hardware, non-static not in hardware > * Hardware DuplicateSoundBuffer > * Proper volume calculation for 3d buffers > - * Remove DS_HEL_FRAGS and use mixer fragment length for it > */ > > #include <stdarg.h> > @@ -92,9 +91,6 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; > > /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > -int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -147,23 +143,10 @@ void setup_dsound_options(void) > if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) > ds_hel_buflen = atoi(buffer); > > - if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) > - ds_snd_queue_max = atoi(buffer); > - > - > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > - TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 7817b88..bdd3a37 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -31,10 +31,6 @@ > #include "wine/list.h" > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > -extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > /***************************************************************************** > * Predeclare the interface implementation structures > -- > 1.7.11.3 > > >

1 0

Re: [PATCH 3/5] wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend.
by Matteo Bruni 19 Oct '12

19 Oct '12

2012/10/18 Henri Verbeet <hverbeet(a)codeweavers.com>: > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 57119e1..993b547 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -2530,6 +2530,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_EXP: instruction = "exp2"; break; > case WINED3DSIH_DSX: instruction = "dFdx"; break; > case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; > + case WINED3DSIH_ROUND_NI: instruction = "floor"; break; Hmm, does ROUND_NI really translate to floor() (as opposed to round()) or is that because round() is not supported in GLSL 1.20? In the latter case maybe a FIXME would help.

2 2

Re: ntdll: Don't use strncasecmp for _strnicmp implementation
by Marcus Meissner 19 Oct '12

19 Oct '12

On Tue, Oct 16, 2012 at 12:38:51PM +0200, Jacek Caban wrote: > --- > dlls/ntdll/string.c | 12 +++++++++++- > dlls/ntdll/tests/string.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 1 deletions(-) > > > diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c > index 716dbdf..288e910 100644 > --- a/dlls/ntdll/string.c > +++ b/dlls/ntdll/string.c > @@ -254,7 +254,17 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) > */ > int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) > { > - return strncasecmp( str1, str2, n ); > + int ret = 0; > + > + /* 32-bit Windows return only -1,0,1 values */ > + while(n--) { > + if(!*str1) > + return sizeof(void*) == 4 ? (*str2 ? -1 : 0) : -(unsigned char)*str2; > + if((ret = tolower(*str1++) - tolower(*str2++))) > + return sizeof(void*) == 4 ? (ret > 0 ? 1 : -1) : ret; > + } Errm. Why not int ret = strncasecmp( str1, str2, n ); if (ret < 0 ) return -1; if (ret > 0 ) return 1; return 0; Ciao, Marcus

3 5

Re: vcomp: single-threaded implementation of _vcomp_fork (try 6)
by Alexandre Julliard 19 Oct '12

19 Oct '12

Dan Kegel <dank(a)kegel.com> writes: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > +{ > + __ms_va_list valist; > + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); > + __ms_va_start(valist, wrapper); > + _vcomp_fork_call_wrapper(wrapper, nargs, valist); > + __ms_va_end(valist); > +} It's not a real varargs function, as you noted in the comments, so it's ugly to use varargs only as a hack to get a pointer to the first argument. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] ntdll: Implement nanosecond precision file time storage.
by Alexandre Julliard 19 Oct '12

19 Oct '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This series of patches provides a fix for Bug #31858 (Netflix Internet > Connection Problem). With this particular patch the POSIX.1-2008 > futimens() function is used to replace the BSD futimes() function, > allowing for nanosecond precision of recorded file times. This would need a configure check. -- Alexandre Julliard julliard(a)winehq.org

1 0

"Survey about gaming on linux"
by Saulius Krasuckas 19 Oct '12

19 Oct '12

The post: http://www.linuxforums.org/forum/coffee-lounge/192526-survey-about-gaming-l… The results containing one item about using Wine: https://docs.google.com/spreadsheet/viewanalytics?formkey=dEI5dEx1SGw5TEJMW… S.

2 1

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Daniel Santos 19 Oct '12

19 Oct '12

On 10/16/2012 01:12 PM, Christian Costa wrote: > + /* Choose point inside the client area */ > + point.x = rect.right / 2 - 50; > + point.y = rect.bottom / 2 - 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); > + > + /* Choose point outside the client area */ > + point.x = rect.right / 2 + 50; > + point.y = rect.bottom / 2 + 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); When I do these tests, I like throwing every stupid thing I can possibly come up with (and I'm gifted and coming up with stupid things) but always get shot down because I can't produce an example of a real-world app doing it. So here's one from LoTRO: 8.385:0009:Call user32.ScreenToClient(00000000,0033fd68) ret=006d4d87 And if you don't return zero when it does this, the game crashes resulting in my in-box filling up from desperate game addicts posting to appdb. So if you can please include the below in your patch, I can omit it from mine (see http://bugs.winehq.org/show_bug.cgi?id=31979) and thank you! + /* LoTRO will do this and crash if we don't return zero, precious indeed! */ + ret = ScreenToClient( NULL, &point ); + ok(!ret, "ScreenToClient didn't fail as expected (got %d)\n", ret); Daniel

3 3

Re: [PATCH 2/7] gdi32/tests: Fixed broken bitmap font metrics test on CJK locales.
by Qian Hong 18 Oct '12

18 Oct '12

Hello, On Fri, Oct 19, 2012 at 2:11 AM, Qian Hong <fracting(a)gmail.com> wrote: > Including Arabic, Chinese, English, Dutch, Japanese, Russian > Forgot to say, we have no Korean system in our testbot vms, so I tested this patch locally with Korean Windows 8 preview. -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

1 0