October 2010 - Wine-commits

Andrew Eikum : cryptnet/tests: Use UrlCanonicalize to create a URL.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 35f8d7397b538948dab447953207420bc5029d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f8d7397b538948dab447953… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 11 11:17:26 2010 -0500 cryptnet/tests: Use UrlCanonicalize to create a URL. --- dlls/cryptnet/tests/Makefile.in | 2 +- dlls/cryptnet/tests/cryptnet.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index 7fe1e32..2cef5b6 100644 --- a/dlls/cryptnet/tests/Makefile.in +++ b/dlls/cryptnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = cryptnet.dll -IMPORTS = cryptnet crypt32 +IMPORTS = cryptnet crypt32 shlwapi C_SRCS = \ cryptnet.c diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index b8da671..aab3724 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <shlwapi.h> #include "wine/test.h" static const BYTE bigCert[] = { @@ -316,13 +317,14 @@ static void make_tmp_file(LPSTR path) static void test_retrieveObjectByUrl(void) { BOOL ret; - char tmpfile[MAX_PATH * 2], *ptr, url[MAX_PATH + 8]; + char tmpfile[MAX_PATH * 2], url[MAX_PATH + 8]; CRYPT_BLOB_ARRAY *pBlobArray; PCCERT_CONTEXT cert; PCCRL_CONTEXT crl; HCERTSTORE store; CRYPT_RETRIEVE_AUX_INFO aux = { 0 }; FILETIME ft = { 0 }; + DWORD urllen; SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -332,17 +334,8 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - ptr = strchr(tmpfile, ':'); - if (ptr) - ptr += 2; /* skip colon and first slash */ - else - ptr = tmpfile; - snprintf(url, sizeof(url), "file:///%s", ptr); - do { - ptr = strchr(url, '\\'); - if (ptr) - *ptr = '/'; - } while (ptr); + urllen = sizeof(url); + UrlCanonicalizeA(tmpfile, url, &urllen, URL_WININET_COMPATIBILITY); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0

Andrew Eikum : shlwapi: Handle URL_WININET_COMPATIBILITY flag in UrlCanonicalize.
by Alexandre Julliard 12 Oct '10

12 Oct '10

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

André Hentschel : taskkill: Update German translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 009f45240714bd6aa6ea71d544debc51be13a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=009f45240714bd6aa6ea71d54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 11 20:48:59 2010 +0200 taskkill: Update German translation. --- programs/taskkill/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/De.rc b/programs/taskkill/De.rc index 597cc36..ede9538 100644 --- a/programs/taskkill/De.rc +++ b/programs/taskkill/De.rc @@ -40,4 +40,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Fehler: Konnte Prozess \"%s\" nicht finden.\n" STRING_ENUM_FAILED, "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" STRING_TERMINATE_FAILED, "Fehler: Konnte Prozess \"%s\" nicht beenden.\n" + STRING_SELF_TERMINATION, "Fehler: Eigenen Prozess beenden ist nicht gestattet.\n" }

1 0

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

12 Oct '10

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

Nikolay Sivov : msxml3: Implement ::get_responseXML().
by Alexandre Julliard 11 Oct '10

11 Oct '10

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

Luca Bennati : taskkill: Update Italian translation.
by Alexandre Julliard 11 Oct '10

11 Oct '10

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

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

11 Oct '10

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

