From: Hans Leidekker <hans@codeweavers.com> --- dlls/winhttp/socket.c | 12 ++++++------ dlls/winhttp/winhttp_private.h | 2 -- include/winhttp.h | 3 +++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/socket.c b/dlls/winhttp/socket.c index 7a52dca6d59..04ec1e19e22 100644 --- a/dlls/winhttp/socket.c +++ b/dlls/winhttp/socket.c @@ -139,7 +139,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR release_object( &request->hdr ); return NULL; } - socket->hdr.type = WINHTTP_HANDLE_TYPE_SOCKET; + socket->hdr.type = WINHTTP_HANDLE_TYPE_WEBSOCKET; socket->hdr.vtbl = &socket_vtbl; socket->hdr.refs = 1; socket->hdr.callback = request->hdr.callback; @@ -468,7 +468,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if (len && !buf) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_WEBSOCKET) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; @@ -904,7 +904,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (!buf || !len) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_WEBSOCKET) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; @@ -1043,7 +1043,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_WEBSOCKET) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; @@ -1125,7 +1125,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_WEBSOCKET) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; @@ -1187,7 +1187,7 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status if (!status || (len && !reason) || !ret_len) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_WEBSOCKET) { release_object( &socket->hdr ); return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 8c5bbbbd6ad..99e44e44e50 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -25,8 +25,6 @@ #include "wine/list.h" -#define WINHTTP_HANDLE_TYPE_SOCKET 4 - struct object_header; struct object_vtbl { diff --git a/include/winhttp.h b/include/winhttp.h index 42316496904..c8b081e2c0d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -560,6 +560,9 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_HANDLE_TYPE_SESSION 1 #define WINHTTP_HANDLE_TYPE_CONNECT 2 #define WINHTTP_HANDLE_TYPE_REQUEST 3 +#define WINHTTP_HANDLE_TYPE_PROXY_RESOLVER 4 +#define WINHTTP_HANDLE_TYPE_WEBSOCKET 5 +#define WINHTTP_HANDLE_TYPE_PROTOCOL 6 #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED 0x00000001 #define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT 0x00000002 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10507