April 2010 - Wine-commits - list.winehq.org

Maarten Lankhorst : mmdevapi: Fix IsFormatSupported and initialization.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 61d78d46c77c8b9d664f529efcabfaa43f8126b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d78d46c77c8b9d664f529ef… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 22 22:59:59 2010 +0200 mmdevapi: Fix IsFormatSupported and initialization. --- dlls/mmdevapi/audio.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 2781125..2d19c05 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -473,8 +473,10 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, hr = IAudioClient_IsFormatSupported(iface, mode, pwfx, &pwfx2); CoTaskMemFree(pwfx2); - if (FAILED(hr) || pwfx2) + if (FAILED(hr) || pwfx2) { + WARN("Format not supported, or had to be modified!\n"); return AUDCLNT_E_UNSUPPORTED_FORMAT; + } EnterCriticalSection(This->crst); HeapFree(GetProcessHeap(), 0, This->pwfx); This->pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(*pwfx) + pwfx->cbSize); @@ -483,6 +485,21 @@ static HRESULT WINAPI AC_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, goto out; } memcpy(This->pwfx, pwfx, sizeof(*pwfx) + pwfx->cbSize); + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)This->pwfx; + switch (pwfx->nChannels) { + case 1: wfe->dwChannelMask = MONO; break; + case 2: wfe->dwChannelMask = STEREO; break; + case 4: wfe->dwChannelMask = QUAD; break; + case 6: wfe->dwChannelMask = X5DOT1; break; + case 7: wfe->dwChannelMask = X6DOT1; break; + case 8: wfe->dwChannelMask = X7DOT1; break; + default: + ERR("How did we end up with %i channels?\n", pwfx->nChannels); + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto out; + } + } hr = IAudioClient_GetDevicePeriod(iface, &time, NULL); if (FAILED(hr)) @@ -665,6 +682,9 @@ static HRESULT WINAPI AC_GetCurrentPadding(IAudioClient *iface, UINT32 *numpad) static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx, WAVEFORMATEX **outpwfx) { ACImpl *This = (ACImpl*)iface; + WAVEFORMATEX *tmp; + DWORD mask; + DWORD size; TRACE("(%p)->(%x,%p,%p)\n", This, mode, pwfx, outpwfx); if (!pwfx) return E_POINTER; @@ -676,9 +696,14 @@ static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMOD WARN("Unknown mode %x\n", mode); return E_INVALIDARG; } - if (pwfx->wFormatTag != WAVE_FORMAT_EXTENSIBLE - && pwfx->wFormatTag != WAVE_FORMAT_PCM) + + if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else if (pwfx->wFormatTag == WAVE_FORMAT_PCM) + size = sizeof(WAVEFORMATEX); + else return AUDCLNT_E_UNSUPPORTED_FORMAT; + if (pwfx->nSamplesPerSec < 8000 || pwfx->nSamplesPerSec > 192000) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -687,8 +712,49 @@ static HRESULT WINAPI AC_IsFormatSupported(IAudioClient *iface, AUDCLNT_SHAREMOD if (pwfx->wBitsPerSample > 16) return AUDCLNT_E_UNSUPPORTED_FORMAT; } + + switch (pwfx->nChannels) { + case 1: mask = MONO; break; + case 2: mask = STEREO; break; + case 4: mask = QUAD; break; + case 6: mask = X5DOT1; break; + case 7: mask = X6DOT1; break; + case 8: mask = X7DOT1; break; + default: + TRACE("Unsupported channel count %i\n", pwfx->nChannels); + return AUDCLNT_E_UNSUPPORTED_FORMAT;; + } + tmp = CoTaskMemAlloc(size); + if (outpwfx) + *outpwfx = tmp; + if (!tmp) + return E_OUTOFMEMORY; + + memcpy(tmp, pwfx, size); + tmp->nBlockAlign = tmp->nChannels * tmp->wBitsPerSample / 8; + tmp->nAvgBytesPerSec = tmp->nBlockAlign * tmp->nSamplesPerSec; + tmp->cbSize = size - sizeof(WAVEFORMATEX); + if (tmp->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + WAVEFORMATEXTENSIBLE *ex = (WAVEFORMATEXTENSIBLE*)tmp; + + if (ex->Samples.wValidBitsPerSample) + ex->Samples.wValidBitsPerSample = ex->Format.wBitsPerSample; + + /* Rear is a special allowed case */ + if (ex->dwChannelMask + && !(ex->Format.nChannels == 2 && ex->dwChannelMask == REAR)) + ex->dwChannelMask = mask; + } + + if (memcmp(pwfx, tmp, size)) { + if (outpwfx) + return S_FALSE; + CoTaskMemFree(tmp); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } if (outpwfx) *outpwfx = NULL; + CoTaskMemFree(tmp); return S_OK; }

