November 2012 - Wine-commits

Nikolay Sivov : xmllite: Store remaining reader input parameters.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: dc2fe2a4bec08235b124950a8501a38ee7f14355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2fe2a4bec08235b124950a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 23:33:55 2012 -0500 xmllite: Store remaining reader input parameters. --- dlls/xmllite/reader.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1970ac8..3f22152 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -29,6 +29,7 @@ #include "xmllite_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -73,6 +74,9 @@ typedef struct _xmlreaderinput /* reference passed on IXmlReaderInput creation, is kept when input is created */ IUnknown *input; IMalloc *imalloc; + xml_encoding encoding; + BOOL hint; + WCHAR *baseuri; /* stream reference set after SetInput() call from reader, stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ @@ -161,6 +165,21 @@ static inline void readerinput_free(xmlreaderinput *input, void *mem) return m_free(input->imalloc, mem); } +static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = readerinput_alloc(input, size); + if (ret) memcpy(ret, str, size); + } + + return ret; +} + static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) { const int initial_len = 0x2000; @@ -195,6 +214,32 @@ static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) return S_OK; } +static xml_encoding parse_encoding_name(const WCHAR *encoding) +{ + int min, max, n, c; + + if (!encoding) return XmlEncoding_Unknown; + + min = 0; + max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + + while (min <= max) + { + n = (min+max)/2; + + c = strcmpiW(xml_encoding_map[n].encoding, encoding); + if (!c) + return xml_encoding_map[n].enc; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return XmlEncoding_Unknown; +} + static HRESULT alloc_input_buffer(xmlreaderinput *input) { input_buffer *buffer; @@ -688,6 +733,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) if (This->input) IUnknown_Release(This->input); if (This->stream) ISequentialStream_Release(This->stream); if (This->buffer) free_input_buffer(This->buffer); + readerinput_free(This, This->baseuri); readerinput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -747,7 +793,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, xmlreaderinput *readerinput; HRESULT hr; - FIXME("%p %p %s %d %s %p: stub\n", stream, imalloc, wine_dbgstr_w(encoding), + TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); if (!stream || !ppInput) return E_INVALIDARG; @@ -763,6 +809,9 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->imalloc = imalloc; readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); + readerinput->encoding = parse_encoding_name(encoding); + readerinput->hint = hint; + readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); hr = alloc_input_buffer(readerinput); if (hr != S_OK)

1 0

