October 2010 - Wine-Commits

Alexandre Julliard : user32: Correctly handle mouse events on a size grip scrollbar.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 90ba8ceb07645632318cd11e9ba03d9603056fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ba8ceb07645632318cd11e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 11:43:21 2010 +0200 user32: Correctly handle mouse events on a size grip scrollbar. --- dlls/user32/scroll.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 7e02a42..fd73bf4 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1426,6 +1426,13 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: + if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) + { + SendMessageW( GetParent(hwnd), WM_SYSCOMMAND, + SC_SIZE + ((GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? + WMSZ_BOTTOMLEFT : WMSZ_BOTTOMRIGHT), lParam ); + } + else { POINT pt; pt.x = (short)LOWORD(lParam); @@ -1519,6 +1526,14 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM } break; + case WM_SETCURSOR: + if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) + { + ULONG_PTR cursor = (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE; + return (LRESULT)SetCursor( LoadCursorA( 0, (LPSTR)cursor )); + } + return DefWindowProcW( hwnd, message, wParam, lParam ); + case SBM_SETPOS: return SetScrollPos( hwnd, SB_CTL, wParam, (BOOL)lParam );

1 0

Louis Lenders : gameux: Improve stub for GameExplorerImpl_VerifyAccess.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 75f0573964c8d894d99be2909a1728bfc7f671a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f0573964c8d894d99be2909… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 11 22:11:26 2010 +0200 gameux: Improve stub for GameExplorerImpl_VerifyAccess. --- dlls/gameux/gameexplorer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 744ae8a..1715ad9 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -875,9 +875,9 @@ static HRESULT WINAPI GameExplorerImpl_VerifyAccess( { GameExplorerImpl *This = impl_from_IGameExplorer(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_w(sGDFBinaryPath), pHasAccess); - FIXME("stub\n"); - return E_NOTIMPL; + FIXME("(%p, %s, %p)\n", This, debugstr_w(sGDFBinaryPath), pHasAccess); + *pHasAccess = TRUE; + return S_OK; } static const struct IGameExplorerVtbl GameExplorerImplVtbl =

1 0

Andrew Eikum : shlwapi: Handle URL_WININET_COMPATIBILITY flag in UrlCanonicalize.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 6525d89c95e6ae28eb8f6635a7fb9cb756cc1c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6525d89c95e6ae28eb8f6635a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 11 11:17:35 2010 -0500 shlwapi: Handle URL_WININET_COMPATIBILITY flag in UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 21 +++++++++++++++++ dlls/shlwapi/url.c | 50 ++++++++++++++++++++++++++++++++++------ dlls/wininet/tests/internet.c | 2 +- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index cf74177..febe23d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -123,6 +123,9 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"http://www.winehq.org/tests/../#example", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../#example", FALSE}, {"http://www.winehq.org/tests/foo bar", URL_ESCAPE_SPACES_ONLY| URL_DONT_ESCAPE_EXTRA_INFO , S_OK, "http://www.winehq.org/tests/foo%20bar", FALSE}, {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar", FALSE}, + {"http://www.winehq.org", 0, S_OK, "http://www.winehq.org/", FALSE}, + {"http:///www.winehq.org", 0, S_OK, "http:///www.winehq.org", FALSE}, + {"http:////www.winehq.org", 0, S_OK, "http:////www.winehq.org", FALSE}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:/tests/foo%20bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, @@ -137,6 +140,24 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar", FALSE}, {"file:///c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "file:///c:/tests/foo bar", FALSE}, + {"file:///c:\\tests\\foobar", 0, S_OK, "file:///c:/tests/foobar", FALSE}, + {"file:///c:\\tests\\foobar", URL_WININET_COMPATIBILITY, S_OK, "file://c:\\tests\\foobar", FALSE}, + {"file://home/user/file", 0, S_OK, "file://home/user/file", FALSE}, + {"file:///home/user/file", 0, S_OK, "file:///home/user/file", FALSE}, + {"file:////home/user/file", 0, S_OK, "file://home/user/file", FALSE}, + {"file://home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file:///home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\home\\user\\file", FALSE}, + {"file:////home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file://///home/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://\\\\home\\user\\file", FALSE}, + {"file://C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file://C:/user/file/../asdf", 0, S_OK, "file:///C:/user/asdf", FALSE}, + {"file:///C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file:////C:/user/file", 0, S_OK, "file:///C:/user/file", FALSE}, + {"file://C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"file:///C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"file:////C:/user/file", URL_WININET_COMPATIBILITY, S_OK, "file://C:\\user\\file", FALSE}, + {"http:///www.winehq.org", 0, S_OK, "http:///www.winehq.org", FALSE}, + {"http:///www.winehq.org", URL_WININET_COMPATIBILITY, S_OK, "http:///www.winehq.org", FALSE}, {"http://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/site/about", FALSE}, {"file_://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "file_://www.winehq.org/site/about", FALSE}, {"c:\\dir\\file", 0, S_OK, "file:///c:/dir/file", FALSE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index c808a2f..04e80f9 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -276,6 +276,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, LPWSTR lpszUrlCpy, url, wk2, mp, mp2; INT state; DWORD nByteLen, nLen, nWkLen; + BOOL is_file_url; WCHAR slash = '\0'; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -318,14 +319,13 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, return E_OUTOFMEMORY; } + is_file_url = !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)); + if ((nByteLen >= sizeof(wszHttp) && - !memcmp(wszHttp, url, sizeof(wszHttp))) || - (nByteLen >= sizeof(wszFile) && - !memcmp(wszFile, url, sizeof(wszFile)))) + !memcmp(wszHttp, url, sizeof(wszHttp))) || is_file_url) slash = '/'; - if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) - && !memcmp(wszFile, url, sizeof(wszFile))) + if((dwFlags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) && is_file_url) slash = '\\'; if(nByteLen >= sizeof(wszRes) && !memcmp(wszRes, url, sizeof(wszRes))) { @@ -351,7 +351,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if(url[1] == ':') { /* Assume path */ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); - if (dwFlags & URL_FILE_USE_PATHURL) + if (dwFlags & (URL_FILE_USE_PATHURL | URL_WININET_COMPATIBILITY)) { slash = '\\'; --wk2; @@ -359,6 +359,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, else dwFlags |= URL_ESCAPE_UNSAFE; state = 5; + is_file_url = TRUE; } while (*wk1) { @@ -379,14 +380,47 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) - && !strncmpW(wszFile, url, sizeof(wszFile)/sizeof(WCHAR)) + && is_file_url && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) wk1++; } - if(*wk1 == '/' && (dwFlags & URL_FILE_USE_PATHURL)) + + if(*wk1 == '/' && (dwFlags & URL_FILE_USE_PATHURL)){ wk1++; + }else if(is_file_url){ + const WCHAR *body = wk1; + + while(*body == '/') + ++body; + + if(isalnumW(*body) && *(body+1) == ':'){ + if(!(dwFlags & (URL_WININET_COMPATIBILITY | URL_FILE_USE_PATHURL))){ + if(slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + }else{ + if(dwFlags & URL_WININET_COMPATIBILITY){ + if(*wk1 == '/' && *(wk1+1) != '/'){ + *wk2++ = '\\'; + }else{ + *wk2++ = '\\'; + *wk2++ = '\\'; + } + }else{ + if(*wk1 == '/' && *(wk1+1) != '/'){ + if(slash) + *wk2++ = slash; + else + *wk2++ = '/'; + } + } + } + wk1 = body; + } state = 4; break; case 3: diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4da9c21..54fd229 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -103,7 +103,7 @@ static void test_InternetCanonicalizeUrlA(void) res = InternetCanonicalizeUrlA("file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", buffer, &dwSize, ICU_DECODE | ICU_NO_ENCODE); ok(res, "InternetCanonicalizeUrlA failed %u\n", GetLastError()); ok(dwSize == lstrlenA(buffer), "got %d expected %d\n", dwSize, lstrlenA(buffer)); - todo_wine ok(!lstrcmpA("file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", buffer), + ok(!lstrcmpA("file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", buffer), "got %s expected 'file://C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml'\n", buffer); /* buffer is larger as the required size */

1 0

Paul Vriens : transl: Deal with WS_EX_LAYOUTRTL for RTL languages.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: tools Branch: master Commit: 849ef228f2979805b9c4e8897def7730a857aa6d URL: http://source.winehq.org/git/tools.git/?a=commit;h=849ef228f2979805b9c4e889… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 12 11:01:43 2010 +0200 transl: Deal with WS_EX_LAYOUTRTL for RTL languages. --- transl/lib_res.php | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/transl/lib_res.php b/transl/lib_res.php index efeefe5..caa87b4 100644 --- a/transl/lib_res.php +++ b/transl/lib_res.php @@ -911,6 +911,22 @@ class DialogResource extends Resource function is_hex_different(&$other, $lparam) { $field = $lparam[0]; + + if ($lparam[1] == "EXSTYLE") + { + if ((($this->header['language'] & 0xff) == 0x01 /* LANG_ARABIC */) || + (($this->header['language'] & 0xff) == 0x0d /* LANG_HEBREW */) || + (($this->header['language'] & 0xff) == 0x29 /* LANG_PERSIAN */)) + { + /* WS_EX_LAYOUTRTL (0x400000) should be present */ + if (($this->$field & 0x400000) == 0) + return TRUE; + + /* We can ignore WS_EX_LAYOUTRTL for RTL languages */ + return (($this->$field & ~0x400000) != $other->$field); + } + } + return ($this->$field != $other->$field); }

1 0

Luca Bennati : taskkill: Update Italian translation.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 9d18f10a0d1f2d39f6f47fd4b0f439e9fffd20b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d18f10a0d1f2d39f6f47fd4b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Oct 11 15:00:22 2010 +0200 taskkill: Update Italian translation. --- programs/taskkill/It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/It.rc b/programs/taskkill/It.rc index 05bf2d8..87f7b86 100644 --- a/programs/taskkill/It.rc +++ b/programs/taskkill/It.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Errore: processo non trovato \"%s\".\n" STRING_ENUM_FAILED, "Errore: impossibile elencare la lista dei processi.\n" STRING_TERMINATE_FAILED, "Errore: impossibile terminare il processo \"%s\".\n" + STRING_SELF_TERMINATION, "Errore: l'auto-terminazione del processo non è permessa.\n" }

1 0

Nikolay Sivov : msxml3: Implement ::get_responseXML().
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 45db1d137670c88b712ad96c1ef639a830713871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45db1d137670c88b712ad96c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 9 01:42:44 2010 +0400 msxml3: Implement ::get_responseXML(). --- dlls/msxml3/httprequest.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3c2c049..504da92 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -766,13 +766,34 @@ static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *p return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispatch **ppBody) +static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispatch **body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + IXMLDOMDocument3 *doc; + HRESULT hr; + BSTR str; - FIXME("stub %p %p\n", This, ppBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&doc); + if (hr != S_OK) return hr; + + hr = IXMLHTTPRequest_get_responseText(iface, &str); + if (hr == S_OK) + { + VARIANT_BOOL ok; + + hr = IXMLDOMDocument3_loadXML(doc, str, &ok); + SysFreeString(str); + } + + IXMLDOMDocument3_QueryInterface(doc, &IID_IDispatch, (void**)body); + IXMLDOMDocument3_Release(doc); + + return hr; } static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR *body)