1 0

Maarten Lankhorst : mmdevapi: Silence a fixme when it's harmless.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 8bd65c143f587866af70f0760e44e87dd50bfc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd65c143f587866af70f0760… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 24 07:55:06 2010 +0200 mmdevapi: Silence a fixme when it's harmless. --- dlls/mmdevapi/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 2d19c05..b166d81 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1107,7 +1107,8 @@ static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 writte return E_INVALIDARG; if (!written) { - FIXME("Handled right?\n"); + if (This->parent->locked) + FIXME("Handled right?\n"); This->parent->locked = 0; return S_OK; }

1 0

Piotr Caban : msvcrt: Added wcstod_l implementation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f7197663c998d989c6ecf26ddc8c09208fff873c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7197663c998d989c6ecf26dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:38 2010 +0200 msvcrt: Added wcstod_l implementation. It's almost a copy of strtod_l. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 156ab2e..81e07a7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1413,3 +1413,4 @@ @ cdecl _create_locale(long str) @ cdecl _free_locale(ptr) @ cdecl _configthreadlocale(long) +@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 21d0d28..94c638b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -18,6 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include <stdio.h> #include <math.h> @@ -120,6 +123,110 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /********************************************************************* + * _wcstod_l - not exported in native msvcrt + */ +double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, + MSVCRT__locale_t locale) +{ + unsigned __int64 d=0, hlp; + int exp=0, sign=1; + const MSVCRT_wchar_t *p; + double ret; + + if(!str) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return 0; + } + + if(!locale) + locale = get_locale(); + + p = str; + while(isspaceW(*p)) + p++; + + if(*p == '-') { + sign = -1; + p++; + } else if(*p == '+') + p++; + + while(isdigitW(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { + exp++; + break; + } else + d = hlp; + } + while(isdigitW(*p)) { + exp++; + p++; + } + if(*p == *locale->locinfo->lconv->decimal_point) + p++; + + while(isdigitW(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) + break; + + d = hlp; + exp--; + } + while(isdigitW(*p)) + p++; + + if(p == str) { + if(end) + *end = (MSVCRT_wchar_t*)str; + return 0.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(isdigitW(*p)) { + while(isdigitW(*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--; + } + } + + if(exp>0) + ret = (double)sign*d*pow(10, exp); + else + ret = (double)sign*d/pow(10, -exp); + + if((d && ret==0.0) || isinf(ret)) + *MSVCRT__errno() = MSVCRT_ERANGE; + + if(end) + *end = (MSVCRT_wchar_t*)p; + + return ret; +} + +/********************************************************************* * wcstod (MSVCRT.@) */ double CDECL MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end)

1 0

