January 2011 - Wine-Commits

David Hedberg : oleaut32: Make ITypeComp::BindType case-insensitive.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 900c5cde698d25367d45e6385bb2b836c36c16db URL: http://source.winehq.org/git/wine.git/?a=commit;h=900c5cde698d25367d45e6385… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Jan 11 10:10:01 2011 +0100 oleaut32: Make ITypeComp::BindType case-insensitive. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++++ dlls/oleaut32/typelib.c | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a47a188..03eda3b 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -117,6 +117,7 @@ static void test_TypeComp(void) static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; static WCHAR wszFont[] = {'F','o','n','t',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; + static WCHAR wszguid[] = {'g','u','i','d',0}; static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; @@ -291,6 +292,17 @@ static void test_TypeComp(void) ITypeInfo_Release(pTypeInfo); if(pTypeComp_tmp) ITypeComp_Release(pTypeComp_tmp); /* fixme */ + /* test BindType case-insensitivity */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszguid); + pTypeComp_tmp = (void*)0xdeadbeef; + pTypeInfo = (void*)0xdeadbeef; + hr = ITypeComp_BindType(pTypeComp, wszguid, ulHash, &pTypeInfo, &pTypeComp_tmp); + ok_ole_success(hr, ITypeComp_BindType); + ok(pTypeInfo != NULL, "Got NULL pTypeInfo\n"); + todo_wine ok(pTypeComp_tmp == NULL, "Got pTypeComp_tmp %p\n", pTypeComp_tmp); + ITypeInfo_Release(pTypeInfo); + if(pTypeComp_tmp) ITypeComp_Release(pTypeComp_tmp); /* fixme */ + ITypeComp_Release(pTypeComp); /* tests for ITypeComp on an interface */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 91da30a..b1e3e4f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4914,7 +4914,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( for (pTypeInfo = This->pTypeInfo; pTypeInfo; pTypeInfo = pTypeInfo->next) { /* FIXME: should use lHash to do the search */ - if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) + if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName)) { TRACE("returning %p\n", pTypeInfo); *ppTInfo = (ITypeInfo *)&pTypeInfo->lpVtbl;

1 0

Michael Stefaniuc : windowscodecs: COM cleanup for stream.c.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 0ceabe8879c34483161dfacc4c41f4875f20addc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ceabe8879c34483161dfacc4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:47:30 2011 +0100 windowscodecs: COM cleanup for stream.c. --- dlls/windowscodecs/stream.c | 91 +++++++++++++++++++++++++------------------ 1 files changed, 53 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ceabe8879c34483161df…

1 0

