March 2017 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Rewrite InternetReadFileEx for http protocol to make use of non-blocking reads.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 08808747b2e2aa590a5c8dc0d85c2882b098c460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08808747b2e2aa590a5c8dc0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:19:50 2017 +0100 wininet: Rewrite InternetReadFileEx for http protocol to make use of non-blocking reads. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 100 ++++++++++++++++++++++------------------------ dlls/wininet/tests/http.c | 10 ----- 2 files changed, 48 insertions(+), 62 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4109849..c9119f3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3166,77 +3166,73 @@ static DWORD async_read(http_request_t *req, void *buf, DWORD size, DWORD read_p static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { - http_request_t *req = (http_request_t*)hdr; - DWORD res, read, cread, error = ERROR_SUCCESS; + DWORD res = ERROR_SUCCESS, read = 0, cread, error = ERROR_SUCCESS; + BOOL allow_blocking, notify_received = FALSE; TRACE("(%p %p %u %x)\n", req, buf, size, flags); if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); + + if(allow_blocking || TryEnterCriticalSection(&req->read_section)) { + if(allow_blocking) + EnterCriticalSection(&req->read_section); + if(hdr->dwError == ERROR_SUCCESS) + hdr->dwError = INTERNET_HANDLE_IN_USE; + else if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + if(req->read_size) { + read = min(size, req->read_size); + memcpy(buf, req->read_buf + req->read_pos, read); + req->read_size -= read; + req->read_pos += read; + } - if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - if (TryEnterCriticalSection( &req->read_section )) - { - if (get_avail_data(req) || end_of_read_data(req)) - { - res = HTTPREQ_Read(req, buf, size, &read, BLOCKING_DISALLOW); - LeaveCriticalSection( &req->read_section ); - goto done; + if(read < size && (!read || !(flags & IRF_NO_WAIT)) && !end_of_read_data(req)) { + LeaveCriticalSection(&req->read_section); + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + EnterCriticalSection( &req->read_section ); + notify_received = TRUE; + + while(read < size) { + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, + allow_blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW); + read += cread; + if (res != ERROR_SUCCESS || !cread) + break; } - LeaveCriticalSection( &req->read_section ); } - if(flags & IRF_NO_WAIT) - return async_read(req, NULL, 0, 0, 0); - return async_read(req, buf, size, 0, ret_read); - } - - read = 0; - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == ERROR_SUCCESS) - hdr->dwError = INTERNET_HANDLE_IN_USE; - else if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - while(1) { - res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, BLOCKING_ALLOW); - if(res != ERROR_SUCCESS) - break; - - read += cread; - if(read == size || end_of_read_data(req)) - break; + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_SUCCESS; + else + error = hdr->dwError; LeaveCriticalSection( &req->read_section ); - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &cread, sizeof(cread)); - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - - EnterCriticalSection( &req->read_section ); + }else { + res = WSAEWOULDBLOCK; } - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_SUCCESS; - else - error = hdr->dwError; - - LeaveCriticalSection( &req->read_section ); + if(res == WSAEWOULDBLOCK) { + if(!(flags & IRF_NO_WAIT)) + return async_read(req, buf, size, read, ret_read); + if(!read) + return async_read(req, NULL, 0, 0, NULL); + res = ERROR_SUCCESS; + } -done: *ret_read = read; - if (res == ERROR_SUCCESS) { + if (res != ERROR_SUCCESS) + return res; + + if(notify_received) INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &read, sizeof(read)); - } - - return res==ERROR_SUCCESS ? error : res; + return error; } static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6df30fa..48adee6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1111,16 +1111,9 @@ static void InternetReadFileExA_test(int flags) inetbuffers.lpvBuffer = NULL; inetbuffers.dwOffsetHigh = 1234; inetbuffers.dwOffsetLow = 5678; - SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); - SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); rc = InternetReadFileExA(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); trace("read %i bytes\n", inetbuffers.dwBufferLength); - todo_wine - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); - } rc = InternetReadFileExA(NULL, &inetbuffers, 0, 0xdeadcafe); ok(!rc && (GetLastError() == ERROR_INVALID_HANDLE), @@ -1167,10 +1160,8 @@ static void InternetReadFileExA_test(int flags) CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); if (inetbuffers.dwBufferLength) { - todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); - } } else { @@ -4463,7 +4454,6 @@ static void test_async_read(int port) if (!ib.dwBufferLength) break; } - todo_wine ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); close_async_handle( ses, hCompleteEvent, 2 );

