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

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

May 20, 2011

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

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

May 20, 2011

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard May 20, 2011

May 20, 2011

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 : ole32/tests: IDropTarget::QueryInterface() shouldn' t be called.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

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

May 20, 2011

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

Piotr Caban : msvcrt: Make FILE position related functions thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: f2d425b7fc5d8d467db3439f751d7a951dcb847a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d425b7fc5d8d467db3439f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:39 2011 +0200 msvcrt: Make FILE position related functions thread safe. --- dlls/msvcrt/file.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 16aa10c..f11c23d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1118,6 +1118,9 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) */ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) { + int ret; + + MSVCRT__lock_file(file); /* Flush output if needed */ if(file->_flag & MSVCRT__IOWRT) msvcrt_flush_buffer(file); @@ -1145,7 +1148,10 @@ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) } /* Clear end of file flag */ file->_flag &= ~MSVCRT__IOEOF; - return (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; + ret = (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; + + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* @@ -1210,8 +1216,11 @@ void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) void CDECL MSVCRT_rewind(MSVCRT_FILE* file) { TRACE(":file (%p) fd (%d)\n",file,file->_file); + + MSVCRT__lock_file(file); MSVCRT_fseek(file, 0L, SEEK_SET); MSVCRT_clearerr(file); + MSVCRT__unlock_file(file); } static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* stream_flags) @@ -3228,6 +3237,9 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, MSVCRT_FIL */ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { + int ret; + + MSVCRT__lock_file(file); /* Note that all this has been lifted 'as is' from fseek */ if(file->_flag & MSVCRT__IOWRT) msvcrt_flush_buffer(file); @@ -3241,7 +3253,9 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - return (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + ret = (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* @@ -3252,8 +3266,13 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) /* TODO: just call fgetpos and return lower half of result */ int off=0; __int64 pos; + + MSVCRT__lock_file(file); pos = _telli64(file->_file); - if(pos == -1) return -1; + if(pos == -1) { + MSVCRT__unlock_file(file); + return -1; + } if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; @@ -3272,6 +3291,8 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } } } + + MSVCRT__unlock_file(file); return off + pos; } @@ -3289,8 +3310,13 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { int off=0; + + MSVCRT__lock_file(file); *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); - if(*pos == -1) return -1; + if(*pos == -1) { + MSVCRT__unlock_file(file); + return -1; + } if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; @@ -3310,6 +3336,7 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) } } *pos += off; + MSVCRT__unlock_file(file); return 0; }

1 0

