January 2011 - Wine-commits

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

11 Jan '11

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

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

11 Jan '11

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

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

11 Jan '11

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

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

11 Jan '11

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

Nikolay Sivov : oleaut32/tests: Test for return value directly.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: d47e638ba3522218684b014ac0c4c14a2d4ff514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47e638ba3522218684b014ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 11 02:07:42 2011 +0300 oleaut32/tests: Test for return value directly. --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d1388dd..a1a3ec5 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -106,7 +106,7 @@ static void init(void) HRESULT res; res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); - ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), + ok(res == S_OK && (lstrlenW(bstr) > 0), "Expected localized string for 'True'\n"); /* lstrcpyW / lstrcatW do not work on win95 */ memcpy(sz12_true, sz12, sizeof(sz12)); @@ -114,7 +114,7 @@ static void init(void) SysFreeString(bstr); res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); - ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), + ok(res == S_OK && (lstrlenW(bstr) > 0), "Expected localized string for 'False'\n"); memcpy(sz12_false, sz12, sizeof(sz12)); if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); @@ -1582,7 +1582,7 @@ static void test_UdateFromDate( int line, DATE dt, ULONG flags, HRESULT r, WORD memset(&ud, 0, sizeof(ud)); res = pVarUdateFromDate(dt, flags, &ud); - ok_(__FILE__,line)(r == res && (FAILED(res) || (ud.st.wYear == y && ud.st.wMonth == m && ud.st.wDay == d && + ok_(__FILE__,line)(r == res && (res != S_OK || (ud.st.wYear == y && ud.st.wMonth == m && ud.st.wDay == d && ud.st.wHour == h && ud.st.wMinute == mn && ud.st.wSecond == s && ud.st.wMilliseconds == ms && ud.st.wDayOfWeek == dw && ud.wDayOfYear == dy)), "%.16g expected res(%x) %d,%d,%d,%d,%d,%d,%d %d %d, got res(%x) %d,%d,%d,%d,%d,%d,%d %d %d\n", @@ -1643,7 +1643,7 @@ static void test_DateFromUDate( int line, WORD d, WORD m, WORD y, WORD h, WORD m ud.st.wDayOfWeek = dw; ud.wDayOfYear = dy; res = pVarDateFromUdate(&ud, flags, &out); - ok_(__FILE__,line)(r == res && (FAILED(r) || EQ_DOUBLE(out, dt)), + ok_(__FILE__,line)(r == res && (r != S_OK || EQ_DOUBLE(out, dt)), "expected %x, %.16g, got %x, %.16g\n", r, dt, res, out); } #define UD2T(d,m,y,h,mn,s,ms,dw,dy,flags,r,dt) test_DateFromUDate(__LINE__,d,m,y,h,mn,s,ms,dw,dy,flags,r,dt)

1 0

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

11 Jan '11

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

Vincent Povirk : windowscodecs: Ignore an unspecified extra sample in RGB TIFF images.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 377d890820f36a1d363e4f857c47a2d8e433755b URL: http://source.winehq.org/git/wine.git/?a=commit;h=377d890820f36a1d363e4f857… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 15:46:44 2011 -0600 windowscodecs: Ignore an unspecified extra sample in RGB TIFF images. --- dlls/windowscodecs/tiffformat.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5c8aae9..976870a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -333,6 +333,9 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { + case 0: /* Unspecified data */ + decode_info->format = &GUID_WICPixelFormat32bppBGR; + break; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat32bppPBGRA; break; @@ -350,6 +353,10 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) else switch(extra_samples[0]) { + case 0: /* Unspecified data */ + /* decode_info->format = &GUID_WICPixelFormat64bppRGB; */ + FIXME("64-bit RGB is unsupported\n"); + return E_FAIL; case 1: /* Associated (pre-multiplied) alpha data */ decode_info->format = &GUID_WICPixelFormat64bppPRGBA; break;

1 0

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

11 Jan '11

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 : urlmon: Use an iface instead of a vtbl pointer in stgmed_buf_t.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 482740d0208a3eda63022e9dd0ea8d04ed4b3ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482740d0208a3eda63022e9dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:36:45 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in stgmed_buf_t. --- dlls/urlmon/binding.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d5664c7..14f11a7 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -28,7 +28,7 @@ static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o', static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; typedef struct { - const IUnknownVtbl *lpUnknownVtbl; + IUnknown IUnknown_iface; LONG ref; @@ -55,8 +55,6 @@ struct _stgmed_obj_t { const stgmed_obj_vtbl *vtbl; }; -#define STGMEDUNK(x) ((IUnknown*) &(x)->lpUnknownVtbl) - typedef enum { BEFORE_DOWNLOAD, DOWNLOADING, @@ -360,19 +358,22 @@ static void cache_file_available(Binding *This, const WCHAR *file_name) } } -#define STGMEDUNK_THIS(iface) DEFINE_THIS(stgmed_buf_t, Unknown, iface) +static inline stgmed_buf_t *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, stgmed_buf_t, IUnknown_iface); +} static HRESULT WINAPI StgMedUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - stgmed_buf_t *This = STGMEDUNK_THIS(iface); + stgmed_buf_t *This = impl_from_IUnknown(iface); *ppv = NULL; if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = STGMEDUNK(This); - IUnknown_AddRef(STGMEDUNK(This)); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(&This->IUnknown_iface); return S_OK; } @@ -382,7 +383,7 @@ static HRESULT WINAPI StgMedUnk_QueryInterface(IUnknown *iface, REFIID riid, voi static ULONG WINAPI StgMedUnk_AddRef(IUnknown *iface) { - stgmed_buf_t *This = STGMEDUNK_THIS(iface); + stgmed_buf_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -392,7 +393,7 @@ static ULONG WINAPI StgMedUnk_AddRef(IUnknown *iface) static ULONG WINAPI StgMedUnk_Release(IUnknown *iface) { - stgmed_buf_t *This = STGMEDUNK_THIS(iface); + stgmed_buf_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -410,8 +411,6 @@ static ULONG WINAPI StgMedUnk_Release(IUnknown *iface) return ref; } -#undef STGMEDUNK_THIS - static const IUnknownVtbl StgMedUnkVtbl = { StgMedUnk_QueryInterface, StgMedUnk_AddRef, @@ -422,7 +421,7 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocolEx *protocol) { stgmed_buf_t *ret = heap_alloc(sizeof(*ret)); - ret->lpUnknownVtbl = &StgMedUnkVtbl; + ret->IUnknown_iface.lpVtbl = &StgMedUnkVtbl; ret->ref = 1; ret->size = 0; ret->init = FALSE; @@ -494,7 +493,7 @@ static ULONG WINAPI ProtocolStream_Release(IStream *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - IUnknown_Release(STGMEDUNK(This->buf)); + IUnknown_Release(&This->buf->IUnknown_iface); heap_free(This); URLMON_UnlockModule(); @@ -687,7 +686,7 @@ static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) stgmed->tymed = TYMED_ISTREAM; stgmed->u.pstm = STREAM(stream); - stgmed->pUnkForRelease = STGMEDUNK(stream->buf); + stgmed->pUnkForRelease = &stream->buf->IUnknown_iface; return S_OK; } @@ -724,7 +723,7 @@ static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) ret->lpStreamVtbl = &ProtocolStreamVtbl; ret->ref = 1; - IUnknown_AddRef(STGMEDUNK(buf)); + IUnknown_AddRef(&buf->IUnknown_iface); ret->buf = buf; URLMON_LockModule(); @@ -736,7 +735,7 @@ static void stgmed_file_release(stgmed_obj_t *obj) { stgmed_file_obj_t *file_obj = (stgmed_file_obj_t*)obj; - IUnknown_Release(STGMEDUNK(file_obj->buf)); + IUnknown_Release(&file_obj->buf->IUnknown_iface); heap_free(file_obj); } @@ -753,7 +752,7 @@ static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) stgmed->tymed = TYMED_FILE; stgmed->u.lpszFileName = file_obj->buf->cache_file; - stgmed->pUnkForRelease = STGMEDUNK(file_obj->buf); + stgmed->pUnkForRelease = &file_obj->buf->IUnknown_iface; return S_OK; } @@ -775,7 +774,7 @@ static stgmed_obj_t *create_stgmed_file(stgmed_buf_t *buf) ret->stgmed_obj.vtbl = &stgmed_file_vtbl; - IUnknown_AddRef(STGMEDUNK(buf)); + IUnknown_AddRef(&buf->IUnknown_iface); ret->buf = buf; return &ret->stgmed_obj; @@ -867,7 +866,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface) if(This->service_provider) IServiceProvider_Release(This->service_provider); if(This->stgmed_buf) - IUnknown_Release(STGMEDUNK(This->stgmed_buf)); + IUnknown_Release(&This->stgmed_buf->IUnknown_iface); if(This->stgmed_obj) This->stgmed_obj->vtbl->release(This->stgmed_obj); if(This->obj) @@ -1499,7 +1498,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB if(binding_ctx) { ret->stgmed_buf = binding_ctx->stgmed_buf; - IUnknown_AddRef(STGMEDUNK(ret->stgmed_buf)); + IUnknown_AddRef(&ret->stgmed_buf->IUnknown_iface); ret->clipboard_format = binding_ctx->clipboard_format; }else { ret->stgmed_buf = create_stgmed_buf(PROTOCOLEX(ret->protocol));

1 0

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

11 Jan '11

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