1 0

Jacek Caban : wininet: Reimplemented InternetQueryDataAvailable on top of async_read.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: a546e8acaadfa67457dd31da9610bbeeb233047c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a546e8acaadfa67457dd31da9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:02 2017 +0100 wininet: Reimplemented InternetQueryDataAvailable on top of async_read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 78 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9119f3..3e0bd97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3285,56 +3285,60 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return res; } -typedef struct { - task_header_t hdr; - DWORD *ret_size; -} http_data_available_task_t; - -static void AsyncQueryDataAvailableProc(task_header_t *hdr) -{ - http_data_available_task_t *task = (http_data_available_task_t*)hdr; - - HTTP_ReceiveRequestData((http_request_t*)task->hdr.hdr, FALSE, task->ret_size); -} - static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { http_request_t *req = (http_request_t*)hdr; + DWORD res = ERROR_SUCCESS, avail = 0, error = ERROR_SUCCESS; + BOOL allow_blocking, notify_received = FALSE; TRACE("(%p %p %x %lx)\n", req, available, flags, ctx); - if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - http_data_available_task_t *task; + if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) + FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); - /* never wait, if we can't enter the section we queue an async request right away */ - if (TryEnterCriticalSection( &req->read_section )) - { - refill_read_buffer(req, BLOCKING_DISALLOW, NULL); - if ((*available = get_avail_data( req ))) goto done; - if (end_of_read_data( req )) goto done; - LeaveCriticalSection( &req->read_section ); - } + *available = 0; + allow_blocking = !(req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); - task = alloc_async_task(&req->hdr, AsyncQueryDataAvailableProc, sizeof(*task)); - task->ret_size = available; - INTERNET_AsyncCall(&task->hdr); - return ERROR_IO_PENDING; - } + if(allow_blocking || TryEnterCriticalSection(&req->read_section)) { + if(allow_blocking) + EnterCriticalSection(&req->read_section); + if(hdr->dwError == ERROR_SUCCESS) + hdr->dwError = INTERNET_HANDLE_IN_USE; + else if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - EnterCriticalSection( &req->read_section ); + avail = req->read_size; - if (!(*available = get_avail_data( req )) && !end_of_read_data( req )) - { - refill_read_buffer( req, BLOCKING_ALLOW, NULL ); - *available = get_avail_data( req ); + if(!avail && !end_of_read_data(req)) { + LeaveCriticalSection(&req->read_section); + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); + EnterCriticalSection( &req->read_section ); + notify_received = TRUE; + + res = refill_read_buffer(req, allow_blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW, &avail); + } + + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_SUCCESS; + else + error = hdr->dwError; + + LeaveCriticalSection( &req->read_section ); + }else { + res = WSAEWOULDBLOCK; } -done: - LeaveCriticalSection( &req->read_section ); + if(res == WSAEWOULDBLOCK) + return async_read(req, NULL, 0, 0, available); - TRACE( "returning %u\n", *available ); - return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) + return res; + + *available = avail; + if(notify_received) + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &avail, sizeof(avail)); + return error; } static DWORD HTTPREQ_LockRequestFile(object_header_t *hdr, req_file_t **ret)

1 0

