wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Akihiro Sagawa : comctl32: Truncate the info tip text when using ANSI version messages.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 8cedea0d60f567b68531be06efc4f0a21ad8b516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cedea0d60f567b68531be06e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 13 22:45:22 2012 +0900 comctl32: Truncate the info tip text when using ANSI version messages. --- dlls/comctl32/tests/tooltips.c | 6 +++--- dlls/comctl32/tooltips.c | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index cf571de..c92ed62 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -668,7 +668,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_ENUMTOOLSA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); ok(toolinfoA.uId == 0x1234ABCD, "uId should be retrieved, got %p\n", (void*)toolinfoA.uId); @@ -678,7 +678,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); memset(bufA, 0, sizeof(bufA)); toolinfoA.hwnd = NULL; @@ -686,7 +686,7 @@ static void test_longtextA(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); textlen = lstrlenA(toolinfoA.lpszText); - todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(textlen == 80, "lpszText has %d chars\n", textlen); } DestroyWindow(hwnd); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 1d758b4..d1e57a3 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -171,6 +171,8 @@ typedef struct #define ICON_HEIGHT 16 #define ICON_WIDTH 16 +#define MAX_TEXT_SIZE_A 80 /* maximum retriving text size by ANSI message */ + static LRESULT CALLBACK TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); @@ -954,8 +956,9 @@ TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) else if (isW) strcpyW (ti->lpszText, toolPtr->lpszText); else + /* ANSI version, the buffer is maximum 80 bytes without null. */ WideCharToMultiByte(CP_ACP, 0, toolPtr->lpszText, -1, - (LPSTR)ti->lpszText, INFOTIPSIZE, NULL, NULL); + (LPSTR)ti->lpszText, MAX_TEXT_SIZE_A, NULL, NULL); } } @@ -1341,12 +1344,13 @@ TOOLTIPS_GetTextT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) /* NB this API is broken, there is no way for the app to determine what size buffer it requires nor a way to specify how long the - one it supplies is. We'll assume it's up to INFOTIPSIZE */ + one it supplies is. According to the test result, it's up to + 80 bytes by the ANSI version. */ buffer[0] = '\0'; TOOLTIPS_GetTipText(infoPtr, nTool, buffer); WideCharToMultiByte(CP_ACP, 0, buffer, -1, (LPSTR)ti->lpszText, - INFOTIPSIZE, NULL, NULL); + MAX_TEXT_SIZE_A, NULL, NULL); } return 0;

1 0

Akihiro Sagawa : comctl32/tests: Add tests for long info tip texts.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 28f26c978387e161b42b9dd5960a91e1af6b49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f26c978387e161b42b9dd59… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 13 22:45:20 2012 +0900 comctl32/tests: Add tests for long info tip texts. --- dlls/comctl32/tests/tooltips.c | 124 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 31504d1..cf571de 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -636,6 +636,128 @@ static void test_ttm_gettoolinfo(void) DestroyWindow(hwnd); } +static void test_longtextA(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. In fact, the buffer is not null-terminated."; + HWND hwnd; + TTTOOLINFOA toolinfoA = { 0 }; + CHAR bufA[256]; + LRESULT r; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = GetModuleHandleA(NULL); + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1234ABCD; + strcpy(bufA, longtextA); + toolinfoA.lpszText = bufA; + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + if (r) + { + int textlen; + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0xABCD1234; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_ENUMTOOLSA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(toolinfoA.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoA.uId); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + +static void test_longtextW(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. Actually, this is not applied for wide version."; + HWND hwnd; + TTTOOLINFOW toolinfoW = { 0 }; + WCHAR bufW[256]; + LRESULT r; + int lenW; + + hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + if(!hwnd) + { + win_skip("CreateWindowExW() not supported. Skipping.\n"); + return; + } + + toolinfoW.cbSize = TTTOOLINFOW_V2_SIZE; + toolinfoW.hwnd = NULL; + toolinfoW.hinst = GetModuleHandleW(NULL); + toolinfoW.uFlags = 0; + toolinfoW.uId = 0x1234ABCD; + MultiByteToWideChar(CP_ACP, 0, longtextA, -1, bufW, sizeof(bufW)/sizeof(bufW[0])); + lenW = lstrlenW(bufW); + toolinfoW.lpszText = bufW; + toolinfoW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); + if (r) + { + int textlen; + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0xABCD1234; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_ENUMTOOLSW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + ok(toolinfoW.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoW.uId); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW || + broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ + "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -644,4 +766,6 @@ START_TEST(tooltips) test_customdraw(); test_gettext(); test_ttm_gettoolinfo(); + test_longtextA(); + test_longtextW(); }

1 0

Christian Costa : winegstreamer: Remove useless FIXME.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 1a5851f634efe9261b9bb98b32eb07e72d713437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5851f634efe9261b9bb98b3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 19:23:31 2012 +0200 winegstreamer: Remove useless FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 3a84f7a..03b854b 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -796,7 +796,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P NULL); hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); - FIXME("%08x\n", hr); gst_caps_unref(capsin); gst_caps_unref(capsout);