1 0

Andrew Nguyen : msvcrt: Implement _strlwr_s.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 41ab8251266299e2d22551f9d333bcaa5cb1b85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ab8251266299e2d22551f9d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:25:23 2010 -0500 msvcrt: Implement _strlwr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 35 +++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 1 + 7 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eb8028d..60211ab 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1142,7 +1142,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b5be55f..4b0363f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -996,7 +996,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5647b13..967db82 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -982,7 +982,7 @@ @ stub _stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr @ stub _strlwr_l -@ stub _strlwr_s +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s @ stub _strlwr_s_l @ stub _strncoll @ stub _strncoll_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b964724..e6a8670 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -917,7 +917,7 @@ # stub _stricoll_l @ cdecl _strlwr(str) ntdll._strlwr # stub _strlwr_l -# stub _strlwr_s +@ cdecl _strlwr_s(ptr long) # stub _strlwr_s_l @ stub _strncoll #(str str long) # stub _strncoll_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0b1beae..02bd0a5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -51,6 +51,41 @@ char* CDECL _strdup(const char* str) } /********************************************************************* + * _strlwr_s (MSVCRT.@) + */ +int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +{ + char *ptr = str; + + if (!str || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (len && *ptr) + { + len--; + ptr++; + } + + if (!len) + { + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (*str) + { + *str = tolower(*str); + str++; + } + + return 0; +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4955f75..a7d033a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -60,6 +60,7 @@ static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); +static errno_t (__cdecl *p_strlwr_s)(char*,size_t); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1370,6 +1371,63 @@ static void test__itoa_s(void) buffer); } +static void test__strlwr_s(void) +{ + errno_t ret; + char buffer[20]; + + if (!p_strlwr_s) + { + win_skip("Skipping _strlwr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_strlwr_s(NULL, 0); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_strlwr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_strlwr_s(buffer, 0); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + strcpy(buffer, "GoRrIsTeR"); + errno = EBADF; + ret = p_strlwr_s(buffer, 5); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), + "Expected the output buffer to be \"gorrIsTeR\"\n"); + + strcpy(buffer, "GoRrIsTeR"); + errno = EBADF; + ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR") - 1); + ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), + "Expected the output buffer to be \"gorrIsTeR\"\n"); + + strcpy(buffer, "GoRrIsTeR"); + ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR")); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "gorrister"), + "Expected the output buffer to be \"gorrister\", got \"%s\"\n", + buffer); + + memcpy(buffer, "GoRrIsTeR\0ELLEN", sizeof("GoRrIsTeR\0ELLEN")); + ret = p_strlwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")), + "Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n", + buffer); +} + START_TEST(string) { char mem[100]; @@ -1396,6 +1454,7 @@ START_TEST(string) pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); + p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1431,4 +1490,5 @@ START_TEST(string) test_mbstowcs(); test_gcvt(); test__itoa_s(); + test__strlwr_s(); } diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 614fa85..8ab459b 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -48,6 +48,7 @@ errno_t __cdecl strerror_s(char*,size_t,int); int __cdecl _stricmp(const char*,const char*); int __cdecl _stricoll(const char*,const char*); char* __cdecl _strlwr(char*); +errno_t __cdecl _strlwr_s(char*,size_t); int __cdecl _strnicmp(const char*,const char*,size_t); char* __cdecl _strnset(char*,int,size_t); char* __cdecl _strrev(char*);