Jacek Caban : wininet: Merge InternetReadFile and InternetReadFileEx implementations.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 7eaadabc5cd9f77e358105e63ff9d8d9abaf7530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaadabc5cd9f77e358105e63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:14 2017 +0100 wininet: Merge InternetReadFile and InternetReadFileEx implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 12 ++---------- dlls/wininet/http.c | 38 +------------------------------------- dlls/wininet/internet.c | 16 +++++++++------- dlls/wininet/internet.h | 3 +-- dlls/wininet/tests/http.c | 2 -- 5 files changed, 13 insertions(+), 58 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 396777d..e12e494 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1184,7 +1184,8 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe return INET_QueryOption(hdr, option, buffer, size, unicode); } -static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) +static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read, + DWORD flags, DWORD_PTR context) { ftp_file_t *file = (ftp_file_t*)hdr; int res; @@ -1208,12 +1209,6 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return error; } -static DWORD FTPFILE_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_size, - DWORD flags, DWORD_PTR context) -{ - return FTPFILE_ReadFile(hdr, buf, size, ret_size); -} - static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) { ftp_file_t *lpwh = (ftp_file_t*) hdr; @@ -1300,7 +1295,6 @@ static const object_vtbl_t FTPFILEVtbl = { FTPFILE_QueryOption, INET_SetOption, FTPFILE_ReadFile, - FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, NULL, @@ -2404,7 +2398,6 @@ static const object_vtbl_t FTPSESSIONVtbl = { NULL, NULL, NULL, - NULL, NULL }; @@ -3543,7 +3536,6 @@ static const object_vtbl_t FTPFINDNEXTVtbl = { NULL, NULL, NULL, - NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3e0bd97..9cb517d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3163,7 +3163,7 @@ static DWORD async_read(http_request_t *req, void *buf, DWORD size, DWORD read_p return ERROR_IO_PENDING; } -static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, +static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { http_request_t *req = (http_request_t*)hdr; @@ -3251,40 +3251,6 @@ 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) - { - if (TryEnterCriticalSection( &req->read_section )) - { - if (get_avail_data(req) || end_of_read_data(req)) - { - res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_DISALLOW); - LeaveCriticalSection( &req->read_section ); - return res; - } - LeaveCriticalSection( &req->read_section ); - } - - *read = 0; - return async_read(req, buffer, size, 0, read); - } - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_WAITALL); - if(res == ERROR_SUCCESS) - res = hdr->dwError; - LeaveCriticalSection( &req->read_section ); - - return res; -} - static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { http_request_t *req = (http_request_t*)hdr; @@ -3362,7 +3328,6 @@ static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_QueryOption, HTTPREQ_SetOption, HTTPREQ_ReadFile, - HTTPREQ_ReadFileEx, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, NULL, @@ -5850,7 +5815,6 @@ static const object_vtbl_t HTTPSESSIONVtbl = { NULL, NULL, NULL, - NULL, NULL }; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 91678b6..1f1bbbd 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -982,7 +982,6 @@ static const object_vtbl_t APPINFOVtbl = { APPINFO_SetOption, NULL, NULL, - NULL, NULL }; @@ -2166,8 +2165,11 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, return FALSE; } - if(hdr->vtbl->ReadFile) - res = hdr->vtbl->ReadFile(hdr, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead); + if(hdr->vtbl->ReadFile) { + res = hdr->vtbl->ReadFile(hdr, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, 0, 0); + if(res == ERROR_IO_PENDING) + *pdwNumOfBytesRead = 0; + } WININET_Release(hdr); @@ -2225,8 +2227,8 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu return FALSE; } - if(hdr->vtbl->ReadFileEx) - res = hdr->vtbl->ReadFileEx(hdr, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength, + if(hdr->vtbl->ReadFile) + res = hdr->vtbl->ReadFile(hdr, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength, &lpBuffersOut->dwBufferLength, dwFlags, dwContext); WININET_Release(hdr); @@ -2263,8 +2265,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return FALSE; } - if(hdr->vtbl->ReadFileEx) - res = hdr->vtbl->ReadFileEx(hdr, lpBuffer->lpvBuffer, lpBuffer->dwBufferLength, &lpBuffer->dwBufferLength, + if(hdr->vtbl->ReadFile) + res = hdr->vtbl->ReadFile(hdr, lpBuffer->lpvBuffer, lpBuffer->dwBufferLength, &lpBuffer->dwBufferLength, dwFlags, dwContext); WININET_Release(hdr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index d400df0..6a49bf1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -279,8 +279,7 @@ typedef struct { void (*CloseConnection)(object_header_t*); DWORD (*QueryOption)(object_header_t*,DWORD,void*,DWORD*,BOOL); DWORD (*SetOption)(object_header_t*,DWORD,void*,DWORD); - DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*); - DWORD (*ReadFileEx)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); + DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(object_header_t*,void*); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 48adee6..3bb96e1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4520,7 +4520,6 @@ static void test_async_read(int port) { ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); ok( bytes == 0, "expected 0, got %u\n", bytes ); - todo_wine CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); if (!pending_reads++) @@ -4543,7 +4542,6 @@ static void test_async_read(int port) if (!bytes) break; } - todo_wine ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); close_async_handle( ses, hCompleteEvent, 2 );