Piotr Caban : msvcrt: Use wcstod_l/ strtod_l in other functions that parses doubles.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 6974abe0e67063b46dd30005d9b8b68257a376dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6974abe0e67063b46dd30005d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:49 2010 +0200 msvcrt: Use wcstod_l/strtod_l in other functions that parses doubles. --- dlls/msvcr80/msvcr80.spec | 8 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.spec | 6 ++-- dlls/msvcrt/string.c | 24 +++++++++---- dlls/msvcrt/wcs.c | 79 ++++++++------------------------------------ 5 files changed, 42 insertions(+), 83 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b8e89e4..65da427 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -289,7 +289,7 @@ @ cdecl _assert(str str long) msvcrt._assert @ stub _atodbl @ stub _atodbl_l -@ stub _atof_l +@ cdecl _atof_l(str ptr) msvcrt._atof_l @ stub _atoflt @ stub _atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @@ -1105,7 +1105,7 @@ @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s -@ stub _wcstod_l +@ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ stub _wcstoi64 @ stub _wcstoi64_l @ stub _wcstol_l @@ -1207,8 +1207,8 @@ @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam @ stub _wtmpnam @ stub _wtmpnam_s -@ stub _wtof -@ stub _wtof_l +@ cdecl _wtof(wstr) msvcrt._wtof +@ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 141592d..b7884dc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -281,7 +281,7 @@ @ cdecl _assert(str str long) msvcrt._assert @ stub _atodbl @ stub _atodbl_l -@ stub _atof_l +@ cdecl _atof_l(str ptr) msvcrt._atof_l @ stub _atoflt @ stub _atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @@ -1092,7 +1092,7 @@ @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s -@ stub _wcstod_l +@ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l @ stub _wcstoi64 @ stub _wcstoi64_l @ stub _wcstol_l @@ -1191,8 +1191,8 @@ @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam @ stub _wtmpnam @ stub _wtmpnam_s -@ stub _wtof -@ stub _wtof_l +@ cdecl _wtof(wstr) msvcrt._wtof +@ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 81e07a7..0680375 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -264,7 +264,7 @@ @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl #(ptr str) # stub _atodbl_l -# stub _atof_l +@ cdecl _atof_l(str ptr) MSVCRT__atof_l # stub _atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 # stub _atoi64_l @@ -1136,8 +1136,8 @@ # stub _wtempnam_dbg @ stub _wtmpnam #(ptr) # stub _wtmpnam_s -# stub _wtof -# stub _wtof_l +@ cdecl _wtof(wstr) MSVCRT__wtof +@ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) ntdll._wtoi @ cdecl _wtoi64(wstr) ntdll._wtoi64 # stub _wtoi64_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6829e25..d99c508 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -132,14 +132,6 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } /********************************************************************* - * atof (MSVCRT.@) - */ -double CDECL MSVCRT_atof( const char *str ) -{ - return atof( str ); -} - -/********************************************************************* * strtod_l (MSVCRT.@) */ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) @@ -253,6 +245,22 @@ double CDECL MSVCRT_strtod( const char *str, char **end ) } /********************************************************************* + * atof (MSVCRT.@) + */ +double CDECL MSVCRT_atof( const char *str ) +{ + return MSVCRT_strtod_l(str, NULL, NULL); +} + +/********************************************************************* + * _atof_l (MSVCRT.@) + */ +double CDECL MSVCRT__atof_l( const char *str, MSVCRT__locale_t locale) +{ + return MSVCRT_strtod_l(str, NULL, locale); +} + +/********************************************************************* * strcoll (MSVCRT.@) */ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 94c638b..44a3b4d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -231,73 +231,24 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, */ double CDECL MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end) { - const MSVCRT_wchar_t* str = lpszStr; - int negative = 0; - double ret = 0, divisor = 10.0; - - TRACE("(%s,%p) semi-stub\n", debugstr_w(lpszStr), end); - - /* FIXME: - * - Should set errno on failure - * - Should fail on overflow - * - Need to check which input formats are allowed - */ - while (isspaceW(*str)) - str++; - - if (*str == '-') - { - negative = 1; - str++; - } - - while (isdigitW(*str)) - { - ret = ret * 10.0 + (*str - '0'); - str++; - } - if (*str == '.') - str++; - while (isdigitW(*str)) - { - ret = ret + (*str - '0') / divisor; - divisor *= 10; - str++; - } - - if (*str == 'E' || *str == 'e' || *str == 'D' || *str == 'd') - { - int negativeExponent = 0; - int exponent = 0; - if (*(++str) == '-') - { - negativeExponent = 1; - str++; - } - while (isdigitW(*str)) - { - exponent = exponent * 10 + (*str - '0'); - str++; - } - if (exponent != 0) - { - if (negativeExponent) - ret = ret / pow(10.0, exponent); - else - ret = ret * pow(10.0, exponent); - } - } - - if (negative) - ret = -ret; - - if (end) - *end = (MSVCRT_wchar_t*)str; + return MSVCRT__wcstod_l(lpszStr, end, NULL); +} - TRACE("returning %g\n", ret); - return ret; +/********************************************************************* + * _wtof (MSVCRT.@) + */ +double CDECL MSVCRT__wtof(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wcstod_l(str, NULL, NULL); } +/********************************************************************* + * _wtof_l (MSVCRT.@) + */ +double CDECL MSVCRT__wtof_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + return MSVCRT__wcstod_l(str, NULL, locale); +} typedef struct pf_output_t {

1 0