Hans Leidekker : msi: Add support for comparing TrueType font versions.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 0c25649d3ea2c88a6d4716119c43eb4a050d2c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c25649d3ea2c88a6d4716119… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 11 10:28:16 2011 +0100 msi: Add support for comparing TrueType font versions. --- dlls/msi/action.c | 63 ++++++++++++++++++++++++++++++++++++++------------ dlls/msi/appsearch.c | 2 +- dlls/msi/font.c | 55 +++++++++++++++++++++++++++++++------------ dlls/msi/msipriv.h | 1 + 4 files changed, 89 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c5661c0..7ccc7c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2236,6 +2236,18 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } +static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +{ + DWORD ms1, ms2; + + msi_parse_version_string( ver1, &ms1, NULL ); + msi_parse_version_string( ver2, &ms2, NULL ); + + if (ms1 > ms2) return 1; + else if (ms1 < ms2) return -1; + return 0; +} + static DWORD get_disk_file_size( LPCWSTR filename ) { HANDLE file; @@ -2305,6 +2317,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) static UINT set_file_install_states( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; MSIFILE *file; LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -2326,26 +2339,46 @@ static UINT set_file_install_states( MSIPACKAGE *package ) comp->Cost += file->FileSize; continue; } - if (file->Version && (file_version = msi_get_disk_file_version( file->TargetPath ))) + if (file->Version) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - - if (msi_compare_file_versions( file_version, file->Version ) < 0) + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + { + file->state = msifs_overwrite; + comp->Cost += file->FileSize; + } + else + { + TRACE("Destination file version equal or greater, not overwriting\n"); + file->state = msifs_present; + } + msi_free( file_version ); + continue; } - else + else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + { + file->state = msifs_overwrite; + comp->Cost += file->FileSize; + } + else + { + TRACE("Destination file version equal or greater, not overwriting\n"); + file->state = msifs_present; + } + msi_free( font_version ); + continue; } - msi_free( file_version ); - continue; } if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 28aac23..c8aea77 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -71,7 +71,7 @@ void msi_parse_version_string(LPCWSTR verStr, PDWORD ms, PDWORD ls) x4 = atoiW(ptr + 1); /* FIXME: byte-order dependent? */ *ms = x1 << 16 | x2; - *ls = x3 << 16 | x4; + if (ls) *ls = x3 << 16 | x4; } /* Fills in sig with the values from the Signature table, where name is the diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 2128e92..7a49386 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -52,6 +52,9 @@ typedef struct _tagTT_NAME_TABLE_HEADER { * from start of the table */ } TT_NAME_TABLE_HEADER; +#define NAME_ID_FULL_FONT_NAME 4 +#define NAME_ID_VERSION 5 + typedef struct _tagTT_NAME_RECORD { USHORT uPlatformID; USHORT uEncodingID; @@ -80,10 +83,8 @@ static const WCHAR regfont2[] = /* * Code based off of code located here * http://www.codeproject.com/gdi/fontnamefromfile.asp - * - * Using string index 4 (full font name) instead of 1 (family name) */ -static LPWSTR load_ttfname_from(LPCWSTR filename) +WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) { TT_TABLE_DIRECTORY tblDir; BOOL bFound = FALSE; @@ -142,30 +143,24 @@ static LPWSTR load_ttfname_from(LPCWSTR filename) break; ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); - /* 4 is the Full Font Name */ - if(ttRecord.uNameID == 4) + if (ttRecord.uNameID == id) { int nPos; LPSTR buf; - static const char tt[] = " (TrueType)"; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); nPos = SetFilePointer(handle, 0, NULL, FILE_CURRENT); - SetFilePointer(handle, tblDir.uOffset + - ttRecord.uStringOffset + - ttNTHeader.uStorageOffset, - NULL, FILE_BEGIN); - buf = msi_alloc_zero( ttRecord.uStringLength + 1 + strlen(tt) ); + SetFilePointer(handle, tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset, + NULL, FILE_BEGIN); + buf = msi_alloc_zero( ttRecord.uStringLength + 1 ); ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); if (strlen(buf) > 0) { - strcat(buf,tt); ret = strdupAtoW(buf); msi_free(buf); break; } - msi_free(buf); SetFilePointer(handle,nPos, NULL, FILE_BEGIN); } @@ -173,8 +168,36 @@ static LPWSTR load_ttfname_from(LPCWSTR filename) end: CloseHandle(handle); + TRACE("Returning %s\n", debugstr_w(ret)); + return ret; +} + +static WCHAR *font_name_from_file( const WCHAR *filename ) +{ + static const WCHAR truetypeW[] = {' ','(','T','r','u','e','T','y','p','e',')',0}; + WCHAR *name, *ret = NULL; + + if ((name = load_ttf_name_id( filename, NAME_ID_FULL_FONT_NAME ))) + { + ret = msi_alloc( (strlenW( name ) + strlenW( truetypeW ) + 1 ) * sizeof(WCHAR) ); + strcpyW( ret, name ); + strcatW( ret, truetypeW ); + msi_free( name ); + } + return ret; +} - TRACE("Returning fontname %s\n",debugstr_w(ret)); +WCHAR *font_version_from_file( const WCHAR *filename ) +{ + WCHAR *version, *p, *ret = NULL; + + if ((p = version = load_ttf_name_id( filename, NAME_ID_VERSION ))) + { + while (*p && !isdigitW( *p )) p++; + ret = msi_alloc( (strlenW( p ) + 1) * sizeof(WCHAR) ); + strcpyW( ret, p ); + msi_free( version ); + } return ret; } @@ -212,7 +235,7 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) RegCreateKeyW(HKEY_LOCAL_MACHINE,regfont2,&hkey2); if (MSI_RecordIsNull(row,2)) - name = load_ttfname_from( file->TargetPath ); + name = font_name_from_file( file->TargetPath ); else name = msi_dup_record_field(row,2); @@ -296,7 +319,7 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) RegCreateKeyW( HKEY_LOCAL_MACHINE, regfont2, &hkey2 ); if (MSI_RecordIsNull( row, 2 )) - name = load_ttfname_from( file->TargetPath ); + name = font_name_from_file( file->TargetPath ); else name = msi_dup_record_field( row, 2 ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10ddb4e..3f482ea 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -957,6 +957,7 @@ extern void msi_component_set_state(MSIPACKAGE *, MSICOMPONENT *, INSTALLSTATE); extern void msi_feature_set_state(MSIPACKAGE *, MSIFEATURE *, INSTALLSTATE); extern MSIASSEMBLY *load_assembly(MSIPACKAGE *, MSICOMPONENT *); extern UINT install_assembly(MSIPACKAGE *, MSICOMPONENT *); +extern WCHAR *font_version_from_file(const WCHAR *); /* media */