1 0

Jacek Caban : wininet: Get rid of no longer needed BLOCKING_WAITALL.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 18f9d0303a8f24da6e173a5f587ebfcf0d1a0359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f9d0303a8f24da6e173a5f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:20 2017 +0100 wininet: Get rid of no longer needed BLOCKING_WAITALL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9cb517d..501a4a5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -382,8 +382,7 @@ static WCHAR *get_host_header( http_request_t *req ) typedef enum { BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL + BLOCKING_DISALLOW } blocking_mode_t; struct data_stream_vtbl_t { @@ -2658,27 +2657,20 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD res = ERROR_SUCCESS; - int len = 0, ret = 0; + int ret = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - while((res = NETCON_recv(req->netconn, buf+ret, size-ret, blocking_mode != BLOCKING_DISALLOW, &len)) == ERROR_SUCCESS) { - if(!len) { + res = NETCON_recv(req->netconn, buf, size, blocking_mode != BLOCKING_DISALLOW, &ret); + if(res == ERROR_SUCCESS) { + if(!ret) netconn_stream->content_length = netconn_stream->content_read; - break; - } - ret += len; - netconn_stream->content_read += len; - if(blocking_mode != BLOCKING_WAITALL || size == ret) - break; + netconn_stream->content_read += ret; } - - if(res == WSAEWOULDBLOCK && ret) - res = ERROR_SUCCESS; } - TRACE("read %u bytes\n", ret); + TRACE("res %u read %u bytes\n", res, ret); *read = ret; return res; }

1 0

Jacek Caban : wininet: Get rid of no longer needed blocking_mode_t.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: fd0ac40798c029e4d971245dbea73d87057601c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0ac40798c029e4d971245db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 18:20:28 2017 +0100 wininet: Get rid of no longer needed blocking_mode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 64 +++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd0ac40798c029e4d9712…

1 0

Alistair Leslie-Hughes : include: Add msstkppg.h.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 18c594a6b44aacaaaab6501a49eee4a17bb43b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c594a6b44aacaaaab6501a4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 10 03:25:01 2017 +0000 include: Add msstkppg.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msstkppg.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4fbfd16..9ee3d52 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -464,6 +464,7 @@ HEADER_SRCS = \ msidefs.h \ msiquery.h \ mssip.h \ + msstkppg.h \ mstcpip.h \ msvcrt/assert.h \ msvcrt/conio.h \ diff --git a/include/msstkppg.h b/include/msstkppg.h new file mode 100644 index 0000000..bf53aaa --- /dev/null +++ b/include/msstkppg.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _MS_STOCK_PROP_PAGES_H_ +#define _MS_STOCK_PROP_PAGES_H_ + +DEFINE_GUID(CLSID_StockColorPage, 0x7ebdaae1, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); +DEFINE_GUID(CLSID_StockFontPage, 0x7ebdaae0, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); +DEFINE_GUID(CLSID_StockPicturePage, 0x7ebdaae2, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); + +#endif

1 0

