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

Vincent Povirk : windowscodecs: Implement IWICStream_InitializeFromFilename .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 2f41a3ad21ff5689e12e78031d102c8cdf10373a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f41a3ad21ff5689e12e78031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:20:42 2010 -0500 windowscodecs: Implement IWICStream_InitializeFromFilename. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/stream.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 7ff3ae2..0516161 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 advapi32 kernel32 +IMPORTS = uuid ole32 shlwapi advapi32 kernel32 EXTRAINCL = @PNGINCL@ C_SRCS = \ diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index bd5592b..bee27db 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winreg.h" #include "objbase.h" +#include "shlwapi.h" #include "wincodec.h" #include "wincodecs_private.h" @@ -434,8 +435,35 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, LPCWSTR wzFileName, DWORD dwDesiredAccess) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + IWICStreamImpl *This = (IWICStreamImpl*)iface; + HRESULT hr; + DWORD dwMode; + IStream *stream; + + TRACE("(%p, %s, %u)\n", iface, debugstr_w(wzFileName), dwDesiredAccess); + + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + if(dwDesiredAccess & GENERIC_WRITE) + dwMode = STGM_SHARE_DENY_WRITE | STGM_WRITE | STGM_CREATE; + else if(dwDesiredAccess & GENERIC_READ) + dwMode = STGM_SHARE_DENY_WRITE | STGM_READ | STGM_FAILIFTHERE; + else + return E_INVALIDARG; + + hr = SHCreateStreamOnFileW(wzFileName, dwMode, &stream); + + if (SUCCEEDED(hr)) + { + if (InterlockedCompareExchangePointer((void**)&This->pStream, stream, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(stream); + hr = WINCODEC_ERR_WRONGSTATE; + } + } + + return hr; } /******************************************

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory_CreateDecoderFromFilename.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b468c29de10d29d9b3a7717bbc8b8dc631a4ca83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b468c29de10d29d9b3a7717bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:40:40 2010 -0500 windowscodecs: Implement IWICImagingFactory_CreateDecoderFromFilename. --- dlls/windowscodecs/imgfactory.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index a98aeb8..e3dcca0 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winreg.h" #include "objbase.h" +#include "shellapi.h" #include "wincodec.h" #include "wincodecs_private.h" @@ -89,9 +90,27 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( DWORD dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%s,%s,%u,%u,%p): stub\n", iface, debugstr_w(wzFilename), + IWICStream *stream; + HRESULT hr; + + TRACE("(%p,%s,%s,%u,%u,%p)\n", iface, debugstr_w(wzFilename), debugstr_guid(pguidVendor), dwDesiredAccess, metadataOptions, ppIDecoder); - return E_NOTIMPL; + + hr = StreamImpl_Create(&stream); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromFilename(stream, wzFilename, dwDesiredAccess); + + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreateDecoderFromStream(iface, (IStream*)stream, + pguidVendor, metadataOptions, ppIDecoder); + } + + IWICStream_Release(stream); + } + + return hr; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory_CreateFormatConverter.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 83f32fc7d8f6ba709884bfb2214f862dae1420ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f32fc7d8f6ba709884bfb22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:46:53 2010 -0500 windowscodecs: Implement IWICImagingFactory_CreateFormatConverter. --- dlls/windowscodecs/imgfactory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e3dcca0..3f51493 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -247,8 +247,7 @@ static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, IWICFormatConverter **ppIFormatConverter) { - FIXME("(%p,%p): stub\n", iface, ppIFormatConverter); - return E_NOTIMPL; + return FormatConverter_CreateInstance(NULL, &IID_IWICFormatConverter, (void**)ppIFormatConverter); } static HRESULT WINAPI ImagingFactory_CreateBitmapScaler(IWICImagingFactory *iface,

1 0

Piotr Caban : msvcrt: Added _wcstoi64 and _wcstoui64 implementation.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 0ec1635172b70fd42ece6d05edb6383437514b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec1635172b70fd42ece6d05e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 27 08:42:32 2010 +0200 msvcrt: Added _wcstoi64 and _wcstoui64 implementation. --- dlls/msvcr80/msvcr80.spec | 8 +- dlls/msvcr90/msvcr90.spec | 8 +- dlls/msvcrt/msvcrt.spec | 8 +- dlls/msvcrt/string.c | 6 +- dlls/msvcrt/wcs.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 173 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3cc641e..6ead0a7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1106,13 +1106,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ stub _wcstoi64 -@ stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l @ stub _wcstombs_s_l -@ stub _wcstoui64 -@ stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 59a71ba..72dff79 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1093,13 +1093,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ stub _wcstoi64 -@ stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l @ stub _wcstombs_s_l -@ stub _wcstoui64 -@ stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e5bbaf4..5f82cf1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1035,13 +1035,13 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) # stub _wcsset_s -# stub _wcstoi64 -# stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l # stub _wcstombs_l # stub _wcstombs_s_l -# stub _wcstoui64 -# stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l # stub _wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 459d1a1..7d578a3 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -529,10 +529,10 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { ret = MSVCRT_I64_MAX; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else if(negative && (ret<MSVCRT_I64_MIN/base || ret*base<MSVCRT_I64_MIN-v)) { ret = MSVCRT_I64_MIN; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else ret = ret*base + v; } @@ -606,7 +606,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { ret = MSVCRT_UI64_MAX; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else ret = ret*base + v; } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 44a3b4d..04d90de 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1408,3 +1408,161 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ dst[0] = '\0'; return MSVCRT_ERANGE; } + +/********************************************************************* + * _wctoi64_l (MSVCR90.@) + * + * FIXME: locale parameter is ignored + */ +__int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) +{ + BOOL negative = FALSE; + __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if(!nptr || base<0 || base>36 || base==1) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolowerW(*nptr); + int v; + + if(isdigitW(cur)) { + if(cur >= '0'+base) + break; + v = cur-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + if(negative) + v = -v; + + nptr++; + + if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { + ret = MSVCRT_I64_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(negative && (ret<MSVCRT_I64_MIN/base || ret*base<MSVCRT_I64_MIN-v)) { + ret = MSVCRT_I64_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + + return ret; +} + +/********************************************************************* + * _wcstoi64 (MSVCR90.@) + */ +__int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base) +{ + return MSVCRT__wcstoi64_l(nptr, endptr, base, NULL); +} + +/********************************************************************* + * _wcstoui64_l (MSVCR90.@) + * + * FIXME: locale parameter is ignored + */ +unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) +{ + BOOL negative = FALSE; + unsigned __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if(!nptr || base<0 || base>36 || base==1) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolowerW(*nptr); + int v; + + if(isdigit(cur)) { + if(cur >= '0'+base) + break; + v = *nptr-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + nptr++; + + if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { + ret = MSVCRT_UI64_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + + return negative ? -ret : ret; +} + +/********************************************************************* + * _wcstoui64 (MSVCR90.@) + */ +unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base) +{ + return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); +}

