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

Nikolay Sivov : d3dx10: Implement D3DX10CreateDevice().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 8622cdac40471c9be4c26d1d12d7bb066d92ebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8622cdac40471c9be4c26d1d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 17:42:30 2016 +0200 d3dx10: Implement D3DX10CreateDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 21 ++++++++++++++++++++- include/d3dx10core.idl | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index cb48f0d..6e67a6b 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,5 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 +IMPORTS = d3d10_1 C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 0673f6a..53059bf 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -18,7 +18,7 @@ @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) -@ stub D3DX10CreateDevice(ptr long long long ptr) +@ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stub D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index fa4fa79..1b60fc5 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -33,7 +33,7 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10.h" +#include "d3d10_1.h" #include "d3dx10core.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -123,3 +123,22 @@ HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, ID3D10Device **device) +{ + HRESULT hr; + + TRACE("adapter %p, driver_type %d, swrast %p, flags %#x, device %p.\n", adapter, driver_type, + swrast, flags, device); + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_1, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_0, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + return hr; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 0e2bf31..6d9927e 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -66,3 +66,5 @@ interface ID3DX10ThreadPump : IUnknown }; cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") +cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") +cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);")

1 0

Michael Müller : ws2_32/tests: Add initial tests for DisconnectEx.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 0625dd8bf6f60a90f33e2000c9c48860b01596ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625dd8bf6f60a90f33e2000c… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:48 2016 +0200 ws2_32/tests: Add initial tests for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d5e01c8..e5da804 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7810,6 +7810,102 @@ end: closesocket(connector2); } +static void test_DisconnectEx(void) +{ + SOCKET listener, acceptor, connector; + LPFN_DISCONNECTEX pDisconnectEx; + GUID disconnectExGuid = WSAID_DISCONNECTEX; + struct sockaddr_in address; + DWORD num_bytes, flags; + OVERLAPPED overlapped; + int addrlen, iret; + BOOL bret; + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectExGuid, sizeof(disconnectExGuid), + &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + closesocket(connector); + return; + } + + listener = socket(AF_INET, SOCK_STREAM, 0); + ok(listener != INVALID_SOCKET, "failed to create listener socket, error %d\n", WSAGetLastError()); + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr *)&address, sizeof(address)); + ok(iret == 0, "failed to bind, error %d\n", WSAGetLastError()); + + addrlen = sizeof(address); + iret = getsockname(listener, (struct sockaddr *)&address, &addrlen); + ok(iret == 0, "failed to lookup bind address, error %d\n", WSAGetLastError()); + + iret = listen(listener, 1); + ok(iret == 0, "failed to listen, error %d\n", WSAGetLastError()); + + set_blocking(listener, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = WSACreateEvent(); + ok(overlapped.hEvent != WSA_INVALID_EVENT, "WSACreateEvent failed, error %d\n", WSAGetLastError()); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + if (bret) + ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + else if (WSAGetLastError() == ERROR_IO_PENDING) + bret = WSAGetOverlappedResult(connector, &overlapped, &num_bytes, TRUE, &flags); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + WSACloseEvent(overlapped.hEvent); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + bret = pDisconnectEx(connector, NULL, 0, 0); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + closesocket(listener); +} + #define compare_file(h,s,o) compare_file2(h,s,o,__FILE__,__LINE__) static void compare_file2(HANDLE handle, SOCKET sock, int offset, const char *file, int line) @@ -9588,6 +9684,7 @@ START_TEST( sock ) test_getaddrinfo(); test_AcceptEx(); test_ConnectEx(); + test_DisconnectEx(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange();

1 0

Henri Verbeet : wined3d: Don' t enumerate sub-resources in wined3d_device_reset().
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 58a1796d83cf52c8cbabd4b01380f06074f8577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a1796d83cf52c8cbabd4b01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:13 2016 +0200 wined3d: Don't enumerate sub-resources in wined3d_device_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 54 +++++++++++++++++------------------------- dlls/d3d9/device.c | 54 +++++++++++++++++------------------------- dlls/wined3d/context.c | 8 +++---- dlls/wined3d/device.c | 19 ++++++++------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 15 ++++++++---- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 1 + 11 files changed, 77 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58a1796d83cf52c8cbabd…

1 0

Henri Verbeet : wined3d: Allocate system memory for complete textures.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 3b96ac290db1bca225ecfff4581e0969202007ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b96ac290db1bca225ecfff45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 19:29:12 2016 +0200 wined3d: Allocate system memory for complete textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 +-- dlls/d3d9/tests/device.c | 4 +-- dlls/wined3d/surface.c | 21 ++++++--------- dlls/wined3d/swapchain.c | 6 ++--- dlls/wined3d/texture.c | 60 ++++++++++++++++++++++++++++++------------ dlls/wined3d/volume.c | 22 +++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ 7 files changed, 69 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b96ac290db1bca225ecf…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 076cb32d5304a5c8c3ac064481358e1b67241802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076cb32d5304a5c8c3ac06448… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 21 00:54:16 2016 +0200 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index adbc019..0f42ced 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11768,7 +11768,8 @@ msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: reg.rc:52 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" +msgstr "" +"reg : l'option [/d] doit être suivie d'une chaîne de caractères valide\n" #: reg.rc:53 msgid ""