Michael Müller : bcrypt: Add a builtin sha256 implementation.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: f34bd5b174b01c23dd556beb462aa25a3d1fb93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34bd5b174b01c23dd556beb4… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 7 23:15:08 2017 +0100 bcrypt: Add a builtin sha256 implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 3 +- dlls/bcrypt/bcrypt_internal.h | 11 +++ dlls/bcrypt/bcrypt_main.c | 13 ++++ dlls/bcrypt/sha256.c | 169 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index ef9d7ea..c2322c8 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -4,6 +4,7 @@ IMPORTLIB = bcrypt EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ - bcrypt_main.c + bcrypt_main.c \ + sha256.c RC_SRCS = version.rc diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index de6a37e..ef137e9 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -25,6 +25,17 @@ #include "windef.h" #include "winbase.h" +typedef struct +{ + ULONG64 len; + DWORD h[8]; + UCHAR buf[64]; +} SHA256_CTX; + +void sha256_init(SHA256_CTX *ctx) DECLSPEC_HIDDEN; +void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) DECLSPEC_HIDDEN; +void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) DECLSPEC_HIDDEN; + /* Definitions from advapi32 */ typedef struct { diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index cef2b1b..301f454 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -448,6 +448,7 @@ struct hash_impl { MD5_CTX md5; SHA_CTX sha1; + SHA256_CTX sha256; } u; }; @@ -463,6 +464,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) A_SHAInit( &hash->u.sha1 ); break; + case ALG_ID_SHA256: + sha256_init( &hash->u.sha256 ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -483,6 +488,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, A_SHAUpdate( &hash->u.sha1, input, size ); break; + case ALG_ID_SHA256: + sha256_update( &hash->u.sha256, input, size ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; @@ -504,6 +513,10 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, A_SHAFinal( &hash->u.sha1, (ULONG *)output ); break; + case ALG_ID_SHA256: + sha256_finalize( &hash->u.sha256, output ); + break; + default: ERR( "unhandled id %u\n", alg_id ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/sha256.c b/dlls/bcrypt/sha256.c new file mode 100644 index 0000000..48c4a48 --- /dev/null +++ b/dlls/bcrypt/sha256.c @@ -0,0 +1,169 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +/* Based on public domain implementation from + https://git.musl-libc.org/cgit/musl/tree/src/crypt/crypt_sha256.c */ + +#include "bcrypt_internal.h" + +static DWORD ror(DWORD n, int k) { return (n >> k) | (n << (32-k)); } +#define Ch(x,y,z) (z ^ (x & (y ^ z))) +#define Maj(x,y,z) ((x & y) | (z & (x | y))) +#define S0(x) (ror(x,2) ^ ror(x,13) ^ ror(x,22)) +#define S1(x) (ror(x,6) ^ ror(x,11) ^ ror(x,25)) +#define R0(x) (ror(x,7) ^ ror(x,18) ^ (x>>3)) +#define R1(x) (ror(x,17) ^ ror(x,19) ^ (x>>10)) + +static const DWORD K[64] = +{ + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 +}; + +static void processblock(SHA256_CTX *ctx, const UCHAR *buffer) +{ + DWORD W[64], t1, t2, a, b, c, d, e, f, g, h; + int i; + + for (i = 0; i < 16; i++) + { + W[i] = (DWORD)buffer[4*i]<<24; + W[i] |= (DWORD)buffer[4*i+1]<<16; + W[i] |= (DWORD)buffer[4*i+2]<<8; + W[i] |= buffer[4*i+3]; + } + + for (; i < 64; i++) + W[i] = R1(W[i-2]) + W[i-7] + R0(W[i-15]) + W[i-16]; + + a = ctx->h[0]; + b = ctx->h[1]; + c = ctx->h[2]; + d = ctx->h[3]; + e = ctx->h[4]; + f = ctx->h[5]; + g = ctx->h[6]; + h = ctx->h[7]; + + for (i = 0; i < 64; i++) + { + t1 = h + S1(e) + Ch(e,f,g) + K[i] + W[i]; + t2 = S0(a) + Maj(a,b,c); + h = g; + g = f; + f = e; + e = d + t1; + d = c; + c = b; + b = a; + a = t1 + t2; + } + + ctx->h[0] += a; + ctx->h[1] += b; + ctx->h[2] += c; + ctx->h[3] += d; + ctx->h[4] += e; + ctx->h[5] += f; + ctx->h[6] += g; + ctx->h[7] += h; +} + +static void pad(SHA256_CTX *ctx) +{ + ULONG64 r = ctx->len % 64; + + ctx->buf[r++] = 0x80; + + if (r > 56) + { + memset(ctx->buf + r, 0, 64 - r); + r = 0; + processblock(ctx, ctx->buf); + } + + memset(ctx->buf + r, 0, 56 - r); + ctx->len *= 8; + ctx->buf[56] = ctx->len >> 56; + ctx->buf[57] = ctx->len >> 48; + ctx->buf[58] = ctx->len >> 40; + ctx->buf[59] = ctx->len >> 32; + ctx->buf[60] = ctx->len >> 24; + ctx->buf[61] = ctx->len >> 16; + ctx->buf[62] = ctx->len >> 8; + ctx->buf[63] = ctx->len; + + processblock(ctx, ctx->buf); +} + +void sha256_init(SHA256_CTX *ctx) +{ + ctx->len = 0; + ctx->h[0] = 0x6a09e667; + ctx->h[1] = 0xbb67ae85; + ctx->h[2] = 0x3c6ef372; + ctx->h[3] = 0xa54ff53a; + ctx->h[4] = 0x510e527f; + ctx->h[5] = 0x9b05688c; + ctx->h[6] = 0x1f83d9ab; + ctx->h[7] = 0x5be0cd19; +} + +void sha256_update(SHA256_CTX *ctx, const UCHAR *buffer, ULONG len) +{ + const UCHAR *p = buffer; + ULONG64 r = ctx->len % 64; + + ctx->len += len; + if (r) + { + if (len < 64 - r) + { + memcpy(ctx->buf + r, p, len); + return; + } + memcpy(ctx->buf + r, p, 64 - r); + len -= 64 - r; + p += 64 - r; + processblock(ctx, ctx->buf); + } + for (; len >= 64; len -= 64, p += 64) + processblock(ctx, p); + memcpy(ctx->buf, p, len); +} + +void sha256_finalize(SHA256_CTX *ctx, UCHAR *buffer) +{ + int i; + + pad(ctx); + for (i = 0; i < 8; i++) + { + buffer[4*i] = ctx->h[i] >> 24; + buffer[4*i+1] = ctx->h[i] >> 16; + buffer[4*i+2] = ctx->h[i] >> 8; + buffer[4*i+3] = ctx->h[i]; + } +}

