wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Damjan Jovanovic : winemenubuilder: Only add mime types that aren' t already in freedesktop.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: fbb43c42a752039544daed980f7e590134be475a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb43c42a752039544daed980… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 27 19:07:32 2009 +0200 winemenubuilder: Only add mime types that aren't already in freedesktop. --- programs/winemenubuilder/winemenubuilder.c | 89 ++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2e63168..2e87ca5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1441,6 +1441,73 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim return ret; } +static BOOL match_glob(struct list *native_mime_types, const char *extension, + char **match) +{ + struct xdg_mime_type *mime_type_entry; + int matchLength = 0; + + *match = NULL; + + LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) + { + if (fnmatch(mime_type_entry->glob, extension, 0) == 0) + { + if (*match == NULL || matchLength < strlen(mime_type_entry->glob)) + { + *match = mime_type_entry->mimeType; + matchLength = strlen(mime_type_entry->glob); + } + } + } + + if (*match != NULL) + { + *match = heap_printf("%s", *match); + if (*match == NULL) + return FALSE; + } + return TRUE; +} + +static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, + const char *extensionA, + LPCWSTR extensionW, + char **mime_type) +{ + WCHAR *lower_extensionW; + INT len; + BOOL ret = match_glob(native_mime_types, extensionA, mime_type); + if (ret == FALSE || *mime_type != NULL) + return ret; + len = strlenW(extensionW); + lower_extensionW = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); + if (lower_extensionW) + { + char *lower_extensionA; + memcpy(lower_extensionW, extensionW, (len + 1)*sizeof(WCHAR)); + strlwrW(lower_extensionW); + lower_extensionA = wchars_to_utf8_chars(lower_extensionW); + if (lower_extensionA) + { + ret = match_glob(native_mime_types, lower_extensionA, mime_type); + HeapFree(GetProcessHeap(), 0, lower_extensionA); + } + else + { + ret = FALSE; + WINE_FIXME("out of memory\n"); + } + HeapFree(GetProcessHeap(), 0, lower_extensionW); + } + else + { + ret = FALSE; + WINE_FIXME("out of memory\n"); + } + return ret; +} + static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const char *dot_extension, const char *mime_type, const char *comment) { @@ -1541,14 +1608,28 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); - if (contentTypeW == NULL) + + if (!freedesktop_mime_type_for_extension(nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) goto end; - mimeTypeA = wchars_to_utf8_chars(contentTypeW); if (mimeTypeA == NULL) - goto end; + { + if (contentTypeW != NULL) + mimeTypeA = wchars_to_utf8_chars(contentTypeW); + else + mimeTypeA = heap_printf("application/x-wine-extension-%s", &extensionA[1]); - write_freedesktop_mime_type_entry(packages_dir, extensionA, mimeTypeA, friendlyDocNameA); + if (mimeTypeA != NULL) + { + write_freedesktop_mime_type_entry(packages_dir, extensionA, mimeTypeA, friendlyDocNameA); + hasChanged = TRUE; + } + else + { + WINE_FIXME("out of memory\n"); + goto end; + } + } end: HeapFree(GetProcessHeap(), 0, extensionA);

1 0

Hans Leidekker : msi: The assembly file version field is optional.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 7d837b9f8235872f64e8dad3384a3e0253ab7c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d837b9f8235872f64e8dad33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 29 15:13:57 2009 +0200 msi: The assembly file version field is optional. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 948cf4a..c824904 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6076,7 +6076,7 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) /* FIXME: we should probably check the manifest file here */ if (!MsiGetFileVersionW(assembly->file->TargetPath, version, &size, NULL, NULL) && - strcmpW(version, assembly->file->Version) >= 0) + (!assembly->file->Version || strcmpW(version, assembly->file->Version) >= 0)) { assembly->installed = TRUE; }

1 0

Detlef Riekenberg : kernel32/nls: Add missing translations for dec.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 1fc61f0838df9696e6e151ec01687609225c573f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc61f0838df9696e6e151ec0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:27:56 2009 +0200 kernel32/nls: Add missing translations for dec.nls. --- dlls/kernel32/nls/dec.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/dec.nls b/dlls/kernel32/nls/dec.nls index 0badeeb..a77cac0 100644 --- a/dlls/kernel32/nls/dec.nls +++ b/dlls/kernel32/nls/dec.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LIECHTENSTEIN LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

1 0

Detlef Riekenberg : kernel32/nls: Add missing translations for del.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 587d6c4e959d7657de966c86056b2c490fe26f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=587d6c4e959d7657de966c860… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:28:39 2009 +0200 kernel32/nls: Add missing translations for del.nls. --- dlls/kernel32/nls/del.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls index a848e0c..396be9f 100644 --- a/dlls/kernel32/nls/del.nls +++ b/dlls/kernel32/nls/del.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

1 0

Detlef Riekenberg : kernel32/nls: Add missing translations for dea.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: a59c55a568f46295b943d1cb99b01a4a9b90b04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c55a568f46295b943d1cb9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:26:35 2009 +0200 kernel32/nls: Add missing translations for dea.nls. --- dlls/kernel32/nls/dea.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index 39d6b80..777961d 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

1 0

