December 2012 - Wine-commits

Piotr Caban : msvcrt: Don' t duplicate floating-point number parsing code in MSVCRT__atoflt_l.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 38bf8ac44bbc9d9f9cb121158e51bfe7ca02dd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf8ac44bbc9d9f9cb121158… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:18:54 2012 +0100 msvcrt: Don't duplicate floating-point number parsing code in MSVCRT__atoflt_l. --- dlls/msvcrt/string.c | 137 +++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 108 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2748c8d..90518bc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -280,10 +280,7 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } -/********************************************************************* - * strtod_l (MSVCRT.@) - */ -double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) +static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; @@ -294,7 +291,10 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; - if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; + if(err) + *err = 0; + else + if(!MSVCRT_CHECK_PMT(str != NULL)) return 0; if(!locale) locinfo = get_locinfo(); @@ -392,8 +392,12 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca _control87(fpcontrol, 0xffffffff); - if((d && ret==0.0) || isinf(ret)) - *MSVCRT__errno() = MSVCRT_ERANGE; + if((d && ret==0.0) || isinf(ret)) { + if(err) + *err = MSVCRT_ERANGE; + else + *MSVCRT__errno() = MSVCRT_ERANGE; + } if(end) *end = (char*)p; @@ -402,6 +406,14 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca } /********************************************************************* + * strtod_l (MSVCRT.@) + */ +double CDECL MSVCRT_strtod_l(const char *str, char **end, MSVCRT__locale_t locale) +{ + return strtod_helper(str, end, locale, NULL); +} + +/********************************************************************* * strtod (MSVCRT.@) */ double CDECL MSVCRT_strtod( const char *str, char **end ) @@ -430,107 +442,16 @@ double CDECL MSVCRT__atof_l( const char *str, MSVCRT__locale_t locale) */ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_t locale) { - MSVCRT_pthreadlocinfo locinfo; - unsigned __int64 d=0, hlp; - unsigned fpcontrol; - int exp=0, sign=1; - const char *p; - int ret=0; - BOOL found_digit = FALSE; - - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - /* FIXME: use *_l functions */ - p = str; - while(isspace(*p)) - p++; - - if(*p == '-') { - sign = -1; - p++; - } else if(*p == '+') - p++; - - while(isdigit(*p)) { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp++; - break; - } else - d = hlp; - } - while(isdigit(*p)) { - exp++; - p++; - } - - if(*p == *locinfo->lconv->decimal_point) - p++; - - while(isdigit(*p)) { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) - break; - - d = hlp; - exp--; - } - while(isdigit(*p)) - p++; - - if(!found_digit) { - value->f = 0.0; - return 0; - } - - if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { - int e=0, s=1; - - p++; - if(*p == '-') { - s = -1; - p++; - } else if(*p == '+') - p++; - - if(isdigit(*p)) { - while(isdigit(*p)) { - if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) - e = INT_MAX; - p++; - } - e *= s; - - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; - else exp += e; - } else { - if(*p=='-' || *p=='+') - p--; - p--; - } - } - - fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - - if(exp>0) - value->f = (double)sign*d*pow(10, exp); - else - value->f = (double)sign*d/pow(10, -exp); - - _control87(fpcontrol, 0xffffffff); - - if((d && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) || isinf(value->f)) - ret = exp > 0 ? MSVCRT__OVERFLOW : MSVCRT__UNDERFLOW; - - return ret; + double d; + int err; + + d = strtod_helper(str, NULL, locale, &err); + value->f = d; + if(isinf(value->f)) + return MSVCRT__OVERFLOW; + if((d!=0 || err) && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) + return MSVCRT__UNDERFLOW; + return 0; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _atodbl tests.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 78553db096daf2b776a37612f7955ec1f2c71499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78553db096daf2b776a37612f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:19 2012 +0100 msvcrt: Added _atodbl tests. --- dlls/msvcrt/tests/string.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d606ebb..bbaeda0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -30,6 +30,7 @@ #include <locale.h> #include <errno.h> #include <limits.h> +#include <math.h> static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -89,6 +90,7 @@ static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); +static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -2376,6 +2378,66 @@ static void test_tolower(void) setlocale(LC_ALL, "C"); } +static void test__atodbl(void) +{ + _CRT_DOUBLE d; + char num[32]; + int ret; + + if(!p__atodbl_l) { + /* Old versions of msvcrt use different values for _OVERFLOW and _UNDERFLOW + * Because of this lets skip _atodbl tests when _atodbl_l is not available */ + win_skip("_atodbl_l is not available\n"); + return; + } + + num[0] = 0; + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "t"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"t\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"t\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "0"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"0\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"0\") returned %d, expected 0\n", ret); + ok(d.x == 0, "d.x = %lf, expected 0\n", d.x); + + strcpy(num, "123"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == 0, "_atodbl_l(&d, \"123\", NULL) returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + ret = _atodbl(&d, num); + ok(ret == 0, "_atodbl(&d, \"123\") returned %d, expected 0\n", ret); + ok(d.x == 123, "d.x = %lf, expected 123\n", d.x); + + strcpy(num, "1e-309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _UNDERFLOW, "_atodbl_l(&d, \"1e-309\", NULL) returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + ret = _atodbl(&d, num); + ok(ret == _UNDERFLOW, "_atodbl(&d, \"1e-309\") returned %d, expected _UNDERFLOW\n", ret); + ok(d.x!=0 && almost_equal(d.x, 0), "d.x = %le, expected 0\n", d.x); + + strcpy(num, "1e309"); + ret = p__atodbl_l(&d, num, NULL); + ok(ret == _OVERFLOW, "_atodbl_l(&d, \"1e309\", NULL) returned %d, expected _OVERFLOW\n", ret); + ret = _atodbl(&d, num); + ok(ret == _OVERFLOW, "_atodbl(&d, \"1e309\") returned %d, expected _OVERFLOW\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2420,6 +2482,7 @@ START_TEST(string) p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); + p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2469,4 +2532,5 @@ START_TEST(string) test_wctob(); test_wctomb(); test_tolower(); + test__atodbl(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 5010949..d4755f4 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -140,6 +140,7 @@ typedef int (__cdecl *_onexit_t)(void); int __cdecl _atodbl(_CRT_DOUBLE*,char*); +int __cdecl _atodbl_l(_CRT_DOUBLE*,char*,_locale_t); int __cdecl _atoflt(_CRT_FLOAT*,char*); int __cdecl _atoflt_l(_CRT_FLOAT*,char*,_locale_t); __int64 __cdecl _atoi64(const char*);

