September 2013 - Wine-Commits

André Hentschel : More protocol relative urls in the French translation
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: 2558702ee86c991227ab0226f00e0243e978b3a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2558702ee86c991227ab02… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:08:53 2013 +0200 More protocol relative urls in the French translation --- templates/fr/about.template | 4 +- templates/fr/forums.template | 44 +++++++++++++++++++++--------------------- templates/fr/help.template | 12 +++++----- templates/fr/home.template | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=2558702ee86c991227…

1 0

André Hentschel : More protocol relative urls in the German translation
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: d09cc7261ccbeed6104f47be4bc79714873911c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=d09cc7261ccbeed6104f47… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 17 21:10:18 2013 +0200 More protocol relative urls in the German translation --- templates/de/about.template | 2 +- templates/de/help.template | 12 ++++++------ templates/de/home.template | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 1e2e5dc..0e461da 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -11,7 +11,7 @@ Wine wird immer <a href="http://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software (en)</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers (en)</a>, die eine eigene Version von Wine mit Support verkaufen. -Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen. +Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="//appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="//forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen. <h3>Erfahre mehr:</h3> <ul> diff --git a/templates/de/help.template b/templates/de/help.template index e21dca1..1f414e2 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -57,10 +57,10 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png"> Forum</a> + <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"> Forum</a> </td> <td valign="top"> - Wir haben eine <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> + Wir haben eine <a href="//forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. Des weiteren gibt es die <a href="{$root}/site/forums">Mailing Lists</a>, die Teil der gleichen Gemeinschaft sind. @@ -79,20 +79,20 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> + <a href="//appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> </td> <td valign="top"> Falls Du Unterstützung für eine bestimmte Anwendung suchst, ist unsere Anwendungsdatenbank - <a href="http://appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. + <a href="//appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. </td> </tr> <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> + <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> - Unser Bug Tracking-System <a href="http://bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen + Unser Bug Tracking-System <a href="//bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen zu allen Problemen, an denen wir jemals gearbeitet haben oder gerade arbeiten. </td> </tr> diff --git a/templates/de/home.template b/templates/de/home.template index c71f3f7..668a41d 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -62,14 +62,14 @@ <td style="padding-left: 15px; padding-bottom: 2px;"> <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">Neuerungen (en)</a>) </td></tr> <tr><td>Entwicklungsversion:</td> <td style="padding-left: 15px;"> <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Neuerungen (en)</a>) + (<a href="//source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">Neuerungen (en)</a>) </td></tr> </table>

1 0

