wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Talbot : msacm32: Indentation fix.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: bb55f47e414ed1f958477e40ffb6003635bb769c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb55f47e414ed1f958477e40f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 17 22:12:11 2012 +0000 msacm32: Indentation fix. --- dlls/msacm32/format.c | 111 ++++++++++++++++++++++++------------------------- 1 files changed, 54 insertions(+), 57 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 963daf7..f7f0fa4 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -894,12 +894,12 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum) { - PWINE_ACMDRIVERID padid; - unsigned int i; - BOOL bPcmDone = FALSE; + PWINE_ACMDRIVERID padid; + unsigned int i; + BOOL bPcmDone = FALSE; TRACE("(%p, %p, %p, %ld, %d)\n", - had, paftd, fnCallback, dwInstance, fdwEnum); + had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) return MMSYSERR_INVALPARAM; @@ -920,63 +920,60 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, /* if (had) FIXME("had != NULL, not supported\n"); */ if (had) { + if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) + return MMSYSERR_INVALHANDLE; - if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) - return MMSYSERR_INVALHANDLE; - - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* (WS) I'm preserving this PCM hack since it seems to be - * correct. Please notice this block was borrowed from - * below. - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) - return MMSYSERR_NOERROR; - } - } - + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* (WS) I'm preserving this PCM hack since it seems to be + * correct. Please notice this block was borrowed from + * below. + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) + return MMSYSERR_NOERROR; + } + } } - /* if had==0 then search for the first suitable driver */ else { - for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { - /* should check for codec only */ - if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && - acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { - for (i = 0; i < padid->cFormatTags; i++) { - paftd->dwFormatTagIndex = i; - if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, - (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { - if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { - if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); - /* FIXME (EPP): I'm not sure this is the correct - * algorithm (should make more sense to apply the same - * for all already loaded formats, but this will do - * for now - */ - if (bPcmDone) continue; - bPcmDone = TRUE; - } - if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { - acmDriverClose(had, 0); - return MMSYSERR_NOERROR; - } - } - } - acmDriverClose(had, 0); - } - } + for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { + /* should check for codec only */ + if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && + acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { + for (i = 0; i < padid->cFormatTags; i++) { + paftd->dwFormatTagIndex = i; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, + (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { + if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { + if (paftd->szFormatTag[0] == 0) + MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + /* FIXME (EPP): I'm not sure this is the correct + * algorithm (should make more sense to apply the same + * for all already loaded formats, but this will do + * for now + */ + if (bPcmDone) continue; + bPcmDone = TRUE; + } + if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { + acmDriverClose(had, 0); + return MMSYSERR_NOERROR; + } + } + } + acmDriverClose(had, 0); + } + } } return MMSYSERR_NOERROR; }

1 0

Andrew Talbot : msvcrt: Indentation fix.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 4c191378e9b43920a7786f736ea6d63b2bfd9a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c191378e9b43920a7786f736… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 17 22:12:14 2012 +0000 msvcrt: Indentation fix. --- dlls/msvcrt/wcs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index cc48968..e7bf0e4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1019,13 +1019,14 @@ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 */ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* accept ) { - const MSVCRT_wchar_t* p; - while (*str) - { - for (p = accept; *p; p++) if (*p == *str) return (MSVCRT_wchar_t*)str; - str++; - } - return NULL; + const MSVCRT_wchar_t* p; + + while (*str) + { + for (p = accept; *p; p++) if (*p == *str) return (MSVCRT_wchar_t*)str; + str++; + } + return NULL; } /*********************************************************************

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

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: 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_l implementation.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 3b5ab1b48facb8f30032948e326ce9eb3521502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5ab1b48facb8f30032948e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:07 2012 +0100 msvcrt: Added _atodbl_l implementation. --- dlls/msvcrt/msvcrt.h | 6 ++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ea31b3c..bdd5933 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -986,6 +986,7 @@ int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT_FLT_MIN 1.175494351e-38F +#define MSVCRT_DBL_MIN 2.2250738585072014e-308 #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 @@ -994,4 +995,9 @@ typedef struct float f; } MSVCRT__CRT_FLOAT; +typedef struct +{ + double x; +} MSVCRT__CRT_DOUBLE; + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 274554b..79f6511 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -300,8 +300,8 @@ # stub _aligned_realloc_dbg(ptr long long str long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert -@ stub _atodbl(ptr str) -# stub _atodbl_l(ptr str ptr) +@ cdecl _atodbl(ptr str) MSVCRT__atodbl +@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 90518bc..f166865 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -455,6 +455,29 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_ } /********************************************************************* + * _atodbl_l (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl_l(MSVCRT__CRT_DOUBLE *value, char *str, MSVCRT__locale_t locale) +{ + int err; + + value->x = strtod_helper(str, NULL, locale, &err); + if(isinf(value->x)) + return MSVCRT__OVERFLOW; + if((value->x!=0 || err) && value->x>-MSVCRT_DBL_MIN && value->x<MSVCRT_DBL_MIN) + return MSVCRT__UNDERFLOW; + return 0; +} + +/********************************************************************* + * _atodbl (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl(MSVCRT__CRT_DOUBLE *value, char *str) +{ + return MSVCRT__atodbl_l(value, str, NULL); +} + +/********************************************************************* * _strcoll_l (MSVCRT.@) */ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale )

1 0