Nikolay Sivov : odbc32: Implement SQLDataSourcesA() forward.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: b5ee2079e22d4e2ff4175471e9780b1d88d3f197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ee2079e22d4e2ff4175471e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 22:56:50 2012 -0500 odbc32: Implement SQLDataSourcesA() forward. --- dlls/odbc32/odbc32.spec | 2 +- dlls/odbc32/proxyodbc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index 8e54e2b..766eec0 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -150,7 +150,7 @@ 254 stub SQLTablesA 255 stub SQLBrowseConnectA 256 stub SQLColumnPrivilegesA -257 stub SQLDataSourcesA +257 stdcall SQLDataSourcesA(long long str long ptr str long ptr) 260 stub SQLForeignKeysA 262 stub SQLNativeSqlA 265 stub SQLPrimaryKeysA diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 50a2f99..10adf16 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -75,6 +75,7 @@ static SQLRETURN (*pSQLConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLIN static SQLRETURN (*pSQLConnectW)(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); static SQLRETURN (*pSQLCopyDesc)(SQLHDESC,SQLHDESC); static SQLRETURN (*pSQLDataSources)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); +static SQLRETURN (*pSQLDataSourcesA)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); static SQLRETURN (*pSQLDataSourcesW)(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); static SQLRETURN (*pSQLDescribeCol)(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLUINTEGER*,SQLSMALLINT*,SQLSMALLINT*); static SQLRETURN (*pSQLDescribeColW)(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*); @@ -584,6 +585,7 @@ static BOOL ODBC_LoadDMFunctions(void) LOAD_FUNC(SQLConnectW); LOAD_FUNC(SQLCopyDesc); LOAD_FUNC(SQLDataSources); + LOAD_FUNC(SQLDataSourcesA); LOAD_FUNC(SQLDataSourcesW); LOAD_FUNC(SQLDescribeCol); LOAD_FUNC(SQLDescribeColW); @@ -969,6 +971,32 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, return ret; } +SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) +{ + SQLRETURN ret; + + TRACE("EnvironmentHandle = %p\n", (void*)EnvironmentHandle); + + if (!pSQLDataSourcesA) return SQL_ERROR; + + ret = pSQLDataSourcesA(EnvironmentHandle, Direction, ServerName, + BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + if (TRACE_ON(odbc)) + { + TRACE("returns: %d \t", ret); + if (NameLength1 && *NameLength1 > 0) + TRACE("DataSource = %s,", ServerName); + if (NameLength2 && *NameLength2 > 0) + TRACE(" Description = %s", Description); + TRACE("\n"); + } + + return ret; +} /************************************************************************* * SQLDescribeCol [ODBC32.008]

1 0

Nikolay Sivov : oledb32: Implement IDataInitialize::CreateDBInstance.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: d587a1f102c1ac2a16839a079834a630376c3fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d587a1f102c1ac2a16839a079… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 23:27:30 2012 -0500 oledb32: Implement IDataInitialize::CreateDBInstance. --- dlls/oledb32/datainit.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 862c725..b990dd8 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -298,15 +298,16 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I return E_NOTIMPL; } -static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID clsidProvider, - IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, REFIID riid, - IUnknown **ppDataSource) +static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID provider, + IUnknown *outer, DWORD clsctx, LPWSTR reserved, REFIID riid, + IUnknown **datasource) { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->()\n", This); + TRACE("(%p)->(%s %p 0x%08x %s %s %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved), + debugstr_guid(riid), datasource); - return E_NOTIMPL; + return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource); } static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider,

1 0

André Hentschel : advpack: Fix possible NULL pointer access in heap_strdupWtoA.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: bafe54e7e515d88cd3cd3a7b7cdb64222fe9afd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafe54e7e515d88cd3cd3a7b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:49:49 2012 +0100 advpack: Fix possible NULL pointer access in heap_strdupWtoA. --- dlls/advpack/advpack_private.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index a1bcfe4..5d74897 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -44,7 +44,8 @@ static inline char *heap_strdupWtoA(const WCHAR *str) if(str) { size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

André Hentschel : dwrite: Fix possible NULL pointer access in heap_strdup*.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 7e2cac2602e1b7f894ffa7a61b0f8600d4dbddbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2cac2602e1b7f894ffa7a61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:26 2012 +0100 dwrite: Fix possible NULL pointer access in heap_strdup*. --- dlls/dwrite/dwrite_private.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 54ae0dc..0c2698e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -47,7 +47,8 @@ static inline LPWSTR heap_strdupW(const WCHAR *str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -60,8 +61,11 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) if (len) { ret = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(ret, str, len*sizeof(WCHAR)); - ret[len] = 0; + if(ret) + { + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } } return ret;

1 0

André Hentschel : jscript: Fix possible NULL pointer access in heap_strdupW.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 6804ae26fbee19603beb6b310f53eb07c48145cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6804ae26fbee19603beb6b310… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:29 2012 +0100 jscript: Fix possible NULL pointer access in heap_strdupW. --- dlls/jscript/jscript.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6b7c5a1..0ab2e06 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -84,7 +84,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret;

1 0

André Hentschel : mshtml: Fix possible NULL pointer access in heap_str*.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: e9bfe83683266edcc2917e3d151254aefd4b070d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bfe83683266edcc2917e3d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:32 2012 +0100 mshtml: Fix possible NULL pointer access in heap_str*. --- dlls/mshtml/mshtml_private.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6c7662e..f9c05f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1033,7 +1033,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -1045,8 +1046,11 @@ static inline LPWSTR heap_strndupW(LPCWSTR str, unsigned len) if(str) { ret = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(ret, str, len*sizeof(WCHAR)); - ret[len] = 0; + if(ret) + { + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } } return ret; @@ -1061,7 +1065,8 @@ static inline char *heap_strdupA(const char *str) size = strlen(str)+1; ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -1076,7 +1081,8 @@ static inline WCHAR *heap_strdupAtoW(const char *str) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); } return ret; @@ -1089,7 +1095,8 @@ static inline char *heap_strdupWtoA(LPCWSTR str) if(str) { DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

André Hentschel : msxml3: Fix possible NULL pointer access in heap_strdupW.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: c02b84d3c5f041942a46d5e87d9965a5e86989ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02b84d3c5f041942a46d5e87… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:35 2012 +0100 msxml3: Fix possible NULL pointer access in heap_strdupW. --- dlls/msxml3/msxml_private.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 503a580..66baea8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -194,7 +194,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret;

1 0

André Hentschel : urlmon: Fix possible NULL pointer access in heap_strdup*.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 78b08cdabdc1ef6123d7d21b8d7b84809fb2b8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b08cdabdc1ef6123d7d21b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:38 2012 +0100 urlmon: Fix possible NULL pointer access in heap_strdup*. --- dlls/urlmon/urlmon_main.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 2d51818..01de984 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -261,7 +261,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -289,7 +290,8 @@ static inline LPWSTR heap_strdupAtoW(const char *str) if(str) { DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); } return ret; @@ -302,7 +304,8 @@ static inline char *heap_strdupWtoA(const WCHAR *str) if(str) { size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

Piotr Caban : msvcp60: Fixed basic_string::_Tidy implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 3a7a1d7125378aaca255149792c0d3b1ce39193e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7a1d7125378aaca25514979… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:17 2012 +0100 msvcp60: Fixed basic_string::_Tidy implementation. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2b890fa..5b0b358 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -166,7 +166,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) - MSVCP_allocator_char_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--; @@ -1882,7 +1882,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu if(!this->ptr || !built); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) - MSVCP_allocator_wchar_deallocate(NULL, this->ptr, this->res+2); + MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--;

1 0