1 0

Piotr Caban : msvcrt: Added wcstombs_s implementation.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 6c0e61cd65c5a9bacb46608c116d99e81bd12131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0e61cd65c5a9bacb46608c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 27 08:42:46 2010 +0200 msvcrt: Added wcstombs_s implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/wcs.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6ead0a7..3866dc6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1110,7 +1110,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l -@ stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @@ -1456,7 +1456,7 @@ @ stub wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs -@ stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm @ stub wctob diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 72dff79..ea3e534 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1097,7 +1097,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l -@ stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @@ -1440,7 +1440,7 @@ @ stub wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs -@ stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm @ stub wctob diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5f82cf1..1e7b9e2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1039,7 +1039,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l # stub _wcstombs_l -# stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l # stub _wcstoul_l @@ -1396,7 +1396,7 @@ # stub wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) ntdll.wcstombs -# stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) ntdll.wcstoul @ stub wcsxfrm #(ptr wstr long) MSVCRT_wcsxfrm # stub wctob diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 04d90de..ddeb999 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -227,6 +227,82 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } /********************************************************************* + * _wcstombs_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + char default_char = '\0', *p; + int hlp, len; + + if(!size) + return 0; + + if(!mbstr || !wcstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(mbstr) + *mbstr = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(!locale) + locale = get_locale(); + + if(size<=count) + len = size; + else if(count==_TRUNCATE) + len = size-1; + else + len = count; + + p = mbstr; + *ret = 0; + while(1) { + if(!len) + break; + + if(*wcstr == '\0') { + *p = '\0'; + break; + } + + hlp = WideCharToMultiByte(locale->locinfo->lc_codepage, + WC_NO_BEST_FIT_CHARS, wcstr, 1, p, len, &default_char, NULL); + if(!hlp || *p=='\0') + break; + + p += hlp; + len -= hlp; + + wcstr++; + *ret += 1; + } + + if(!len && size<=count) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *mbstr = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + if(*wcstr == '\0') + *ret += 1; + *p = '\0'; + return 0; +} + +/********************************************************************* + * wcstombs_s (MSVCRT.@) + */ +int CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count) +{ + return MSVCRT__wcstombs_s_l(ret, mbstr, size, wcstr, count, NULL); +} + +/********************************************************************* * wcstod (MSVCRT.@) */ double CDECL MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end)

