wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcrt: Added mbrtowc tests.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: f20a85a5da003ebe3e920847641c8097f255a373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20a85a5da003ebe3e9208476… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:20 2012 +0000 msvcrt: Added mbrtowc tests. --- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 73e7414..743b5b3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -86,6 +86,7 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_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*); #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) @@ -319,6 +320,28 @@ static void test_mbcp(void) ok(state == mbstring[0], "incorrect state value (%x)\n", state); expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d"); } + + /* mbrtowc */ + if(!setlocale(LC_ALL, ".936") || !p_mbrtowc) { + win_skip("mbrtowc tests\n"); + }else { + mbstate_t state = 0; + wchar_t dst; + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 2, NULL), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+2, 2, NULL), 2, int, "%d"); + ok(dst == 0x3f, "dst = %x, expected 0x3f\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+3, 2, NULL), 1, int, "%d"); + ok(dst == 0x20, "dst = %x, expected 0x20\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, NULL), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, &state), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + ok(state == mbstring[0], "incorrect state value (%x)\n", state); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+1, 1, &state), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + ok(state == 0, "incorrect state value (%x)\n", state); + } setlocale(LC_ALL, "C"); /* _mbccpy/_mbsncpy */ @@ -2320,6 +2343,7 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); + p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added mbrtowc implementation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 4b67531bf72ee1a8c92029a7be3836c96594150e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b67531bf72ee1a8c92029a7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:02 2012 +0000 msvcrt: Added mbrtowc implementation. --- dlls/msvcrt/mbcs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b083ea1..71b5343 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1995,7 +1995,7 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, /* return the number of bytes from src that have been used */ if(!*str) return 0; - if(n >= 2 && MSVCRT__isleadbyte_l(*str, locale) && str[1]) + if(n >= 2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale) && str[1]) return 2; return 1; } @@ -2009,6 +2009,53 @@ int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n) } /********************************************************************* + * mbrtowc(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbrtowc(MSVCRT_wchar_t *dst, const char *str, + MSVCRT_size_t n, MSVCRT_mbstate_t *state) +{ + MSVCRT_pthreadlocinfo locinfo = get_locinfo(); + MSVCRT_mbstate_t s = (state ? *state : 0); + char tmpstr[2]; + int len = 0; + + if(dst) + *dst = 0; + + if(!n || !str || !*str) + return 0; + + if(locinfo->mb_cur_max == 1) { + tmpstr[len++] = *str; + }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) { + if(n == 1) { + s = (unsigned char)*str; + len = -2; + }else { + tmpstr[0] = str[0]; + tmpstr[1] = str[1]; + len = 2; + } + }else if(!s) { + tmpstr[len++] = *str; + }else { + tmpstr[0] = s; + tmpstr[1] = *str; + len = 2; + s = 0; + } + + if(len > 0) { + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, tmpstr, len, dst, dst ? 1 : 0)) + len = -1; + } + + if(state) + *state = s; + return len; +} + +/********************************************************************* * _mbstowcs_l(MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7957e92..4f2fa9a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1329,7 +1329,7 @@ @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -# stub mbrtowc(ptr str long ptr) +@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) # stub mbsrtowcs(ptr ptr long ptr) # stub mbsrtowcs_s(ptr ptr long ptr long ptr)

1 0

