May 2011 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Implementation of ScriptPlaceOpenType.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: e3ed47bf952aabef9d50dc649eb243d91cc2e060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ed47bf952aabef9d50dc649… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 12 13:57:32 2011 -0500 usp10: Implementation of ScriptPlaceOpenType. --- dlls/usp10/usp10.c | 93 +++++++++++++++++++++++++++++++++++++++++++----- dlls/usp10/usp10.spec | 2 +- 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e7bda77..da4fbb1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1662,17 +1662,26 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } /*********************************************************************** - * ScriptPlace (USP10.@) + * ScriptPlaceOpenType (USP10.@) * * Produce advance widths for a run. * * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * pwGlyphs [I] Array of glyphs. - * cGlyphs [I] Number of glyphs in pwGlyphs. - * psva [I] Array of visual attributes. * psa [I/O] String analysis. + * tagScript [I] The OpenType tag for the Script + * tagLangSys [I] The OpenType tag for the Language + * rcRangeChars[I] Array of Character counts in each range + * rpRangeProperties [I] Array of TEXTRANGE_PROPERTIES structures + * cRanges [I] Count of ranges + * pwcChars [I] Array of characters specifying the run. + * pwLogClust [I] Array of logical cluster info + * pCharProps [I] Array of character property values + * cChars [I] Number of characters in pwcChars. + * pwGlyphs [I] Array of glyphs. + * pGlyphProps [I] Array of attributes for the retrieved glyphs + * cGlyphs [I] Count of Glyphs * piAdvance [O] Array of advance widths. * pGoffset [O] Glyph offsets. * pABC [O] Combined ABC width. @@ -1681,20 +1690,37 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, - int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) + +HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, + OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, + int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, WORD *pwLogClust, + SCRIPT_CHARPROP *pCharProps, int cChars, + const WORD *pwGlyphs, const SCRIPT_GLYPHPROP *pGlyphProps, + int cGlyphs, int *piAdvance, + GOFFSET *pGoffset, ABC *pABC +) { HRESULT hr; int i; - TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, - piAdvance, pGoffset, pABC); + TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n", + hdc, psc, psa, + debugstr_an((char*)&tagScript,4), debugstr_an((char*)&tagLangSys,4), + rcRangeChars, rpRangeProperties, cRanges, debugstr_wn(pwcChars, cChars), + pwLogClust, pCharProps, cChars, pwGlyphs, pGlyphProps, cGlyphs, piAdvance, + pGoffset, pABC); - if (!psva) return E_INVALIDARG; + if (!pGlyphProps) return E_INVALIDARG; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (!pGoffset) return E_FAIL; + if (cRanges) + FIXME("Ranges not supported yet\n"); + + ((ScriptCache *)*psc)->userScript = tagScript; + ((ScriptCache *)*psc)->userLang = tagLangSys; + if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) { @@ -1731,6 +1757,53 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, } /*********************************************************************** + * ScriptPlace (USP10.@) + * + * Produce advance widths for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwGlyphs [I] Array of glyphs. + * cGlyphs [I] Number of glyphs in pwGlyphs. + * psva [I] Array of visual attributes. + * psa [I/O] String analysis. + * piAdvance [O] Array of advance widths. + * pGoffset [O] Glyph offsets. + * pABC [O] Combined ABC width. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, + int cGlyphs, const SCRIPT_VISATTR *psva, + SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) +{ + HRESULT hr; + SCRIPT_GLYPHPROP *glyphProps; + int i; + + TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, + piAdvance, pGoffset, pABC); + + if (!psva) return E_INVALIDARG; + if (!pGoffset) return E_FAIL; + + glyphProps = heap_alloc(sizeof(SCRIPT_GLYPHPROP)*cGlyphs); + if (!glyphProps) return E_OUTOFMEMORY; + + for (i = 0; i < cGlyphs; i++) + glyphProps[i].sva = psva[i]; + + hr = ScriptPlaceOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, NULL, NULL, NULL, 0, pwGlyphs, glyphProps, cGlyphs, piAdvance, pGoffset, pABC); + + heap_free(glyphProps); + + return hr; +} + +/*********************************************************************** * ScriptGetCMap (USP10.@) * * Retrieve glyph indices. diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index bc2eb73..05269c5 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -20,7 +20,7 @@ @ stdcall ScriptJustify(ptr ptr long long long ptr) @ stdcall ScriptLayout(long ptr ptr ptr) @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) -@ stub ScriptPlaceOpenType +@ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Grazvydas Ignotas : gdi32: Implement font selection by its full name.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: adcce5d7128ab8f3ccb3ced29d6dc271222aeabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcce5d7128ab8f3ccb3ced29… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 10 23:38:07 2011 +0300 gdi32: Implement font selection by its full name. --- dlls/gdi32/freetype.c | 19 +++++++++++++++++++ dlls/gdi32/tests/font.c | 1 - 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e95376e..d6271db 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -262,6 +262,7 @@ struct enum_data typedef struct tagFace { struct list entry; WCHAR *StyleName; + const WCHAR *FullName; char *file; void *font_data_ptr; DWORD font_data_size; @@ -1461,6 +1462,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; face->StyleName = StyleW; + face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); if (file) { face->file = strdupA(file); @@ -3610,6 +3612,20 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) } } + /* Search by full face name. */ + LIST_FOR_EACH(family_elem_ptr, &font_list) { + family = LIST_ENTRY(family_elem_ptr, Family, entry); + LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face = LIST_ENTRY(face_elem_ptr, Face, entry); + if(face->FullName && !strcmpiW(face->FullName, FaceName) && + ((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0])) + { + if(face->scalable || can_use_bitmap) + goto found_face; + } + } + } + /* * Try check the SystemLink list first for a replacement font. * We may find good replacements there. @@ -3763,6 +3779,9 @@ found: ret->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); ret->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); +found_face: + height = lf.lfHeight; + ret->fs = face->fs; if(csi.fs.fsCsb[0]) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 151e655..330d25e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3771,7 +3771,6 @@ static void test_fullname(void) buf[0] = 0; ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)), "face full name could not be read\n"); -todo_wine ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf); SelectObject(hdc, of); DeleteObject(hfont);

1 0

Grazvydas Ignotas : gdi32: Refactor get_facename to retrieve other names too.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 03741026257361546ed57395ba8bedd1d816a77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03741026257361546ed57395b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 10 23:38:06 2011 +0300 gdi32: Refactor get_facename to retrieve other names too. --- dlls/gdi32/freetype.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 79073a6..e95376e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1095,32 +1095,32 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req) return FALSE; } -static WCHAR *get_familyname(FT_Face ft_face) +static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort language_id) { - WCHAR *family = NULL; + WCHAR *ret = NULL; FT_SfntName name; name.platform_id = TT_PLATFORM_MICROSOFT; name.encoding_id = TT_MS_ID_UNICODE_CS; - name.language_id = GetUserDefaultLCID(); - name.name_id = TT_NAME_ID_FONT_FAMILY; + name.language_id = language_id; + name.name_id = name_id; if(get_name_table_entry(ft_face, &name)) { FT_UInt i; /* String is not nul terminated and string_len is a byte length. */ - family = HeapAlloc(GetProcessHeap(), 0, name.string_len + 2); + ret = HeapAlloc(GetProcessHeap(), 0, name.string_len + 2); for(i = 0; i < name.string_len / 2; i++) { WORD *tmp = (WORD *)&name.string[i * 2]; - family[i] = GET_BE_WORD(*tmp); + ret[i] = GET_BE_WORD(*tmp); } - family[i] = 0; - TRACE("Got localised name %s\n", debugstr_w(family)); + ret[i] = 0; + TRACE("Got localised name %s\n", debugstr_w(ret)); } - return family; + return ret; } @@ -1331,7 +1331,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if (target_family) { - localised_family = get_familyname(ft_face); + localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); if (localised_family && strcmpiW(localised_family,target_family)!=0) { TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index); @@ -1360,7 +1360,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ localised_family = NULL; if(!fake_family) { - localised_family = get_familyname(ft_face); + localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); if(localised_family && !strcmpiW(localised_family, english_family)) { HeapFree(GetProcessHeap(), 0, localised_family); localised_family = NULL;

1 0

Hans Leidekker : msi: Handle embedded nulls in text archives.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: e2ba5dce06b80a38ee763081ee4348cf7c28bde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ba5dce06b80a38ee763081e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 12 17:23:27 2011 +0200 msi: Handle embedded nulls in text archives. --- dlls/msi/database.c | 66 ++++++++++++++++++++++++++++++++------------------ dlls/msi/tests/db.c | 34 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 02fc007..e7164e5 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -509,7 +509,7 @@ end: return r; } -static LPWSTR msi_read_text_archive(LPCWSTR path) +static LPWSTR msi_read_text_archive(LPCWSTR path, DWORD *len) { HANDLE file; LPSTR data = NULL; @@ -521,15 +521,17 @@ static LPWSTR msi_read_text_archive(LPCWSTR path) return NULL; size = GetFileSize( file, NULL ); - data = msi_alloc( size + 1 ); - if (!data) - goto done; + if (!(data = msi_alloc( size ))) goto done; - if (!ReadFile( file, data, size, &read, NULL )) - goto done; + if (!ReadFile( file, data, size, &read, NULL ) || read != size) goto done; - data[size] = '\0'; - wdata = strdupAtoW( data ); + while (!data[size - 1]) size--; + *len = MultiByteToWideChar( CP_ACP, 0, data, size, NULL, 0 ); + if ((wdata = msi_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, data, size, wdata, *len ); + wdata[*len] = 0; + } done: CloseHandle( file ); @@ -537,21 +539,22 @@ done: return wdata; } -static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries) +static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries, DWORD *len) { LPWSTR ptr = *line, save; - DWORD i, count = 1; + DWORD i, count = 1, chars_left = *len; *entries = NULL; /* stay on this line */ - while (*ptr && *ptr != '\n') + while (chars_left && *ptr != '\n') { /* entries are separated by tabs */ if (*ptr == '\t') count++; ptr++; + chars_left--; } *entries = msi_alloc(count * sizeof(LPWSTR)); @@ -559,28 +562,43 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries) return; /* store pointers into the data */ + chars_left = *len; for (i = 0, ptr = *line; i < count; i++) { - while (*ptr && *ptr == '\r') ptr++; + while (chars_left && *ptr == '\r') + { + ptr++; + chars_left--; + } save = ptr; - while (*ptr && *ptr != '\t' && *ptr != '\n' && *ptr != '\r') ptr++; + while (chars_left && *ptr != '\t' && *ptr != '\n' && *ptr != '\r') + { + if (!*ptr) *ptr = '\n'; /* convert embedded nulls to \n */ + ptr++; + chars_left--; + } /* NULL-separate the data */ if (*ptr == '\n' || *ptr == '\r') { - while (*ptr == '\n' || *ptr == '\r') - *(ptr++) = '\0'; + while (chars_left && (*ptr == '\n' || *ptr == '\r')) + { + *(ptr++) = 0; + chars_left--; + } } else if (*ptr) - *ptr++ = '\0'; - + { + *(ptr++) = 0; + chars_left--; + } (*entries)[i] = save; } /* move to the next line if there's more, else EOF */ *line = ptr; - + *len = chars_left; if (num_entries) *num_entries = count; } @@ -916,12 +934,12 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) lstrcatW( path, szBackSlash ); lstrcatW( path, file ); - data = msi_read_text_archive( path ); + data = msi_read_text_archive( path, &len ); ptr = data; - msi_parse_line( &ptr, &columns, &num_columns ); - msi_parse_line( &ptr, &types, &num_types ); - msi_parse_line( &ptr, &labels, &num_labels ); + msi_parse_line( &ptr, &columns, &num_columns, &len ); + msi_parse_line( &ptr, &types, &num_types, &len ); + msi_parse_line( &ptr, &labels, &num_labels, &len ); if (num_columns == 1 && !columns[0][0] && num_labels == 1 && !labels[0][0] && num_types == 2 && !strcmpW( types[1], forcecodepage )) @@ -944,9 +962,9 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) } /* read in the table records */ - while (*ptr) + while (len) { - msi_parse_line( &ptr, &records[num_records], NULL ); + msi_parse_line( &ptr, &records[num_records], NULL, &len ); num_records++; temp_records = msi_realloc(records, (num_records + 1) * sizeof(LPWSTR *)); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 342157e..08b84bf 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9253,6 +9253,39 @@ static void test_createtable(void) DeleteFileA(msifile); } +static void test_embedded_nulls(void) +{ + static const char control_table[] = + "Dialog\tText\n" + "s72\tL0\n" + "Control\tDialog\n" + "LicenseAgreementDlg\ttext\0text"; + UINT r, sz; + MSIHANDLE hdb, hrec; + char buffer[32]; + + r = MsiOpenDatabaseA( msifile, MSIDBOPEN_CREATE, &hdb ); + ok( r == ERROR_SUCCESS, "failed to open database %u\n", r ); + + GetCurrentDirectoryA( MAX_PATH, CURR_DIR ); + write_file( "temp_file", control_table, sizeof(control_table) ); + r = MsiDatabaseImportA( hdb, CURR_DIR, "temp_file" ); + ok( r == ERROR_SUCCESS, "failed to import table %u\n", r ); + DeleteFileA( "temp_file" ); + + r = do_query( hdb, "SELECT `Text` FROM `Control` WHERE `Dialog` = 'LicenseAgreementDlg'", &hrec ); + ok( r == ERROR_SUCCESS, "query failed %u\n", r ); + + buffer[0] = 0; + sz = sizeof(buffer); + r = MsiRecordGetStringA( hrec, 1, buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get string %u\n", r ); + ok( !memcmp( "text\ntext", buffer, sizeof("text\ntext") - 1 ), "wrong buffer contents \"%s\"\n", buffer ); + + MsiCloseHandle( hrec ); + MsiCloseHandle( hdb ); + DeleteFileA( msifile ); +} START_TEST(db) { @@ -9307,4 +9340,5 @@ START_TEST(db) test_suminfo_import(); test_createtable(); test_collation(); + test_embedded_nulls(); }