1 0

Piotr Caban : msvcrt: Sync spec files.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 1cd0c4abd625b55a2cc5d7c289645ff9e24c658a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd0c4abd625b55a2cc5d7c28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:38 2012 +0100 msvcrt: Sync spec files. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 160280b..cad39da 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -115,7 +115,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) CRTDLL__fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 24d3080..8f0ecdb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -687,7 +687,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -850,7 +850,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 789233c..141b791 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -323,7 +323,7 @@ @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 123d5c7..28bffdb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -317,7 +317,7 @@ @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime @ cdecl _ftime64(ptr) msvcrt._ftime64 -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bdb442d..b4eaf7b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -343,7 +343,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) msvcr100._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -504,7 +504,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bc122e6..90b4b04 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -335,7 +335,7 @@ @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ cdecl _atodbl(ptr str) msvcrt._atodbl -@ stub _atodbl_l +@ cdecl _atodbl_l(ptr str ptr) msvcrt._atodbl_l @ cdecl _atof_l(str ptr) msvcrt._atof_l @ cdecl _atoflt(ptr str) msvcr100._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @@ -499,7 +499,7 @@ @ cdecl _ftime32_s(ptr) msvcrt._ftime32_s @ cdecl _ftime64(ptr) msvcrt._ftime64 @ cdecl _ftime64_s(ptr) msvcrt._ftime64_s -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 77c41be..ded1bca 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -933,7 +933,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index d65b49d..a90436d 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1020,7 +1020,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index ffdc04a..044ecc6 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -303,7 +303,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt(double long str) msvcrt._gcvt

1 0