1 0

Michael Müller : bcrypt: Add a builtin sha384/ sha512 implementation.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: b56ddad8b00f7a406dc072250d5774b9562c47f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56ddad8b00f7a406dc072250… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 13:09:04 2017 +0100 bcrypt: Add a builtin sha384/sha512 implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 3 +- dlls/bcrypt/bcrypt_internal.h | 15 +++ dlls/bcrypt/bcrypt_main.c | 25 +++++ dlls/bcrypt/sha512.c | 212 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 254 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b56ddad8b00f7a406dc07…

1 0

Michael Müller : bcrypt: Always use builtin hash implementation.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: fd05297f0033034fd203e441e958614b6d3f3011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd05297f0033034fd203e441e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 7 23:17:10 2017 +0100 bcrypt: Always use builtin hash implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 172 ---------------------------------------------- 1 file changed, 172 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7caac2f..cf4e3c6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -55,9 +55,6 @@ MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); -MAKE_FUNCPTR(gnutls_hash); -MAKE_FUNCPTR(gnutls_hash_deinit); -MAKE_FUNCPTR(gnutls_hash_init); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR @@ -87,9 +84,6 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) LOAD_FUNCPTR(gnutls_global_set_log_level) - LOAD_FUNCPTR(gnutls_hash); - LOAD_FUNCPTR(gnutls_hash_deinit); - LOAD_FUNCPTR(gnutls_hash_init); LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR @@ -277,171 +271,6 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) return STATUS_SUCCESS; } -#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H -struct hash_impl -{ - union - { - CC_MD5_CTX md5_ctx; - CC_SHA1_CTX sha1_ctx; - CC_SHA256_CTX sha256_ctx; - CC_SHA512_CTX sha512_ctx; - } u; -}; - -static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) -{ - switch (alg_id) - { - case ALG_ID_MD5: - CC_MD5_Init( &hash->u.md5_ctx ); - break; - - case ALG_ID_SHA1: - CC_SHA1_Init( &hash->u.sha1_ctx ); - break; - - case ALG_ID_SHA256: - CC_SHA256_Init( &hash->u.sha256_ctx ); - break; - - case ALG_ID_SHA384: - CC_SHA384_Init( &hash->u.sha512_ctx ); - break; - - case ALG_ID_SHA512: - CC_SHA512_Init( &hash->u.sha512_ctx ); - break; - - default: - ERR( "unhandled id %u\n", alg_id ); - return STATUS_NOT_IMPLEMENTED; - } - return STATUS_SUCCESS; -} - -static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, - UCHAR *input, ULONG size ) -{ - switch (alg_id) - { - case ALG_ID_MD5: - CC_MD5_Update( &hash->u.md5_ctx, input, size ); - break; - - case ALG_ID_SHA1: - CC_SHA1_Update( &hash->u.sha1_ctx, input, size ); - break; - - case ALG_ID_SHA256: - CC_SHA256_Update( &hash->u.sha256_ctx, input, size ); - break; - - case ALG_ID_SHA384: - CC_SHA384_Update( &hash->u.sha512_ctx, input, size ); - break; - - case ALG_ID_SHA512: - CC_SHA512_Update( &hash->u.sha512_ctx, input, size ); - break; - - default: - ERR( "unhandled id %u\n", alg_id ); - return STATUS_NOT_IMPLEMENTED; - } - return STATUS_SUCCESS; -} - -static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, - UCHAR *output, ULONG size ) -{ - switch (alg_id) - { - case ALG_ID_MD5: - CC_MD5_Final( output, &hash->u.md5_ctx ); - break; - - case ALG_ID_SHA1: - CC_SHA1_Final( output, &hash->u.sha1_ctx ); - break; - - case ALG_ID_SHA256: - CC_SHA256_Final( output, &hash->u.sha256_ctx ); - break; - - case ALG_ID_SHA384: - CC_SHA384_Final( output, &hash->u.sha512_ctx ); - break; - - case ALG_ID_SHA512: - CC_SHA512_Final( output, &hash->u.sha512_ctx ); - break; - - default: - ERR( "unhandled id %u\n", alg_id ); - break; - } - return STATUS_SUCCESS; -} - -#elif defined(HAVE_GNUTLS_HASH) -struct hash_impl -{ - gnutls_hash_hd_t hash_handle; -}; - -static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) -{ - gnutls_digest_algorithm_t alg; - - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - - switch (alg_id) - { - case ALG_ID_MD5: - alg = GNUTLS_DIG_MD5; - break; - - case ALG_ID_SHA1: - alg = GNUTLS_DIG_SHA1; - break; - - case ALG_ID_SHA256: - alg = GNUTLS_DIG_SHA256; - break; - - case ALG_ID_SHA384: - alg = GNUTLS_DIG_SHA384; - break; - - case ALG_ID_SHA512: - alg = GNUTLS_DIG_SHA512; - break; - - default: - ERR( "unhandled id %u\n", alg_id ); - return STATUS_NOT_IMPLEMENTED; - } - - if (pgnutls_hash_init( &hash->hash_handle, alg )) return STATUS_INTERNAL_ERROR; - return STATUS_SUCCESS; -} - -static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, - UCHAR *input, ULONG size ) -{ - if (pgnutls_hash( hash->hash_handle, input, size )) return STATUS_INTERNAL_ERROR; - return STATUS_SUCCESS; -} - -static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, - UCHAR *output, ULONG size ) -{ - pgnutls_hash_deinit( hash->hash_handle, output ); - return STATUS_SUCCESS; -} - -#else struct hash_impl { union @@ -548,7 +377,6 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, } return STATUS_SUCCESS; } -#endif struct hash {