1 0

Hans Leidekker : msi: Improve the stub for MisGetMode(MSIRUNMODE_ADMIN).
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: b55cbe8d113f0f9ac436772841e262f9a4448cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55cbe8d113f0f9ac43677284… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 12 17:22:56 2011 +0200 msi: Improve the stub for MisGetMode(MSIRUNMODE_ADMIN). --- dlls/msi/install.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 686fc58..3559792 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -724,6 +724,11 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) switch (iRunMode) { + case MSIRUNMODE_ADMIN: + FIXME("no support for administrative installs\n"); + r = FALSE; + break; + case MSIRUNMODE_WINDOWS9X: if (GetVersion() & 0x80000000) r = TRUE;

1 0

Hans Leidekker : msi: Unescape ^Q^Y sequences in text archives.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: c7e36d8ba8eb4cb7fdf65b0c2b23367d9e221e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e36d8ba8eb4cb7fdf65b0c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 12 17:24:11 2011 +0200 msi: Unescape ^Q^Y sequences in text archives. --- dlls/msi/database.c | 5 +++++ dlls/msi/tests/db.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index e7164e5..9b5a894 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -575,6 +575,11 @@ static void msi_parse_line(LPWSTR *line, LPWSTR **entries, DWORD *num_entries, D while (chars_left && *ptr != '\t' && *ptr != '\n' && *ptr != '\r') { if (!*ptr) *ptr = '\n'; /* convert embedded nulls to \n */ + if (ptr > *line && *ptr == '\x19' && *(ptr - 1) == '\x11') + { + *ptr = '\n'; + *(ptr - 1) = '\r'; + } ptr++; chars_left--; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 08b84bf..a9d0e933 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9259,7 +9259,7 @@ static void test_embedded_nulls(void) "Dialog\tText\n" "s72\tL0\n" "Control\tDialog\n" - "LicenseAgreementDlg\ttext\0text"; + "LicenseAgreementDlg\ttext\x11\x19text\0text"; UINT r, sz; MSIHANDLE hdb, hrec; char buffer[32]; @@ -9280,7 +9280,7 @@ static void test_embedded_nulls(void) sz = sizeof(buffer); r = MsiRecordGetStringA( hrec, 1, buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get string %u\n", r ); - ok( !memcmp( "text\ntext", buffer, sizeof("text\ntext") - 1 ), "wrong buffer contents \"%s\"\n", buffer ); + ok( !memcmp( "text\r\ntext\ntext", buffer, sizeof("text\r\ntext\ntext") - 1 ), "wrong buffer contents \"%s\"\n", buffer ); MsiCloseHandle( hrec ); MsiCloseHandle( hdb );

1 0

Grazvydas Ignotas : gdi32/tests: Test for font selection by full name.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 86495cea9486aa5df4ebdf0261d9058583640621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86495cea9486aa5df4ebdf026… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 10 23:38:05 2011 +0300 gdi32/tests: Test for font selection by full name. --- dlls/gdi32/tests/font.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 143 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index da155e1..151e655 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2347,6 +2347,7 @@ typedef struct ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_NAME_TAG MS_MAKE_TAG('n','a','m','e') typedef struct { @@ -2552,6 +2553,101 @@ end: return r; } +#define TT_PLATFORM_MICROSOFT 3 +#define TT_MS_ID_UNICODE_CS 1 +#define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 +#define TT_NAME_ID_FULL_NAME 4 + +static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, char *out_buf, SIZE_T out_size) +{ + struct sfnt_name_header + { + USHORT format; + USHORT number_of_record; + USHORT storage_offset; + } *header; + struct sfnt_name + { + USHORT platform_id; + USHORT encoding_id; + USHORT language_id; + USHORT name_id; + USHORT length; + USHORT offset; + } *entry; + BOOL r = FALSE; + LONG size, offset, length; + LONG c, ret; + WCHAR *name; + BYTE *data; + USHORT i; + + size = GetFontData(hdc, MS_NAME_TAG, 0, NULL, 0); + ok(size != GDI_ERROR, "no name table found\n"); + if(size == GDI_ERROR) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetFontData(hdc, MS_NAME_TAG, 0, data, size); + ok(ret == size, "GetFontData should return %u not %u\n", size, ret); + + header = (void *)data; + header->format = GET_BE_WORD(header->format); + header->number_of_record = GET_BE_WORD(header->number_of_record); + header->storage_offset = GET_BE_WORD(header->storage_offset); + if (header->format != 0) + { + trace("got format %u\n", header->format); + goto out; + } + if (header->number_of_record == 0 || sizeof(*header) + header->number_of_record * sizeof(*entry) > size) + { + trace("number records out of range: %d\n", header->number_of_record); + goto out; + } + if (header->storage_offset >= size) + { + trace("storage_offset %u > size %u\n", header->storage_offset, size); + goto out; + } + + entry = (void *)&header[1]; + for (i = 0; i < header->number_of_record; i++) + { + if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || + GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || + GET_BE_WORD(entry[i].language_id) != TT_MS_LANGID_ENGLISH_UNITED_STATES || + GET_BE_WORD(entry[i].name_id) != name_id) + { + continue; + } + + offset = header->storage_offset + GET_BE_WORD(entry[i].offset); + length = GET_BE_WORD(entry[i].length); + if (offset + length > size) + { + trace("entry %d is out of range\n", i); + break; + } + if (length >= out_size) + { + trace("buffer too small for entry %d\n", i); + break; + } + + name = (WCHAR *)(data + offset); + for (c = 0; c < length / 2; c++) + out_buf[c] = GET_BE_WORD(name[c]); + out_buf[c] = 0; + + r = TRUE; + break; + } + +out: + HeapFree(GetProcessHeap(), 0, data); + return r; +} + static void test_text_metrics(const LOGFONTA *lf) { HDC hdc; @@ -3637,6 +3733,52 @@ static void test_EnumFonts(void) DeleteDC(hdc); } +static void test_fullname(void) +{ + static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic"}; + char buf[LF_FULLFACESIZE]; + HFONT hfont, of; + LOGFONTA lf; + HDC hdc; + int i; + + /* Lucida Sans comes with XP SP2 or later */ + if (!is_truetype_font_installed("Lucida Sans")) + { + skip("Lucida Sans is not installed\n"); + return; + } + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + + for (i = 0; i < sizeof(TestName) / sizeof(TestName[0]); i++) + { + lstrcpyA(lf.lfFaceName, TestName[i]); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + + of = SelectObject(hdc, hfont); + buf[0] = 0; + ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)), + "face full name could not be read\n"); +todo_wine + ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf); + SelectObject(hdc, of); + DeleteObject(hfont); + } + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -3688,4 +3830,5 @@ START_TEST(font) test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset(); + test_fullname(); }

1 0

Hans Leidekker : msi: Remove redundant tracing.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 1650367e16f4d3c2368c8e05fdac68b17ad6f5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1650367e16f4d3c2368c8e05f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 12 17:22:34 2011 +0200 msi: Remove redundant tracing. --- dlls/msi/action.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 32cea4e..4a56485 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2744,8 +2744,6 @@ VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) DWORD versize, handle; UINT sz; - TRACE("%s\n", debugstr_w(filename)); - versize = GetFileVersionInfoSizeW( filename, &handle ); if (!versize) return NULL; @@ -2799,13 +2797,12 @@ DWORD msi_get_disk_file_size( LPCWSTR filename ) HANDLE file; DWORD size; - TRACE("%s\n", debugstr_w(filename)); - file = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); if (file == INVALID_HANDLE_VALUE) return INVALID_FILE_SIZE; size = GetFileSize( file, NULL ); + TRACE("size is %u\n", size); CloseHandle( file ); return size; }