Andrew Eikum : mmdevapi: Implement (Un)RegisterEndpointNotificationCallback .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 8d775ec09b80bcc729743ed869fcee896dd399f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d775ec09b80bcc729743ed86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:53 2012 -0600 mmdevapi: Implement (Un)RegisterEndpointNotificationCallback. --- dlls/mmdevapi/devenum.c | 59 ++++++++++++++++++++++++- dlls/mmdevapi/tests/mmdevenum.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d7c5a44..f9b9172 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" #include "initguid.h" @@ -1035,20 +1036,72 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA return E_INVALIDARG; } +struct NotificationClientWrapper { + IMMNotificationClient *client; + struct list entry; +}; + +static struct list g_notif_clients = LIST_INIT(g_notif_clients); + +static CRITICAL_SECTION g_notif_lock; +static CRITICAL_SECTION_DEBUG g_notif_lock_debug = +{ + 0, 0, &g_notif_lock, + { &g_notif_lock_debug.ProcessLocksList, &g_notif_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_notif_lock") } +}; +static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); + + if(!client) + return E_POINTER; + + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + if(!wrapper) + return E_OUTOFMEMORY; + + wrapper->client = client; + + EnterCriticalSection(&g_notif_lock); + + list_add_tail(&g_notif_clients, &wrapper->entry); + + LeaveCriticalSection(&g_notif_lock); + return S_OK; } static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper, *wrapper2; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); - return S_OK; + + if(!client) + return E_POINTER; + + EnterCriticalSection(&g_notif_lock); + + LIST_FOR_EACH_ENTRY_SAFE(wrapper, wrapper2, &g_notif_clients, + struct NotificationClientWrapper, entry){ + if(wrapper->client == client){ + list_remove(&wrapper->entry); + HeapFree(GetProcessHeap(), 0, wrapper); + LeaveCriticalSection(&g_notif_lock); + return S_OK; + } + } + + LeaveCriticalSection(&g_notif_lock); + + return E_NOTFOUND; } static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 82dda40..12e2156 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -118,6 +118,73 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ok(0, "Unexpected QueryInterface call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + ok(0, "Unexpected AddRef call\n"); + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + ok(0, "Unexpected Release call\n"); + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + ok(0, "Unexpected OnDeviceStateChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceAdded call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceRemoved call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + ok(0, "Unexpected OnDefaultDeviceChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + ok(0, "Unexpected OnPropertyValueChanged call\n"); + return E_NOTIMPL; +} + +static IMMNotificationClientVtbl notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient notif = { &notif_vtbl }; + /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { @@ -192,5 +259,29 @@ START_TEST(mmdevenum) test_collection(mme, col); } + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, (IMMNotificationClient*)0xdeadbeef); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + IMMDeviceEnumerator_Release(mme); }

1 0

Andrew Eikum : mmdevapi: Send notifications to clients when the user-selected default device changes .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: d4e9b26cbb757f0d12d4585acf5277e2dd2d2347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e9b26cbb757f0d12d4585ac… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:56 2012 -0600 mmdevapi: Send notifications to clients when the user-selected default device changes. --- dlls/mmdevapi/devenum.c | 159 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f9b9172..21a3530 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,6 +59,11 @@ static const WCHAR reg_devicestate[] = { 'D','e','v','i','c','e','S','t','a','t','e',0 }; static const WCHAR reg_properties[] = { 'P','r','o','p','e','r','t','i','e','s',0 }; +static const WCHAR slashW[] = {'\\',0}; +static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; +static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; +static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; +static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; static HKEY key_render; static HKEY key_capture; @@ -916,12 +921,6 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa HKEY key; HRESULT hr; - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; - static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; - static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; - static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; - TRACE("(%p)->(%u,%u,%p)\n", This, flow, role, device); if (!device) @@ -1042,6 +1041,7 @@ struct NotificationClientWrapper { }; static struct list g_notif_clients = LIST_INIT(g_notif_clients); +static HANDLE g_notif_thread; static CRITICAL_SECTION g_notif_lock; static CRITICAL_SECTION_DEBUG g_notif_lock_debug = @@ -1052,6 +1052,147 @@ static CRITICAL_SECTION_DEBUG g_notif_lock_debug = }; static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; +static void notify_clients(EDataFlow flow, ERole role, const WCHAR *id) +{ + struct NotificationClientWrapper *wrapper; + LIST_FOR_EACH_ENTRY(wrapper, &g_notif_clients, + struct NotificationClientWrapper, entry) + IMMNotificationClient_OnDefaultDeviceChanged(wrapper->client, flow, + role, id); + + /* Windows 7 treats changes to eConsole as changes to eMultimedia */ + if(role == eConsole) + notify_clients(flow, eMultimedia, id); +} + +static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +{ + WCHAR new_val[64], *id; + DWORD size; + HRESULT hr; + + size = sizeof(new_val); + if(RegQueryValueExW(key, val_name, 0, NULL, + (BYTE*)new_val, &size) != ERROR_SUCCESS){ + if(old_val[0] != 0){ + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; + } + + /* system default -> system default, noop */ + return 0; + } + + if(!lstrcmpW(old_val, new_val)){ + /* set by user -> same value */ + return 0; + } + + if(new_val[0] != 0){ + /* set by user -> different value */ + notify_clients(flow, role, new_val); + memcpy(old_val, new_val, sizeof(new_val)); + return 1; + } + + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; +} + +static DWORD WINAPI notif_thread_proc(void *user) +{ + HKEY key; + WCHAR reg_key[256]; + WCHAR out_name[64], vout_name[64], in_name[64], vin_name[64]; + DWORD size; + + lstrcpyW(reg_key, drv_keyW); + lstrcatW(reg_key, slashW); + lstrcatW(reg_key, drvs.module_name); + + if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, + MAXIMUM_ALLOWED, NULL, &key, NULL) != ERROR_SUCCESS){ + ERR("RegCreateKeyEx failed: %u\n", GetLastError()); + return 1; + } + + size = sizeof(out_name); + if(RegQueryValueExW(key, reg_out_nameW, 0, NULL, + (BYTE*)out_name, &size) != ERROR_SUCCESS) + out_name[0] = 0; + + size = sizeof(vout_name); + if(RegQueryValueExW(key, reg_vout_nameW, 0, NULL, + (BYTE*)vout_name, &size) != ERROR_SUCCESS) + vout_name[0] = 0; + + size = sizeof(in_name); + if(RegQueryValueExW(key, reg_in_nameW, 0, NULL, + (BYTE*)in_name, &size) != ERROR_SUCCESS) + in_name[0] = 0; + + size = sizeof(vin_name); + if(RegQueryValueExW(key, reg_vin_nameW, 0, NULL, + (BYTE*)vin_name, &size) != ERROR_SUCCESS) + vin_name[0] = 0; + + while(1){ + if(RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, + NULL, FALSE) != ERROR_SUCCESS){ + ERR("RegNotifyChangeKeyValue failed: %u\n", GetLastError()); + RegCloseKey(key); + g_notif_thread = NULL; + return 1; + } + + EnterCriticalSection(&g_notif_lock); + + notify_if_changed(eRender, eConsole, key, reg_out_nameW, + out_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eRender, eCommunications, key, reg_vout_nameW, + vout_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eCapture, eConsole, key, reg_in_nameW, + in_name, &MMDevice_def_rec->IMMDevice_iface); + notify_if_changed(eCapture, eCommunications, key, reg_vin_nameW, + vin_name, &MMDevice_def_rec->IMMDevice_iface); + + LeaveCriticalSection(&g_notif_lock); + } + + RegCloseKey(key); + + g_notif_thread = NULL; + + return 0; +} + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); @@ -1072,6 +1213,12 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn list_add_tail(&g_notif_clients, &wrapper->entry); + if(!g_notif_thread){ + g_notif_thread = CreateThread(NULL, 0, notif_thread_proc, NULL, 0, NULL); + if(!g_notif_thread) + ERR("CreateThread failed: %u\n", GetLastError()); + } + LeaveCriticalSection(&g_notif_lock); return S_OK;