1 0

Michael Stefaniuc : urlmon: COM cleanup for the IMoniker iface.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 8c0a69430c9555106f7124683c74543abb6d9895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0a69430c9555106f7124683… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 10:10:04 2011 +0100 urlmon: COM cleanup for the IMoniker iface. --- dlls/urlmon/umon.c | 67 +++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c0a69430c9555106f712…

1 0

Nikolay Sivov : ole32/tests: Test for return value directly without macros.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: d91dbd0baa887349bf9bd665e1475d5e4ac8324f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91dbd0baa887349bf9bd665e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 11 02:00:14 2011 +0300 ole32/tests: Test for return value directly without macros. --- dlls/ole32/tests/clipboard.c | 6 +++--- dlls/ole32/tests/stg_prop.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 8a44f50..1029a68 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -826,15 +826,15 @@ static void test_set_clipboard(void) cf_onemore = RegisterClipboardFormatA("one more format"); hr = DataObjectImpl_CreateText("data1", &data1); - ok(SUCCEEDED(hr), "Failed to create data1 object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create data1 object: 0x%08x\n", hr); if(FAILED(hr)) return; hr = DataObjectImpl_CreateText("data2", &data2); - ok(SUCCEEDED(hr), "Failed to create data2 object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create data2 object: 0x%08x\n", hr); if(FAILED(hr)) return; hr = DataObjectImpl_CreateComplex(&data_cmpl); - ok(SUCCEEDED(hr), "Failed to create complex data object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create complex data object: 0x%08x\n", hr); if(FAILED(hr)) return; diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 77f0d7c..db4c142 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -186,7 +186,7 @@ static void testProps(void) spec.ulKind = PRSPEC_PROPID; U(spec).propid = PIDSI_THUMBNAIL; hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); - ok(SUCCEEDED(hr), "ReadMultiple failed: 0x%08x\n", hr); + ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr); ok(var.vt == VT_CF, "variant type wrong\n"); ok(U(var).pclipdata->ulClipFmt == CF_ENHMETAFILE, "clipboard type wrong\n");

1 0