Andrew Nguyen : msvcrt: Implement _localtime64_s.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: e245cb52c6f4e2dd60a8e4989a2ba79e39039067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e245cb52c6f4e2dd60a8e4989… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:24:20 2010 -0500 msvcrt: Implement _localtime64_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/time.c | 70 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/time.c | 45 +++++++++++++++++++++++++++ include/msvcrt/time.h | 1 + 8 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 79517e5..ace6201 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -849,7 +849,7 @@ @ cdecl _localtime32(ptr) msvcrt._localtime32 @ stub _localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 -@ stub _localtime64_s +@ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock @ stub _lock_file @ cdecl _locking(long long long) msvcrt._locking diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3795264..3c03f09 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -695,7 +695,7 @@ @ cdecl _localtime32(ptr) msvcrt._localtime32 @ stub _localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 -@ stub _localtime64_s +@ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock @ stub _lock_file @ cdecl _locking(long long long) msvcrt._locking diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c0ed8b6..5917bcc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -683,7 +683,7 @@ @ cdecl _localtime32(ptr) msvcrt._localtime32 @ stub _localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 -@ stub _localtime64_s +@ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock @ stub _lock_file @ cdecl _locking(long long long) msvcrt._locking diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8e0bd43..3d9639e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -717,6 +717,8 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1) +#define _MAX__TIME64_T (((MSVCRT___time64_t)0x00000007 << 32) | 0x93406FFF) + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 341093b..8f3a318 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -622,7 +622,7 @@ @ cdecl _localtime32(ptr) MSVCRT__localtime32 # stub _localtime32_s @ cdecl _localtime64(ptr) MSVCRT__localtime64 -# stub _localtime64_s +@ cdecl _localtime64_s(ptr ptr) @ cdecl _lock(long) @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb( double ) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index b11ecf7..38e06c2 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -27,6 +27,8 @@ #include <stdio.h> /*printf*/ #include <errno.h> +#define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) + #define SECSPERDAY 86400 #define SECSPERHOUR 3600 #define SECSPERMIN 60 @@ -38,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_localtime64_s)(struct tm*, __time64_t*); static void init(void) { @@ -48,6 +51,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_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); } static int get_test_year(time_t *start) @@ -421,6 +425,71 @@ static void test_wstrtime(void) ok(count == 3, "Wrong format: count = %d, should be 3\n", count); } +static void test_localtime64_s(void) +{ + struct tm tm; + __time64_t time; + errno_t err; + + if (!p_localtime64_s) + { + win_skip("Skipping _localtime64_s tests\n"); + return; + } + + errno = EBADF; + err = p_localtime64_s(NULL, NULL); + ok(err == EINVAL, "Expected _localtime64_s to return EINVAL, got %d\n", err); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + time = 0xdeadbeef; + err = p_localtime64_s(NULL, &time); + ok(err == EINVAL, "Expected _localtime64_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_localtime64_s(&tm, NULL); + ok(err == EINVAL, "Expected _localtime64_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_localtime64_s(&tm, &time); + ok(err == EINVAL, "Expected _localtime64_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 = _MAX__TIME64_T + 1; + errno = EBADF; + err = p_localtime64_s(&tm, &time); + ok(err == EINVAL, "Expected _localtime64_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); +} + START_TEST(time) { init(); @@ -433,4 +502,5 @@ START_TEST(time) test_strtime(); test_wstrdate(); test_wstrtime(); + test_localtime64_s(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index df31593..d0201e2 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -78,6 +78,19 @@ static inline void unix_tm_to_msvcrt( struct MSVCRT_tm *dest, const struct tm *s dest->tm_isdst = src->tm_isdst; } +static inline void write_invalid_msvcrt_tm( struct MSVCRT_tm *tm ) +{ + 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; +} + #define SECSPERDAY 86400 /* 1601 to 1970 is 369 years plus 89 leap days */ #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) @@ -206,6 +219,38 @@ struct MSVCRT_tm* CDECL MSVCRT__localtime64(const MSVCRT___time64_t* secs) } /********************************************************************* + * _localtime64_s (MSVCRT.@) + */ +int CDECL _localtime64_s(struct MSVCRT_tm *time, const MSVCRT___time64_t *secs) +{ + struct tm *tm; + time_t seconds; + + if (!time || !secs || *secs < 0 || *secs > _MAX__TIME64_T) + { + if (time) + write_invalid_msvcrt_tm(time); + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + seconds = *secs; + + _mlock(_TIME_LOCK); + if (!(tm = localtime(&seconds))) + { + _munlock(_TIME_LOCK); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + unix_tm_to_msvcrt(time, tm); + _munlock(_TIME_LOCK); + return 0; +} + +/********************************************************************* * _localtime32 (MSVCRT.@) */ struct MSVCRT_tm* CDECL MSVCRT__localtime32(const MSVCRT___time32_t* secs) diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index ebbfbc2..194b47c 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -104,6 +104,7 @@ struct tm* __cdecl _gmtime32(const __time32_t*); struct tm* __cdecl _gmtime64(const __time64_t*); struct tm* __cdecl _localtime32(const __time32_t*); struct tm* __cdecl _localtime64(const __time64_t*); +errno_t __cdecl _localtime64_s(struct tm*, const __time64_t*); __time32_t __cdecl _mktime32(struct tm*); __time64_t __cdecl _mktime64(struct tm*); size_t __cdecl strftime(char*,size_t,const char*,const struct tm*);

1 0

Andrew Nguyen : msvcrt: Use the write_invalid_msvcrt_tm helper in _gmtime64_s.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 90771ab6054ccdfca65de1e12dd7c03205a1d151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90771ab6054ccdfca65de1e12… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 11 05:24:30 2010 -0500 msvcrt: Use the write_invalid_msvcrt_tm helper in _gmtime64_s. --- dlls/msvcrt/time.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index d0201e2..ae2463c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -284,17 +284,9 @@ int CDECL MSVCRT__gmtime64_s(struct MSVCRT_tm *res, const MSVCRT___time64_t *sec SYSTEMTIME st; ULONGLONG time; - if(!res || !secs || *secs<0) { - if(res) { - res->tm_sec = -1; - res->tm_min = -1; - res->tm_hour = -1; - res->tm_mday = -1; - res->tm_year = -1; - res->tm_mon = -1; - res->tm_wday = -1; - res->tm_yday = -1; - res->tm_isdst = -1; + if (!res || !secs || *secs < 0) { + if (res) { + write_invalid_msvcrt_tm(res); } *MSVCRT__errno() = MSVCRT_EINVAL;

1 0

Andrew Nguyen : msvcrt: Implement _localtime32_s.
by Alexandre Julliard 11 Oct '10

11 Oct '10

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