https://git.reactos.org/?p=reactos.git;a=commitdiff;h=792a2286d895a1d56fea6b1bf80ea29687d4f337
commit 792a2286d895a1d56fea6b1bf80ea29687d4f337 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Jan 26 13:12:47 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Jan 26 13:12:47 2019 +0100 [JSPROXY] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/jsproxy/main.c | 11 +++-------- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dll/win32/jsproxy/main.c b/dll/win32/jsproxy/main.c index e6a35d5ff2..e58553f4fc 100644 --- a/dll/win32/jsproxy/main.c +++ b/dll/win32/jsproxy/main.c @@ -184,20 +184,15 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { - DWORD i, len = 0; - for (i = 0; i < buffer->dwScriptBufferSize; i++) - { - if (!buffer->lpszScriptBuffer[i]) break; - len++; - } - if (len == buffer->dwScriptBufferSize) + if (!buffer->dwScriptBufferSize) { SetLastError( ERROR_INVALID_PARAMETER ); LeaveCriticalSection( &cs_jsproxy ); return FALSE; } heap_free( global_script->text ); - if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, len ))) ret = TRUE; + if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, + buffer->dwScriptBufferSize ))) ret = TRUE; } else { diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3d007d6a89..090c2971cd 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -86,7 +86,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-3.3 reactos/dll/win32/itss # Synced to WineStaging-3.17 reactos/dll/win32/jscript # Synced to WineStaging-4.0 -reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 +reactos/dll/win32/jsproxy # Synced to WineStaging-4.0 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 reactos/dll/win32/mapi32 # Synced to WineStaging-3.3
