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

Nikolay Sivov : comctl32/listview: Fix parameter validation for LVM_SETITEMTEXT.
by Alexandre Julliard 13 May '11

13 May '11

Module: wine Branch: master Commit: c6dd14199c6f48161ee8393232cb4daddb4df78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dd14199c6f48161ee839323… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 01:52:09 2011 +0400 comctl32/listview: Fix parameter validation for LVM_SETITEMTEXT. --- dlls/comctl32/listview.c | 4 ++-- dlls/comctl32/tests/listview.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8f7745f..86c3f76 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8785,8 +8785,8 @@ static BOOL LISTVIEW_SetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { LVITEMW lvItem; - if (nItem < 0 && nItem >= infoPtr->nItemCount) return FALSE; - + if (!lpLVItem || nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE; + lvItem.iItem = nItem; lvItem.iSubItem = lpLVItem->iSubItem; lvItem.mask = LVIF_TEXT; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20f231e..7f9f7a7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4710,6 +4710,40 @@ static void test_dispinfo(void) DestroyWindow(hwnd); } +static void test_LVM_SETITEMTEXT(void) +{ + static char testA[] = "TEST"; + LVITEMA item; + HWND hwnd; + DWORD ret; + + hwnd = create_listview_control(LVS_ICON); + ok(hwnd != NULL, "failed to create listview window\n"); + + insert_item(hwnd, 0); + + /* null item pointer */ + ret = SendMessage(hwnd, LVM_SETITEMTEXTA, 0, 0); + expect(FALSE, ret); + + ret = SendMessage(hwnd, LVM_SETITEMTEXTW, 0, 0); + expect(FALSE, ret); + + /* index out of bounds */ + item.pszText = testA; + item.cchTextMax = 0; /* ignored */ + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 1, (LPARAM)&item); + expect(FALSE, ret); + + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, -1, (LPARAM)&item); + expect(FALSE, ret); + + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + expect(TRUE, ret); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4774,6 +4808,7 @@ START_TEST(listview) test_destroynotify(); test_createdragimage(); test_dispinfo(); + test_LVM_SETITEMTEXT(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

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

12 May '11

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

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

12 May '11

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: Handle embedded nulls in text archives.
by Alexandre Julliard 12 May '11

12 May '11

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: Unescape ^Q^Y sequences in text archives.
by Alexandre Julliard 12 May '11

12 May '11

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 12 May '11

12 May '11

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

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

12 May '11

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

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

12 May '11

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

Hans Leidekker : msi: Remove redundant tracing.
by Alexandre Julliard 12 May '11

12 May '11

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

Huw Davies : gdi32: Implement SelectBrush for DIB pattern brushes.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 3c70a26e4b8b2814b44ef6e284a750a369404a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c70a26e4b8b2814b44ef6e28… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 12 12:05:37 2011 +0100 gdi32: Implement SelectBrush for DIB pattern brushes. --- dlls/gdi32/dibdrv/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 5 ++ dlls/gdi32/dibdrv/objects.c | 49 ++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + 4 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a9a53ad..7a11bec 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -108,6 +108,29 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return TRUE; } +BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage) +{ + DWORD *masks = NULL; + RGBQUAD *color_table = NULL; + BYTE *ptr = (BYTE*)bi + bi->biSize; + int num_colors = bi->biClrUsed; + + if(bi->biCompression == BI_BITFIELDS) + { + masks = (DWORD *)ptr; + ptr += 3 * sizeof(DWORD); + } + + if(!num_colors && bi->biBitCount <= 8) num_colors = 1 << bi->biBitCount; + if(num_colors) color_table = (RGBQUAD*)ptr; + if(usage == DIB_PAL_COLORS) + ptr += num_colors * sizeof(WORD); + else + ptr += num_colors * sizeof(*color_table); + + return init_dib_info(dib, bi, masks, ptr); +} + static void clear_dib_info(dib_info *dib) { dib->bits = NULL; @@ -118,7 +141,7 @@ static void clear_dib_info(dib_info *dib) * * Free the resources associated with a dib and optionally the bits */ -static void free_dib_info(dib_info *dib, BOOL free_bits) +void free_dib_info(dib_info *dib, BOOL free_bits) { if(free_bits) { @@ -127,6 +150,80 @@ static void free_dib_info(dib_info *dib, BOOL free_bits) } } +void copy_dib_color_info(dib_info *dst, const dib_info *src) +{ + dst->bit_count = src->bit_count; + dst->red_mask = src->red_mask; + dst->green_mask = src->green_mask; + dst->blue_mask = src->blue_mask; + dst->red_len = src->red_len; + dst->green_len = src->green_len; + dst->blue_len = src->blue_len; + dst->red_shift = src->red_shift; + dst->green_shift = src->green_shift; + dst->blue_shift = src->blue_shift; + dst->funcs = src->funcs; +} + +static BOOL dib_formats_match(const dib_info *d1, const dib_info *d2) +{ + if(d1->bit_count != d2->bit_count) return FALSE; + + switch(d1->bit_count) + { + case 24: return TRUE; + + case 32: + case 16: + return (d1->red_mask == d2->red_mask) && (d1->green_mask == d2->green_mask) && + (d1->blue_mask == d2->blue_mask); + + default: + ERR("Unexpected depth %d\n", d1->bit_count); + return FALSE; + } +} + +/************************************************************** + * convert_dib + * + * Converts src into the format specified in dst. + * + * FIXME: At the moment this always creates a top-down dib, + * do we want to give the option of bottom-up? + */ +BOOL convert_dib(dib_info *dst, const dib_info *src) +{ + INT y; + + dst->height = src->height; + dst->width = src->width; + dst->stride = ((dst->width * dst->bit_count + 31) >> 3) & ~3; + dst->bits = NULL; + + if(dib_formats_match(src, dst)) + { + dst->bits = HeapAlloc(GetProcessHeap(), 0, dst->height * dst->stride); + + if(src->stride > 0) + memcpy(dst->bits, src->bits, dst->height * dst->stride); + else + { + BYTE *src_bits = src->bits; + BYTE *dst_bits = dst->bits; + for(y = 0; y < dst->height; y++) + { + memcpy(dst_bits, src_bits, dst->stride); + dst_bits += dst->stride; + src_bits += src->stride; + } + } + return TRUE; + } + FIXME("Format conversion not implemented\n"); + return FALSE; +} + /*********************************************************************** * dibdrv_DeleteDC */ @@ -135,6 +232,7 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p)\n", dev); DeleteObject(pdev->clip); + free_pattern_brush(pdev); free_dib_info(&pdev->dib, FALSE); return 0; } @@ -156,6 +254,8 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) pdev->defer = 0; clear_dib_info(&pdev->dib); + clear_dib_info(&pdev->brush_dib); + pdev->brush_and_bits = pdev->brush_xor_bits = NULL; if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) pdev->defer |= DEFER_FORMAT; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7327fca..1982866 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -48,6 +48,11 @@ extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage) DECLSPEC_HIDDEN; +extern void free_dib_info(dib_info *dib, BOOL free_bits) DECLSPEC_HIDDEN; +extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; +extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; +extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 52aab44..dde7a96 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -956,11 +956,37 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) return TRUE; } +/********************************************************************** + * pattern_brush + * + * Fill a number of rectangles with the pattern brush + * FIXME: Should we insist l < r && t < b? Currently we assume this. + */ +static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) +{ + return FALSE; +} + +static void free_pattern_brush_bits( dibdrv_physdev *pdev ) +{ + HeapFree(GetProcessHeap(), 0, pdev->brush_and_bits); + HeapFree(GetProcessHeap(), 0, pdev->brush_xor_bits); + pdev->brush_and_bits = NULL; + pdev->brush_xor_bits = NULL; +} + +void free_pattern_brush( dibdrv_physdev *pdev ) +{ + free_pattern_brush_bits( pdev ); + free_dib_info( &pdev->brush_dib, TRUE ); +} + void update_brush_rop( dibdrv_physdev *pdev, INT rop ) { pdev->brush_rop = rop; if(pdev->brush_style == BS_SOLID) calc_and_xor_masks(rop, pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + free_pattern_brush_bits( pdev ); } /*********************************************************************** @@ -983,6 +1009,8 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->defer |= DEFER_BRUSH; + free_pattern_brush( pdev ); + switch(logbrush.lbStyle) { case BS_SOLID: @@ -991,6 +1019,27 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->brush_rects = solid_brush; pdev->defer &= ~DEFER_BRUSH; break; + + case BS_DIBPATTERN: + { + BITMAPINFOHEADER *bi = GlobalLock((HGLOBAL)logbrush.lbHatch); + dib_info orig_dib; + + if(!bi) return NULL; + if(init_dib_info_from_packed(&orig_dib, bi, LOWORD(logbrush.lbColor))) + { + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); + if(convert_dib(&pdev->brush_dib, &orig_dib)) + { + pdev->brush_rects = pattern_brush; + pdev->defer &= ~DEFER_BRUSH; + } + free_dib_info(&orig_dib, FALSE); + } + GlobalUnlock((HGLOBAL)logbrush.lbHatch); + break; + } + default: break; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9cb528c..0f59f48 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -124,6 +124,8 @@ typedef struct dibdrv_physdev UINT brush_style; INT brush_rop; /* PatBlt, for example, can override the DC's rop2 */ DWORD brush_color, brush_and, brush_xor; + dib_info brush_dib; + void *brush_and_bits, *brush_xor_bits; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); /* background */

1 0