1 0

Andrew Nguyen : msvcrt: Implement _itoa_s.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: bcfaf467b590e6b1b1edf6e8311f0ee975bb356c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfaf467b590e6b1b1edf6e83… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:25:15 2010 -0500 msvcrt: Implement _itoa_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 75 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 95 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 7 files changed, 175 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 042437e..eb8028d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -834,7 +834,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c1d18d6..b5be55f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -680,7 +680,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6d5d518..5647b13 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -668,7 +668,7 @@ @ stub _iswxdigit_l @ stub _isxdigit_l @ cdecl _itoa(long ptr long) msvcrt._itoa -@ stub _itoa_s +@ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow @ stub _itow_s @ cdecl _j0(double) msvcrt._j0 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e628e48..b964724 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -607,7 +607,7 @@ # stub _iswxdigit_l # stub _isxdigit_l @ cdecl _itoa(long ptr long) ntdll._itoa -# stub _itoa_s +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow # stub _itow_s @ cdecl _j0(double) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f44e6eb..0b1beae 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -637,6 +637,81 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas } /********************************************************************* + * _itoa_s (MSVCRT.@) + */ +int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) +{ + unsigned int val, digit; + int is_negative; + char buffer[33], *pos; + size_t len; + + if (!str || !size || radix < 2 || radix > 36) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + char *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len); + return 0; +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0ea1198..4955f75 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -59,6 +59,7 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); +static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1277,6 +1278,98 @@ static void test_gcvt(void) ok(buf[0] == '\0', "buf[0] = %c\n", buf[0]); } +static void test__itoa_s(void) +{ + errno_t ret; + char buffer[33]; + + if (!p_itoa_s) + { + win_skip("Skipping _itoa_s tests\n"); + return; + } + + errno = EBADF; + ret = p_itoa_s(0, NULL, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, 0, 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == 'X', "Expected the output buffer to be untouched\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, sizeof(buffer), 0); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(0, buffer, sizeof(buffer), 64); + ok(ret == EINVAL, "Expected _itoa_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "Expected the output buffer to be null terminated\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(12345678, buffer, 4, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\000765", 4), + "Expected the output buffer to be null terminated with truncated output\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(12345678, buffer, 8, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\0007654321", 8), + "Expected the output buffer to be null terminated with truncated output\n"); + + memset(buffer, 'X', sizeof(buffer)); + errno = EBADF; + ret = p_itoa_s(-12345678, buffer, 9, 10); + ok(ret == ERANGE, "Expected _itoa_s to return ERANGE, got %d\n", ret); + ok(errno == ERANGE, "Expected errno to be ERANGE, got %d\n", errno); + ok(!memcmp(buffer, "\00087654321", 9), + "Expected the output buffer to be null terminated with truncated output\n"); + + ret = p_itoa_s(12345678, buffer, 9, 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "12345678"), + "Expected output buffer string to be \"12345678\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(43690, buffer, sizeof(buffer), 2); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "1010101010101010"), + "Expected output buffer string to be \"1010101010101010\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(1092009, buffer, sizeof(buffer), 36); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "nell"), + "Expected output buffer string to be \"nell\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(5704, buffer, sizeof(buffer), 18); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "hag"), + "Expected output buffer string to be \"hag\", got \"%s\"\n", + buffer); + + ret = p_itoa_s(-12345678, buffer, sizeof(buffer), 10); + ok(ret == 0, "Expected _itoa_s to return 0, got %d\n", ret); + ok(!strcmp(buffer, "-12345678"), + "Expected output buffer string to be \"-12345678\", got \"%s\"\n", + buffer); +} + START_TEST(string) { char mem[100]; @@ -1302,6 +1395,7 @@ START_TEST(string) pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); p_gcvt_s = (void *)GetProcAddress(hMsvcrt, "_gcvt_s"); + p_itoa_s = (void *)GetProcAddress(hMsvcrt, "_itoa_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1336,4 +1430,5 @@ START_TEST(string) test__strtod(); test_mbstowcs(); test_gcvt(); + test__itoa_s(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index bef83f4..086c3e1 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -148,6 +148,7 @@ char* __cdecl _fullpath(char*,const char*,size_t); char* __cdecl _gcvt(double,int,char*); char* __cdecl _i64toa(__int64,char*,int); char* __cdecl _itoa(int,char*,int); +errno_t __cdecl _itoa_s(int,char*,size_t,int); char* __cdecl _ltoa(__msvcrt_long,char*,int); __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int);

