wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Jeremy Newman : set open graph image based on news type
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: 5557aa9fcc6518811564acbb9f1921cf3f3ecb7a URL: http://source.winehq.org/git/website.git/?a=commit;h=5557aa9fcc6518811564ac… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:36:33 2014 -0500 set open graph image based on news type --- include/plugins/news.php | 9 +++++++++ templates/en/news.template | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index bc9deb7..b8c4da8 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -26,6 +26,15 @@ switch (true) // set open graph tags $html->meta_og['title'] = trim($vars['title']); + $ogmode = preg_replace('/^(.*)({\$root}\/)(wwn|announce)(\/)(.*)$/ms', '$3', $vars['body']); + switch ($ogmode) + { + case 'wwn': + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-world-wine-…"; + break; + default: + $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announcemen…"; + } // add page title $html->page_title .= " - {$html->meta_og['title']}"; diff --git a/templates/en/news.template b/templates/en/news.template index 8ea824f..0443453 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,12 +1,11 @@   - <h1 class="title">News</h1>  -<hr /> +<hr> <div class="link-container"> <p><a href="{$root}/wwn/">World Wine News Archive</a></p>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: a441ed6f4ed5ef8839874d26ea8224b9e5d4aec8 URL: http://source.winehq.org/git/website.git/?a=commit;h=a441ed6f4ed5ef8839874d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:19:23 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : use open graph image for news posts
by Jeremy Newman 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: 11334311207ec50da265a4146c7b101200033f1a URL: http://source.winehq.org/git/website.git/?a=commit;h=11334311207ec50da265a4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 31 14:18:50 2014 -0500 use open graph image for news posts --- templates/en/news.template | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/en/news.template b/templates/en/news.template index 38aabe1..8ea824f 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,5 +1,6 @@   + <h1 class="title">News</h1>

1 0

Alexandre Julliard : Wine release 1.7.30
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: website Branch: master Commit: cd3b53a5e627bb0581c4e25c5366ab30596edb1c URL: http://source.winehq.org/git/website.git/?a=commit;h=cd3b53a5e627bb0581c4e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:45:33 2014 +0900 Wine release 1.7.30 --- news/en/2014103101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014103101.xml b/news/en/2014103101.xml new file mode 100644 index 0000000..b9c923b --- /dev/null +++ b/news/en/2014103101.xml @@ -0,0 +1,16 @@ +<news> +<date>October 31, 2014</date> +<title>Wine 1.7.30 Released</title> +<body> +<p> The Wine development release 1.7.30 is now available.</p> +<p> <a href="{$root}/announce/1.7.30">What's new</a> in this release: +<ul> + <li>More support for fonts in DirectWrite.</li> + <li>Improved ATL thunk support.</li> + <li>A few more C runtime functions.</li> + <li>Regedit import/export fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.30.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>. +</p></body></news>

1 0

Tag wine-1.7.30 : Alexandre Julliard : Release 1.7.30
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: refs/tags/wine-1.7.30 Tag: 3a37002eee767c5fd8371715f2753ced43988712 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3a37002eee767c5fd8371715f275… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30

1 0

Alexandre Julliard : Release 1.7.30.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 288f1868b7e32b1dd4f35caaed2239e66c2bafd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f1868b7e32b1dd4f35caae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 22:43:41 2014 +0900 Release 1.7.30. --- ANNOUNCE | 522 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 270 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=288f1868b7e32b1dd4f35…

1 0