1 0

Ričardas Barkauskas : ddraw: Fix filtering of enumerated display modes.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: a7bd11afb0ad9062b8f4feef8d8495ee701420c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7bd11afb0ad9062b8f4feef8… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun May 8 17:54:54 2011 +0300 ddraw: Fix filtering of enumerated display modes. --- dlls/ddraw/ddraw.c | 26 +++---- dlls/ddraw/tests/ddrawmodes.c | 165 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7bd11afb0ad9062b8f4f…

1 0

Jacek Caban : urlmon: Make sure to include query part of relative URI containing path in combine_uri .
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: ebf9f12c29362c2c91b64cc38f410f550b471eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf9f12c29362c2c91b64cc38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 14:47:20 2011 +0000 urlmon: Make sure to include query part of relative URI containing path in combine_uri. --- dlls/urlmon/tests/uri.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 +++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 5ebdd6e..930622a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6078,6 +6078,87 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://winehq.org/dir/testfile",0, + "test?querystring",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org/dir/test",0, + "test?querystring",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org/dir/test?querystring",0, + "#hash",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"winehq.org",S_OK}, + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"#hash",S_OK}, + {"winehq.org",S_OK}, + {"",S_FALSE}, + {"/dir/test",S_OK}, + {"/dir/test?querystring",S_OK}, + {"?querystring",S_OK}, + {"http://winehq.org/dir/test?querystring#hash",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3517c6c..459d4c4 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6006,6 +6006,11 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, } } + if(relative->query_start > -1) { + data.query = relative->canon_uri+relative->query_start; + data.query_len = relative->query_len; + } + /* Make sure the path component is valid. */ ptr = path; pptr = &ptr;

1 0