1 0

Andrew Talbot : mapi32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: c8e952c9397d8e998a4506d18cd98cb3241017ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e952c9397d8e998a4506d18… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:41 2012 +0000 mapi32: Indentation fix. --- dlls/mapi32/prop.c | 74 ++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index a623424..ce122a3 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -736,44 +736,44 @@ SCODE WINAPI ScCountProps(INT iCount, LPSPropValue lpProps, ULONG *pcBytes) lpProps[i].ulPropTag == PROP_ID_INVALID) return MAPI_E_INVALID_PARAMETER; - if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) - { - ulPropSize = UlPropSize(&lpProps[i]); - if (!ulPropSize) - return MAPI_E_INVALID_PARAMETER; - } + if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) + { + ulPropSize = UlPropSize(&lpProps[i]); + if (!ulPropSize) + return MAPI_E_INVALID_PARAMETER; + } - switch (PROP_TYPE(lpProps[i].ulPropTag)) - { - case PT_STRING8: - case PT_UNICODE: - case PT_CLSID: - case PT_BINARY: - case PT_MV_I2: - case PT_MV_I4: - case PT_MV_I8: - case PT_MV_R4: - case PT_MV_R8: - case PT_MV_CURRENCY: - case PT_MV_SYSTIME: - case PT_MV_APPTIME: - ulPropSize += sizeof(SPropValue); - break; - case PT_MV_CLSID: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_STRING8: - case PT_MV_UNICODE: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_BINARY: - ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); - break; - default: - ulPropSize = sizeof(SPropValue); - break; - } - ulBytes += ulPropSize; + switch (PROP_TYPE(lpProps[i].ulPropTag)) + { + case PT_STRING8: + case PT_UNICODE: + case PT_CLSID: + case PT_BINARY: + case PT_MV_I2: + case PT_MV_I4: + case PT_MV_I8: + case PT_MV_R4: + case PT_MV_R8: + case PT_MV_CURRENCY: + case PT_MV_SYSTIME: + case PT_MV_APPTIME: + ulPropSize += sizeof(SPropValue); + break; + case PT_MV_CLSID: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_STRING8: + case PT_MV_UNICODE: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_BINARY: + ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); + break; + default: + ulPropSize = sizeof(SPropValue); + break; + } + ulBytes += ulPropSize; } if (pcBytes) *pcBytes = ulBytes;

