Commit 5e9ee3b9 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Fixed tmpnam and _wtmpname implementation.

parent 9fc0377f
...@@ -3683,6 +3683,7 @@ char * CDECL MSVCRT_tmpnam(char *s) ...@@ -3683,6 +3683,7 @@ char * CDECL MSVCRT_tmpnam(char *s)
{ {
size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr);
memcpy(p, tmpstr, size); memcpy(p, tmpstr, size);
p[size] = '\0';
if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES &&
GetLastError() == ERROR_FILE_NOT_FOUND) GetLastError() == ERROR_FILE_NOT_FOUND)
break; break;
...@@ -3714,6 +3715,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) ...@@ -3714,6 +3715,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s)
{ {
size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr);
memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t));
p[size] = '\0';
if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES &&
GetLastError() == ERROR_FILE_NOT_FOUND) GetLastError() == ERROR_FILE_NOT_FOUND)
break; break;
......
...@@ -74,6 +74,8 @@ static inline void msvcrt_free_tls_mem(void) ...@@ -74,6 +74,8 @@ static inline void msvcrt_free_tls_mem(void)
HeapFree(GetProcessHeap(),0,tls->strerror_buffer); HeapFree(GetProcessHeap(),0,tls->strerror_buffer);
HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); HeapFree(GetProcessHeap(),0,tls->wcserror_buffer);
HeapFree(GetProcessHeap(),0,tls->time_buffer); HeapFree(GetProcessHeap(),0,tls->time_buffer);
HeapFree(GetProcessHeap(),0,tls->tmpnam_buffer);
HeapFree(GetProcessHeap(),0,tls->wtmpnam_buffer);
if(tls->have_locale) { if(tls->have_locale) {
free_locinfo(tls->locinfo); free_locinfo(tls->locinfo);
free_mbcinfo(tls->mbcinfo); free_mbcinfo(tls->mbcinfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment