June 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : Merge branch 'lxr'.
by Alexandre Julliard 30 Jun '14

30 Jun '14

Module: tools Branch: master Commit: d8bd93ef76a21dfd186c192e9246ae8b483d7cd7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d8bd93ef76a21dfd186c192e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 13:34:29 2014 +0200 Merge branch 'lxr'. ---

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.21
by Jeremy Newman 30 Jun '14

30 Jun '14

Module: website Branch: master Commit: b43b1fc9c49c1d651b004764a359c8bc296c6aa2 URL: http://source.winehq.org/git/website.git/?a=commit;h=b43b1fc9c49c1d651b0047… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 28 17:15:33 2014 +0200 Polish translation for release 1.7.21 --- news/pl/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014062701.xml b/news/pl/2014062701.xml new file mode 100644 index 0000000..a3ddbdc --- /dev/null +++ b/news/pl/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 27, 2014</date> +<title>Wydano Wine 1.7.21</title> +<body> + Wydanie rozwojowe Wine 1.7.21 jest już dostępne. + <a href="{$root}/announce/1.7.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa krytycznych sekcji w bibliotece uruchomieniowej C.</li> + <li>Dane Unicode uaktualniono do Unicode 7.0.</li> + <li>Obsługa kodowania PNG z przeplotem.</li> + <li>Zalążek obsługi dla biblioteki Packager.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.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

Julian Rüger : German translation for release 1.7.21
by Jeremy Newman 30 Jun '14

30 Jun '14

Module: website Branch: master Commit: 8227087ccf7c8256cebc552ebec9bc058abb6190 URL: http://source.winehq.org/git/website.git/?a=commit;h=8227087ccf7c8256cebc55… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jun 30 02:38:04 2014 +0200 German translation for release 1.7.21 --- news/de/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014062701.xml b/news/de/2014062701.xml new file mode 100644 index 0000000..3817042 --- /dev/null +++ b/news/de/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>27. Juni 2014</date> +<title>Wine 1.7.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für kritische Abschnitte in der C-Laufzeit.</li> + <li>Unicode-Daten auf Unicode 7.0 aktualisiert.</li> + <li>Unterstützung des Zeilensprungverfahrens bei PNG-Enkodierung.</li> + <li>Initialer Stub der Packager-Bibliothek.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.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.7.21
by Jeremy Newman 27 Jun '14

27 Jun '14

Module: website Branch: master Commit: 135410afd339915d66d688bf7d06ae99676cb079 URL: http://source.winehq.org/git/website.git/?a=commit;h=135410afd339915d66d688… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 27 22:58:56 2014 +0200 French translation for release 1.7.21 --- news/fr/2014062701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014062701.xml b/news/fr/2014062701.xml new file mode 100644 index 0000000..e7bb6cc --- /dev/null +++ b/news/fr/2014062701.xml @@ -0,0 +1,15 @@ +<news> +<date>27 juin 2014</date> +<title>Sortie de Wine 1.7.21</title> +<body> + La version de développement 1.7.21 de Wine est disponible. + <a href="{$root}/announce/1.7.21">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des sections critiques dans le moteur d'exécution C.</li> + <li>Données Unicode mises à jour vers Unicode 7.0.</li> + <li>Prise en charge du codage d'images PNG entrelacées.</li> + <li>Première ébauche de bibliothèque Packager.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.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.7.21
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: website Branch: master Commit: 5b60a5b743eeb7060665c1797da32cee60ab3d17 URL: http://source.winehq.org/git/website.git/?a=commit;h=5b60a5b743eeb7060665c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:20:10 2014 +0200 Wine release 1.7.21 --- news/en/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014062701.xml b/news/en/2014062701.xml new file mode 100644 index 0000000..c81f919 --- /dev/null +++ b/news/en/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>June 27, 2014</date> +<title>Wine 1.7.21 Released</title> +<body> + The Wine development release 1.7.21 is now available. + <a href="{$root}/announce/1.7.21">What's new</a> in this release: +<ul> + <li>Support for critical sections in the C runtime.</li> + <li>Unicode data updated to Unicode 7.0.</li> + <li>Support for interlaced PNG encoding.</li> + <li>Initial stub for the Packager library.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.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

Alexandre Julliard : Release 1.7.21.
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: wine Branch: master Commit: 991575c2370debd29f53ab90689a8889b54a7d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991575c2370debd29f53ab906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21. --- ANNOUNCE | 674 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 318 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991575c2370debd29f53a…

1 0

Tag wine-1.7.21 : Alexandre Julliard : Release 1.7.21
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: wine Branch: refs/tags/wine-1.7.21 Tag: f4dd56db4d8c140b2c5b7646cf882ad6018b0f2a URL: http://source.winehq.org/git/wine.git/?a=tag;h=f4dd56db4d8c140b2c5b7646cf88… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21

1 0