1 0

Andrew Talbot : krnl386.exe16: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 10fb1eac9c499d3a017729da4d167d12c0425087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fb1eac9c499d3a017729da4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:37 2012 +0000 krnl386.exe16: Indentation fix. --- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/vga.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 3535ec3..85b9011 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -278,7 +278,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D && DX_reg(context) == 0x3432) TRACE("Check for QEMM v5.0+ (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; @@ -302,7 +302,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49 && DX_reg(context) == 0x8f4f) TRACE("Check for QDPMI.SYS (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index 98edcef..f1b632e 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -1007,12 +1007,12 @@ void VGA_SetPalette(PALETTEENTRY*pal,int start,int len) /* set a single [char wide] color in 16 color mode. */ void VGA_SetColor16(int reg,int color) { - PALETTEENTRY *pal; + PALETTEENTRY *pal; if (!lpddraw) return; - pal= &vga_def64_palette[color]; - IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); - vga_16_palette[reg]=(char)color; + pal= &vga_def64_palette[color]; + IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); + vga_16_palette[reg]=(char)color; } /* Get a single [char wide] color in 16 color mode. */ @@ -1020,7 +1020,7 @@ char VGA_GetColor16(int reg) { if (!lpddraw) return 0; - return vga_16_palette[reg]; + return vga_16_palette[reg]; } /* set all 17 [char wide] colors at once in 16 color mode. */

1 0

Andrew Talbot : dsound: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: b0e95d27a9f816ba3319ce5e48e51f175f44713c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e95d27a9f816ba3319ce5e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:30 2012 +0000 dsound: Indentation fix. --- dlls/dsound/buffer.c | 8 +++----- dlls/dsound/primary.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cf4d2ec..e8fc5f3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0; - if((p1 && ((BYTE*)p1 < This->buffer->memory || - (BYTE*)p1 >= This->buffer->memory + This->buflen)) || - (p2 && ((BYTE*)p2 < This->buffer->memory || - (BYTE*)p2 >= This->buffer->memory + This->buflen))) - return DSERR_INVALIDPARAM; + if((p1 && ((BYTE*)p1 < This->buffer->memory || (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM; if (x1 || x2) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0964f9b..3ac928b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) else device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; - FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->playpos = 0; + FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(device->mix_buffer, device->mix_buffer_len, 0); + device->playpos = 0; if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && @@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DSERR_PRIOLEVELNEEDED; } - if((p1 && ((BYTE*)p1 < device->buffer || - (BYTE*)p1 >= device->buffer + device->buflen)) || - (p2 && ((BYTE*)p2 < device->buffer || - (BYTE*)p2 >= device->buffer + device->buflen))) - return DSERR_INVALIDPARAM; + if ((p1 && ((BYTE*)p1 < device->buffer || (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM; return DS_OK; }

1 0

Andrew Talbot : dbghelp: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9feb4053fed8154ba7866ed65104025c919b186a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9feb4053fed8154ba7866ed65… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:27 2012 +0000 dbghelp: Indentation fix. --- dlls/dbghelp/elf_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 52060e0..92b4a31 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -678,11 +678,11 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table ((struct symt_data*)sym)->container); if (symp) { - if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && - ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", - sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && + ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) + FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, + ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal;

1 0

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: c8092a04ced5c133eb6b8de72f89c10680f182a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8092a04ced5c133eb6b8de72… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:22 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0c674c5..eeac384 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1793,8 +1793,8 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) flags |= SWP_NOSIZE; SetRectEmpty(&rc); } - SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, - 0, 0, rc.right, rc.bottom, flags); + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); } else {

1 0