May 2011 - Wine-commits - list.winehq.org

Andrew Nguyen : hostname: Add an implementation of the hostname display utility.
by Alexandre Julliard 20 May '11

20 May '11

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: af9eeb00223e7d76bb101d6d8eb7bf43cda77d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9eeb00223e7d76bb101d6d8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri May 20 17:16:16 2011 +0900 po: Update Korean translation. --- po/ko.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/ko.po b/po/ko.po index 56f1616..f152845 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6820,13 +6820,12 @@ msgid "&About Wine" msgstr "WINE 정보(&A)" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "닫기(&C)\tAlt-F4" +msgstr "닫기(&C)\tCtrl-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "다음(&T)\tCtrl-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8737,9 +8736,8 @@ msgid "&View TypeLib..." msgstr "타입 라이브러리 보기(&V)..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "시스템 설정(&S)..." +msgstr "시스템 설정(&S)" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9023,18 +9021,16 @@ msgid "&Copy...\tF8" msgstr "복사(&C)...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "속성(&I)\tAlt+Enter" +msgstr "속성(&P)\tAlt+Enter" #: progman.rc:37 msgid "&Execute..." msgstr "실행(&E)..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "창 종료(&X)..." +msgstr "창 종료(&X)" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options"

1 0

Adam Martinson : msxml3/domdoc: Properly handle character encoding in doparse().
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 17f72b8b675abda5656a680ecc56cb3c3128d879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f72b8b675abda5656a680ec… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri May 20 10:05:05 2011 -0500 msxml3/domdoc: Properly handle character encoding in doparse(). --- dlls/msxml3/domdoc.c | 34 +++++++++------------------------- 1 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 84b7283..07391b4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -455,7 +455,7 @@ static void sax_serror(void* ctx, xmlErrorPtr err) LIBXML2_CALLBACK_SERROR(doparse, err); } -static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encoding) +static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding encoding) { xmlDocPtr doc = NULL; xmlParserCtxtPtr pctx; @@ -506,7 +506,10 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encodi pctx->sax = &sax_handler; pctx->_private = This; pctx->recovery = 0; - pctx->encoding = xmlStrdup(encoding); + + if (encoding != XML_CHAR_ENCODING_NONE) + xmlSwitchEncoding(pctx, encoding); + xmlParseDocument(pctx); if (pctx->wellFormed) @@ -763,7 +766,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) - xmldoc = doparse(This, ptr, len, NULL); + xmldoc = doparse(This, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); if (!xmldoc) @@ -2071,7 +2074,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) domdoc *This = obj; xmlDocPtr xmldoc; - xmldoc = doparse(This, ptr, len, NULL); + xmldoc = doparse(This, ptr, len, XML_CHAR_ENCODING_NONE); if(xmldoc) { xmldoc->_private = create_priv(); return attach_xmldoc(This, xmldoc); @@ -2279,21 +2282,6 @@ static HRESULT WINAPI domdoc_abort( } -static BOOL bstr_to_utf8( BSTR bstr, char **pstr, int *plen ) -{ - UINT len; - LPSTR str; - - len = WideCharToMultiByte( CP_UTF8, 0, bstr, -1, NULL, 0, NULL, NULL ); - str = heap_alloc( len ); - if ( !str ) - return FALSE; - WideCharToMultiByte( CP_UTF8, 0, bstr, -1, str, len, NULL, NULL ); - *plen = len; - *pstr = str; - return TRUE; -} - /* don't rely on data to be in BSTR format, treat it as WCHAR string */ static HRESULT WINAPI domdoc_loadXML( IXMLDOMDocument3 *iface, @@ -2301,11 +2289,8 @@ static HRESULT WINAPI domdoc_loadXML( VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - static const xmlChar encoding[] = "UTF-8"; xmlDocPtr xmldoc = NULL; HRESULT hr = S_FALSE, hr2; - char *str; - int len; TRACE("(%p)->(%s %p)\n", This, debugstr_w( bstrXML ), isSuccessful ); @@ -2315,10 +2300,9 @@ static HRESULT WINAPI domdoc_loadXML( { *isSuccessful = VARIANT_FALSE; - if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) + if ( bstrXML ) { - xmldoc = doparse(This, str, len, encoding); - heap_free( str ); + xmldoc = doparse(This, (LPCSTR)bstrXML, lstrlenW(bstrXML) * sizeof(*bstrXML), XML_CHAR_ENCODING_UTF16LE); if ( !xmldoc ) { This->error = E_FAIL;

1 0

Adam Martinson : msxml3/domdoc: Add support for VT_ARRAY|VT_UI1 in domdoc_load().
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: f730d13c84507023cc18c97d391c8f84a4f8e431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f730d13c84507023cc18c97d3… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri May 20 10:05:38 2011 -0500 msxml3/domdoc: Add support for VT_ARRAY|VT_UI1 in domdoc_load(). --- dlls/msxml3/domdoc.c | 47 ++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 94 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 07391b4..122d62f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2113,6 +2113,8 @@ static HRESULT WINAPI domdoc_load( TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); + if (!isSuccessful) + return E_POINTER; *isSuccessful = VARIANT_FALSE; assert( &This->node ); @@ -2126,6 +2128,51 @@ static HRESULT WINAPI domdoc_load( if (!V_BSTRREF(&source)) return E_INVALIDARG; filename = *V_BSTRREF(&source); break; + case VT_ARRAY|VT_UI1: + { + SAFEARRAY *psa = V_ARRAY(&source); + char *str; + LONG len; + UINT dim = SafeArrayGetDim(psa); + + switch (dim) + { + case 0: + ERR("SAFEARRAY == NULL\n"); + hr = This->error = E_INVALIDARG; + break; + case 1: + /* Only takes UTF-8 strings. + * NOT NULL-terminated. */ + SafeArrayAccessData(psa, (void**)&str); + SafeArrayGetUBound(psa, 1, &len); + + if ((xmldoc = doparse(This, str, ++len, XML_CHAR_ENCODING_UTF8))) + { + hr = This->error = S_OK; + *isSuccessful = VARIANT_TRUE; + TRACE("parsed document %p\n", xmldoc); + } + else + { + This->error = E_FAIL; + TRACE("failed to parse document\n"); + } + + SafeArrayUnaccessData(psa); + + if(xmldoc) + { + xmldoc->_private = create_priv(); + return attach_xmldoc(This, xmldoc); + } + break; + default: + FIXME("unhandled SAFEARRAY dim: %d\n", dim); + hr = This->error = E_NOTIMPL; + } + } + break; case VT_UNKNOWN: hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); if(hr == S_OK) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f828241..abb282a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9946,13 +9946,15 @@ static void test_selection(void) static void test_load(void) { IXMLDOMDocument *doc; + IXMLDOMNodeList *list; VARIANT_BOOL b; HANDLE hfile; VARIANT src; HRESULT hr; BOOL ret; - BSTR path; + BSTR path, bstr1, bstr2; DWORD written; + void* ptr; /* prepare a file */ hfile = CreateFileA("test.xml", GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -9992,6 +9994,96 @@ static void test_load(void) IXMLDOMDocument_Release(doc); DeleteFileA("test.xml"); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("//*"), &list); + EXPECT_HR(hr, S_OK); + bstr1 = _bstr_(list_to_string(list)); + + hr = IXMLDOMNodeList_reset(list); + EXPECT_HR(hr, S_OK); + + IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + VariantInit(&src); + V_ARRAY(&src) = SafeArrayCreateVector(VT_UI1, 0, lstrlenA(szExampleXML)); + V_VT(&src) = VT_ARRAY|VT_UI1; + ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n"); + ptr = NULL; + hr = SafeArrayAccessData(V_ARRAY(&src), &ptr); + EXPECT_HR(hr, S_OK); + ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n"); + + memcpy(ptr, szExampleXML, lstrlenA(szExampleXML)); + hr = SafeArrayUnlock(V_ARRAY(&src)); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_load(doc, src, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("//*"), &list); + EXPECT_HR(hr, S_OK); + bstr2 = _bstr_(list_to_string(list)); + + hr = IXMLDOMNodeList_reset(list); + EXPECT_HR(hr, S_OK); + + ok(lstrcmpW(bstr1, bstr2) == 0, "strings not equal: %s : %s\n", + wine_dbgstr_w(bstr1), wine_dbgstr_w(bstr2)); + + IXMLDOMDocument_Release(doc); + IXMLDOMNodeList_Release(list); + VariantClear(&src); + + /* UTF-16 isn't accepted */ + doc = create_document(&IID_IXMLDOMDocument); + + V_ARRAY(&src) = SafeArrayCreateVector(VT_UI1, 0, lstrlenW(szComplete1) * sizeof(WCHAR)); + V_VT(&src) = VT_ARRAY|VT_UI1; + ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n"); + ptr = NULL; + hr = SafeArrayAccessData(V_ARRAY(&src), &ptr); + EXPECT_HR(hr, S_OK); + ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n"); + + memcpy(ptr, szComplete1, lstrlenW(szComplete1) * sizeof(WCHAR)); + hr = SafeArrayUnlock(V_ARRAY(&src)); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_load(doc, src, &b); + todo_wine EXPECT_HR(hr, S_FALSE); + todo_wine ok(b == VARIANT_FALSE, "got %d\n", b); + + VariantClear(&src); + + /* it doesn't like it as a VT_ARRAY|VT_UI2 either */ + V_ARRAY(&src) = SafeArrayCreateVector(VT_UI2, 0, lstrlenW(szComplete1)); + V_VT(&src) = VT_ARRAY|VT_UI2; + ok(V_ARRAY(&src) != NULL, "SafeArrayCreateVector() returned NULL\n"); + ptr = NULL; + hr = SafeArrayAccessData(V_ARRAY(&src), &ptr); + EXPECT_HR(hr, S_OK); + ok(ptr != NULL, "SafeArrayAccessData() returned NULL\n"); + + memcpy(ptr, szComplete1, lstrlenW(szComplete1) * sizeof(WCHAR)); + hr = SafeArrayUnlock(V_ARRAY(&src)); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_load(doc, src, &b); + todo_wine EXPECT_HR(hr, E_INVALIDARG); + ok(b == VARIANT_FALSE, "got %d\n", b); + + VariantClear(&src); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Adam Martinson : ole32/tests: IDropTarget::QueryInterface() shouldn' t be called.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 456e48efa1df91cee6149b67187812e16350c474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456e48efa1df91cee6149b671… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri May 20 10:06:40 2011 -0500 ole32/tests: IDropTarget::QueryInterface() shouldn't be called. --- dlls/ole32/tests/dragdrop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 18674dd..0c56cb4 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -39,7 +39,7 @@ static int droptarget_refs; static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, void** ppvObject) { - trace("DropTarget_QueryInterface\n"); + todo_wine ok(0, "DropTarget_QueryInterface() shouldn't be called\n"); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDropTarget)) {

1 0

Piotr Caban : msvcrt: Make _filbuf thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: f773ad838817fcc2da42c4c86e30958e7ed02053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f773ad838817fcc2da42c4c86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:21:50 2011 +0200 msvcrt: Make _filbuf thread safe. --- dlls/msvcrt/file.c | 59 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c8d488c..baaabf0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2605,36 +2605,47 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) */ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { - /* Allocate buffer if needed */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF) ) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOREAD)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOREAD; - } else { - return MSVCRT_EOF; - } - } - if(file->_flag & MSVCRT__IONBF) { - unsigned char c; + unsigned char c; + MSVCRT__lock_file(file); + + /* Allocate buffer if needed */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + msvcrt_alloc_buffer(file); + + if(!(file->_flag & MSVCRT__IOREAD)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOREAD; + else { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + } + + if(file->_flag & MSVCRT__IONBF) { int r; - if ((r = read_i(file->_file,&c,1)) != 1) { + if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; + MSVCRT__unlock_file(file); return MSVCRT_EOF; - } - return c; - } else { - file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); - if(file->_cnt<=0) { + } + + 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; - return *(unsigned char *)file->_base; - } + } + + file->_cnt--; + file->_ptr = file->_base+1; + c = *(unsigned char *)file->_base; + MSVCRT__unlock_file(file); + return c; + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make _flsbuf thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: c989c4980bf25d9cf87e6c2fa42fb264b56fcd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c989c4980bf25d9cf87e6c2fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:00 2011 +0200 msvcrt: Make _flsbuf thread safe. --- dlls/msvcrt/file.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index baaabf0..89f1267 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3025,30 +3025,40 @@ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) */ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { - /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOWRT; - } else { - return MSVCRT_EOF; - } - } - if(file->_bufsiz) { + MSVCRT__lock_file(file); + + /* Flush output buffer */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + msvcrt_alloc_buffer(file); + } + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) { + file->_flag |= MSVCRT__IOWRT; + } else { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + } + if(file->_bufsiz) { int res=msvcrt_flush_buffer(file); - return res?res : MSVCRT_fputc(c, file); - } else { - unsigned char cc=c; + if(!res) + res = MSVCRT_fputc(c, file); + MSVCRT__unlock_file(file); + return res; + } else { + unsigned char cc=c; int len; /* set _cnt to 0 for unbuffered FILEs */ file->_cnt = 0; - len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) return c & 0xff; + len = MSVCRT__write(file->_file, &cc, 1); + if (len == 1) { + MSVCRT__unlock_file(file); + return c & 0xff; + } file->_flag |= MSVCRT__IOERR; + MSVCRT__unlock_file(file); return MSVCRT_EOF; - } + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make setvbuf thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: eb01bc1efa9f0ebd66f214f652fe187ee3958a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb01bc1efa9f0ebd66f214f65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:10 2011 +0200 msvcrt: Make setvbuf thread safe. --- dlls/msvcrt/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 89f1267..ad70bce 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3479,7 +3479,7 @@ int CDECL _wrename(const MSVCRT_wchar_t *oldpath,const MSVCRT_wchar_t *newpath) */ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t size) { - /* TODO: Check if file busy */ + MSVCRT__lock_file(file); if(file->_bufsiz) { MSVCRT_free(file->_base); file->_bufsiz = 0; @@ -3494,6 +3494,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s } else { file->_flag |= MSVCRT__IONBF; } + MSVCRT__unlock_file(file); return 0; }

