April 2016 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Fix handling of numbers starting with decimal separator.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 756c604d9a2d656afd972929c7d9d3cc99c611ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=756c604d9a2d656afd972929c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 11:12:35 2016 +0200 jscript: Fix handling of numbers starting with decimal separator. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 3 ++- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 65b16a6..3523958 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -603,7 +603,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) return '}'; case '.': - if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + if(ctx->ptr+1 < ctx->end && isdigitW(ctx->ptr[1])) { double n; HRESULT hres; hres = parse_decimal(&ctx->ptr, ctx->end, &n); @@ -614,6 +614,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) *(literal_t**)lval = new_double_literal(ctx, n); return tNumericLiteral; } + ctx->ptr++; return '.'; case '<': diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ae8e408..95655ab 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -407,6 +407,10 @@ tmp = 2.5*3.5; ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); +tmp = 2*.5; +ok(tmp === 1, "2*.5 !== 1"); +ok(getVT(tmp) == "VT_I4", "getVT(2*.5) !== VT_I4"); + tmp = 4/2; ok(tmp === 2, "4/2 !== 2"); ok(getVT(tmp) === "VT_I4", "getVT(4/2) !== VT_I4");

1 0

Nikolay Sivov : hnetcfg: Claim success in INetFwOpenPorts::Add().
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 65ba59322d0448ebfbdfb3a1b437913cf3aae844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ba59322d0448ebfbdfb3a1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 21:51:36 2016 +0300 hnetcfg: Claim success in INetFwOpenPorts::Add(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 036ecb9..7d74965 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -526,7 +526,7 @@ static HRESULT WINAPI fw_ports_Add( fw_ports *This = impl_from_INetFwOpenPorts( iface ); FIXME("%p, %p\n", This, port); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_ports_Remove(

1 0

Jacek Caban : wininet: Don' t use INTERNET_MAX_HOST_NAME_LENGTH in InternetCheckConnectionW.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 8e2586db52ea839e92965be38cab548da5ef74ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2586db52ea839e92965be38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:20:39 2016 +0200 wininet: Don't use INTERNET_MAX_HOST_NAME_LENGTH in InternetCheckConnectionW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 83919b1..5359794 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3330,13 +3330,12 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe BOOL rc = FALSE; static const CHAR ping[] = "ping -c 1 "; static const CHAR redirect[] = " >/dev/null 2>/dev/null"; - CHAR *command = NULL; - WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH]; - DWORD len; + WCHAR *host; + DWORD len, host_len; INTERNET_PORT port; int status = -1; - FIXME("\n"); + FIXME("(%s %x %x)\n", debugstr_w(lpszUrl), dwFlags, dwReserved); /* * Crack or set the Address @@ -3355,27 +3354,34 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe } else { - URL_COMPONENTSW components; + URL_COMPONENTSW components = {sizeof(components)}; - ZeroMemory(&components,sizeof(URL_COMPONENTSW)); - components.lpszHostName = (LPWSTR)hostW; - components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + components.dwHostNameLength = 1; if (!InternetCrackUrlW(lpszUrl,0,0,&components)) goto End; - TRACE("host name : %s\n",debugstr_w(components.lpszHostName)); + host = components.lpszHostName; + host_len = components.dwHostNameLength; port = components.nPort; - TRACE("port: %d\n", port); + TRACE("host name: %s port: %d\n",debugstr_wn(host, host_len), port); } if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_storage saddr; socklen_t sa_len = sizeof(saddr); + WCHAR *host_z; int fd; + BOOL b; - if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len, NULL)) + host_z = heap_strndupW(host, host_len); + if (!host_z) + return FALSE; + + b = GetAddress(host_z, port, (struct sockaddr *)&saddr, &sa_len, NULL); + heap_free(host_z); + if(!b) goto End; init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); @@ -3391,15 +3397,18 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe /* * Build our ping command */ - len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL); - command = heap_alloc(strlen(ping)+len+strlen(redirect)); - strcpy(command,ping); - WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL); - strcat(command,redirect); + char *command; + + len = WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, NULL, 0, NULL, NULL); + command = heap_alloc(strlen(ping)+len+strlen(redirect)+1); + strcpy(command, ping); + WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, command+sizeof(ping)-1, len, NULL, NULL); + strcpy(command+sizeof(ping)-1+len, redirect); TRACE("Ping command is : %s\n",command); status = system(command); + heap_free( command ); TRACE("Ping returned a code of %i\n",status); @@ -3409,7 +3418,6 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe } End: - heap_free( command ); if (rc == FALSE) INTERNET_SetLastError(ERROR_NOT_CONNECTED);

1 0

