Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINHTTP] Initialize winsock upon WinHttpOpen

Browse source 
As it was done before syncing with wine-staging 4.18 (5bd6580)
ROSTESTS-348
This commit is contained in:
Victor Perevertkin 2019-12-20 01:43:07 +03:00 committed by Victor Perevertkin
parent 8b5dc3bf5f
commit 4bf76a659e
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/winhttp/net.c
View file

@ -167,7 +167,11 @@ static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx )
return TRUE; return TRUE;
} }
#ifdef __REACTOS__
void winsock_init(void)
#else
static void winsock_init(void) static void winsock_init(void)
#endif
{ {
static INIT_ONCE once = INIT_ONCE_STATIC_INIT; static INIT_ONCE once = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL );
@ -185,7 +189,9 @@ struct netconn *netconn_create( struct hostdata *host, const struct sockaddr_sto
unsigned int addr_len; unsigned int addr_len;
BOOL ret = FALSE; BOOL ret = FALSE;
#ifndef __REACTOS__
winsock_init(); winsock_init();
#endif
conn = heap_alloc_zero(sizeof(*conn)); conn = heap_alloc_zero(sizeof(*conn));
if (!conn) return NULL; if (!conn) return NULL;

8
dll/win32/winhttp/session.c
View file

@ -240,6 +240,10 @@ static const struct object_vtbl session_vtbl =
session_set_option session_set_option
}; };
#ifdef __REACTOS__
void winsock_init(void);
#endif
/*********************************************************************** /***********************************************************************
* WinHttpOpen (winhttp.@) * WinHttpOpen (winhttp.@)
*/ */
@ -297,6 +301,10 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST
if (!(handle = alloc_handle( &session->hdr ))) goto end; if (!(handle = alloc_handle( &session->hdr ))) goto end;
session->hdr.handle = handle; session->hdr.handle = handle;
#ifdef __REACTOS__
winsock_init();
#endif
end: end:
release_object( &session->hdr ); release_object( &session->hdr );
TRACE("returning %p\n", handle); TRACE("returning %p\n", handle);