David Hedberg : oleaut32: Handle NULL arguments to ITypeComp::BindType.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 454b1fca24bdf0ba84e8c20e7a619d9e4246b01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=454b1fca24bdf0ba84e8c20e7… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Jan 11 10:10:00 2011 +0100 oleaut32: Handle NULL arguments to ITypeComp::BindType. --- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 3 +++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index aabd3e7..a47a188 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -109,6 +109,7 @@ static void test_TypeComp(void) BINDPTR bindptr; ITypeInfo *pTypeInfo; ITypeInfo *pFontTypeInfo; + ITypeComp *pTypeComp_tmp; static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; @@ -255,6 +256,41 @@ static void test_TypeComp(void) ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + /* test basic BindType argument handling */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + hr = ITypeComp_BindType(pTypeComp, wszGUID, ulHash, NULL, NULL); + ok(hr == E_INVALIDARG, "Got %08x\n", hr); + + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + pTypeInfo = (void*)0xdeadbeef; + hr = ITypeComp_BindType(pTypeComp, wszGUID, ulHash, &pTypeInfo, NULL); + ok(hr == E_INVALIDARG, "Got %08x\n", hr); + ok(pTypeInfo == (void*)0xdeadbeef, "Got %p\n", pTypeInfo); + + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + pTypeComp_tmp = (void*)0xdeadbeef; + hr = ITypeComp_BindType(pTypeComp, wszGUID, ulHash, NULL, &pTypeComp_tmp); + ok(hr == E_INVALIDARG, "Got %08x\n", hr); + ok(pTypeComp_tmp == (void*)0xdeadbeef, "Got %p\n", pTypeComp_tmp); + + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + pTypeComp_tmp = (void*)0xdeadbeef; + pTypeInfo = (void*)0xdeadbeef; + hr = ITypeComp_BindType(pTypeComp, NULL, ulHash, &pTypeInfo, &pTypeComp_tmp); + ok(hr == E_INVALIDARG, "Got %08x\n", hr); + ok(pTypeInfo == (void*)0xdeadbeef, "Got %p\n", pTypeInfo); + ok(pTypeComp_tmp == (void*)0xdeadbeef, "Got %p\n", pTypeComp_tmp); + + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + pTypeComp_tmp = (void*)0xdeadbeef; + pTypeInfo = (void*)0xdeadbeef; + hr = ITypeComp_BindType(pTypeComp, wszGUID, ulHash, &pTypeInfo, &pTypeComp_tmp); + ok_ole_success(hr, ITypeComp_BindType); + ok(pTypeInfo != NULL, "Got NULL pTypeInfo\n"); + todo_wine ok(pTypeComp_tmp == NULL, "Got pTypeComp_tmp %p\n", pTypeComp_tmp); + ITypeInfo_Release(pTypeInfo); + if(pTypeComp_tmp) ITypeComp_Release(pTypeComp_tmp); /* fixme */ + ITypeComp_Release(pTypeComp); /* tests for ITypeComp on an interface */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 854b165..91da30a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4908,6 +4908,9 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + if(!szName || !ppTInfo || !ppTComp) + return E_INVALIDARG; + for (pTypeInfo = This->pTypeInfo; pTypeInfo; pTypeInfo = pTypeInfo->next) { /* FIXME: should use lHash to do the search */

1 0

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in AsyncBindCtx.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 346e766d5364c566a62f0830fa412cb9c4f73f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=346e766d5364c566a62f0830f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:41:11 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in AsyncBindCtx. --- dlls/urlmon/bindctx.c | 51 ++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index f04b3e4..1af7fa7 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -616,32 +616,33 @@ HRESULT WINAPI RevokeBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc } typedef struct { - const IBindCtxVtbl *lpBindCtxVtbl; + IBindCtx IBindCtx_iface; LONG ref; IBindCtx *bindctx; } AsyncBindCtx; -#define BINDCTX(x) ((IBindCtx*) &(x)->lpBindCtxVtbl) - -#define BINDCTX_THIS(iface) DEFINE_THIS(AsyncBindCtx, BindCtx, iface) +static inline AsyncBindCtx *impl_from_IBindCtx(IBindCtx *iface) +{ + return CONTAINING_RECORD(iface, AsyncBindCtx, IBindCtx_iface); +} static HRESULT WINAPI AsyncBindCtx_QueryInterface(IBindCtx *iface, REFIID riid, void **ppv) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); *ppv = NULL; if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; }else if(IsEqualGUID(riid, &IID_IBindCtx)) { TRACE("(%p)->(IID_IBindCtx %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; }else if(IsEqualGUID(riid, &IID_IAsyncBindCtx)) { TRACE("(%p)->(IID_IAsyncBindCtx %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; } if(*ppv) { @@ -655,7 +656,7 @@ static HRESULT WINAPI AsyncBindCtx_QueryInterface(IBindCtx *iface, REFIID riid, static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -665,7 +666,7 @@ static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface) static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -680,7 +681,7 @@ static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface) static HRESULT WINAPI AsyncBindCtx_RegisterObjectBound(IBindCtx *iface, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, punk); @@ -689,7 +690,7 @@ static HRESULT WINAPI AsyncBindCtx_RegisterObjectBound(IBindCtx *iface, IUnknown static HRESULT WINAPI AsyncBindCtx_RevokeObjectBound(IBindCtx *iface, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p %p)\n", This, punk); @@ -698,7 +699,7 @@ static HRESULT WINAPI AsyncBindCtx_RevokeObjectBound(IBindCtx *iface, IUnknown * static HRESULT WINAPI AsyncBindCtx_ReleaseBoundObjects(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)\n", This); @@ -707,7 +708,7 @@ static HRESULT WINAPI AsyncBindCtx_ReleaseBoundObjects(IBindCtx *iface) static HRESULT WINAPI AsyncBindCtx_SetBindOptions(IBindCtx *iface, BIND_OPTS *pbindopts) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pbindopts); @@ -716,7 +717,7 @@ static HRESULT WINAPI AsyncBindCtx_SetBindOptions(IBindCtx *iface, BIND_OPTS *pb static HRESULT WINAPI AsyncBindCtx_GetBindOptions(IBindCtx *iface, BIND_OPTS *pbindopts) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pbindopts); @@ -725,7 +726,7 @@ static HRESULT WINAPI AsyncBindCtx_GetBindOptions(IBindCtx *iface, BIND_OPTS *pb static HRESULT WINAPI AsyncBindCtx_GetRunningObjectTable(IBindCtx *iface, IRunningObjectTable **pprot) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pprot); @@ -734,7 +735,7 @@ static HRESULT WINAPI AsyncBindCtx_GetRunningObjectTable(IBindCtx *iface, IRunni static HRESULT WINAPI AsyncBindCtx_RegisterObjectParam(IBindCtx *iface, LPOLESTR pszkey, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_w(pszkey), punk); @@ -743,7 +744,7 @@ static HRESULT WINAPI AsyncBindCtx_RegisterObjectParam(IBindCtx *iface, LPOLESTR static HRESULT WINAPI AsyncBindCtx_GetObjectParam(IBindCtx* iface, LPOLESTR pszkey, IUnknown **punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_w(pszkey), punk); @@ -752,7 +753,7 @@ static HRESULT WINAPI AsyncBindCtx_GetObjectParam(IBindCtx* iface, LPOLESTR pszk static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR pszkey) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pszkey)); @@ -761,15 +762,13 @@ static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR p static HRESULT WINAPI AsyncBindCtx_EnumObjectParam(IBindCtx *iface, IEnumString **pszkey) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pszkey); return IBindCtx_EnumObjectParam(This->bindctx, pszkey); } -#undef BINDCTX_THIS - static const IBindCtxVtbl AsyncBindCtxVtbl = { AsyncBindCtx_QueryInterface, @@ -876,16 +875,16 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, ret = heap_alloc(sizeof(AsyncBindCtx)); - ret->lpBindCtxVtbl = &AsyncBindCtxVtbl; + ret->IBindCtx_iface.lpVtbl = &AsyncBindCtxVtbl; ret->ref = 1; ret->bindctx = bindctx; - hres = init_bindctx(BINDCTX(ret), options, callback, format); + hres = init_bindctx(&ret->IBindCtx_iface, options, callback, format); if(FAILED(hres)) { - IBindCtx_Release(BINDCTX(ret)); + IBindCtx_Release(&ret->IBindCtx_iface); return hres; } - *pbind = BINDCTX(ret); + *pbind = &ret->IBindCtx_iface; return S_OK; }