Jacek Caban : wininet: Don't use INTERNET_MAX_* macros in parse_proxy_url.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: e0c7741d2257b07cb58ac618e7ae39816fa22d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c7741d2257b07cb58ac618e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:20:18 2016 +0200 wininet: Don't use INTERNET_MAX_* macros in parse_proxy_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6cf890b..83919b1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -521,41 +521,32 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - URL_COMPONENTSW uc; - - hostname[0] = username[0] = password[0] = 0; - memset( &uc, 0, sizeof(uc) ); - uc.dwStructSize = sizeof(uc); - uc.lpszHostName = hostname; - uc.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - uc.lpszUserName = username; - uc.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - uc.lpszPassword = password; - uc.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + static const WCHAR fmt[] = {'%','.','*','s',':','%','u',0}; + URL_COMPONENTSW uc = {sizeof(uc)}; + + uc.dwHostNameLength = 1; + uc.dwUserNameLength = 1; + uc.dwPasswordLength = 1; if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE; - if (!hostname[0]) + if (!uc.dwHostNameLength) { if (!(info->proxy = heap_strdupW( url ))) return FALSE; info->proxyUsername = NULL; info->proxyPassword = NULL; return TRUE; } - if (!(info->proxy = heap_alloc( (strlenW(hostname) + 12) * sizeof(WCHAR) ))) return FALSE; - sprintfW( info->proxy, fmt, hostname, uc.nPort ); + if (!(info->proxy = heap_alloc( (uc.dwHostNameLength + 12) * sizeof(WCHAR) ))) return FALSE; + sprintfW( info->proxy, fmt, uc.dwHostNameLength, uc.lpszHostName, uc.nPort ); - if (!username[0]) info->proxyUsername = NULL; - else if (!(info->proxyUsername = heap_strdupW( username ))) + if (!uc.dwUserNameLength) info->proxyUsername = NULL; + else if (!(info->proxyUsername = heap_strndupW( uc.lpszUserName, uc.dwUserNameLength ))) { heap_free( info->proxy ); return FALSE; } - if (!password[0]) info->proxyPassword = NULL; - else if (!(info->proxyPassword = heap_strdupW( password ))) + if (!uc.dwPasswordLength) info->proxyPassword = NULL; + else if (!(info->proxyPassword = heap_strndupW( uc.lpszPassword, uc.dwPasswordLength ))) { heap_free( info->proxyUsername ); heap_free( info->proxy );

1 0

Sebastian Lackner : wininet: Send INTERNET_STATUS_RESPONSE_RECEIVED notification in async handler.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 45459965aa6e8908c765eac5b9701d6ed208daf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45459965aa6e8908c765eac5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 05:12:49 2016 +0200 wininet: Send INTERNET_STATUS_RESPONSE_RECEIVED notification in async handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 +++++++ dlls/wininet/tests/http.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 08f5a08..66ee6ba 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3134,6 +3134,13 @@ static void AsyncReadFileExProc(task_header_t *hdr) TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); + if (res == ERROR_SUCCESS) + { + DWORD read = *task->ret_read; + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &read, sizeof(read)); + } + send_request_complete(req, res == ERROR_SUCCESS, res); } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 22f8fbe..c90e6d2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1099,7 +1099,7 @@ static void InternetReadFileExA_test(int flags) CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } else @@ -4505,6 +4505,7 @@ static void test_async_read(int port) if (!ret) { ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); if (!pending_reads++) { @@ -4517,6 +4518,7 @@ static void test_async_read(int port) ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); todo_wine_if( pending_reads > 1 ) ok( ib.dwBufferLength != 0, "expected ib.dwBufferLength != 0\n" ); + CHECK_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); }

1 0

Michael Müller : wininet: Fix async check in HTTPREQ_ReadFileEx.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: d332ff74452ee5d395bb54ffa5f0efa2c16e6bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d332ff74452ee5d395bb54ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 28 05:09:40 2016 +0200 wininet: Fix async check in HTTPREQ_ReadFileEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ef0b36e..08f5a08 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3149,7 +3149,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - if (hdr->dwFlags & INTERNET_FLAG_ASYNC) + if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { read_file_ex_task_t *task;

1 0

Austin English : kernel32: Add FreeUserPhysicalPages stub.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: b0ce049cbbfecf747ffab6815bccbd59a20a2130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce049cbbfecf747ffab6815… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 05:41:38 2016 +0200 kernel32: Add FreeUserPhysicalPages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 4 ++-- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index cf10c20..2ad54b7 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -1,6 +1,6 @@ -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) kernel32.AllocateUserPhysicalPages +@ stdcall AllocateUserPhysicalPages(long ptr ptr) kernel32.AllocateUserPhysicalPages @ stub AllocateUserPhysicalPagesNuma -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages @ stub GetMemoryErrorHandlingCapabilities @ stub MapUserPhysicalPages @ stub RegisterBadMemoryNotification diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index eeed785..fffd0e4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PT SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray) +{ + FIXME("stub: %p %p %p\n", process, pages, userarray); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 71dbe4d..ec7155b6e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -154,7 +154,7 @@ @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) +@ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @@ -535,7 +535,7 @@ @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) @ stub FreeVirtualBuffer @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress

1 0