Piotr Caban : msvcrt: Added mbrlen tests.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 00658a4a6383cf0e219440f8230a138eeb98cf6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00658a4a6383cf0e219440f82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:46 2012 +0000 msvcrt: Added mbrlen tests. --- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 909077f..73e7414 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -23,6 +23,7 @@ #include "winnls.h" #include <string.h> #include <mbstring.h> +#include <wchar.h> #include <stdlib.h> #include <stdio.h> #include <mbctype.h> @@ -84,6 +85,7 @@ static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); static int (__cdecl *p_tolower)(int); +static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_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) @@ -304,6 +306,21 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + /* mbrlen */ + if(!setlocale(LC_ALL, ".936") || !p_mbrlen) { + win_skip("mbrlen tests\n"); + }else { + mbstate_t state = 0; + expect_eq(p_mbrlen((const char*)mbstring, 2, NULL), 2, int, "%d"); + expect_eq(p_mbrlen((const char*)&mbstring[2], 2, NULL), 2, int, "%d"); + expect_eq(p_mbrlen((const char*)&mbstring[3], 2, NULL), 1, int, "%d"); + expect_eq(p_mbrlen((const char*)mbstring, 1, NULL), -2, int, "%d"); + expect_eq(p_mbrlen((const char*)mbstring, 1, &state), -2, int, "%d"); + ok(state == mbstring[0], "incorrect state value (%x)\n", state); + expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d"); + } + setlocale(LC_ALL, "C"); + /* _mbccpy/_mbsncpy */ memset(buf, 0xff, sizeof(buf)); _mbccpy(buf, mbstring); @@ -2302,6 +2319,7 @@ START_TEST(string) p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added mbrlen implementation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: b8ee0dd7ab70b046d15176ed2bfccff8e5d44a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee0dd7ab70b046d15176ed2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:27 2012 +0000 msvcrt: Added mbrlen implementation. --- dlls/msvcrt/mbcs.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3c575e9..b083ea1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1902,12 +1902,44 @@ int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) if(get_locinfo()->mb_cur_max == 1) return 1; /* ASCII CP */ - return !MSVCRT_isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + return !MSVCRT_isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1); } return 0; } /********************************************************************* + * mbrlen(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbrlen(const char *str, MSVCRT_size_t len, MSVCRT_mbstate_t *state) +{ + MSVCRT_mbstate_t s = (state ? *state : 0); + MSVCRT_size_t ret; + + if(!len || !str || !*str) + return 0; + + if(get_locinfo()->mb_cur_max == 1) { + return 1; + }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) { + if(len == 1) { + s = (unsigned char)*str; + ret = -2; + }else { + ret = 2; + } + }else if(!s) { + ret = 1; + }else { + s = 0; + ret = 2; + } + + if(state) + *state = s; + return ret; +} + +/********************************************************************* * _mbstrlen_l(MSVCRT.@) */ MSVCRT_size_t CDECL _mbstrlen_l(const char* str, MSVCRT__locale_t locale) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f5cad22..7957e92 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1328,7 +1328,7 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen -# stub mbrlen(ptr long ptr) +@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen # stub mbrtowc(ptr str long ptr) # stub mbsdup_dbg(wstr long ptr long) # stub mbsrtowcs(ptr ptr long ptr)

1 0

Piotr Caban : msvcp100: Added exception throwing helpers.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d55eabbb31f54a50be48aeebea4c7f85114fa4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55eabbb31f54a50be48aeebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:10 2012 +0000 msvcp100: Added exception throwing helpers. --- dlls/msvcp100/exception.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 18 +++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 1f4ffd2..2e9f1aa 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -454,6 +454,45 @@ void __cdecl _Nomemory(void) throw_exception(EXCEPTION_BAD_ALLOC, NULL); } +/* ?_Xmem@tr1@std@@YAXXZ */ +void __cdecl _Xmem(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + +/* ?_Xinvalid_argument@std@@YAXPBD@Z */ +/* ?_Xinvalid_argument@std@@YAXPEBD@Z */ +void __cdecl _Xinvalid_argument(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_INVALID_ARGUMENT, str); +} + +/* ?_Xlength_error@std@@YAXPBD@Z */ +/* ?_Xlength_error@std@@YAXPEBD@Z */ +void __cdecl _Xlength_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_LENGTH_ERROR, str); +} + +/* ?_Xout_of_range@std@@YAXPBD@Z */ +/* ?_Xout_of_range@std@@YAXPEBD@Z */ +void __cdecl _Xout_of_range(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_OUT_OF_RANGE, str); +} + +/* ?_Xruntime_error@std@@YAXPBD@Z */ +/* ?_Xruntime_error@std@@YAXPEBD@Z */ +void __cdecl _Xruntime_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_RUNTIME_ERROR, str); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index e4ac191..6a67b3b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1232,17 +1232,17 @@ @ stub ?_XLgamma@tr1@std@@YAOO@Z @ stub ?_Xbad@tr1@std@@YAXW4error_type@regex_constants@12@@Z @ stub ?_Xfunc@tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xinvalid_argument@std@@YAXPEBD@Z -@ stub -arch=win32 ?_Xlength_error@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xlength_error@std@@YAXPEBD@Z -@ stub ?_Xmem@tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xout_of_range@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xout_of_range@std@@YAXPEBD@Z +@ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument +@ cdecl -arch=win64 ?_Xinvalid_argument@std@@YAXPEBD@Z(str) _Xinvalid_argument +@ cdecl -arch=win32 ?_Xlength_error@std@@YAXPBD@Z(str) _Xlength_error +@ cdecl -arch=win64 ?_Xlength_error@std@@YAXPEBD@Z(str) _Xlength_error +@ cdecl ?_Xmem@tr1@std@@YAXXZ() _Xmem +@ cdecl -arch=win32 ?_Xout_of_range@std@@YAXPBD@Z(str) _Xout_of_range +@ cdecl -arch=win64 ?_Xout_of_range@std@@YAXPEBD@Z(str) _Xout_of_range @ stub -arch=win32 ?_Xoverflow_error@std@@YAXPBD@Z @ stub -arch=win64 ?_Xoverflow_error@std@@YAXPEBD@Z -@ stub -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z +@ cdecl -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z(str) _Xruntime_error +@ cdecl -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z(str) _Xruntime_error @ thiscall -arch=win32 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=win32 ?bad@ios_base@std@@QBE_NXZ(ptr) ios_base_bad