1 0

Alasdair Sinclair : Fix bug list in release announcement
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 46ecfe23067a261412287cadf52fb18ac5af6301 URL: http://source.winehq.org/git/website.git/?a=commit;h=46ecfe23067a261412287c… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sun Apr 15 17:27:46 2012 +0100 Fix bug list in release announcement Regards Alasdair --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 6faaae2..5000fc5 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -39,7 +39,7 @@ if ($arr = file($announce)) } else if ($in_bugs) { - $arr[$c] = preg_replace("^/( +)([0-9]+)/", + $arr[$c] = preg_replace("/^( +)([0-9]+)/", "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>", $arr[$c]); }

1 0

hasan kiran : Turkish translation for release 1.5.=?UTF-8?Q?2=E2=80=8F?=
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: e081c96759cd7408369305a1380869bad7a3bae9 URL: http://source.winehq.org/git/website.git/?a=commit;h=e081c96759cd7408369305… Author: hasan kiran <sunder67(a)hotmail.com> Date: Sat Apr 14 14:19:16 2012 +0000 Turkish translation for release 1.5.2‏ --_78a6ce78-4b8c-4c84-823f-251a6940b706_ Content-Type: text/plain; charset="windows-1256" Content-Transfer-Encoding: 8bit <html> <head> <style></style></head> <body class='hmmessage'><div dir='ltr'> </div></body> </html> --- news/tr/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/tr/2012041301.xml b/news/tr/2012041301.xml new file mode 100644 index 0000000..a3019a6 --- /dev/null +++ b/news/tr/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>13 Nisan 2012</date> +<title>Wine 1.5.2 Yayınlandı</title> +<body> + Wine 1.5.2 geliştirme sürümü şimdi kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.5.2">yenilikler</a> : +<ul> + <li>Ses cihazları için gelişmiş adlandırma şeması.</li> + <li>Mac OS X sistem yazı tiplerini bulmak için daha iyi destek.</li> + <li>JPEG kodlama için destek başlangıcı.</li> + <li>Çeşitli baskı düzeltmeleri.</li> + <li>URL önbellek geliştirmeleri.</li> + <li>Çeşitli hata düzeltmeleri.</li> +</ul> +Kaynağı <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">artık kullanımda</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news>

1 0