Michael Müller : wininet: Handle async mode in HTTPREQ_ReadFile.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 221590213ea12375cb2549afd774855dcc6c46e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221590213ea12375cb2549afd… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 28 05:14:47 2016 +0200 wininet: Handle async mode in HTTPREQ_ReadFile. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 60 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 66ee6ba..775ff61 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3101,23 +3101,6 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) return ret; } -static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) -{ - http_request_t *req = (http_request_t*)hdr; - DWORD res; - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - res = HTTPREQ_Read(req, buffer, size, read); - if(res == ERROR_SUCCESS) - res = hdr->dwError; - LeaveCriticalSection( &req->read_section ); - - return res; -} - typedef struct { task_header_t hdr; void *buf; @@ -3241,6 +3224,49 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } +static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) +{ + http_request_t *req = (http_request_t*)hdr; + DWORD res; + + if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + read_file_ex_task_t *task; + + if (TryEnterCriticalSection( &req->read_section )) + { + if (get_avail_data(req)) + { + res = HTTPREQ_Read(req, buffer, size, read); + LeaveCriticalSection( &req->read_section ); + return res; + } + LeaveCriticalSection( &req->read_section ); + } + + task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); + task->buf = buffer; + task->size = size; + task->ret_read = read; + + *read = 0; + INTERNET_AsyncCall(&task->hdr); + + return ERROR_IO_PENDING; + } + + EnterCriticalSection( &req->read_section ); + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + res = HTTPREQ_Read(req, buffer, size, read); + if(res == ERROR_SUCCESS) + res = hdr->dwError; + LeaveCriticalSection( &req->read_section ); + + return res; +} + typedef struct { task_header_t hdr; DWORD *ret_size;

1 0

Jacek Caban : wininet: Added new heap_strndupAtoW helper and use it in HttpAddRequestHeadersA.
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: d282a64280f3e147f09adae9e3e3152b1d20dbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d282a64280f3e147f09adae9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:18:12 2016 +0200 wininet: Added new heap_strndupAtoW helper and use it in HttpAddRequestHeadersA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 14 +++++--------- dlls/wininet/internet.h | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bdc659d..ef0b36e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1376,21 +1376,17 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, LPCSTR lpszHeader, DWORD dwHeaderLength, DWORD dwModifier) { - DWORD len; - LPWSTR hdr; + WCHAR *headers = NULL; BOOL r; TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); - len = MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, NULL, 0 ); - hdr = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, lpszHeader, dwHeaderLength, hdr, len ); - if( dwHeaderLength != ~0U ) - dwHeaderLength = len; + if(lpszHeader) + headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength); - r = HttpAddRequestHeadersW( hHttpRequest, hdr, dwHeaderLength, dwModifier ); + r = HttpAddRequestHeadersW(hHttpRequest, headers, dwHeaderLength, dwModifier); - heap_free( hdr ); + heap_free(headers); return r; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8c3a1f1..eb3a023 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -166,6 +166,25 @@ static inline LPWSTR heap_strndupW(LPCWSTR str, UINT max_len) return ret; } +static inline WCHAR *heap_strndupAtoW(const char *str, int len_a, DWORD *len_w) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + if(len_a < 0) len_a = strlen(str); + len = MultiByteToWideChar(CP_ACP, 0, str, len_a, NULL, 0); + ret = heap_alloc((len+1)*sizeof(WCHAR)); + if(ret) { + MultiByteToWideChar(CP_ACP, 0, str, len_a, ret, len); + ret[len] = 0; + *len_w = len; + } + } + + return ret; +} + static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Nikolay Sivov : msvcrt: Handle overflow in calloc().
by Alexandre Julliard April 27, 2016

April 27, 2016

Module: wine Branch: master Commit: 50dd4b892825c75db35cd1f378291b51fa782f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50dd4b892825c75db35cd1f37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 11:11:49 2016 +0300 msvcrt: Handle overflow in calloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 10 +++++++++- dlls/msvcrt/tests/heap.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 52a5287..3fe0227 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -394,7 +394,15 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs */ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { - return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, count*size); + MSVCRT_size_t bytes = count*size; + + if (size && bytes / size != count) + { + *MSVCRT__errno() = MSVCRT_ENOMEM; + return NULL; + } + + return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, bytes); } /********************************************************************* diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 2aaf48d..82a5961 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -456,6 +456,28 @@ static void test_sbheap(void) free(mem); } +static void test_calloc(void) +{ + void *ptr; + + ptr = calloc(1, 0); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + ptr = calloc(0, 0); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + ptr = calloc(0, 1); + ok(ptr != NULL, "got %p\n", ptr); + free(ptr); + + errno = 0; + ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2); + ok(ptr == NULL, "got %p\n", ptr); + ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno); +} + START_TEST(heap) { void *mem; @@ -480,4 +502,5 @@ START_TEST(heap) test_aligned(); test_sbheap(); + test_calloc(); }

1 0