1 0

Andrew Nguyen : msvcrt: Implement _localtime32_s.
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 60866103145d52121d5ac1f4c1501c0849d87191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60866103145d52121d5ac1f4c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:25:05 2010 -0500 msvcrt: Implement _localtime32_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/time.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/time.c | 20 ++++++++++++++++ include/msvcrt/time.h | 1 + 7 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ace6201..042437e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -847,7 +847,7 @@ @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 -@ stub _localtime32_s +@ cdecl _localtime32_s(ptr ptr) msvcrt._localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3c03f09..c1d18d6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -693,7 +693,7 @@ @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 -@ stub _localtime32_s +@ cdecl _localtime32_s(ptr ptr) msvcrt._localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5917bcc..6d5d518 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -681,7 +681,7 @@ @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 @ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 -@ stub _localtime32_s +@ cdecl _localtime32_s(ptr ptr) msvcrt._localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8f3a318..e628e48 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -620,7 +620,7 @@ @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 -# stub _localtime32_s +@ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock(long) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 38e06c2..a56f53c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -40,6 +40,7 @@ static struct tm* (__cdecl *p_gmtime32)(__time32_t*); static errno_t (__cdecl *p_gmtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); +static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static void init(void) @@ -51,6 +52,7 @@ static void init(void) p_mkgmtime32 = (void*)GetProcAddress(hmod, "_mkgmtime32"); p_strtime_s = (void*)GetProcAddress(hmod, "_strtime_s"); p_strdate_s = (void*)GetProcAddress(hmod, "_strdate_s"); + p_localtime32_s = (void*)GetProcAddress(hmod, "_localtime32_s"); p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); } @@ -425,6 +427,57 @@ static void test_wstrtime(void) ok(count == 3, "Wrong format: count = %d, should be 3\n", count); } +static void test_localtime32_s(void) +{ + struct tm tm; + __time32_t time; + errno_t err; + + if (!p_localtime32_s) + { + win_skip("Skipping _localtime32_s tests\n"); + return; + } + + errno = EBADF; + err = p_localtime32_s(NULL, NULL); + ok(err == EINVAL, "Expected _localtime32_s to return EINVAL, got %d\n", err); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + time = 0x12345678; + err = p_localtime32_s(NULL, &time); + ok(err == EINVAL, "Expected _localtime32_s to return EINVAL, got %d\n", err); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memset(&tm, 0, sizeof(tm)); + errno = EBADF; + err = p_localtime32_s(&tm, NULL); + ok(err == EINVAL, "Expected _localtime32_s to return EINVAL, got %d\n", err); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(tm.tm_sec == -1 && tm.tm_min == -1 && tm.tm_hour == -1 && + tm.tm_mday == -1 && tm.tm_mon == -1 && tm.tm_year == -1 && + tm.tm_wday == -1 && tm.tm_yday == -1 && tm.tm_isdst == -1, + "Expected tm structure members to be initialized to -1, got " + "(%d, %d, %d, %d, %d, %d, %d, %d, %d)\n", tm.tm_sec, tm.tm_min, + tm.tm_hour, tm.tm_mday, tm.tm_mon, tm.tm_year, tm.tm_wday, tm.tm_yday, + tm.tm_isdst); + + memset(&tm, 0, sizeof(tm)); + time = -1; + errno = EBADF; + err = p_localtime32_s(&tm, &time); + ok(err == EINVAL, "Expected _localtime32_s to return EINVAL, got %d\n", err); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(tm.tm_sec == -1 && tm.tm_min == -1 && tm.tm_hour == -1 && + tm.tm_mday == -1 && tm.tm_mon == -1 && tm.tm_year == -1 && + tm.tm_wday == -1 && tm.tm_yday == -1 && tm.tm_isdst == -1, + "Expected tm structure members to be initialized to -1, got " + "(%d, %d, %d, %d, %d, %d, %d, %d, %d)\n", tm.tm_sec, tm.tm_min, + tm.tm_hour, tm.tm_mday, tm.tm_mon, tm.tm_year, tm.tm_wday, tm.tm_yday, + tm.tm_isdst); +} + static void test_localtime64_s(void) { struct tm tm; @@ -502,5 +555,6 @@ START_TEST(time) test_strtime(); test_wstrdate(); test_wstrtime(); + test_localtime32_s(); test_localtime64_s(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index ae2463c..9d59625 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -260,6 +260,26 @@ struct MSVCRT_tm* CDECL MSVCRT__localtime32(const MSVCRT___time32_t* secs) } /********************************************************************* + * _localtime32_s (MSVCRT.@) + */ +int CDECL _localtime32_s(struct MSVCRT_tm *time, const MSVCRT___time32_t *secs) +{ + MSVCRT___time64_t secs64; + + if (!time || !secs || *secs < 0) + { + if (time) + write_invalid_msvcrt_tm(time); + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + secs64 = *secs; + return _localtime64_s(time, &secs64); +} + +/********************************************************************* * localtime (MSVCRT.@) */ #ifdef _WIN64 diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 194b47c..3a5e22f 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -103,6 +103,7 @@ double __cdecl _difftime64(__time64_t,__time64_t); struct tm* __cdecl _gmtime32(const __time32_t*); struct tm* __cdecl _gmtime64(const __time64_t*); struct tm* __cdecl _localtime32(const __time32_t*); +errno_t __cdecl _localtime32_s(struct tm*, const __time64_t*); struct tm* __cdecl _localtime64(const __time64_t*); errno_t __cdecl _localtime64_s(struct tm*, const __time64_t*); __time32_t __cdecl _mktime32(struct tm*);

1 0

Henri Verbeet : wined3d: Add traces to IWineD3DDeviceImpl_AcquireFocusWindow() / IWineD3DDeviceImpl_ReleaseFocusWindow().
by Alexandre Julliard Oct. 11, 2010

Oct. 11, 2010

Module: wine Branch: master Commit: 3c45bba11eb82ef152817bc4710affcdbaecb8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c45bba11eb82ef152817bc47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 11 13:06:20 2010 +0200 wined3d: Add traces to IWineD3DDeviceImpl_AcquireFocusWindow() / IWineD3DDeviceImpl_ReleaseFocusWindow(). --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 97acd5f..209f87d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1754,6 +1754,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_AcquireFocusWindow(IWineD3DDevice *ifac { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + TRACE("iface %p, window %p.\n", iface, window); + if (!wined3d_register_window(window, device)) { ERR("Failed to register window %p.\n", window); @@ -1770,6 +1772,8 @@ static void WINAPI IWineD3DDeviceImpl_ReleaseFocusWindow(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + TRACE("iface %p.\n", iface); + if (device->focus_window) wined3d_unregister_window(device->focus_window); device->focus_window = NULL; }

1 0