1 0

Piotr Caban : msvcrt: Make ungetc and ungetwc thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: dd303022680d2c631586f9c868140257ebdc82e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd303022680d2c631586f9c86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:20 2011 +0200 msvcrt: Make ungetc and ungetwc thread safe. --- dlls/msvcrt/file.c | 55 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ad70bce..444a8d8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3768,20 +3768,25 @@ int CDECL MSVCRT_printf_s(const char *format, ...) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { - if (c == MSVCRT_EOF) - return MSVCRT_EOF; - if(file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); - file->_ptr++; - } - if(file->_ptr>file->_base) { - file->_ptr--; - *file->_ptr=c; - file->_cnt++; - MSVCRT_clearerr(file); - return c; - } - return MSVCRT_EOF; + if (c == MSVCRT_EOF) + return MSVCRT_EOF; + + MSVCRT__lock_file(file); + if(file->_bufsiz == 0) { + msvcrt_alloc_buffer(file); + file->_ptr++; + } + if(file->_ptr>file->_base) { + file->_ptr--; + *file->_ptr=c; + file->_cnt++; + MSVCRT_clearerr(file); + MSVCRT__unlock_file(file); + return c; + } + + MSVCRT__unlock_file(file); + return MSVCRT_EOF; } /********************************************************************* @@ -3789,14 +3794,20 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) */ MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { - MSVCRT_wchar_t mwc = wc; - char * pp = (char *)&mwc; - int i; - for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { - if(pp[i] != MSVCRT_ungetc(pp[i],file)) - return MSVCRT_WEOF; - } - return mwc; + MSVCRT_wchar_t mwc = wc; + char * pp = (char *)&mwc; + int i; + + MSVCRT__lock_file(file); + for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { + if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } + + MSVCRT__unlock_file(file); + return mwc; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make FILE->_flag reading functions thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: ae15a4b6bcc6163255ffb01e820ba5b4532febf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae15a4b6bcc6163255ffb01e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:29 2011 +0200 msvcrt: Make FILE->_flag reading functions thread safe. --- dlls/msvcrt/file.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 444a8d8..16aa10c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1198,7 +1198,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) { TRACE(":file (%p) fd (%d)\n",file,file->_file); + + MSVCRT__lock_file(file); file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF); + MSVCRT__unlock_file(file); } /********************************************************************* @@ -1338,8 +1341,15 @@ __int64 CDECL MSVCRT__filelengthi64(int fd) */ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) { + int ret; + TRACE(":FILE* (%p) fd (%d)\n",file,file->_file); - return file->_file; + + MSVCRT__lock_file(file); + ret = file->_file; + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -2589,7 +2599,13 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) */ int CDECL MSVCRT_feof(MSVCRT_FILE* file) { - return file->_flag & MSVCRT__IOEOF; + int ret; + + MSVCRT__lock_file(file); + ret = file->_flag & MSVCRT__IOEOF; + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -2597,7 +2613,13 @@ int CDECL MSVCRT_feof(MSVCRT_FILE* file) */ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) { - return file->_flag & MSVCRT__IOERR; + int ret; + + MSVCRT__lock_file(file); + ret = file->_flag & MSVCRT__IOERR; + MSVCRT__unlock_file(file); + + return ret; } /*********************************************************************

1 0