1 0

Francois Gouget : mmdevapi/tests: A spelling fix for a render ok() message.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: c79236b86ed841179d64a930806b49d3f2da8d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79236b86ed841179d64a9308… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:12 2016 +0200 mmdevapi/tests: A spelling fix for a render ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d2853c..9c42f3a 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -730,7 +730,7 @@ static void test_padding(void) ok(defp == 100000 || broken(defp == 101587) || defp == 200000, "Expected 10ms default period: %u\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); - ok(minp <= defp, "Mininum period is greater than default period\n"); + ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr);

1 0

Michael Müller : ws2_32: Add semi-stub for DisconnectEx.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: 59ffe4e321dae9aa5135baa333e614140282a70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ffe4e321dae9aa5135baa33… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:57 2016 +0200 ws2_32: Add semi-stub for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f62c9cd..8d58631 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3552,6 +3552,24 @@ connection_success: return TRUE; } +/*********************************************************************** + * DisconnectEx + */ +static BOOL WINAPI WS2_DisconnectEx( SOCKET s, LPOVERLAPPED ov, DWORD flags, DWORD reserved ) +{ + TRACE( "socket %04lx, ov %p, flags 0x%x, reserved 0x%x\n", s, ov, flags, reserved ); + + if (flags & TF_REUSE_SOCKET) + FIXME( "Reusing socket not supported yet\n" ); + + if (ov) + { + ov->Internal = STATUS_PENDING; + ov->InternalHigh = 0; + } + + return !WS_shutdown( s, SD_BOTH ); +} /*********************************************************************** * getpeername (WS2_32.5) @@ -4767,7 +4785,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; + break; } else if ( IsEqualGUID(&acceptex_guid, in_buff) ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e5da804..00555a9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7828,7 +7828,7 @@ static void test_DisconnectEx(void) &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); if (iret) { - skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); closesocket(connector); return; } @@ -7859,7 +7859,7 @@ static void test_DisconnectEx(void) memset(&overlapped, 0, sizeof(overlapped)); bret = pDisconnectEx(connector, &overlapped, 0, 0); ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); iret = connect(connector, (struct sockaddr *)&address, addrlen); ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError());

1 0

Francois Gouget : mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.
by Alexandre Julliard April 21, 2016

April 21, 2016

Module: wine Branch: master Commit: d25af3c247fa47c7b62e924138c7e56ad9b5b5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25af3c247fa47c7b62e92413… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 11:52:11 2016 +0200 mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP. RegGetValueW() was added later and should be avoided in the conformance tests. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 06fe690..665136f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); ok(type == REG_DWORD, "Got wrong value type: %u\n", type); ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval);

1 0

Hans Leidekker : jsproxy: Don' t use the length parameters in InternetGetProxyInfo.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 6ea6b37096f06112d235269fd88d5d0772d6d1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea6b37096f06112d235269fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:48 2016 +0200 jsproxy: Don't use the length parameters in InternetGetProxyInfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index e277a0b..d5c3e72 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -97,7 +97,7 @@ static inline BOOL heap_free( LPVOID mem ) return HeapFree( GetProcessHeap(), 0, mem ); } -static inline WCHAR *strdupAW( const char *src, DWORD len ) +static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; if (src) @@ -628,8 +628,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW EnterCriticalSection( &cs_jsproxy ); if (!global_script->text) goto done; - if (!(urlW = strdupAW( url, len_url ))) goto done; - if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; + if (!(urlW = strdupAW( url, -1 ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done; TRACE( "%s\n", debugstr_w(global_script->text) ); ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy );

1 0

Hans Leidekker : jsproxy: Allow multiple calls to InternetInitializeAutoProxyDll.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: d4c9440f71434a0816dbdd5c7daa93f1fd10759b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c9440f71434a0816dbdd5c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:47 2016 +0200 jsproxy: Allow multiple calls to InternetInitializeAutoProxyDll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 0399173..e277a0b 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -186,14 +186,16 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile EnterCriticalSection( &cs_jsproxy ); - if (global_script->text) + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { - LeaveCriticalSection( &cs_jsproxy ); - return FALSE; + heap_free( global_script->text ); + if( (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + } + else + { + heap_free( global_script->text ); + if ((global_script->text = load_script( tmpfile ))) ret = TRUE; } - if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && - (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; - else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; LeaveCriticalSection( &cs_jsproxy ); return ret;

1 0