Piotr Caban : msvcrt: Fix debug message in scanf.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 59c1139f0521e405bab2cbd56079ef3f57db8075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c1139f0521e405bab2cbd56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:58 2010 +0200 msvcrt: Fix debug message in scanf. --- dlls/msvcrt/scanf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 6366a77..b78d57c 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -110,7 +110,7 @@ _FUNCTION_ { TRACE("(%s):\n", debugstr_a(format)); #else /* CONSOLE */ #ifdef STRING - TRACE("%s (%s)\n", file, debugstr_a(format)); + TRACE("%s (%s)\n", debugstr_a(file), debugstr_a(format)); #else /* STRING */ TRACE("%p (%s)\n", file, debugstr_a(format)); #endif /* STRING */

1 0

Piotr Caban : msvcrt: Added strtok_s implementation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 2b3b860396175653dce6582190748f5a4b5b2b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3b860396175653dce658219… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 14:09:59 2010 +0200 msvcrt: Added strtok_s implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 27 +++++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 65da427..60e66ba 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1396,7 +1396,7 @@ @ cdecl strstr(str str) msvcrt.strstr @ cdecl strtod(str ptr) msvcrt.strtod @ cdecl strtok(str str) msvcrt.strtok -@ stub strtok_s +@ cdecl strtok_s(ptr str ptr) msvcrt.strtok_s @ cdecl strtol(str ptr long) msvcrt.strtol @ cdecl strtoul(str ptr long) msvcrt.strtoul @ cdecl strxfrm(ptr str long) msvcrt.strxfrm diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7884dc..16a1bc2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1380,7 +1380,7 @@ @ cdecl strstr(str str) msvcrt.strstr @ cdecl strtod(str ptr) msvcrt.strtod @ cdecl strtok(str str) msvcrt.strtok -@ stub strtok_s +@ cdecl strtok_s(ptr str ptr) msvcrt.strtok_s @ cdecl strtol(str ptr long) msvcrt.strtol @ cdecl strtoul(str ptr long) msvcrt.strtoul @ cdecl strxfrm(ptr str long) msvcrt.strxfrm diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0680375..6807de2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1331,7 +1331,7 @@ @ cdecl strstr(str str) ntdll.strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok -# stub strtok_s +@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d99c508..459d1a1 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -111,6 +111,33 @@ char * CDECL MSVCRT_strtok( char *str, const char *delim ) return ret; } +/********************************************************************* + * strtok_s (MSVCRT.@) + */ +char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) +{ + if(!delim || !ctx || (!str && !*ctx)) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } + + if(!str) + str = *ctx; + + while(*str && strchr(delim, *str)) + str++; + if(!*str) + return NULL; + + *ctx = str+1; + while(**ctx && !strchr(delim, **ctx)) + (*ctx)++; + if(**ctx) + *(*ctx)++ = 0; + + return str; +} /********************************************************************* * _swab (MSVCRT.@)

1 0

Gerald Pfeifer : quartz: Remove variable keyframe which is not really used from AVISplitter_next_request .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0dac2e89111cd7628ca1bb8fc7fb269ca99aef88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dac2e89111cd7628ca1bb8fc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 15:52:15 2010 +0200 quartz: Remove variable keyframe which is not really used from AVISplitter_next_request. --- dlls/quartz/avisplit.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 42ec2ae..d1d3426 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -178,7 +178,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe { AVISTDINDEX *index = stream->stdindex[stream->index]; AVISTDINDEX_ENTRY *entry = &index->aIndex[stream->pos]; - BOOL keyframe; /* End of file */ if (stream->index >= stream->entries) @@ -189,7 +188,6 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe } rtSampleStart = index->qwBaseOffset; - keyframe = !(entry->dwSize >> 31); rtSampleStart += entry->dwOffset; rtSampleStart = MEDIATIME_FROM_BYTES(rtSampleStart);

1 0

Henri Verbeet : wined3d: Kill the now unused MAX_MIP_LEVELS.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 61d8338815516d2161f6806a4f519d34bbe33abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d8338815516d2161f6806a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:32 2010 +0200 wined3d: Kill the now unused MAX_MIP_LEVELS. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52486f5..556ceeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -773,9 +773,6 @@ extern int num_lock DECLSPEC_HIDDEN; (vec)[3] = D3DCOLOR_A(dw); \ } while(0) -/* DirectX Device Limits */ -/* --------------------- */ -#define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */

1 0

