November 2012 - Wine-Commits

Jacek Caban : mshtml: Use stdint.h type names in nsiface.idl.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 96ace8636a307e30144df074c6906bb978ffbf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8636a307e30144df074c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 15:29:21 2012 +0100 mshtml: Use stdint.h type names in nsiface.idl. Gecko uses stdint.h types instead of NSPR types for most of the codebase now. --- dlls/mshtml/nsiface.idl | 934 ++++++++++++++++++++++++----------------------- 1 files changed, 475 insertions(+), 459 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96ace8636a307e30144df…

1 0

Nikolay Sivov : oledb32: Implement IDataInitialize::GetInitializationString .
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 92013d7bd263ff07db15d38d23cc01f1c4ee06fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=92013d7bd263ff07db15d38d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 20 12:40:28 2012 -0500 oledb32: Implement IDataInitialize::GetInitializationString. --- dlls/oledb32/datainit.c | 199 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 194 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b990dd8..b53e08a 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -27,13 +27,15 @@ #include "ole2.h" #include "msdasc.h" #include "oledberr.h" - +#include "initguid.h" #include "oledb_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit { @@ -288,14 +290,201 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *p return E_NOTIMPL; } -static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *pDataSource, - boolean fIncludePassword, LPWSTR *ppwszInitString) +/* returns character length of string representation */ +static int get_propvalue_length(DBPROP *prop) +{ + VARIANT str; + HRESULT hr; + + if (V_VT(&prop->vValue) == VT_BSTR) return SysStringLen(V_BSTR(&prop->vValue)); + + VariantInit(&str); + hr = VariantChangeType(&str, &prop->vValue, 0, VT_BSTR); + if (hr == S_OK) + { + int len = SysStringLen(V_BSTR(&str)); + VariantClear(&str); + return len; + } + + return 0; +} + +static void write_propvalue_str(WCHAR *str, DBPROP *prop) +{ + VARIANT *v = &prop->vValue; + VARIANT vstr; + HRESULT hr; + + if (V_VT(v) == VT_BSTR) + { + strcatW(str, V_BSTR(v)); + return; + } + + VariantInit(&vstr); + hr = VariantChangeType(&vstr, v, VARIANT_ALPHABOOL, VT_BSTR); + if (hr == S_OK) + { + strcatW(str, V_BSTR(&vstr)); + VariantClear(&vstr); + } +} + +static WCHAR *get_propinfo_descr(DBPROP *prop, DBPROPINFOSET *propinfoset) { + int i; + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + if (propinfoset->rgPropertyInfos[i].dwPropertyID == prop->dwPropertyID) + return propinfoset->rgPropertyInfos[i].pwszDescription; + + return NULL; +} + +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + int i; + + for (i = 0; i < count; i++) + { + int p; + + for (p = 0; p < propset[i].cProperties; p++) + { + VariantClear(&propset[i].rgProperties[p].vValue); + CoTaskMemFree(&propset[i].rgProperties[p]); + } + CoTaskMemFree(&propset[i]); + } +} + +static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) +{ + int i; + + for (i = 0; i < count; i++) + { + int p; + + for (p = 0; p < propinfoset[i].cPropertyInfos; p++) + { + VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); + CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); + } + CoTaskMemFree(&propinfoset[i]); + } +} + +static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource, + boolean include_pass, LPWSTR *init_string) +{ + static const WCHAR provW[] = {'P','r','o','v','i','d','e','r','=',0}; + static const WCHAR colW[] = {';',0}; datainit *This = impl_from_IDataInitialize(iface); + DBPROPINFOSET *propinfoset; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG count, infocount; + WCHAR *progid, *desc; + DBPROPSET *propset; + IPersist *persist; + HRESULT hr; + CLSID clsid; + int i, len; + + TRACE("(%p)->(%p %d %p)\n", This, datasource, include_pass, init_string); + + /* IPersist support is mandatory for data sources */ + hr = IUnknown_QueryInterface(datasource, &IID_IPersist, (void**)&persist); + if (FAILED(hr)) return hr; + + memset(&clsid, 0, sizeof(clsid)); + hr = IPersist_GetClassID(persist, &clsid); + IPersist_Release(persist); + if (FAILED(hr)) return hr; + + progid = NULL; + ProgIDFromCLSID(&clsid, &progid); + TRACE("clsid=%s, progid=%s\n", debugstr_guid(&clsid), debugstr_w(progid)); + + /* now get initialization properties */ + hr = IUnknown_QueryInterface(datasource, &IID_IDBProperties, (void**)&props); + if (FAILED(hr)) + { + WARN("IDBProperties not supported\n"); + CoTaskMemFree(progid); + return hr; + } - FIXME("(%p)->(%p %d %p)\n", This, pDataSource, fIncludePassword, ppwszInitString); + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINIT; + propset = NULL; + count = 0; + hr = IDBProperties_GetProperties(props, 1, &propidset, &count, &propset); + if (FAILED(hr)) + { + WARN("failed to get data source properties, 0x%08x\n", hr); + CoTaskMemFree(progid); + return hr; + } - return E_NOTIMPL; + infocount = 0; + IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + IDBProperties_Release(props); + + /* check if we need to skip password */ + len = strlenW(progid) + strlenW(provW) + 1; /* including ';' */ + for (i = 0; i < count; i++) + { + WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); + if (descr) + { + /* include '=' and ';' */ + len += strlenW(descr) + 2; + len += get_propvalue_length(&propset->rgProperties[i]); + } + + if ((propset->rgProperties[i].dwPropertyID == DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO) && + (V_BOOL(&propset->rgProperties[i].vValue) == VARIANT_FALSE)) + include_pass = FALSE; + } + + len *= sizeof(WCHAR); + *init_string = CoTaskMemAlloc(len); + *init_string[0] = 0; + + /* provider name */ + strcatW(*init_string, provW); + strcatW(*init_string, progid); + strcatW(*init_string, colW); + CoTaskMemFree(progid); + + for (i = 0; i < count; i++) + { + WCHAR *descr; + + if (!include_pass && propset->rgProperties[i].dwPropertyID == DBPROP_AUTH_PASSWORD) continue; + + descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); + if (descr) + { + static const WCHAR eqW[] = {'=',0}; + strcatW(*init_string, descr); + strcatW(*init_string, eqW); + write_propvalue_str(*init_string, &propset->rgProperties[i]); + strcatW(*init_string, colW); + } + } + + free_dbpropset(count, propset); + free_dbpropinfoset(infocount, propinfoset); + CoTaskMemFree(desc); + + if (!include_pass) + TRACE("%s\n", debugstr_w(*init_string)); + return S_OK; } static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID provider,