Eduardo García : Spanish translation for release 1.5.2
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 7d194b8caf4bbc783e6dddbc905a77bcf028d3c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=7d194b8caf4bbc783e6ddd… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat Apr 14 16:15:46 2012 +0200 Spanish translation for release 1.5.2 With regards. Eduardo >From 976d0aa981abb288006888c7e96cdce3947ad71c Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 14 Apr 2012 16:06:46 +0200 Subject: Spanish translation for release 1.5.2 --- news/es/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/es/2012041301.xml b/news/es/2012041301.xml new file mode 100644 index 0000000..368e510 --- /dev/null +++ b/news/es/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>Abril 13, 2012</date> +<title>Wine 1.5.2 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.2 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.2">Novedades</a> en esta versión: +<ul> + <li>Mejorada la nomenclatura para dispositivos de audio.</li> + <li>Soporte mejorado para la localización de fuentes del sistema en Mac OS X.</li> + <li>Inicios del soporte para la codificación JPEG.</li> + <li>Varias mejoras en la impresión.</li> + <li>Mejoras en la caché de URLs.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.2 freigegeben
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: c2bf8a22318f6cf45ae9702e298fbd2ad0839dba URL: http://source.winehq.org/git/website.git/?a=commit;h=c2bf8a22318f6cf45ae970… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 14 13:04:49 2012 +0200 Wine 1.5.2 freigegeben --- news/de/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012041301.xml b/news/de/2012041301.xml new file mode 100644 index 0000000..ad84ba9 --- /dev/null +++ b/news/de/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>13. April 2012</date> +<title>Wine 1.5.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Namensgebung für Audio Geräte.</li> + <li>Verbesserte Unterstützung um Systemschriftarten unter Mac OS X zu finden.</li> + <li>Anfänge einer Unterstützung für JPEG Kodierung.</li> + <li>Mehrer Fehlerbehebungen beim Drucken.</li> + <li>Verbesserungen am URL Cache.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.2
by Jeremy Newman 16 Apr '12

16 Apr '12

Module: website Branch: master Commit: 51052a6f1a2e3f1f7a8bbcb750841c195fc6b9c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=51052a6f1a2e3f1f7a8bbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 13 20:44:02 2012 +0200 French translation for release 1.5.2 --- news/fr/2012041301.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2012041301.xml b/news/fr/2012041301.xml new file mode 100644 index 0000000..1f484ad --- /dev/null +++ b/news/fr/2012041301.xml @@ -0,0 +1,20 @@ +<news> +<date>13 avril 2012</date> +<title>Sortie de Wine 1.5.2</title> +<body> + La version de développement 1.5.2 de Wine est disponible. + <a href="{$root}/announce/1.5.2">Nouveautés</a> de cette version : +<ul> + <li>Canevas de nommage amélioré pour les périphériques audios.</li> + <li>Meilleure prise en charge de la découverte de polices système sous Mac OS X.</li> + <li>Ébauche de support du codage JPEG.</li> + <li>Divers correctifs pour l'impression.</li> + <li>Améliorations au cache d'URL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.2
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: website Branch: master Commit: b7bb05802b4d21fbab5e0967d53ad8927f8c2c67 URL: http://source.winehq.org/git/website.git/?a=commit;h=b7bb05802b4d21fbab5e09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 20:26:22 2012 +0200 Wine release 1.5.2 --- news/en/2012041301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012041301.xml b/news/en/2012041301.xml new file mode 100644 index 0000000..7e9b396 --- /dev/null +++ b/news/en/2012041301.xml @@ -0,0 +1,17 @@ +<news> +<date>April 13, 2012</date> +<title>Wine 1.5.2 Released</title> +<body> + The Wine development release 1.5.2 is now available. + <a href="{$root}/announce/1.5.2">What's new</a> in this release: +<ul> + <li>Improved naming scheme for audio devices.</li> + <li>Better support for finding system fonts on Mac OS X.</li> + <li>Beginnings of support for JPEG encoding.</li> + <li>Several printing fixes.</li> + <li>Improvements to the URL cache.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.2 : Alexandre Julliard : Release 1.5.2
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: refs/tags/wine-1.5.2 Tag: 261b5154ffaf3d4d223c1f60b0f0b33a2569a44b URL: http://source.winehq.org/git/wine.git/?a=tag;h=261b5154ffaf3d4d223c1f60b0f0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 20:15:36 2012 +0200 Release 1.5.2

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
72
Older →

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 April 2012