1 0

Nikolay Sivov : msxml3: Initialize body pointer and size for unknown types (Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 2684eee0b243c3e7977c9c3a8582ac49d8215604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2684eee0b243c3e7977c9c3a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:52:53 2012 -0500 msxml3: Initialize body pointer and size for unknown types (Coverity). --- dlls/msxml3/httprequest.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3f02337..7fbb836 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -699,14 +699,14 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * size++; break; } + default: + FIXME("unsupported body data type %d\n", V_VT(body)); + /* fall through */ case VT_EMPTY: case VT_ERROR: ptr = NULL; size = 0; break; - default: - FIXME("unsupported body data type %d\n", V_VT(body)); - break; } bsc->body = GlobalAlloc(GMEM_FIXED, size);

1 0

Nikolay Sivov : msxml3: Fix a leak on error path.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 00484ed942b6d499eb524b7727a567d37c0015f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00484ed942b6d499eb524b772… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:35:19 2012 -0500 msxml3: Fix a leak on error path. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 3aafc44..3c84e09 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -598,6 +598,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk); if(FAILED(hres)) { ERR("Could not get iface: %08x\n", hres); + ITypeInfo_Release(ti); return E_FAIL; }

1 0

Nikolay Sivov : msxml3: Revert "msxml3: AddRef() typeinfo pointers only when we have to.".
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: f929611a68e2cd659aebdcca88b96b49e9c4f85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f929611a68e2cd659aebdcca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:32:38 2012 -0500 msxml3: Revert "msxml3: AddRef() typeinfo pointers only when we have to.". This reverts commit 6e566ce6c24186174ab9c5370a3ffbeccb8389a1. --- dlls/msxml3/dispex.c | 14 ++++++++------ dlls/msxml3/httprequest.c | 30 ++++++++++++++++++------------ dlls/msxml3/mxwriter.c | 17 +++++++++-------- dlls/msxml3/node.c | 14 ++++++++++---- dlls/msxml3/saxreader.c | 28 ++++++++++++++++++++-------- dlls/msxml3/xmldoc.c | 15 +++++++++------ dlls/msxml3/xmlelem.c | 14 ++++++++++---- 7 files changed, 84 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f929611a68e2cd659aebd…

1 0

Nikolay Sivov : oledb32: Properly free property sets and propinfo sets ( Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 75cc571fabd101bace788a67c3e3a2cfdadd199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc571fabd101bace788a67c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 08:22:55 2012 -0500 oledb32: Properly free property sets and propinfo sets (Coverity). --- dlls/oledb32/datainit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b53e08a..a191c88 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -355,8 +355,8 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) VariantClear(&propset[i].rgProperties[p].vValue); CoTaskMemFree(&propset[i].rgProperties[p]); } - CoTaskMemFree(&propset[i]); } + CoTaskMemFree(propset); } static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) @@ -372,8 +372,8 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); } - CoTaskMemFree(&propinfoset[i]); } + CoTaskMemFree(propinfoset); } static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource,

1 0

Nikolay Sivov : dwrite: Handle allocation error (Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 0e179e08b67f3d7b69e1a258fd0e8318f8f6f3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e179e08b67f3d7b69e1a258f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:38:21 2012 -0500 dwrite: Handle allocation error (Coverity). --- dlls/dwrite/font.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7d332b7..0ec581b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -930,6 +930,13 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) ret = GetOutlineTextMetricsW(hdc, 0, NULL); otm = heap_alloc(ret); + if (!otm) + { + heap_free(This); + DeleteDC(hdc); + DeleteObject(hfont); + return E_OUTOFMEMORY; + } otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm);

1 0

← Newer
1
2
3
4
5
6
7
8
...
71
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 November 2012