wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Piotr Caban : wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW .
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: ef4db477f08a7f83d506621876b46b2a623edd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4db477f08a7f83d50662187… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:26 2013 +0200 wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d0ed459..18279da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3541,7 +3541,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, STHook->wDayOfWeek = tmpTM.tm_wday; STHook->wMonth = tmpTM.tm_mon + 1; STHook->wSecond = tmpTM.tm_sec; - STHook->wYear = tmpTM.tm_year; + STHook->wYear = 1900+tmpTM.tm_year; TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek,

1 0

Dmitry Timoshkov : wineps.drv: Add support for TrueType composite glyph transforms.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: a0b4ce601730a43f67de149fd9c66464a6f9ad1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b4ce601730a43f67de149fd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 1 19:47:01 2013 +0900 wineps.drv: Add support for TrueType composite glyph transforms. --- dlls/wineps.drv/type1.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 01c9c7e..6855019 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -423,7 +423,7 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli const BYTE *ptr = data; WORD flags, index; short arg1, arg2; - WORD scale_xx = 1 << 14, scale_xy = 0, scale_yx = 0, scale_yy = 1 << 14; + FLOAT scale_xx = 1, scale_xy = 0, scale_yx = 0, scale_yy = 1; WORD start_pt, end_pt; ptr += 10; @@ -447,37 +447,44 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } if(flags & WE_HAVE_A_SCALE) { - scale_xx = scale_yy = get_be_word(ptr); + scale_xx = scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_AN_X_AND_Y_SCALE) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } else if(flags & WE_HAVE_A_TWO_BY_TWO) { - scale_xx = get_be_word(ptr); + scale_xx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_xy = get_be_word(ptr); + scale_xy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yx = get_be_word(ptr); + scale_yx = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; - scale_yy = get_be_word(ptr); + scale_yy = (FLOAT)(short)get_be_word(ptr) / 0x4000; ptr += 2; } - if ((flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) && - (scale_xx != 1 << 14 || scale_yy != 1 << 14 || scale_xy || scale_yx)) - FIXME( "unhandled scaling %x,%x,%x,%x of glyph %x\n", - scale_xx, scale_xy, scale_yx, scale_yy, index ); - start_pt = pts_in_outline(outline); append_glyph_outline(hdc, index, outline); end_pt = pts_in_outline(outline); + if (flags & (WE_HAVE_A_SCALE | WE_HAVE_AN_X_AND_Y_SCALE | WE_HAVE_A_TWO_BY_TWO)) + { + WORD i; + TRACE("transform %f,%f,%f,%f of glyph %x\n", scale_xx, scale_xy, scale_yx, scale_yy, index); + for (i = start_pt; i < end_pt; i++) + { + LONG x = outline->pts[i].x, y = outline->pts[i].y; + outline->pts[i].x = x * scale_xx + y * scale_yx; + outline->pts[i].y = x * scale_xy + y * scale_yy; + } + } + if((flags & ARGS_ARE_XY_VALUES) == 0) { WORD orig_pt = arg1, new_pt = arg2;

1 0

Jacek Caban : mshtml: Fixed builtin getter call with arguments.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 8c0c09e4c707b41b4e5fd5492adfae41d577f7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0c09e4c707b41b4e5fd5492… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 1 11:50:29 2013 +0200 mshtml: Fixed builtin getter call with arguments. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/tests/jstest.html | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 38d9df4..d70ae2d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1216,7 +1216,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD) || dp->cArgs) { if(V_VT(&v) != VT_DISPATCH) { FIXME("Not a function %s\n", debugstr_variant(&v)); VariantClear(&v); @@ -1228,7 +1228,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD }else if(res) { *res = v; }else { - IDispatch_Release(V_DISPATCH(&v)); + VariantClear(&v); } } } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index ebf2861..4185112 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -137,6 +137,8 @@ function test_getter_call() { e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); + + ok(document.all("divid").tagName === "DIV", "document.all('divid').tagName = " + document.all("divid").tagName); } function test_arg_conv() {

1 0

Andrew Talbot : krnl386.exe16: Constify a variable.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 08254df3168e376394f137c79414d6419e827d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08254df3168e376394f137c79… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:41:53 2013 +0000 krnl386.exe16: Constify a variable. --- dlls/krnl386.exe16/dosexe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index 9797c86..ff96554 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -238,7 +238,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W if ( !ReadFile(hFile,&mz_header,sizeof(mz_header),&len,NULL) || len != sizeof(mz_header) || mz_header.e_magic != IMAGE_DOS_SIGNATURE) { - char *p = strrchr( filename, '.' ); + const char *p = strrchr( filename, '.' ); if (!p || strcasecmp( p, ".com" )) /* check for .COM extension */ { SetLastError(ERROR_BAD_FORMAT);

1 0

Jactry Zeng : msvcrt: Add missing declarations for _wcsncoll, _wcsncoll_l, _wcsicoll_l, _wcsnicoll_l and wcscoll_l.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 8c53b6fde4927daabe4a9c7d32ecc07009e73b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c53b6fde4927daabe4a9c7d3… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 31 03:42:29 2013 +0800 msvcrt: Add missing declarations for _wcsncoll, _wcsncoll_l, _wcsicoll_l, _wcsnicoll_l and wcscoll_l. --- include/msvcrt/wchar.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 028e2cb..27f673c 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -401,12 +401,17 @@ int __cdecl wctomb(char*,wchar_t); #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED +int __cdecl _wcscoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcsdup(const wchar_t*); int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); +int __cdecl _wcsicoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +int __cdecl _wcsncoll(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsncoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsnicoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);

1 0

Jactry Zeng : msvcrt: Added _wcsnicoll_l implementation.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 5af20ef18052f135fd989805d9913f206767d856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af20ef18052f135fd989805d… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 31 00:00:30 2013 +0800 msvcrt: Added _wcsnicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 20 ++++++++++++++++++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0c363bd..1531da9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1495,7 +1495,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2d9e69e..c851928 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1858,7 +1858,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0faa5f7..e33c694 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1155,7 +1155,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f7c751a..fb549cf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1149,7 +1149,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5193104..ff96b36 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1114,7 +1114,7 @@ @ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp # stub _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll -# stub _wcsnicoll_l(wstr wstr long ptr) +@ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset # stub _wcsnset_s(wstr long long) @ cdecl _wcsrev(wstr) MSVCRT__wcsrev diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 776ef20..a5795bd 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -102,12 +102,28 @@ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st } /********************************************************************* + * _wcsnicoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, + str1, count, str2, count)-CSTR_EQUAL; +} + +/********************************************************************* * _wcsnicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; + return MSVCRT__wcsnicoll_l(str1, str2, count, NULL); } /*********************************************************************

1 0

Jactry Zeng : msvcrt: Added _wcsicoll_l implementation.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: d2763e43d10160eaf5e0c057e32d68d4f9289b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2763e43d10160eaf5e0c057e… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 30 22:59:02 2013 +0800 msvcrt: Added _wcsicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 19 +++++++++++++++++-- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ab52ff7..0c363bd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1485,7 +1485,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7776dee..2d9e69e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1848,7 +1848,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e635e96..0faa5f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1145,7 +1145,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9bcdccb..f7c751a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1139,7 +1139,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 30ac113..5193104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1104,7 +1104,7 @@ @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp # stub _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll -# stub _wcsicoll_l(wstr wstr ptr) +@ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr # stub _wcslwr_l(wstr ptr) @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9d45a24..776ef20 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -78,12 +78,27 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsicoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, + str1, -1, str2, -1)-CSTR_EQUAL; +} + +/********************************************************************* * _wcsicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; + return MSVCRT__wcsicoll_l(str1, str2, NULL); } /*********************************************************************

1 0

Jactry Zeng : msvcrt: Added _wcscoll_l implementation.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: dafa7611e9e77158f9fa17632066775a4811b5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafa7611e9e77158f9fa17632… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 30 22:34:31 2013 +0800 msvcrt: Added _wcscoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 18 ++++++++++++++++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6476571..ab52ff7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1477,7 +1477,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c8c99f1..7776dee 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1840,7 +1840,7 @@ @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat @ stub _wcreate_locale -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cd83405..e635e96 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1137,7 +1137,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6d19a3d..9bcdccb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1131,7 +1131,7 @@ @ cdecl _wchmod(wstr long) msvcrt._wchmod @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat -@ stub _wcscoll_l +@ cdecl _wcscoll_l(wstr wstr ptr) msvcrt._wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 89d9028..30ac113 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1095,7 +1095,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -# stub _wcscoll_l(wstr wstr ptr) +@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup # stub _wcsdup_dbg(wstr long str long) @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 511a814..9d45a24 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1038,12 +1038,26 @@ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, } /********************************************************************* + * _wcscoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; +} + +/********************************************************************* * wcscoll (MSVCRT.@) */ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - 0, str1, -1, str2, -1)-CSTR_EQUAL; + return MSVCRT__wcscoll_l(str1, str2, NULL); } /*********************************************************************

1 0

Alexandre Julliard : winebuild: Check for delayed import before the library is parsed, in case the real module name is different.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 2467c06a30e96f1b6f400b99af190a2a2033f5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2467c06a30e96f1b6f400b99a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 14:32:36 2013 +0200 winebuild: Check for delayed import before the library is parsed, in case the real module name is different. --- tools/winebuild/import.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3756c75..f533989 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -226,6 +226,7 @@ static int read_import_lib( struct import *imp ) struct stat stat; struct import *prev_imp; DLLSPEC *spec = imp->spec; + int delayed = is_delayed_import( spec->file_name ); f = open_input_file( NULL, imp->full_name ); fstat( fileno(f), &stat ); @@ -244,7 +245,7 @@ static int read_import_lib( struct import *imp ) return 0; /* the same file was already loaded, ignore this one */ } - if (is_delayed_import( spec->file_name )) + if (delayed) { imp->delay = 1; nb_delayed++;

1 0

Piotr Caban : wininet: Fixed buffer size check in urlcache_create_file_pathA.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: a59210a6e8012cc8d44b6162479cf0d5f3a3b2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59210a6e8012cc8d44b61624… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:13 2013 +0200 wininet: Fixed buffer size check in urlcache_create_file_pathA. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2167036..5efa614 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1065,7 +1065,7 @@ static BOOL urlcache_create_file_pathA( dir_len = 0; nRequired = (path_len + dir_len + file_name_len) * sizeof(char); - if (nRequired < *lpBufferSize) + if (nRequired <= *lpBufferSize) { WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL); if(dir_len) {

1 0

← Newer
1
...
51
52
53
54
55
56
57
58
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 April 2013