Detlef Riekenberg : kernel32/nls: Add missing translations for des.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: a224ad076ec7a39eb1fa772ea3982d83f7acc044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a224ad076ec7a39eb1fa772ea… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:25:49 2009 +0200 kernel32/nls: Add missing translations for des.nls. --- dlls/kernel32/nls/des.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/des.nls b/dlls/kernel32/nls/des.nls index bdee876..acc470a 100644 --- a/dlls/kernel32/nls/des.nls +++ b/dlls/kernel32/nls/des.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

1 0

Detlef Riekenberg : kernel32/nls: Translation-fix for deu.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 508c95f343224a905ab6a71a98b2b695ae45c70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=508c95f343224a905ab6a71a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:24:22 2009 +0200 kernel32/nls: Translation-fix for deu.nls. --- dlls/kernel32/nls/deu.nls | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/nls/deu.nls b/dlls/kernel32/nls/deu.nls index 4e39233..a4d39b4 100644 --- a/dlls/kernel32/nls/deu.nls +++ b/dlls/kernel32/nls/deu.nls @@ -141,7 +141,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)"

1 0

Nikolay Sivov : comctl32/listview: Don' t offset subitem rectangles with item padding returned by LVM_GETSUBITEMRECT .
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 3cd15e5db5b9b89abbc3d5a7a16b62ce28eed153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd15e5db5b9b89abbc3d5a7a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 29 01:35:36 2009 +0400 comctl32/listview: Don't offset subitem rectangles with item padding returned by LVM_GETSUBITEMRECT. --- dlls/comctl32/listview.c | 6 +++--- dlls/comctl32/tests/listview.c | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 92bab29..1c84f02 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2044,7 +2044,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW { Icon.left = Box.left + state_width; - if (uView == LVS_REPORT) + if (uView == LVS_REPORT && lpLVItem->iSubItem == 0) Icon.left += REPORT_MARGINX; Icon.top = Box.top; @@ -2145,7 +2145,7 @@ calc_label: Label.right = lpColumnInfo->rcHeader.right; Label.bottom = Label.top + infoPtr->nItemHeight; } - else /* LVS_SMALLICON, LVS_LIST or LVS_REPORT */ + else /* LVS_SMALLICON or LVS_LIST */ { Label.left = Icon.right; Label.top = Box.top; @@ -6077,7 +6077,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, Position.x, Position.y); + OffsetRect(lprc, 0, Position.y); return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 003f98f..217c2ee 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1835,32 +1835,26 @@ todo_wine rect.right = rect.bottom = 0; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); ok(r != 0, "Expected not-null LRESULT\n"); -todo_wine { expect(100, rect.left); expect(250, rect.right); -} rect.left = LVIR_ICON; rect.top = 1; rect.right = rect.bottom = 0; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); ok(r != 0, "Expected not-null LRESULT\n"); - /* no icon attached - zero width rectangle */ -todo_wine { + /* no icon attached - zero width rectangle, with no left padding */ expect(100, rect.left); expect(100, rect.right); -} rect.left = LVIR_LABEL; rect.top = 1; rect.right = rect.bottom = 0; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); ok(r != 0, "Expected not-null LRESULT\n"); - /* should equal to LVIR_BOUNDS */ -todo_wine { + /* same as full LVIR_BOUNDS */ expect(100, rect.left); expect(250, rect.right); -} DestroyWindow(hwnd);

1 0

Nikolay Sivov : comctl32/listview: A bunch of LVM_GETSUBITEMRECT tests.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 6101a48089085e4222e95b76232d43f9658641f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6101a48089085e4222e95b762… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 29 00:58:10 2009 +0400 comctl32/listview: A bunch of LVM_GETSUBITEMRECT tests. --- dlls/comctl32/tests/listview.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c4022d..003f98f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1827,6 +1827,41 @@ todo_wine todo_wine expect(3, rect.top); + /* item LVS_REPORT padding isn't applied to subitems */ + insert_item(hwnd, 0); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); +todo_wine { + expect(100, rect.left); + expect(250, rect.right); +} + + rect.left = LVIR_ICON; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + /* no icon attached - zero width rectangle */ +todo_wine { + expect(100, rect.left); + expect(100, rect.right); +} + + rect.left = LVIR_LABEL; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + /* should equal to LVIR_BOUNDS */ +todo_wine { + expect(100, rect.left); + expect(250, rect.right); +} + DestroyWindow(hwnd); /* try it for non LVS_REPORT style */

1 0

Nikolay Sivov : comctl32/listview: Fix regression on LVIR_BOUNDS request - y offset still needed.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: dd24e5de8c3a8e1241b8c3dca881ec941e3cf709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd24e5de8c3a8e1241b8c3dca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 29 00:47:25 2009 +0400 comctl32/listview: Fix regression on LVIR_BOUNDS request - y offset still needed. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fb1828e..92bab29 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5990,7 +5990,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT } if ((uView == LVS_REPORT) && (type == LVIR_BOUNDS)) - OffsetRect(lprc, Origin.x, Origin.y); + OffsetRect(lprc, Origin.x, Position.y + Origin.y); else OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); @@ -6543,7 +6543,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, INT j; /* for top/bottom only */ - bounds.left = 0; + bounds.left = LVIR_BOUNDS; LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009