Piotr Caban : msvcrt: Make FILE reading functions thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 11c6c5324f47c4cd7adc65748a0740032f093562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c6c5324f47c4cd7adc65748… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:48 2011 +0200 msvcrt: Make FILE reading functions thread safe. --- dlls/msvcrt/file.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f11c23d..27b9ef5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2686,12 +2686,16 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { unsigned char *i; unsigned int j; + + MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; j = *i; } else j = MSVCRT__filbuf(file); + + MSVCRT__unlock_file(file); return j; } @@ -2714,6 +2718,8 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", file,file->_file,s,size); + MSVCRT__lock_file(file); + while ((size >1) && (cc = MSVCRT_fgetc(file)) != MSVCRT_EOF && cc != '\n') { *s++ = (char)cc; @@ -2722,12 +2728,14 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) if ((cc == MSVCRT_EOF) && (s == buf_start)) /* If nothing read, return 0*/ { TRACE(":nothing read\n"); + MSVCRT__unlock_file(file); return NULL; } if ((cc != MSVCRT_EOF) && (size > 1)) *s++ = cc; *s = '\0'; TRACE(":got %s\n", debugstr_a(buf_start)); + MSVCRT__unlock_file(file); return buf_start; } @@ -2741,6 +2749,7 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { int c; + MSVCRT__lock_file(file); if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { MSVCRT_wchar_t wc; @@ -2763,11 +2772,15 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; + + MSVCRT__unlock_file(file); return MSVCRT_WEOF; } wcp[i] = j; } } + + MSVCRT__unlock_file(file); return wc; } @@ -2776,6 +2789,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { FIXME("Treat Multibyte characters\n"); } + + MSVCRT__unlock_file(file); if (c == MSVCRT_EOF) return MSVCRT_WEOF; else @@ -2791,14 +2806,19 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) int i, k; unsigned int j; ch = (char *)&i; + + MSVCRT__lock_file(file); for (j=0; j<sizeof(int); j++) { k = MSVCRT_fgetc(file); if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; + MSVCRT__unlock_file(file); return EOF; } ch[j] = k; } + + MSVCRT__unlock_file(file); return i; } @@ -2837,6 +2857,8 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", file,file->_file,s,size); + MSVCRT__lock_file(file); + while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { *s++ = (char)cc; @@ -2845,12 +2867,14 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/ { TRACE(":nothing read\n"); + MSVCRT__unlock_file(file); return NULL; } if ((cc != MSVCRT_WEOF) && (size > 1)) *s++ = cc; *s = 0; TRACE(":got %s\n", debugstr_w(buf_start)); + MSVCRT__unlock_file(file); return buf_start; } @@ -3104,13 +3128,16 @@ int CDECL _fputchar(int c) * fread (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) -{ MSVCRT_size_t rcnt=size * nmemb; +{ + MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; int pread=0; if(!rcnt) return 0; + MSVCRT__lock_file(file); + /* first buffered data */ if(file->_cnt>0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; @@ -3123,8 +3150,10 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm } else if(!(file->_flag & MSVCRT__IOREAD )) { if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; - } else - return 0; + } else { + MSVCRT__unlock_file(file); + return 0; + } } while(rcnt>0) { @@ -3169,6 +3198,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if (i < 1) break; } read+=pread; + MSVCRT__unlock_file(file); return read / size; } @@ -3396,6 +3426,7 @@ char * CDECL MSVCRT_gets(char *buf) int cc; char * buf_start = buf; + MSVCRT__lock_file(MSVCRT_stdin); for(cc = MSVCRT_fgetc(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; cc = MSVCRT_fgetc(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; @@ -3403,6 +3434,7 @@ char * CDECL MSVCRT_gets(char *buf) *buf = '\0'; TRACE("got '%s'\n", buf_start); + MSVCRT__unlock_file(MSVCRT_stdin); return buf_start; } @@ -3414,6 +3446,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) MSVCRT_wint_t cc; MSVCRT_wchar_t* ws = buf; + MSVCRT__lock_file(MSVCRT_stdin); for (cc = MSVCRT_fgetwc(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; cc = MSVCRT_fgetwc(MSVCRT_stdin)) { @@ -3423,6 +3456,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) *buf = '\0'; TRACE("got %s\n", debugstr_w(ws)); + MSVCRT__unlock_file(MSVCRT_stdin); return ws; }

1 0

Alexandre Julliard : include: Declare gethostname for Windows builds.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: af2fee302ce491ec98735768be516819876308e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2fee302ce491ec98735768b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 17:24:05 2011 +0200 include: Declare gethostname for Windows builds. --- include/winsock.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 2f5e480..0e409ec 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -1036,7 +1036,6 @@ int WINAPI WS(closesocket)(SOCKET); int WINAPI WS(connect)(SOCKET,const struct WS(sockaddr)*,int); struct WS(hostent)* WINAPI WS(gethostbyaddr)(const char*,int,int); struct WS(hostent)* WINAPI WS(gethostbyname)(const char*); -/* gethostname not defined because of conflicts with unistd.h */ int WINAPI WS(getpeername)(SOCKET,struct WS(sockaddr)*,int*); struct WS(protoent)* WINAPI WS(getprotobyname)(const char*); struct WS(protoent)* WINAPI WS(getprotobynumber)(int); @@ -1059,6 +1058,11 @@ int WINAPI WS(setsockopt)(SOCKET,int,int,const char*,int); int WINAPI WS(shutdown)(SOCKET,int); SOCKET WINAPI WS(socket)(int,int,int); +#if defined(__MINGW32__) || defined (_MSC_VER) +/* gethostname is not defined on Unix because of conflicts with unistd.h */ +int WINAPI WS(gethostname)(char*,int); +#endif + #endif /* !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES */ #ifdef __cplusplus

1 0

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

May 20, 2011

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 setvbuf thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

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