1 0

Jeff Latimer : usp10: Check that there are sufficient script_items before setting the last pointer .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b367e902c9cafb1dfa5f35e52bf89377dd608ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b367e902c9cafb1dfa5f35e52… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 27 22:43:34 2010 +1000 usp10: Check that there are sufficient script_items before setting the last pointer. --- dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 124526b..5ba4315 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -673,6 +673,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; WCHAR TestItem4[] = {'T', 'e', 's', 't', 'd',' ',0x0684,0x0694,0x06a4,' ',' ','\r','\n','e','n','d',0}; WCHAR TestItem5[] = {0x0684,'T','e','s','t','e',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem6[] = {'T', 'e', 's', 't', 'f',' ',' ',' ','\r','\n','e','n','d',0}; SCRIPT_CACHE psc; int cChars; @@ -848,6 +849,15 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", pItem[0].a.s.uBidiLevel); + + /* This test checks to make sure that the test to see if there are sufficient buffers to store * + * the pointer to the last char works. Note that windows often needs a greater number of * + * SCRIPT_ITEMS to process a string than is returned in pcItems. */ + cInChars = (sizeof(TestItem6)/2)-1; + cMaxItems = 4; + hr = ScriptItemize(TestItem6, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == E_OUTOFMEMORY, "ScriptItemize should return E_OUTOFMEMORY, returned %08x\n", hr); + } static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 201a74a..eebc8ab 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -669,16 +669,17 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem /* While not strictly necessary according to the spec, make sure the n+1 * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ - memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); + index++; + memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos); + TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (pcItems) *pcItems = index + 1; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; + if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */ - pItems[index+1].iCharPos = cnt; /* the last + 1 item - contains the ptr to the lastchar */ + pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ heap_free(levels); return S_OK; }

1 0

Jeff Latimer : usp10/tests: Remove some redundant tests and fully test bidi flag setting.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: a7fc0c65c1dcf4a1d40476f99713524e1bbb00c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fc0c65c1dcf4a1d40476f99… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 27 22:43:43 2010 +1000 usp10/tests: Remove some redundant tests and fully test bidi flag setting. --- dlls/usp10/tests/usp10.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5ba4315..002748a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -806,8 +806,6 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", pItem[2].iCharPos, pItem[3].iCharPos, cInChars); } - hr = ScriptFreeCache( &psc); - ok (!psc, "psc is not null after ScriptFreeCache\n"); } /* This is a valid test that will cause parsing to take place and create 5 script_items */ @@ -823,21 +821,27 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", pItem[0].iCharPos, pItem[1].iCharPos); + ok (pItem[0].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[0].a.s.uBidiLevel); ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", pItem[1].iCharPos, pItem[2].iCharPos); + ok (pItem[1].a.s.uBidiLevel == 1, "Should have been bidi=1 not %d\n", + pItem[1].a.s.uBidiLevel); ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == 12, "Start pos [2] not = 11 (%d) or end [3] pos not = 12 (%d)\n", pItem[2].iCharPos, pItem[3].iCharPos); + ok (pItem[2].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[2].a.s.uBidiLevel); ok (pItem[3].iCharPos == 12 && pItem[4].iCharPos == 13, "Start pos [3] not = 12 (%d) or end [4] pos not = 13 (%d)\n", pItem[3].iCharPos, pItem[4].iCharPos); + ok (pItem[3].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[3].a.s.uBidiLevel); ok (pItem[4].iCharPos == 13 && pItem[5].iCharPos == cInChars, "Start pos [4] not = 13 (%d) or end [5] pos not = 16 (%d), cInChars = %d\n", pItem[4].iCharPos, pItem[5].iCharPos, cInChars); } - hr = ScriptFreeCache( &psc); - ok (!psc, "psc is not null after ScriptFreeCache\n"); } /*