Piotr Caban : msvcrt: Use file-> _flag to check if file buffering is enabled.
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: wine Branch: master Commit: fffbc8e570e024558ddd21e2aab5fabf8b2056a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffbc8e570e024558ddd21e2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:24 2014 +0200 msvcrt: Use file->_flag to check if file buffering is enabled. --- dlls/msvcrt/file.c | 66 +++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 465a417..77ec853 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -588,7 +588,7 @@ void msvcrt_init_io(void) /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(MSVCRT_FILE* file) { - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) { file->_flag |= MSVCRT__IOERR; @@ -627,8 +627,8 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) file->_flag |= MSVCRT__IOMYBUF; } else { file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); + file->_bufsiz = 2; + file->_flag |= MSVCRT__IONBF; } file->_ptr = file->_base; file->_cnt = 0; @@ -641,11 +641,13 @@ static BOOL add_std_buffer(MSVCRT_FILE *file) static char buffers[2][MSVCRT_BUFSIZ]; if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) - || !MSVCRT__isatty(file->_file) || file->_bufsiz) + || (file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + || !MSVCRT__isatty(file->_file)) return FALSE; file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__USERBUF; return TRUE; } @@ -656,6 +658,7 @@ static void remove_std_buffer(MSVCRT_FILE *file) msvcrt_flush_buffer(file); file->_ptr = file->_base = NULL; file->_bufsiz = file->_cnt = 0; + file->_flag &= ~MSVCRT__USERBUF; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -3413,7 +3416,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } /* Allocate buffer if needed */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) msvcrt_alloc_buffer(file); if(!(file->_flag & MSVCRT__IOREAD)) { @@ -3425,7 +3428,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } } - if(file->_flag & MSVCRT__IONBF) { + if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; @@ -3647,7 +3650,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } if(!(file->_flag & MSVCRT__IOWRT)) { @@ -3656,7 +3659,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) else return MSVCRT_EOF; } - if(file->_bufsiz && !(file->_flag&MSVCRT__IONBF)) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0; if(file->_cnt <= 0) { @@ -3706,22 +3709,21 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si written += pcnt; wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if(!file->_bufsiz && (file->_flag & MSVCRT__IONBF)) { - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else - break; - } + } else if((file->_flag & MSVCRT__IONBF) + || ((file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= file->_bufsiz) + || (!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= MSVCRT_INTERNAL_BUFSIZ)) { + MSVCRT_size_t pcnt; + int bufsiz; + + if(file->_flag & MSVCRT__IONBF) + bufsiz = 1; + else if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + bufsiz = MSVCRT_INTERNAL_BUFSIZ; + else + bufsiz = file->_bufsiz; + + pcnt = (wrcnt / bufsiz) * bufsiz; - if(MSVCRT__write(file->_file, ptr, wrcnt) <= 0) { - file->_flag |= MSVCRT__IOERR; - break; - } - written += wrcnt; - wrcnt = 0; - } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { - MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; if(msvcrt_flush_buffer(file) == MSVCRT_EOF) break; @@ -3939,7 +3941,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm { MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; - int pread=0; + MSVCRT_size_t pread=0; if(!rcnt) return 0; @@ -3963,11 +3965,14 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm return 0; } } + + if(rcnt>0 && !(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + msvcrt_alloc_buffer(file); + while(rcnt>0) { int i; - if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && !(file->_flag & MSVCRT__IONBF) - && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { + if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -3981,8 +3986,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm file->_cnt -= i; file->_ptr += i; } - } else if (rcnt > UINT_MAX) { - i = MSVCRT__read(file->_file, ptr, UINT_MAX); + } else if (rcnt > INT_MAX) { + i = MSVCRT__read(file->_file, ptr, INT_MAX); } else if (rcnt < MSVCRT_BUFSIZ) { i = MSVCRT__read(file->_file, ptr, rcnt); } else { @@ -4190,7 +4195,7 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return -1; } - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; @@ -4879,7 +4884,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if((!file->_bufsiz && msvcrt_alloc_buffer(file)) + if((!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++;

1 0

Piotr Caban : msvcrt: Don' t touch _bufsiz value while initializing FILE structure.
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: wine Branch: master Commit: 60eb44d8209e9829f21edb159408b8930b68107e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60eb44d8209e9829f21edb159… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:52 2014 +0200 msvcrt: Don't touch _bufsiz value while initializing FILE structure. --- dlls/msvcrt/file.c | 4 +++- dlls/msvcrt/tests/file.c | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77ec853..44e9339 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -458,9 +458,11 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) *MSVCRT__errno() = MSVCRT_EBADF; return -1; } - memset(file, 0, sizeof(*file)); + file->_ptr = file->_base = NULL; + file->_cnt = 0; file->_file = fd; file->_flag = stream_flags; + file->_tmpfname = NULL; TRACE(":got FILE* (%p)\n",file); return 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 2fd46f2..c253f88 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1628,7 +1628,7 @@ static void test_fopen_s( void ) const char name[] = "empty1"; char buff[16]; unsigned char *ubuff = (unsigned char*)buff; - FILE *file; + FILE *file, *file2; int ret; int len; @@ -1719,6 +1719,22 @@ static void test_fopen_s( void ) ubuff[0], ubuff[1], ubuff[2]); fclose(file); + /* test initial FILE values */ + memset(file, 0xfe, sizeof(*file)); + file->_flag = 0; + ret = p_fopen_s(&file2, name, "r"); + ok(!ret, "fopen_s failed with %d\n", ret); + ok(file == file2, "file != file2 %p %p\n", file, file2); + ok(!file->_ptr, "file->_ptr != NULL\n"); + ok(!file->_cnt, "file->_cnt != 0\n"); + ok(!file->_base, "file->_base != NULL\n"); + ok(file->_flag == 1, "file->_flag = %x\n", file->_flag); + ok(file->_file, "file->_file == 0\n"); + ok(file->_charbuf == 0xfefefefe, "file->_charbuf = %x\n", file->_charbuf); + ok(file->_bufsiz == 0xfefefefe, "file->_bufsiz = %x\n", file->_bufsiz); + ok(!file->_tmpfname, "file->_tmpfname != NULL\n"); + fclose(file2); + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } @@ -2273,7 +2289,6 @@ static void test_write_flush(void) file = fopen(tempf, "wb+"); ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; - fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf));

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Jun '14

27 Jun '14

Module: wine Branch: master Commit: 4b594361f91df8b09c187ec83e5fa5139bc5dd9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b594361f91df8b09c187ec83… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 26 23:41:43 2014 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index e9893e5..e82349f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6582,10 +6582,8 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Yhteys estetty.\n" +msgstr "Vastapuoli nollasi yhteyden.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0