June 2020 - Wine-devel - list.winehq.org

[PATCH V2 3/3] dsdmo: Implement IDirectSoundFXEcho::SetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 2/3] dsdmo: Implement IDirectSoundFXEcho::GetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v6 01/12] msscript.ocx: Fix detaching the script host in put_Language.
by Gabriel Ivăncescu 25 Jun '20

25 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 8b36f3a..fd2ada5 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1203,8 +1203,8 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan } } if (FAILED(hres)) { - This->host = NULL; detach_script_host(This->host); + This->host = NULL; } return hres; } -- 2.21.0

2 19

[PATCH 3/3] dsdmo: Implement IDirectSoundFXEcho::SetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] dsdmo: Implement IDirectSoundFXEcho::GetAllParameters.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] dsdmo: Implement IDirectSoundFXEcho stub interface.
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] vbscript: Parse empty CASE ELSE clause
by Dmitry Kislyuk 25 Jun '20

25 Jun '20

2 1

[PATCH] include: Add ndisguid.h
by Vijay Kiran Kamuju 25 Jun '20

25 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 2

[PATCH 3/3] winhttp: Add stubs for new proxy functions.
by Hans Leidekker 25 Jun '20

25 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 12 +++++ 2 files changed, 119 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 186b70e4a2..228eb646ae 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2028,6 +2028,113 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) return ret; } +/*********************************************************************** + * WinHttpCreateProxyResolver (winhttp.@) + */ +DWORD WINAPI WinHttpCreateProxyResolver( HINTERNET hsession, HINTERNET *hresolver ) +{ + FIXME("%p, %p\n", hsession, hresolver); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpFreeProxyResult (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResult( WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxyResultEx (winhttp.@) + */ +void WINAPI WinHttpFreeProxyResultEx( WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p\n", result); +} + +/*********************************************************************** + * WinHttpFreeProxySettings (winhttp.@) + */ +void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p\n", settings); +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyForUrlEx2 (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, + DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) +{ + FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResult (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResult( HINTERNET hresolver, WINHTTP_PROXY_RESULT *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxyResultEx (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxyResultEx( HINTERNET hresolver, WINHTTP_PROXY_RESULT_EX *result ) +{ + FIXME("%p, %p\n", hresolver, result); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpGetProxySettingsVersion (winhttp.@) + */ +DWORD WINAPI WinHttpGetProxySettingsVersion( HINTERNET hsession, DWORD *version ) +{ + FIXME("%p, %p\n", hsession, version); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpReadProxySettings (winhttp.@) + */ +DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connection, BOOL use_defaults, + BOOL set_autodiscover, DWORD *version, BOOL *defaults_returned, + WINHTTP_PROXY_SETTINGS *settings) +{ + FIXME("%p, %s, %d, %d, %p, %p, %p\n", hsession, debugstr_w(connection), use_defaults, set_autodiscover, + version, defaults_returned, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +/*********************************************************************** + * WinHttpResetAutoProxy (winhttp.@) + */ +DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) +{ + FIXME("%p, %08x\n", hsession, flags); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + +DWORD WINAPI WinHttpWriteProxySettings( HINTERNET hsession, BOOL force, WINHTTP_PROXY_SETTINGS *settings ) +{ + FIXME("%p, %d, %p\n", hsession, force, settings); + return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; +} + /*********************************************************************** * WinHttpSetStatusCallback (winhttp.@) */ diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index beace245a8..581918791e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -7,11 +7,20 @@ @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long) @ stdcall WinHttpCrackUrl(wstr long long ptr) +@ stdcall WinHttpCreateProxyResolver(ptr ptr) @ stdcall WinHttpCreateUrl(ptr long ptr ptr) @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) +@ stdcall WinHttpFreeProxyResult(ptr) +@ stdcall WinHttpFreeProxyResultEx(ptr) +@ stdcall WinHttpFreeProxySettings(ptr) @ stdcall WinHttpGetDefaultProxyConfiguration(ptr) @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx(ptr wstr ptr ptr) +@ stdcall WinHttpGetProxyForUrlEx2(ptr wstr ptr long ptr ptr) +@ stdcall WinHttpGetProxyResult(ptr ptr) +@ stdcall WinHttpGetProxyResultEx(ptr ptr) +@ stdcall WinHttpGetProxySettingsVersion(ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stdcall WinHttpQueryAuthSchemes(ptr ptr ptr ptr) @@ -19,7 +28,9 @@ @ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) +@ stdcall WinHttpReadProxySettings(ptr wstr long long ptr ptr ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) +@ stdcall WinHttpResetAutoProxy(ptr long) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @@ -35,3 +46,4 @@ @ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWebSocketShutdown(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) +@ stdcall WinHttpWriteProxySettings(ptr long ptr) -- 2.20.1

1 0

[PATCH 2/3] winhttp: Status and reason are optional in the close response.
by Hans Leidekker 25 Jun '20

25 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 623fdf5db5..c15be38592 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3310,7 +3310,7 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD { DWORD err; if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; - if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if (*ret_len != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3341,8 +3341,7 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || - (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } @@ -3353,14 +3352,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket { USHORT len16; if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; - if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; - if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3548,23 +3545,21 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea } if ((ret = receive_frame( netconn, &count, &socket->opcode ))) goto done; - if (socket->opcode != SOCKET_OPCODE_CLOSE || (count && count > sizeof(socket->reason))) + if (socket->opcode != SOCKET_OPCODE_CLOSE || + (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; } - if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; - if (count != sizeof(socket->status)) + if (count) { - ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; - goto done; - } - socket->status = RtlUshortByteSwap( socket->status ); - if (!(ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ))) - { - socket->state = SOCKET_STATE_CLOSED; + DWORD reason_len = count - sizeof(socket->status); + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + socket->status = RtlUshortByteSwap( socket->status ); + if ((ret = receive_bytes( netconn, socket->reason, reason_len, &socket->reason_len ))) goto done; } + socket->state = SOCKET_STATE_CLOSED; done: if (async) -- 2.20.1

1 0