1 0

Hans Leidekker : kernel32/tests: Fix test failures on certain versions of Windows.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 9b33b479d61e0f39f856ad717d105914e2c5f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b33b479d61e0f39f856ad717… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:30:52 2010 +0200 kernel32/tests: Fix test failures on certain versions of Windows. --- dlls/kernel32/tests/version.c | 92 +++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b33b479d61e0f39f856a…

1 0

Nikolay Sivov : shell32/shlview: Try to use IShellDetails to respond on notifications if IShellFolder2 isn' t available.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 7ea711964ba9619c24425f384c8e11ef33a599f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea711964ba9619c24425f384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 00:38:48 2010 +0400 shell32/shlview: Try to use IShellDetails to respond on notifications if IShellFolder2 isn't available. --- dlls/shell32/shlview.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b3d300a..d3322e4 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1387,28 +1387,49 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if(lpdi->item.mask & LVIF_TEXT) /* text requested */ { + static WCHAR emptyW[] = { 0 }; + SHELLDETAILS sd; + HRESULT hr; + if (This->pSF2Parent) { - SHELLDETAILS sd; - IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); - if (lpnmh->code == LVN_GETDISPINFOA) - { - /* shouldn't happen */ - NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; - StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",lpdiA->item.pszText); - } - else /* LVN_GETDISPINFOW */ - { - StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",debugstr_w(lpdi->item.pszText)); - } + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); } else { - FIXME("no SF2\n"); + IShellDetails *details; + + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IShellDetails, (void**)&details); + if (hr == S_OK) + { + hr = IShellDetails_GetDetailsOf(details, pidl, lpdi->item.iSubItem, &sd); + IShellDetails_Release(details); + } + else + WARN("IShellFolder2/IShellDetails not supported\n"); + } + + if (hr != S_OK) + { + /* set to empty on failure */ + sd.str.uType = STRRET_WSTR; + sd.str.u.pOleStr = emptyW; } + + if (lpnmh->code == LVN_GETDISPINFOW) + { + StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n", debugstr_w(lpdi->item.pszText)); + } + else + { + /* LVN_GETDISPINFOA - shouldn't happen */ + NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; + StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n", lpdiA->item.pszText); + } } + if(lpdi->item.mask & LVIF_IMAGE) /* image requested */ { lpdi->item.iImage = SHMapPIDLToSystemImageListIndex(This->pSFParent, pidl, 0);

1 0

Roderick Colenbrander : wgl: Improve wglDeleteContext threading behavior.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b86787e57c6b12e1d6e9f04f45e4bcbc0e1fc99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86787e57c6b12e1d6e9f04f4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 26 15:49:56 2010 +0200 wgl: Improve wglDeleteContext threading behavior. --- dlls/opengl32/tests/opengl.c | 56 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 62 +++++++++++++++++++++++++++++------------ 2 files changed, 100 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index d0eb24f..a59f8d2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -499,6 +499,61 @@ static void test_acceleration(HDC hdc) } } +struct wgl_thread_param +{ + HANDLE test_finished; + HGLRC hglrc; + BOOL hglrc_deleted; +}; + +static DWORD WINAPI wgl_thread(void *param) +{ + struct wgl_thread_param *p = param; + + p->hglrc_deleted = wglDeleteContext(p->hglrc); + SetEvent(p->test_finished); + + return 0; +} + +static void test_deletecontext(HDC hdc) +{ + struct wgl_thread_param thread_params; + HGLRC hglrc = wglCreateContext(hdc); + HANDLE thread_handle; + DWORD res, tid; + + if(!hglrc) + { + skip("wglCreateContext failed!\n"); + return; + } + + res = wglMakeCurrent(hdc, hglrc); + if(!res) + { + skip("wglMakeCurrent failed!\n"); + return; + } + + /* WGL doesn't allow you to delete a context from a different thread than the one in which it is current. + * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. + */ + thread_params.hglrc = hglrc; + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); + ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); + if(thread_handle) + { + WaitForSingleObject(thread_handle, INFINITE); + ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + } + CloseHandle(thread_params.test_finished); + + res = wglDeleteContext(hglrc); + ok(res == TRUE, "wglDeleteContext failed\n"); +} + static void test_make_current_read(HDC hdc) { int res; @@ -802,6 +857,7 @@ START_TEST(opengl) return; } + test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc); test_sharelists(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf22f95..ccd9050 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -113,6 +113,7 @@ typedef struct wine_glcontext { BOOL do_escape; BOOL has_been_current; BOOL sharing; + DWORD tid; BOOL gl3_context; XVisualInfo *vis; WineGLPixelFormat *fmt; @@ -1763,29 +1764,33 @@ HGLRC CDECL X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - BOOL ret = TRUE; TRACE("(%p)\n", hglrc); if (!has_opengl()) return 0; - wine_tsx11_lock(); - /* A game (Half Life not to name it) deletes twice the same context, - * so make sure it is valid first */ - if (is_valid_context( ctx )) - { - if (ctx->ctx) pglXDestroyContext(gdi_display, ctx->ctx); - free_context(ctx); - } - else + if (!is_valid_context(ctx)) { WARN("Error deleting context !\n"); SetLastError(ERROR_INVALID_HANDLE); - ret = FALSE; + return FALSE; } - wine_tsx11_unlock(); - return ret; + /* WGL doesn't allow deletion of a context which is current in another thread */ + if (ctx->tid != 0 && ctx->tid != GetCurrentThreadId()) + { + TRACE("Cannot delete context=%p because it is current in another thread.\n", ctx); + return FALSE; + } + + if (ctx->ctx) + { + wine_tsx11_lock(); + pglXDestroyContext(gdi_display, ctx->ctx); + wine_tsx11_unlock(); + } + + return TRUE; } /** @@ -1857,16 +1862,26 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (!has_opengl()) return FALSE; wine_tsx11_lock(); - if (hglrc == NULL) { + if (hglrc == NULL) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; - } else if (ctx->fmt->iPixelFormat != physDev->current_pf) { + } + else if (ctx->fmt->iPixelFormat != physDev->current_pf) + { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", hdc, physDev->current_pf, ctx, ctx->fmt->iPixelFormat ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); ret = FALSE; - } else { + } + else + { Drawable drawable = get_glxdrawable(physDev); + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { @@ -1881,6 +1896,7 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if(ret) { ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; ctx->read_hdc = hdc; ctx->drawables[0] = drawable; @@ -1913,18 +1929,28 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV if (!has_opengl()) return 0; wine_tsx11_lock(); - if (hglrc == NULL) { + if (hglrc == NULL) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; - } else { + } + else + { if (NULL == pglXMakeContextCurrent) { ret = FALSE; } else { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable d_draw = get_glxdrawable(pDrawDev); Drawable d_read = get_glxdrawable(pReadDev); + if (prev_ctx) prev_ctx->tid = 0; + ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); ctx->hdc = pDrawDev->hdc; ctx->read_hdc = pReadDev->hdc; ctx->drawables[0] = d_draw;

1 0