1 0

Alexandre Julliard : odbc32: Fix some data types for 64-bit.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 1ce71ab7d85629f3cc98bc51d7ca0b0d5bc90b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce71ab7d85629f3cc98bc51d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 13:22:05 2012 +0100 odbc32: Fix some data types for 64-bit. --- dlls/odbc32/proxyodbc.c | 44 ++++++++++++++++++++++---------------------- include/sqltypes.h | 23 ++++++++++------------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 10adf16..c7a5038 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -688,7 +688,7 @@ static BOOL ODBC_LoadDMFunctions(void) SQLRETURN WINAPI SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionHandle) { SQLRETURN ret; - TRACE("Env=%lx\n",EnvironmentHandle); + TRACE("Env=%p\n",EnvironmentHandle); if (!pSQLAllocConnect) { @@ -698,7 +698,7 @@ SQLRETURN WINAPI SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionH } ret = pSQLAllocConnect(EnvironmentHandle, ConnectionHandle); - TRACE("Returns ret=%d, Handle %lx\n",ret, *ConnectionHandle); + TRACE("Returns ret=%d, Handle %p\n",ret, *ConnectionHandle); return ret; } @@ -719,7 +719,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle) } ret = pSQLAllocEnv(EnvironmentHandle); - TRACE("Returns ret=%d, Env=%lx\n",ret, *EnvironmentHandle); + TRACE("Returns ret=%d, Env=%p\n",ret, *EnvironmentHandle); return ret; } @@ -730,7 +730,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle) SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { SQLRETURN ret; - TRACE("(Type=%d, Handle=%lx)\n",HandleType,InputHandle); + TRACE("(Type=%d, Handle=%p)\n",HandleType,InputHandle); if (!pSQLAllocHandle) { @@ -751,7 +751,7 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S } ret = pSQLAllocHandle(HandleType, InputHandle, OutputHandle); - TRACE("Returns ret=%d, Handle=%lx\n",ret, *OutputHandle); + TRACE("Returns ret=%d, Handle=%p\n",ret, *OutputHandle); return ret; } @@ -763,7 +763,7 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandl { SQLRETURN ret; - TRACE("(Connection=%lx)\n",ConnectionHandle); + TRACE("(Connection=%p)\n",ConnectionHandle); if (!pSQLAllocStmt) { @@ -773,7 +773,7 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandl } ret = pSQLAllocStmt(ConnectionHandle, StatementHandle); - TRACE ("Returns ret=%d, Handle=%lx\n", ret, *StatementHandle); + TRACE ("Returns ret=%d, Handle=%p\n", ret, *StatementHandle); return ret; } @@ -864,7 +864,7 @@ SQLRETURN WINAPI SQLCancel(SQLHSTMT StatementHandle) SQLRETURN WINAPI SQLCloseCursor(SQLHSTMT StatementHandle) { SQLRETURN ret; - TRACE("(Handle=%lx)\n",StatementHandle); + TRACE("(Handle=%p)\n",StatementHandle); if (!pSQLCloseCursor) return SQL_ERROR; @@ -951,7 +951,7 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, { SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", (LPVOID)EnvironmentHandle); + TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); if (!pSQLDataSources) return SQL_ERROR; @@ -979,7 +979,7 @@ SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle, { SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", (void*)EnvironmentHandle); + TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); if (!pSQLDataSourcesA) return SQL_ERROR; @@ -1021,7 +1021,7 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle) { SQLRETURN ret; - TRACE("(Handle=%lx)\n", ConnectionHandle); + TRACE("(Handle=%p)\n", ConnectionHandle); if (!pSQLDisconnect) return SQL_ERROR; @@ -1114,7 +1114,7 @@ SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrien SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle) { SQLRETURN ret; - TRACE("(Handle=%lx)\n",ConnectionHandle); + TRACE("(Handle=%p)\n",ConnectionHandle); if (!pSQLFreeConnect) return SQL_ERROR; @@ -1130,7 +1130,7 @@ SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle) SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) { SQLRETURN ret; - TRACE("(Env=%lx)\n",EnvironmentHandle); + TRACE("(Env=%p)\n",EnvironmentHandle); if (!pSQLFreeEnv) return SQL_ERROR; @@ -1146,7 +1146,7 @@ SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) { SQLRETURN ret; - TRACE("(Type=%d, Handle=%lx)\n",HandleType,Handle); + TRACE("(Type=%d, Handle=%p)\n",HandleType,Handle); if (!pSQLFreeHandle) return SQL_ERROR; @@ -1162,7 +1162,7 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option) { SQLRETURN ret; - TRACE("(Handle %lx, Option=%d)\n",StatementHandle, Option); + TRACE("(Handle %p, Option=%d)\n",StatementHandle, Option); if (!pSQLFreeStmt) return SQL_ERROR; @@ -2039,7 +2039,7 @@ SQLRETURN WINAPI SQLColAttributesW( { SQLRETURN iResult; - TRACE("hstmt=0x%08lx icol=%d fDescType=%d rgbDesc=%p cbDescMax=%d pcbDesc=%p pfDesc=%p\n", + TRACE("hstmt=%p icol=%d fDescType=%d rgbDesc=%p cbDescMax=%d pcbDesc=%p pfDesc=%p\n", hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); if (!pSQLColAttributesW) return SQL_ERROR; @@ -2085,7 +2085,7 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, WCHAR *ColumnName, SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { SQLRETURN iResult; @@ -2182,7 +2182,7 @@ SQLRETURN WINAPI SQLColAttributeW (SQLHSTMT StatementHandle, { SQLRETURN iResult; - TRACE("StatementHandle=0x%08lx ColumnNumber=%d FieldIdentifier=%d CharacterAttribute=%p BufferLength=%d StringLength=%p NumericAttribute=%p\n", + TRACE("StatementHandle=%p ColumnNumber=%d FieldIdentifier=%d CharacterAttribute=%p BufferLength=%d StringLength=%p NumericAttribute=%p\n", StatementHandle, ColumnNumber, FieldIdentifier, CharacterAttribute, BufferLength, StringLength, NumericAttribute); @@ -2240,7 +2240,7 @@ SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, WCHAR *Name, SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT *Type, SQLSMALLINT *SubType, - SQLINTEGER *Length, SQLSMALLINT *Precision, + SQLLEN *Length, SQLSMALLINT *Precision, SQLSMALLINT *Scale, SQLSMALLINT *Nullable) { TRACE("\n"); @@ -2289,7 +2289,7 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, { SQLRETURN iResult; - TRACE("Attribute = (%02ld) Value = %p BufferLength = (%ld) StringLength = %p\n", + TRACE("Attribute = (%02d) Value = %p BufferLength = (%d) StringLength = %p\n", Attribute, Value, BufferLength, StringLength); if (Value == NULL) { @@ -2507,7 +2507,7 @@ SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, { SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", (LPVOID)EnvironmentHandle); + TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); if (!pSQLDataSourcesW) return SQL_ERROR; @@ -2689,7 +2689,7 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER StringLength) { SQLRETURN iResult; - TRACE("Attribute = (%02ld) Value = %p StringLength = (%ld)\n", + TRACE("Attribute = (%02d) Value = %p StringLength = (%d)\n", Attribute, Value, StringLength); if (!pSQLSetStmtAttrW) return SQL_ERROR; diff --git a/include/sqltypes.h b/include/sqltypes.h index 5c8f3ca..4f3f8fe 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -46,7 +46,7 @@ typedef double SQLDOUBLE; typedef double SQLFLOAT; #endif -typedef long SQLINTEGER; +typedef int SQLINTEGER; #if (ODBCVER >= 0x0300) typedef unsigned char SQLNUMERIC; @@ -69,27 +69,23 @@ typedef unsigned char SQLVARCHAR; typedef SQLSMALLINT SQLRETURN; -/* typedef void * SQLHANDLE; */ - -typedef SQLINTEGER SQLHANDLE; #if (ODBCVER >= 0x0300) - +typedef void *SQLHANDLE; typedef SQLHANDLE SQLHENV; typedef SQLHANDLE SQLHDBC; typedef SQLHANDLE SQLHSTMT; typedef SQLHANDLE SQLHDESC; - #else -typedef SQLINTEGER SQLHENV; -typedef SQLINTEGER SQLHDBC; -typedef SQLINTEGER SQLHSTMT; +typedef void *SQLHENV; +typedef void *SQLHDBC; +typedef void *SQLHSTMT; #endif typedef signed char SCHAR; typedef SCHAR SQLSCHAR; -typedef long int SDWORD; +typedef int SDWORD; typedef signed short int SWORD; -typedef unsigned long int UDWORD; +typedef unsigned int UDWORD; typedef unsigned short int UWORD; typedef UDWORD SQLUINTEGER; typedef signed long SLONG; @@ -207,7 +203,8 @@ typedef struct tagSQL_INTERVAL_STRUCT #endif #if (ODBCVER >= 0x0300) -#define ODBCINT64 long +#define ODBCINT64 __int64 +#define UODBCINT64 unsigned __int64 #ifdef ODBCINT64 typedef ODBCINT64 SQLBIGINT; typedef unsigned ODBCINT64 SQLUBIGINT; @@ -240,7 +237,7 @@ typedef struct tagSQLGUID #endif -typedef unsigned long int BOOKMARK; +typedef SQLULEN BOOKMARK; #define SQL_WCHAR (-8) #define SQL_C_WCHAR SQL_WCHAR

1 0

Daniel Jelinski : xolehlp: Add some stubs.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: da87b102e07a0eafa87d283541ad43f55926a030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da87b102e07a0eafa87d28354… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Nov 3 23:43:36 2012 +0100 xolehlp: Add some stubs. --- dlls/xolehlp/xolehlp.c | 24 ++++++++++++++++++++++++ dlls/xolehlp/xolehlp.spec | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 3b970ef..9573744 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -39,3 +39,27 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, + DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) +{ + FIXME("(%s, %s, %s, %d, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), + debugstr_guid(riid), dwReserved1, wcbReserved2, pvReserved2, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, + DWORD options, void *config, void **ppv) +{ + FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), + debugstr_guid(riid), options, config, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, + DWORD options, void *config, void **ppv) +{ + FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_w(host), debugstr_w(tm_name), + debugstr_guid(riid), options, config, ppv); + return E_NOTIMPL; +} diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec index f774542..0b149de 100644 --- a/dlls/xolehlp/xolehlp.spec +++ b/dlls/xolehlp/xolehlp.spec @@ -1,6 +1,6 @@ @ stub GetDtcLocaleResourceHandle -@ stub DtcGetTransactionManager +@ stdcall DtcGetTransactionManager(str str ptr long long ptr ptr) @ stub DtcGetTransactionManagerEx @ stub DtcGetTransactionManagerC -@ stub DtcGetTransactionManagerExA -@ stub DtcGetTransactionManagerExW +@ stdcall DtcGetTransactionManagerExA(str str ptr long ptr ptr) +@ stdcall DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr)

1 0

Dmitry Timoshkov : windowscodecs: Test QueryCapability of the TIFF decoder.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: a98fe810a4af56626bc5c1475eb8032a137d6389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98fe810a4af56626bc5c1475… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 20 18:37:08 2012 +0800 windowscodecs: Test QueryCapability of the TIFF decoder. --- dlls/windowscodecs/tests/tiffformat.c | 148 ++++++++++++++++++++++++++++----- 1 files changed, 128 insertions(+), 20 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 0874053..9b5db52 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -94,6 +94,8 @@ static const struct tiff_1bpp_data }; #include "poppack.h" +static IWICImagingFactory *factory; + static const char *debugstr_guid(const GUID *guid) { static char buf[50]; @@ -106,23 +108,35 @@ static const char *debugstr_guid(const GUID *guid) return buf; } -static IWICBitmapDecoder *create_decoder(IWICImagingFactory *factory, - const void *image_data, UINT image_size) +static IStream *create_stream(const void *data, int data_size) { - HGLOBAL hmem; - BYTE *data; HRESULT hr; - IWICBitmapDecoder *decoder = NULL; IStream *stream; - GUID guid; + HGLOBAL hdata; + void *locked_data; + + hdata = GlobalAlloc(GMEM_MOVEABLE, data_size); + ok(hdata != 0, "GlobalAlloc failed\n"); + if (!hdata) return NULL; - hmem = GlobalAlloc(0, image_size); - data = GlobalLock(hmem); - memcpy(data, image_data, image_size); - GlobalUnlock(hmem); + locked_data = GlobalLock(hdata); + memcpy(locked_data, data, data_size); + GlobalUnlock(hdata); - hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + hr = CreateStreamOnHGlobal(hdata, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed, hr=%x\n", hr); + + return stream; +} + +static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +{ + HRESULT hr; + IStream *stream; + IWICBitmapDecoder *decoder = NULL; + GUID guid; + + stream = create_stream(image_data, image_size); hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); @@ -139,19 +153,14 @@ static IWICBitmapDecoder *create_decoder(IWICImagingFactory *factory, static void test_tiff_palette(void) { HRESULT hr; - IWICImagingFactory *factory; IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICPalette *palette; GUID format; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); - ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - if (FAILED(hr)) return; - - decoder = create_decoder(factory, &tiff_1bpp_data, sizeof(tiff_1bpp_data)); + decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); ok(decoder != 0, "Failed to load TIFF image data\n"); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -169,14 +178,113 @@ static void test_tiff_palette(void) IWICPalette_Release(palette); IWICBitmapFrameDecode_Release(frame); IWICBitmapDecoder_Release(decoder); - IWICImagingFactory_Release(factory); +} + +static void test_QueryCapability(void) +{ + HRESULT hr; + IStream *stream; + IWICBitmapDecoder *decoder; + static const DWORD exp_caps = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + static const DWORD exp_caps_xp = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages; + DWORD capability; + LARGE_INTEGER pos; + ULARGE_INTEGER cur_pos; + UINT frame_count; + + stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); + if (!stream) return; + + hr = IWICImagingFactory_CreateDecoder(factory, &GUID_ContainerFormatTiff, NULL, &decoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + + frame_count = 0xdeadbeef; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); +todo_wine + ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); +todo_wine + ok(frame_count == 0, "expected 0, got %u\n", frame_count); + + pos.QuadPart = 4; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + capability = 0xdeadbeef; + hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); +todo_wine + ok(hr == S_OK, "QueryCapability error %#x\n", hr); +todo_wine + ok(capability == exp_caps || capability == exp_caps_xp, + "expected %#x, got %#x\n", exp_caps, capability); + + frame_count = 0xdeadbeef; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); +todo_wine + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); +todo_wine + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); +todo_wine + ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), + "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); + + hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); +todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); + + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); +todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); + + IWICBitmapDecoder_Release(decoder); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); +todo_wine + ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + frame_count = 0xdeadbeef; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); + + hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); +todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); + + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); } START_TEST(tiffformat) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + test_tiff_palette(); + test_QueryCapability(); + IWICImagingFactory_Release(factory); CoUninitialize(); }

1 0

Alexandre Julliard : comctl32/pager: Use DrawFrameControl to paint the buttons.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: f3b8e68296767f77da98f944d332fc996a047e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b8e68296767f77da98f944d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 16:01:47 2012 +0100 comctl32/pager: Use DrawFrameControl to paint the buttons. --- dlls/comctl32/pager.c | 173 ++++++------------------------------------------- 1 files changed, 20 insertions(+), 153 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index e1420e0..c270723 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -84,9 +84,6 @@ typedef struct INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ } PAGER_INFO; -#define MIN_ARROW_WIDTH 8 -#define MIN_ARROW_HEIGHT 5 - #define TIMERID1 1 #define TIMERID2 2 #define INITIAL_DELAY 500 @@ -116,115 +113,13 @@ PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBotto } } -/* the horizontal arrows are: - * - * 01234 01234 - * 1 * * - * 2 ** ** - * 3*** *** - * 4*** *** - * 5 ** ** - * 6 * * - * 7 - * - */ -static void -PAGER_DrawHorzArrow (HDC hdc, RECT r, INT colorRef, BOOL left) -{ - INT x, y, w, h; - HPEN hPen, hOldPen; - - w = r.right - r.left + 1; - h = r.bottom - r.top + 1; - if ((h < MIN_ARROW_WIDTH) || (w < MIN_ARROW_HEIGHT)) - return; /* refuse to draw partial arrow */ - - if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return; - hOldPen = SelectObject ( hdc, hPen ); - if (left) - { - x = r.left + ((w - MIN_ARROW_HEIGHT) / 2) + 3; - y = r.top + ((h - MIN_ARROW_WIDTH) / 2) + 1; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x--, y+5); y++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x--, y+3); y++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x, y+1); - } - else - { - x = r.left + ((w - MIN_ARROW_HEIGHT) / 2) + 1; - y = r.top + ((h - MIN_ARROW_WIDTH) / 2) + 1; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x++, y+5); y++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x++, y+3); y++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x, y+1); - } - - SelectObject( hdc, hOldPen ); - DeleteObject( hPen ); -} - -/* the vertical arrows are: - * - * 01234567 01234567 - * 1****** ** - * 2 **** **** - * 3 ** ****** - * 4 - * - */ -static void -PAGER_DrawVertArrow (HDC hdc, RECT r, INT colorRef, BOOL up) -{ - INT x, y, w, h; - HPEN hPen, hOldPen; - - w = r.right - r.left + 1; - h = r.bottom - r.top + 1; - if ((h < MIN_ARROW_WIDTH) || (w < MIN_ARROW_HEIGHT)) - return; /* refuse to draw partial arrow */ - - if (!(hPen = CreatePen( PS_SOLID, 1, GetSysColor( colorRef )))) return; - hOldPen = SelectObject ( hdc, hPen ); - if (up) - { - x = r.left + ((w - MIN_ARROW_HEIGHT) / 2) + 1; - y = r.top + ((h - MIN_ARROW_WIDTH) / 2) + 3; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+5, y--); x++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+3, y--); x++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+1, y); - } - else - { - x = r.left + ((w - MIN_ARROW_HEIGHT) / 2) + 1; - y = r.top + ((h - MIN_ARROW_WIDTH) / 2) + 1; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+5, y++); x++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+3, y++); x++; - MoveToEx (hdc, x, y, NULL); - LineTo (hdc, x+1, y); - } - - SelectObject( hdc, hOldPen ); - DeleteObject( hPen ); -} - static void -PAGER_DrawButton(HDC hdc, COLORREF clrBk, RECT arrowRect, +PAGER_DrawButton(HDC hdc, COLORREF clrBk, RECT rc, BOOL horz, BOOL topLeft, INT btnState) { - HBRUSH hBrush, hOldBrush; - RECT rc = arrowRect; + UINT flags; - TRACE("arrowRect = %s, btnState = %d\n", wine_dbgstr_rect(&arrowRect), btnState); + TRACE("rc = %s, btnState = %d\n", wine_dbgstr_rect(&rc), btnState); if (btnState == PGF_INVISIBLE) return; @@ -232,54 +127,26 @@ PAGER_DrawButton(HDC hdc, COLORREF clrBk, RECT arrowRect, if ((rc.right - rc.left <= 0) || (rc.bottom - rc.top <= 0)) return; - hBrush = CreateSolidBrush(clrBk); - hOldBrush = SelectObject(hdc, hBrush); - - FillRect(hdc, &rc, hBrush); + if (horz) + flags = topLeft ? DFCS_SCROLLLEFT : DFCS_SCROLLRIGHT; + else + flags = topLeft ? DFCS_SCROLLUP : DFCS_SCROLLDOWN; - if (btnState == PGF_HOT) + switch (btnState) { - DrawEdge( hdc, &rc, BDR_RAISEDINNER, BF_RECT); - if (horz) - PAGER_DrawHorzArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - else - PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - } - else if (btnState == PGF_NORMAL) - { - DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT); - if (horz) - PAGER_DrawHorzArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - else - PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - } - else if (btnState == PGF_DEPRESSED) - { - DrawEdge( hdc, &rc, BDR_SUNKENOUTER, BF_RECT); - if (horz) - PAGER_DrawHorzArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - else - PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft); - } - else if (btnState == PGF_GRAYED) - { - DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT); - if (horz) - { - PAGER_DrawHorzArrow(hdc, rc, COLOR_3DHIGHLIGHT, topLeft); - rc.left++, rc.top++; rc.right++, rc.bottom++; - PAGER_DrawHorzArrow(hdc, rc, COLOR_3DSHADOW, topLeft); - } - else - { - PAGER_DrawVertArrow(hdc, rc, COLOR_3DHIGHLIGHT, topLeft); - rc.left++, rc.top++; rc.right++, rc.bottom++; - PAGER_DrawVertArrow(hdc, rc, COLOR_3DSHADOW, topLeft); - } + case PGF_HOT: + break; + case PGF_NORMAL: + flags |= DFCS_FLAT; + break; + case PGF_DEPRESSED: + flags |= DFCS_PUSHED; + break; + case PGF_GRAYED: + flags |= DFCS_INACTIVE | DFCS_FLAT; + break; } - - SelectObject( hdc, hOldBrush ); - DeleteObject(hBrush); + DrawFrameControl( hdc, &rc, DFC_SCROLL, flags ); } /* << PAGER_GetDropTarget >> */

1 0

Alexandre Julliard : comctl32/pager: Fix tracking of mouse position inside the buttons.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 7a78eed463903639f39458b23b6e8403963f8367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a78eed463903639f39458b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 16:02:09 2012 +0100 comctl32/pager: Fix tracking of mouse position inside the buttons. --- dlls/comctl32/pager.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index c270723..d541374 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -314,9 +314,10 @@ PAGER_UpdateBtns(PAGER_INFO *infoPtr, INT scrollRange, BOOL hideGrayBtns) RECT rcTopLeft, rcBottomRight; /* get button rects */ - PAGER_GetButtonRects(infoPtr, &rcTopLeft, &rcBottomRight, FALSE); + PAGER_GetButtonRects(infoPtr, &rcTopLeft, &rcBottomRight, TRUE); GetCursorPos(&pt); + ScreenToClient( infoPtr->hwndSelf, &pt ); /* update states based on scroll position */ if (infoPtr->nPos > 0) @@ -324,7 +325,7 @@ PAGER_UpdateBtns(PAGER_INFO *infoPtr, INT scrollRange, BOOL hideGrayBtns) if (infoPtr->TLbtnState == PGF_INVISIBLE || infoPtr->TLbtnState == PGF_GRAYED) infoPtr->TLbtnState = PGF_NORMAL; } - else if (PtInRect(&rcTopLeft, pt)) + else if (!hideGrayBtns && PtInRect(&rcTopLeft, pt)) infoPtr->TLbtnState = PGF_GRAYED; else infoPtr->TLbtnState = PGF_INVISIBLE; @@ -339,7 +340,7 @@ PAGER_UpdateBtns(PAGER_INFO *infoPtr, INT scrollRange, BOOL hideGrayBtns) if (infoPtr->BRbtnState == PGF_INVISIBLE || infoPtr->BRbtnState == PGF_GRAYED) infoPtr->BRbtnState = PGF_NORMAL; } - else if (PtInRect(&rcBottomRight, pt)) + else if (!hideGrayBtns && PtInRect(&rcBottomRight, pt)) infoPtr->BRbtnState = PGF_GRAYED; else infoPtr->BRbtnState = PGF_INVISIBLE;

1 0

Nikolay Sivov : oledb32: Implement IDataInitialize::CreateDBInstance.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

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

Henri Verbeet : d3d9/tests: Add tests for device resets in d3d9ex.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 2f307a14f0ccbf965b1022f768f3b617dedc56fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f307a14f0ccbf965b1022f76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:14 2012 +0100 d3d9/tests: Add tests for device resets in d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 480 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 480 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f307a14f0ccbf965b102…

1 0

Nikolay Sivov : xmllite: Initial support for reader input encoding detection.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: d693790175ac8c8d1b2ac88ac2026e9a10f3102d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d693790175ac8c8d1b2ac88ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 18:01:46 2012 -0500 xmllite: Initial support for reader input encoding detection. --- dlls/xmllite/reader.c | 123 ++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 11 +++- dlls/xmllite/xmllite_private.h | 5 ++ 3 files changed, 115 insertions(+), 24 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ae05057..188b419 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -117,6 +117,14 @@ static inline void *m_alloc(IMalloc *imalloc, size_t len) return heap_alloc(len); } +static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) +{ + if (imalloc) + return IMalloc_Realloc(imalloc, mem, len); + else + return heap_realloc(mem, len); +} + static inline void m_free(IMalloc *imalloc, void *mem) { if (imalloc) @@ -142,6 +150,11 @@ static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) return m_alloc(input->imalloc, len); } +static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t len) +{ + return m_realloc(input->imalloc, mem, len); +} + static inline void readerinput_free(xmlreaderinput *input, void *mem) { return m_free(input->imalloc, mem); @@ -165,7 +178,7 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) { const struct xml_encoding_data *data; @@ -176,12 +189,12 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) } data = &xml_encoding_map[encoding]; - *cp = data->cp; + input->buffer->code_page = data->cp; return S_OK; } -static HRESULT alloc_input_buffer(xmlreaderinput *input, xml_encoding encoding) +static HRESULT alloc_input_buffer(xmlreaderinput *input) { input_buffer *buffer; HRESULT hr; @@ -192,29 +205,20 @@ static HRESULT alloc_input_buffer(xmlreaderinput *input, xml_encoding encoding) if (!buffer) return E_OUTOFMEMORY; buffer->input = input; - hr = get_code_page(encoding, &buffer->code_page); + buffer->code_page = ~0; /* code page is unknown at this point */ + hr = init_encoded_buffer(input, &buffer->utf16); if (hr != S_OK) { readerinput_free(input, buffer); return hr; } - hr = init_encoded_buffer(input, &buffer->utf16); + hr = init_encoded_buffer(input, &buffer->encoded); if (hr != S_OK) { + free_encoded_buffer(input, &buffer->utf16); readerinput_free(input, buffer); return hr; } - if (encoding != XmlEncoding_UTF16) { - hr = init_encoded_buffer(input, &buffer->encoded); - if (hr != S_OK) { - free_encoded_buffer(input, &buffer->utf16); - readerinput_free(input, buffer); - return hr; - } - } - else - memset(&buffer->encoded, 0, sizeof(buffer->encoded)); - input->buffer = buffer; return S_OK; } @@ -226,7 +230,7 @@ static void free_input_buffer(input_buffer *buffer) readerinput_free(buffer->input, buffer); } -static void xmlreaderinput_release_stream(xmlreaderinput *readerinput) +static void readerinput_release_stream(xmlreaderinput *readerinput) { if (readerinput->stream) { ISequentialStream_Release(readerinput->stream); @@ -236,11 +240,11 @@ static void xmlreaderinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(xmlreaderinput *readerinput) +static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; - xmlreaderinput_release_stream(readerinput); + readerinput_release_stream(readerinput); hr = IUnknown_QueryInterface(readerinput->input, &IID_IStream, (void**)&readerinput->stream); if (hr != S_OK) hr = IUnknown_QueryInterface(readerinput->input, &IID_ISequentialStream, (void**)&readerinput->stream); @@ -248,6 +252,59 @@ static HRESULT xmlreaderinput_query_for_stream(xmlreaderinput *readerinput) return hr; } +/* reads a chunk to raw buffer */ +static HRESULT readerinput_growraw(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + ULONG len = buffer->allocated - buffer->written, read; + HRESULT hr; + + /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + variable width encodings like UTF-8 */ + len = (len + 3) & ~3; + /* try to use allocated space or grow */ + if (buffer->allocated - buffer->written < len) + { + buffer->allocated *= 2; + buffer->data = readerinput_realloc(readerinput, buffer->data, buffer->allocated); + len = buffer->allocated - buffer->written; + } + + hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + if (FAILED(hr)) return hr; + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + buffer->written += read; + + return hr; +} + +static xml_encoding readerinput_detectencoding(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + + /* try start symbols if we have enough data to do that, input buffer should contain + first chunk already */ + if (buffer->written >= 4) + { + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + + if (!memcmp(buffer->data, startA, sizeof(startA))) return XmlEncoding_UTF8; + if (!memcmp(buffer->data, startW, sizeof(startW))) return XmlEncoding_UTF16; + } + + /* try with BOM now */ + if (buffer->written >= 3) + { + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) return XmlEncoding_UTF8; + if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) return XmlEncoding_UTF16; + } + + return XmlEncoding_Unknown; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -305,7 +362,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->input) { - xmlreaderinput_release_stream(This->input); + readerinput_release_stream(This->input); IUnknown_Release(&This->input->IXmlReaderInput_iface); This->input = NULL; } @@ -333,7 +390,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } /* set stream for supplied IXmlReaderInput */ - hr = xmlreaderinput_query_for_stream(This->input); + hr = readerinput_query_for_stream(This->input); if (hr == S_OK) This->state = XmlReadState_Initial; @@ -386,7 +443,27 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); + xmlreader *This = impl_from_IXmlReader(iface); + + FIXME("(%p)->(%p): stub\n", This, node_type); + + if (This->state == XmlReadState_Closed) return S_FALSE; + + /* if it's a first call for a new input we need to detect stream encoding */ + if (This->state == XmlReadState_Initial) + { + xml_encoding enc; + HRESULT hr; + + hr = readerinput_growraw(This->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + enc = readerinput_detectencoding(This->input); + TRACE("detected encoding %d\n", enc); + get_code_page(enc, This->input); + } + return E_NOTIMPL; } @@ -683,7 +760,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); - hr = alloc_input_buffer(readerinput, XmlEncoding_UTF16); + hr = alloc_input_buffer(readerinput); if (hr != S_OK) { readerinput_free(readerinput, readerinput); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 582ad48..f5b7680 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -551,15 +551,24 @@ static void test_readerinput(void) static void test_reader_state(void) { IXmlReader *reader; + XmlNodeType nodetype; HRESULT hr; - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* invalid arguments */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + /* attempt to read on closed reader */ + test_read_state(reader, XmlReadState_Closed, -1, 0); +if (0) +{ + /* newer versions crash here, probably cause no input was set */ + hr = IXmlReader_Read(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); +} IXmlReader_Release(reader); } diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 1677e5c..97993e1 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -27,6 +27,11 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0