Henri Verbeet : wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: c56d3c199c803550d1014fb2a2c5b4a3b9ff1254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56d3c199c803550d1014fb2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:33 2010 +0200 wined3d: Add a missing newline to a TRACE in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b20c4..0fe67a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, DWORD sampler; struct wined3d_format_desc dummy_desc; - TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s", + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %s.\n", iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_point(dst_point));

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: d1ea48b971e52a50e6c987cf5cc8ad668934abe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ea48b971e52a50e6c987cf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:34 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_internal_preload(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 48 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec8a02a..0bd613c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6906,7 +6906,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ RECT dst_rect = *dst_rect_in; /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, dst_surface, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 26c2981..ad969b8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,7 +2003,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI if (context->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); @@ -2149,11 +2149,11 @@ static void context_setup_target(IWineD3DDeviceImpl *device, /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_BOTH); + surface_internal_preload(context->current_rt, SRGB_BOTH); } else { - surface_internal_preload((IWineD3DSurface *)context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, SRGB_RGB); } IWineD3DSurface_ModifyLocation((IWineD3DSurface *)context->current_rt, SFLAG_INDRAWABLE, FALSE); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0fe67a4..894ef2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5247,7 +5247,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, LEAVE_GL(); /* Make sure the surface is loaded and up to date */ - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_impl, SRGB_RGB); IWineD3DSurface_BindTexture(dst_surface, FALSE); src_w = src_impl->currentDesc.Width; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2180256..ddb0ac7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1071,46 +1071,49 @@ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) IWineD3DSurface IWineD3DResource parts follow **************************************************** */ -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) { /* TODO: check for locks */ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = surface->resource.device; IWineD3DBaseTexture *baseTexture = NULL; - TRACE("(%p)Checking to see if the container is a base texture\n", This); - if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) baseTexture; + TRACE("(%p)Checking to see if the container is a base texture\n", surface); + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&baseTexture))) + { + IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *)baseTexture; TRACE("Passing to container\n"); tex_impl->baseTexture.internal_preload(baseTexture, srgb); IWineD3DBaseTexture_Release(baseTexture); } else { struct wined3d_context *context = NULL; - TRACE("(%p) : About to load surface\n", This); + TRACE("(%p) : About to load surface\n", surface); if (!device->isInDraw) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) + if (surface->resource.format_desc->format == WINED3DFMT_P8_UINT + || surface->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - if(palette9_changed(This)) { + if (palette9_changed(surface)) + { TRACE("Reloading surface because the d3d8/9 palette was changed\n"); /* TODO: This is not necessarily needed with hw palettized texture support */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, NULL); /* Make sure the texture is reloaded because of the palette change, this kills performance though :( */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INTEXTURE, FALSE); } } - IWineD3DSurface_LoadTexture(iface, srgb == SRGB_SRGB ? TRUE : FALSE); + IWineD3DSurface_LoadTexture((IWineD3DSurface *)surface, srgb == SRGB_SRGB ? TRUE : FALSE); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { + if (surface->resource.pool == WINED3DPOOL_DEFAULT) + { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; ENTER_GL(); - glPrioritizeTextures(1, &This->texture_name, &tmp); + glPrioritizeTextures(1, &surface->texture_name, &tmp); LEAVE_GL(); } @@ -1118,8 +1121,9 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) } } -static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { - surface_internal_preload(iface, SRGB_ANY); +static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) +{ + surface_internal_preload((IWineD3DSurfaceImpl *)iface, SRGB_ANY); } /* Context activation is done by the caller. */ @@ -2707,7 +2711,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c LEAVE_GL(); } else { /* bind the real texture, and make sure it up to date */ - surface_internal_preload(iface, SRGB_RGB); + surface_internal_preload(This, SRGB_RGB); surface_bind_and_dirtify(This, FALSE); } allocatedMemory = HeapAlloc(GetProcessHeap(), 0, width * height * 4); @@ -3009,7 +3013,7 @@ static void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *dst_surface, IWineD3D } context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); ENTER_GL(); /* Bind the target texture */ @@ -3117,14 +3121,14 @@ static void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *dst_surface, IWine TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ context = context_acquire(device, src_surface, CTXUSAGE_BLIT); - surface_internal_preload((IWineD3DSurface *)dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->texture_name) { /* Get it a description */ - surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + surface_internal_preload(src_surface, SRGB_RGB); } ENTER_GL(); @@ -3657,7 +3661,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } /* Now load the surface */ - surface_internal_preload((IWineD3DSurface *) Src, SRGB_RGB); + surface_internal_preload(Src, SRGB_RGB); /* Activate the destination context, set it up for blitting */ context = context_acquire(device, This, CTXUSAGE_BLIT); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 556ceeb..ecdd836 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1872,7 +1872,7 @@ typedef struct IWineD3DBaseTextureClass void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; -void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; void surface_prepare_texture(IWineD3DSurfaceImpl *surface,

1 0