Alexandre Julliard : crypt32: Add a root store path for Android.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 9640949cc38cb12086b29d352cda903974d3a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9640949cc38cb12086b29d352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 31 15:47:25 2014 +0900 crypt32: Add a root store path for Android. --- dlls/crypt32/rootstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 641a2b7..5cee235 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -489,6 +489,7 @@ static const char * const CRYPT_knownLocations[] = { "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", + "/etc/security/cacerts", /* Android */ }; static const BYTE authenticode[] = {

1 0

Iván Matellanes : msvcrt: Added _fgetwc_nolock implementation.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 156684ba91e165dce614a8da94080a5c1f88d62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=156684ba91e165dce614a8da9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:47 2014 +0100 msvcrt: Added _fgetwc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 21 ++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e33f5fe..80d5bc9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -802,7 +802,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 88144a3..283f5fd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1150,7 +1150,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5c01600..a48e42b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -469,7 +469,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d9d99f4..e9abf00 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -451,7 +451,7 @@ @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar -@ stub _fgetwc_nolock +@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _filbuf(ptr) MSVCRT__filbuf @ cdecl _filelength(long) MSVCRT__filelength diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index dbbbe78..fe3525c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3576,16 +3576,28 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { MSVCRT_wint_t ret; - int ch; MSVCRT__lock_file(file); + ret = MSVCRT__fgetwc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetwc_nolock (MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT__fgetwc_nolock(MSVCRT_FILE* file) +{ + MSVCRT_wint_t ret; + int ch; if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { char *p; for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch == MSVCRT_EOF) { ret = MSVCRT_WEOF; break; @@ -3596,11 +3608,11 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) char mbs[MSVCRT_MB_LEN_MAX]; int len = 0; - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[0] = (char)ch; if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { - ch = MSVCRT_fgetc(file); + ch = MSVCRT__fgetc_nolock(file); if(ch != MSVCRT_EOF) { mbs[1] = (char)ch; len = 2; @@ -3614,7 +3626,6 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 137bec2..256a90c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -919,6 +919,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); +MSVCRT_wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 54c07fe..768b3a0 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -196,6 +196,7 @@ unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED +wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*);

1 0

Iván Matellanes : msvcrt: Added _fgetc_nolock implementation.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 878b4a92803eeac38b218e55dc9f41a6d503deec URL: http://source.winehq.org/git/wine.git/?a=commit;h=878b4a92803eeac38b218e55d… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:43 2014 +0100 msvcrt: Added _fgetc_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr110/msvcr110.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + dlls/msvcrt/file.c | 16 ++++++++++++++-- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 91805ee..e33f5fe 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -800,6 +800,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5de6965..88144a3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1148,6 +1148,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b7f0a86..5c01600 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -467,6 +467,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a8ad25f..d9d99f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -449,6 +449,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock +@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d191953..dbbbe78 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3503,10 +3503,23 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fgetc_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fgetc_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fgetc_nolock(MSVCRT_FILE* file) +{ unsigned char *i; unsigned int j; - MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; @@ -3514,7 +3527,6 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) } else j = MSVCRT__filbuf(file); - MSVCRT__unlock_file(file); return j; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9f00923..137bec2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -916,6 +916,7 @@ int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); +int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 305d251..54c07fe 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -131,6 +131,7 @@ size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); int __cdecl _fflush_nolock(FILE*); +int __cdecl _fgetc_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Iván Matellanes : msvcrt: _filbuf should not lock any file.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: f896cd3dc9fc16586dd7ada2e95b66c677aad1ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f896cd3dc9fc16586dd7ada2e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 28 14:43:35 2014 +0100 msvcrt: _filbuf should not lock any file. --- dlls/msvcr90/tests/msvcr90.c | 7 +++++++ dlls/msvcrt/file.c | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9bb29da..184ce76 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -118,6 +118,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static int (__cdecl *p_filbuf)(FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_filbuf, "_filbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); @@ -1285,6 +1287,11 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_filbuf(filer); + ok(ret==-1, "_filbuf(filer) returned %d\n", ret); + ret = p_filbuf(filew); + ok(ret==-1, "_filbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); ret = p_fflush_nolock(filew); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2e07342..d191953 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3460,12 +3460,9 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { unsigned char c; - MSVCRT__lock_file(file); - if(file->_flag & MSVCRT__IOSTRG) { - MSVCRT__unlock_file(file); + if(file->_flag & MSVCRT__IOSTRG) return MSVCRT_EOF; - } /* Allocate buffer if needed */ if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) @@ -3474,35 +3471,29 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & MSVCRT__IOREAD)) { if(file->_flag & MSVCRT__IORW) file->_flag |= MSVCRT__IOREAD; - else { - MSVCRT__unlock_file(file); + else return MSVCRT_EOF; - } } 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; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } - MSVCRT__unlock_file(file); return c; } else { file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; - MSVCRT__unlock_file(file); return MSVCRT_EOF; } file->_cnt--; file->_ptr = file->_base+1; c = *(unsigned char *)file->_base; - MSVCRT__unlock_file(file); return c; } }

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 October 2014