Lucas Zawacki : Portuguese translation for release 1.7.2
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: 151a638341bbb4e4f4c4721df5cb9797c2e09b2b URL: http://source.winehq.org/git/website.git/?a=commit;h=151a638341bbb4e4f4c472… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Sep 16 14:37:01 2013 -0300 Portuguese translation for release 1.7.2 --- news/pt/2013091301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2013091301.xml b/news/pt/2013091301.xml new file mode 100644 index 0000000..b3c582e --- /dev/null +++ b/news/pt/2013091301.xml @@ -0,0 +1,16 @@ +<news> +<date>13 de de 2013</date> +<title>Wine 1.7.2 lançado</title> +<body> + A versão de desenvolvimento 1.7.2 já está disponível agora. + <a href="{$root}/announce/1.7.2">Novidades</a> desta versão: +<ul> + <li>Melhorias na disposição de texto da direita para esquerda.</li> + <li>NTLM e autenticação negociada para RPC sobre HTTP.</li> + <li>Mais glifos para a fonte Wingdings incluída.</li> + <li>Melhor suporte à bandeja do sistema no driver Mac.</li> + <li>Melhorias do contexto de ativação.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.7.1
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: b090686f56217e0dcd422dc0d56003de5ccb76f6 URL: http://source.winehq.org/git/website.git/?a=commit;h=b090686f56217e0dcd422d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Sep 16 13:53:36 2013 -0300 Portuguese translation for release 1.7.1 --- news/pt/2013083001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2013083001.xml b/news/pt/2013083001.xml new file mode 100644 index 0000000..069b5e3 --- /dev/null +++ b/news/pt/2013083001.xml @@ -0,0 +1,17 @@ +<news> +<date>30 de Agosto de 2013</date> +<title>Wine 1.7.1 lançado</title> +<body> + A versão de desenvolvimento 1.7.1 já está disponível agora. + <a href="{$root}/announce/1.7.1">Novidades</a> desta versão: +<ul> + <li>Suporte a objetos de "keyed events".</li> + <li>Suporte ao mecanismo de sincronização "init once".</li> + <li>Suporte ao contexto de ativação de DLLs, bibliotecas de tipos e classes COM.</li> + <li>Suporte ao carregamento de bibliotecas de tipo de 32-bit em 64-bit.</li> + <li>Várias correções ao driver de Mac.</li> + <li>Algumas correções aos dispositivos de porta serial.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.2
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: f207721ac9207b83b183fc798ee7fe1f95591e09 URL: http://source.winehq.org/git/website.git/?a=commit;h=f207721ac9207b83b183fc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 14 07:18:11 2013 +0200 Polish translation for release 1.7.2 --- news/pl/2013091301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013091301.xml b/news/pl/2013091301.xml new file mode 100644 index 0000000..db4ccf8 --- /dev/null +++ b/news/pl/2013091301.xml @@ -0,0 +1,17 @@ +<news> +<date>Wrzesień 13, 2013</date> +<title>Wydano Wine 1.7.2</title> +<body> + Wydanie rozwojowe Wine 1.7.2 jest już dostępne. + <a href="{$root}/announce/1.7.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszenia w układzie tekstu od prawej-do-lewej.</li> + <li>Uwierzytelnienia NTLM i Negocjacji dla RPC przez HTTP.</li> + <li>Więcej kształtów znaków we wbudowanej czcionce Wingdings.</li> + <li>Lepsze wsparcie dla tacki systemowej w sterowniku Mac.</li> + <li>Ulepszenia w kontekście aktywacji.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Use protocol relative urls in the configuration
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: 6c149053fcf54e408148570fceb61845c6c92f5a URL: http://source.winehq.org/git/website.git/?a=commit;h=6c149053fcf54e40814857… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 20:31:07 2013 +0200 Use protocol relative urls in the configuration --- include/winehq.conf.sample | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 1eb97fb..afb8b05 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -26,7 +26,7 @@ lang: en # default base URLS (if you run the site, in a subdir, set base_root) base_root: -base_url: http://www.winehq.org{$base_root}/ +base_url: //www.winehq.org{$base_root}/ # Path to WWN XML files news_xml_path: news @@ -35,10 +35,10 @@ news_xml_path: news wwn_xml_path: wwn # URL for bugs -bug_system: http://bugs.winehq.org/show_bug.cgi?id= +bug_system: //bugs.winehq.org/show_bug.cgi?id= # URL for git tree -git_tree: http://source.winehq.org/git +git_tree: //source.winehq.org/git # Path to the root directory of the site base_path: /path/to/root/directory/of/website/

1 0

Frédéric Delanoy : French translation for release 1.7.2
by Jeremy Newman Sept. 17, 2013

Sept. 17, 2013

Module: website Branch: master Commit: 0f87af5ac3fbeb50ce09e0aade7049f6120f9b03 URL: http://source.winehq.org/git/website.git/?a=commit;h=0f87af5ac3fbeb50ce09e0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 13 22:00:04 2013 +0200 French translation for release 1.7.2 --- news/fr/2013091301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2013091301.xml b/news/fr/2013091301.xml new file mode 100644 index 0000000..171db70 --- /dev/null +++ b/news/fr/2013091301.xml @@ -0,0 +1,16 @@ +<news> +<date>13 septembre 2013</date> +<title>Sortie de Wine 1.7.2</title> +<body> + La version de développement 1.7.2 de Wine est disponible. + <a href="{$root}/announce/1.7.2">Nouveautés</a> de cette version : +<ul> + <li>Améliorations à l'agencement du texte écrit de droite à gauche.</li> + <li>Authentification NTLM et Negotiate dans RPC sur HTTP.</li> + <li>Glyphes supplémentaires dans la police Wingdings intégrée.</li> + <li>Prise en charge améliorée de la zone de notification système dans le pilote Mac.</li> + <li>Améliorations dans la prise en charge des contextes d'activation.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.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