Christian Costa : d3drm: Fix return error code.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: f0dd3100189488f80ac9b2129d0d09ae7866b9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd3100189488f80ac9b2129… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:51 2012 +0100 d3drm: Fix return error code. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7f246ce..709a2f8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1541,7 +1541,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc } else if (hr != DXFILE_OK) { - ret = D3DRMERR_NOTFOUND; + ret = D3DRMERR_BADFILE; goto end; }

1 0

Christian Costa : d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 871aa9d14daafb869a546a738498716ad58d54dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=871aa9d14daafb869a546a738… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:44 2012 +0100 d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests. --- dlls/d3drm/meshbuilder.c | 8 ++++++++ dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index ffbdec7..bf9a162 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -801,14 +801,22 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetVertices(IDirect3DRMMeshBui TRACE("(%p)->(%p,%p,%p,%p,%p,%p)\n", This, vcount, vertices, ncount, normals, face_data_size, face_data); + if (vertices && (!vcount || (*vcount < This->nb_vertices))) + return D3DRMERR_BADVALUE; if (vcount) *vcount = This->nb_vertices; if (vertices && This->nb_vertices) memcpy(vertices, This->pVertices, This->nb_vertices * sizeof(D3DVECTOR)); + + if (normals && (!ncount || (*ncount < This->nb_normals))) + return D3DRMERR_BADVALUE; if (ncount) *ncount = This->nb_normals; if (normals && This->nb_normals) memcpy(normals, This->pNormals, This->nb_normals * sizeof(D3DVECTOR)); + + if (face_data && (!face_data_size || (*face_data_size < This->face_data_size))) + return D3DRMERR_BADVALUE; if (face_data_size) *face_data_size = This->face_data_size; if (face_data && This->face_data_size) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 97e047a..6eb7bd0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -393,6 +393,24 @@ static void test_MeshBuilder(void) val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); ok(val == 1, "Wrong number of faces %d (must be 1)\n", val); + /* Check no buffer size and too small buffer size errors */ + val1 = 1; val2 = 3; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 1; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 3; val3 = 1; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + + val1 = 3; val2 = 3; val3 = 8; hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);

1 0

Dmitry Timoshkov : wineps.drv: Update default DEVMODE to better indicate initialized fields.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 1cd551cd6a31474c2bd028d0f6e181d8af75e975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd551cd6a31474c2bd028d0f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:41:18 2012 +0800 wineps.drv: Update default DEVMODE to better indicate initialized fields. --- dlls/wineps.drv/init.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 01d7f13..c63a6be 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -48,28 +48,29 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmDriverVersion */ 0x001, /* dmSize */ sizeof(DEVMODEW), /* dmDriverExtra */ sizeof(PSDRV_DEVMODE)-sizeof(DEVMODEW), -/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_SCALE | - DM_COPIES | DM_DEFAULTSOURCE | DM_COLOR | - DM_YRESOLUTION | DM_TTOPTION, +/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | + DM_SCALE | DM_COPIES | DM_DEFAULTSOURCE | DM_PRINTQUALITY | + DM_COLOR | DM_DUPLEX | DM_YRESOLUTION | DM_TTOPTION | + DM_COLLATE | DM_FORMNAME, { /* u1 */ { /* s1 */ /* dmOrientation */ DMORIENT_PORTRAIT, /* dmPaperSize */ DMPAPER_LETTER, /* dmPaperLength */ 2794, /* dmPaperWidth */ 2159, -/* dmScale */ 100, /* ?? */ +/* dmScale */ 100, /* dmCopies */ 1, /* dmDefaultSource */ DMBIN_AUTO, -/* dmPrintQuality */ 0 +/* dmPrintQuality */ 300 } }, /* dmColor */ DMCOLOR_COLOR, /* dmDuplex */ DMDUP_SIMPLEX, -/* dmYResolution */ 0, +/* dmYResolution */ 300, /* dmTTOption */ DMTT_SUBDEV, -/* dmCollate */ 0, -/* dmFormName */ {}, -/* dmUnusedPadding */ 0, +/* dmCollate */ DMCOLLATE_FALSE, +/* dmFormName */ {'L','e','t','t','e','r',0}, +/* dmLogPixels */ 0, /* dmBitsPerPel */ 0, /* dmPelsWidth */ 0, /* dmPelsHeight */ 0,

1 0

Dmitry Timoshkov : winspool.drv: Add more traces.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: bdf14227ab1c6b55c11f466c9650116c9e260c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf14227ab1c6b55c11f466c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:40:38 2012 +0800 winspool.drv: Add more traces. --- dlls/winspool.drv/info.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 45b49f3..60b621e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2248,6 +2248,8 @@ INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, { INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_a(pDevice), debugstr_a(pPort), cap, pOutput, lpdm); + if (!GDI_CallDeviceCapabilities16) { GDI_CallDeviceCapabilities16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), @@ -2288,6 +2290,8 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, LPSTR pPortA = strdupWtoA(pPort); INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_w(pDevice), debugstr_w(pPort), fwCapability, pOutput, pDevMode); + if(pOutput && (fwCapability == DC_BINNAMES || fwCapability == DC_FILEDEPENDENCIES || fwCapability == DC_PAPERNAMES)) { @@ -2454,6 +2458,8 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, PWSTR pwstrPrinterNameW; BOOL ret; + TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); + pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); if(pDefault) {

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
55
Older →

Jump to page:

2025

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-commits December 2012