1 0

Vincent Povirk : windowscodecs: Accept failure when seeking to the start of a TGA footer.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: f4ef7ff48ae9b5decaddd5f2be9856466bfe01af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ef7ff48ae9b5decaddd5f2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 17:13:02 2011 -0600 windowscodecs: Accept failure when seeking to the start of a TGA footer. --- dlls/windowscodecs/tgaformat.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 14510cf..8db1cf1 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -284,25 +284,32 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* Read footer if there is one */ seek.QuadPart = -sizeof(tga_footer); hr = IStream_Seek(pIStream, seek, STREAM_SEEK_END, NULL); - if (FAILED(hr)) goto end; - hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread); - if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer)) - { - TRACE("got only %u footer bytes\n", bytesread); - hr = E_FAIL; - } - if (FAILED(hr)) goto end; + if (SUCCEEDED(hr)) { + hr = IStream_Read(pIStream, &footer, sizeof(tga_footer), &bytesread); + if (SUCCEEDED(hr) && bytesread != sizeof(tga_footer)) + { + TRACE("got only %u footer bytes\n", bytesread); + hr = E_FAIL; + } - if (memcmp(footer.magic, tga_footer_magic, sizeof(tga_footer_magic)) == 0) - { - This->extension_area_offset = footer.extension_area_offset; - This->developer_directory_offset = footer.developer_directory_offset; + if (memcmp(footer.magic, tga_footer_magic, sizeof(tga_footer_magic)) == 0) + { + This->extension_area_offset = footer.extension_area_offset; + This->developer_directory_offset = footer.developer_directory_offset; + } + else + { + This->extension_area_offset = 0; + This->developer_directory_offset = 0; + } } else { + /* File is too small to have a footer. */ This->extension_area_offset = 0; This->developer_directory_offset = 0; + hr = S_OK; } if (This->extension_area_offset)

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in BmpEncoder.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: d341bea6735f3ebb09e2cd2719093ade956403d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341bea6735f3ebb09e2cd271… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:43:15 2011 +0100 windowscodecs: Use an iface instead of a vtbl pointer in BmpEncoder. --- dlls/windowscodecs/bmpencode.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 410c646..69148af 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -412,16 +412,21 @@ static const IWICBitmapFrameEncodeVtbl BmpFrameEncode_Vtbl = { }; typedef struct BmpEncoder { - const IWICBitmapEncoderVtbl *lpVtbl; + IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; IStream *stream; BmpFrameEncode *frame; } BmpEncoder; +static inline BmpEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, BmpEncoder, IWICBitmapEncoder_iface); +} + static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -443,7 +448,7 @@ static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -453,7 +458,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -471,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); @@ -523,7 +528,7 @@ static HRESULT WINAPI BmpEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpFrameEncode *encode; HRESULT hr; @@ -565,7 +570,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p)\n", iface); if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE; @@ -610,13 +615,13 @@ HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpEncoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BmpEncoder_Vtbl; + This->IWICBitmapEncoder_iface.lpVtbl = &BmpEncoder_Vtbl; This->ref = 1; This->stream = NULL; This->frame = NULL; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in BindStatusCallback.
by Alexandre Julliard Jan. 11, 2011

Jan. 11, 2011

Module: wine Branch: master Commit: 2f7da964ace233c3b16417c967e34ddf7c70719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7da964ace233c3b16417c96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:39:48 2011 +0100 urlmon: Use ifaces instead of vtbl pointers in BindStatusCallback. --- dlls/urlmon/bindctx.c | 146 ++++++++++++++++++++++++------------------------- 1 files changed, 72 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f7da964ace233c3b1641…

1 0