Dmitry Timoshkov : shlwapi: Write file access also assumes read access.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: b145f42b0f1327d10c6f26b5e5ab9bf4a3273c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b145f42b0f1327d10c6f26b5e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 16 17:27:08 2013 +0900 shlwapi: Write file access also assumes read access. --- dlls/shlwapi/istream.c | 4 +--- dlls/shlwapi/tests/istream.c | 16 ---------------- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index c7242d1..42f47fe 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -420,12 +420,10 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, /* Access */ switch (STGM_ACCESS_MODE(dwMode)) { + case STGM_WRITE: case STGM_READWRITE: dwAccess = GENERIC_READ|GENERIC_WRITE; break; - case STGM_WRITE: - dwAccess = GENERIC_WRITE; - break; case STGM_READ: dwAccess = GENERIC_READ; break; diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 204854a..67f467b 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -222,27 +222,11 @@ static void test_stream_read_write(IStream *stream, DWORD mode) ret = stream->lpVtbl->Read(stream, buf, 2, &count); if (written != 0) { - /* FIXME: Remove once Wine is fixed */ - if (mode == STGM_WRITE) -todo_wine - ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); - else ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); if (mode == STGM_WRITE || mode == STGM_READWRITE) { - /* FIXME: Remove once Wine is fixed */ - if (mode == STGM_WRITE) - { -todo_wine ok(count == 2, "expected 2, got %u\n", count); -todo_wine ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); - } - else - { - ok(count == 2, "expected 2, got %u\n", count); - ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); - } } else ok(count == 0, "expected 0, got %u\n", count);

1 0