1 0

Henri Verbeet : wined3d: Validate instruction lengths in shader_sm4_read_instruction() (AFL).
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: a9e5a02a20a2b11edf0949c5bb1c4dd6c5297644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e5a02a20a2b11edf0949c5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:04 2017 +0100 wined3d: Validate instruction lengths in shader_sm4_read_instruction() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bd974a2..8986d35 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1507,16 +1507,36 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi DWORD opcode_token, opcode, previous_token; struct wined3d_sm4_data *priv = data; unsigned int i, len; + SIZE_T remaining; const DWORD *p; list_move_head(&priv->src_free, &priv->src); + if (*ptr >= priv->end) + { + WARN("End of byte-code, failed to read opcode.\n"); + goto fail; + } + remaining = priv->end - *ptr; + opcode_token = *(*ptr)++; opcode = opcode_token & WINED3D_SM4_OPCODE_MASK; len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT); if (!len) + { + if (remaining < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + goto fail; + } len = **ptr; + } + if (!len || remaining < len) + { + WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + goto fail; + } --len; if (TRACE_ON(d3d_bytecode)) @@ -1589,6 +1609,13 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } } } + + return; + +fail: + *ptr = priv->end; + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + return; } static BOOL shader_sm4_is_end(void *data, const DWORD **ptr)

1 0