Dmitry Timoshkov : shlwapi/tests: Add a read/ write test for IStream on files.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 75fc26f680a99ecdb25713fda9709942aaf0116f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc26f680a99ecdb25713fda… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 16 17:26:20 2013 +0900 shlwapi/tests: Add a read/write test for IStream on files. --- dlls/shlwapi/tests/istream.c | 71 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index f525d7c..204854a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -191,6 +191,71 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) } +static void test_stream_read_write(IStream *stream, DWORD mode) +{ + static const LARGE_INTEGER start; + HRESULT ret; + unsigned char buf[16]; + DWORD written, count; + + /* IStream_Read/Write from the COBJMACROS is undefined by shlwapi.h */ + + written = 0xdeadbeaf; + ret = stream->lpVtbl->Write(stream, "\x5e\xa7", 2, &written); + if (mode == STGM_WRITE || mode == STGM_READWRITE) + { + ok(ret == S_OK, "IStream_Write error %#x (access %#x)\n", ret, mode); + ok(written == 2, "expected 2, got %u\n", written); + } + else + { + ok(ret == STG_E_ACCESSDENIED || broken(ret == S_OK) /* win2000 */, "expected STG_E_ACCESSDENIED, got %#x (access %#x)\n", ret, mode); + ok(written == 0xdeadbeaf || broken(written == 2) /* win2000 */, "expected 0xdeadbeaf, got %#x\n", written); + written = 0; + if (ret == S_OK) return; /* no point in further testing */ + } + + ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL); + ok(ret == S_OK, "Seek error %#x\n", ret); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, 2, &count); + if (written != 0) + { + /* FIXME: Remove once Wine is fixed */ + if (mode == STGM_WRITE) +todo_wine + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + else + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + if (mode == STGM_WRITE || mode == STGM_READWRITE) + { + /* FIXME: Remove once Wine is fixed */ + if (mode == STGM_WRITE) + { +todo_wine + ok(count == 2, "expected 2, got %u\n", count); +todo_wine + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); + } + else + { + ok(count == 2, "expected 2, got %u\n", count); + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); + } + } + else + ok(count == 0, "expected 0, got %u\n", count); + } + else + { +todo_wine + ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == 0, "expected 0, got %u\n", count); + } + +} + static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) { IStream * stream; @@ -282,6 +347,8 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) if (stream) { BOOL delret; + + test_stream_read_write(stream, mode); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -392,6 +459,8 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) if (stream) { BOOL delret; + + test_stream_read_write(stream, mode); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -616,7 +685,7 @@ START_TEST(istream) int i, j, k; - hShlwapi = GetModuleHandleA("shlwapi.dll"); + hShlwapi = LoadLibrary("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); pSHCreateStreamOnFileW = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileW");

1 0

Piotr Caban : msvcrt: Fix Inf and NaN handling in printf function.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 6594212dd6bbf93d17cedb82eacc6a81bd066fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6594212dd6bbf93d17cedb82e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 16 15:05:16 2013 +0200 msvcrt: Fix Inf and NaN handling in printf function. --- dlls/msvcrt/printf.h | 39 ++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/printf.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 0fe27f7..dd36f59 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -537,6 +537,27 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API int len = flags.Precision + 10; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; int r; + BOOL inf = FALSE, nan = FALSE; + + if(isinf(val)) + inf = TRUE; + else if(isnan(val)) + nan = TRUE; /* FIXME: NaN value may be displayed as #IND or #QNAN */ + + if(inf || nan) { + if(nan || val<0) + flags.Sign = '-'; + + if(flags.Format=='g' || flags.Format=='G') + val = 1.1234; /* fraction will be overwritten with #INF or #IND string */ + else + val = 1; + + if(flags.Format=='a') { + if(flags.Precision==-1) + flags.Precision = 6; /* strlen("#INF00") */ + } + } if(flags.Format=='f') { if(val>-10.0 && val<10.0) @@ -566,9 +587,25 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_fixup_exponent)(tmp); decimal_point = strchr(tmp, '.'); - if(decimal_point) + if(decimal_point) { *decimal_point = *locinfo->lconv->decimal_point; + if(inf || nan) { + static const char inf_str[] = "#INF"; + static const char ind_str[] = "#IND"; + + for(i=1; i<=sizeof(inf ? inf_str : ind_str); i++) { + if(decimal_point[i]<'0' || decimal_point[i]>'9') + break; + + decimal_point[i] = inf ? inf_str[i-1] : ind_str[i-1]; + } + + if(i!=sizeof(inf_str) && i!=1) + decimal_point[i-1]++; + } + } + len = strlen(tmp); i = FUNC_NAME(pf_fill)(pf_puts, puts_ctx, len, &flags, TRUE); if(i < 0) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index e61ca5f..24bc401 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <errno.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -81,7 +82,7 @@ static void test_sprintf( void ) { char buffer[100]; const char *format; - double pnumber=789456123; + double pnumber=789456123, inf, nan; int x, r; WCHAR wide[] = { 'w','i','d','e',0}; @@ -639,6 +640,41 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"123"), "failed: \"%s\"\n", buffer); r = sprintf(buffer, format, 0x12345); ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); + + nan = 0.0; + inf = 1.0/nan; + nan = sqrt(-1); + format = "%lf"; + r = sprintf(buffer, format, nan); + ok(r==9, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND00"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==8, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF00"), "failed: \"%s\"\n", buffer); + + format = "%le"; + r = sprintf(buffer, format, nan); + ok(r==14, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND00e+000"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==13, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF00e+000"), "failed: \"%s\"\n", buffer); + + format = "%lg"; + r = sprintf(buffer, format, nan); + ok(r==7, "r = %d\n", r); + ok(!strcmp(buffer, "-1.#IND"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==6, "r = %d\n", r); + ok(!strcmp(buffer, "1.#INF"), "failed: \"%s\"\n", buffer); + + format = "%010.2lf"; + r = sprintf(buffer, format, nan); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "-000001.#J"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, inf); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void )

1 0