wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Alexandre Julliard : odbc32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 21bfa0812eb45fe1ca048ace0e63d5b7071bf2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfa0812eb45fe1ca048ace0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 odbc32: Don't unload external libraries on process shutdown. --- dlls/odbc32/proxyodbc.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c7a5038..85b3dfe 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -465,39 +465,25 @@ static void ODBC_ReplicateToRegistry (void) /*********************************************************************** * DllMain [Internal] Initializes the internal 'ODBC32.DLL'. - * - * PARAMS - * hinstDLL [I] handle to the DLL's instance - * fdwReason [I] - * lpvReserved [I] reserved, must be NULL - * - * RETURNS - * Success: TRUE - * Failure: FALSE */ - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); - if (fdwReason == DLL_PROCESS_ATTACH) + switch (reason) { - TRACE("Loading ODBC...\n"); + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); if (ODBC_LoadDriverManager()) { ODBC_LoadDMFunctions(); ODBC_ReplicateToRegistry(); } - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - TRACE("Unloading ODBC...\n"); - if (dmHandle) - { - wine_dlclose(dmHandle,NULL,0); - dmHandle = NULL; - } + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (dmHandle) wine_dlclose(dmHandle,NULL,0); } return TRUE;

1 0

Alexandre Julliard : msxml3: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 2710f05cef19a4bb07c63b9c03eb765cf81c6e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2710f05cef19a4bb07c63b9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 msxml3: Don't unload external libraries on process shutdown. --- dlls/msxml3/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index da3969e..46742ef 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -209,7 +209,7 @@ static void init_libxslt(void) #endif } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -235,12 +235,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (reserved) break; #ifdef SONAME_LIBXSLT if (libxslt_handle) { pxsltCleanupGlobals(); wine_dlclose(libxslt_handle, NULL, 0); - libxslt_handle = NULL; } #endif #ifdef HAVE_LIBXML2

1 0

Alexandre Julliard : ctapi32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 6eca89efa7c0aa673a488833c3d20cfc260cfce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eca89efa7c0aa673a488833c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 ctapi32: Don't unload external libraries on process shutdown. --- dlls/ctapi32/ctapi32.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 7889e2a..089e0ab 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -92,16 +92,6 @@ LOAD_FUNCPTR(CT_close); return 0; } -static void unload_functions(void) -{ - pCT_close = NULL; - pCT_data = NULL; - pCT_init = NULL; - if (ctapi_handle) - wine_dlclose(ctapi_handle, NULL, 0); -} - - /* * ct-API specific functions */ @@ -137,18 +127,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); /* Try to load low-level library */ if (load_functions() != 0) return FALSE; /* error */ break; - } case DLL_PROCESS_DETACH: - { - unload_functions(); + if (lpvReserved) break; + if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0); break; - } } return TRUE;

1 0

Alexandre Julliard : server: When changing a process desktop, start the close timeout on the old desktop if necessary.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: be417d68909aa3bdbfcb0439b4940dc9c11a6e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be417d68909aa3bdbfcb0439b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 13:55:54 2013 +0200 server: When changing a process desktop, start the close timeout on the old desktop if necessary. --- server/winstation.c | 63 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index e0b7613..57e6995 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -300,6 +300,40 @@ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ) return get_desktop_obj( thread->process, thread->desktop, access ); } +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; + + desktop->close_timeout = NULL; + unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ + post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ +} + +/* add a user of the desktop and cancel the close timeout */ +static void add_desktop_user( struct desktop *desktop ) +{ + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } +} + +/* remove a user of the desktop and start the close timeout if necessary */ +static void remove_desktop_user( struct desktop *desktop ) +{ + assert( desktop->users > 0 ); + desktop->users--; + + /* if we have one remaining user, it has to be the manager of the desktop window */ + if (desktop->users == 1 && get_top_window_owner( desktop )) + { + assert( !desktop->close_timeout ); + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + } +} + /* set the process default desktop handle */ void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ) @@ -316,15 +350,10 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) if (!thread->desktop) thread->desktop = handle; - if (!process->is_system) + if (!process->is_system && desktop != old_desktop) { - desktop->users++; - if (desktop->close_timeout) - { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; - } - if (old_desktop) old_desktop->users--; + add_desktop_user( desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); } if (old_desktop) release_object( old_desktop ); @@ -372,15 +401,6 @@ done: clear_error(); } -static void close_desktop_timeout( void *private ) -{ - struct desktop *desktop = private; - - desktop->close_timeout = NULL; - unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ - post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ -} - /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { @@ -388,14 +408,7 @@ void close_process_desktop( struct process *process ) if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) { - assert( desktop->users > 0 ); - desktop->users--; - /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } + remove_desktop_user( desktop ); release_object( desktop ); } clear_error(); /* ignore errors */

1 0

Sam Edwards : gdi32: Prevent another possible buffer overflow in get_glyph_outline.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 53ec9b3291be1d7a5531aa2a04dbcf6b1fa83b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ec9b3291be1d7a5531aa2a0… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 30 00:41:47 2013 -0600 gdi32: Prevent another possible buffer overflow in get_glyph_outline. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fec752a..5b3c138 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6362,9 +6362,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, y_shift = height - (src_height / vmul); dst += x_shift + y_shift * ( pitch / 4 ); - while ( src_height ) + height = min( height, src_height / vmul ); + while ( height-- ) { - for ( x = 0; x < src_width / hmul; x++ ) + for ( x = 0; x < width && x < src_width / hmul; x++ ) { if ( rgb ) {

1 0

Christian Costa : d3dxof: Get rid of go_to_next_definition.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: a180e5ed00a298f971d6a015ac476629010b1d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a180e5ed00a298f971d6a015a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:43:03 2013 +0200 d3dxof: Get rid of go_to_next_definition. --- dlls/d3dxof/parsing.c | 40 ++-------------------------------------- 1 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b1dde86..37cf2e1 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1065,39 +1065,6 @@ static BOOL parse_template_parts(parse_buffer * buf) return TRUE; } -static void go_to_next_definition(parse_buffer * buf) -{ - char c; - while (buf->rem_bytes) - { - if (!read_bytes(buf, &c, 1)) - return; - if ((c == '#') || (c == '/')) - { - /* Handle comment (# or //) */ - if (c == '/') - { - if (!read_bytes(buf, &c, 1)) - return; - if (c != '/') - return; - } - c = 0; - while (c != 0x0A) - { - if (!read_bytes(buf, &c, 1)) - return; - } - continue; - } - else if (!is_space(c)) - { - rewind_bytes(buf, 1); - break; - } - } -} - static BOOL parse_template(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_TEMPLATE) @@ -1466,11 +1433,8 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next object */ - go_to_next_definition(buf); - } + /* For seeking to a possibly eof to avoid parsing another object next time */ + check_TOKEN(buf); return TRUE; }

1 0

Christian Costa : d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 1bd5bfebaeb3cf7dd901203c6b554a20723fff0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd5bfebaeb3cf7dd901203c6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:55 2013 +0200 d3dxof: Only parse templates for object files, but with RegisterTemplates parse the whole file. --- dlls/d3dx9_36/tests/xfile.c | 2 +- dlls/d3dxof/d3dxof.c | 7 ++++--- dlls/d3dxof/d3dxof_private.h | 2 +- dlls/d3dxof/parsing.c | 6 ++++-- dlls/d3dxof/tests/d3dxof.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 1238bcd..e514a5f 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -77,7 +77,7 @@ static void test_templates(void) ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5a08b21..498b192 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -241,7 +241,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (FAILED(hr)) goto error; - if (!parse_templates(&object->buf)) + /* Check if there are templates defined before the object */ + if (!parse_templates(&object->buf, TRUE)) { hr = DXFILEERR_PARSEERROR; goto error; @@ -320,7 +321,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (FAILED(hr)) goto cleanup; - if (!parse_templates(&buf)) + if (!parse_templates(&buf, FALSE)) { hr = DXFILEERR_PARSEERROR; goto cleanup; @@ -1003,7 +1004,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } /* Check if there are templates defined before the object */ - if (!parse_templates(&This->buf)) + if (!parse_templates(&This->buf, TRUE)) return DXFILEERR_PARSEERROR; if (!This->buf.rem_bytes) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 8872c14..5bd3c71 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -161,7 +161,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HID HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -BOOL parse_templates(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) DECLSPEC_HIDDEN; int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1c624d3..b1dde86 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1121,10 +1121,12 @@ static BOOL parse_template(parse_buffer * buf) return TRUE; } -BOOL parse_templates(parse_buffer * buf) +BOOL parse_templates(parse_buffer * buf, BOOL templates_only) { - while (check_TOKEN(buf) == TOKEN_TEMPLATE) + while (check_TOKEN(buf) != TOKEN_NONE) { + if (templates_only && (check_TOKEN(buf) != TOKEN_TEMPLATE)) + return TRUE; if (!parse_template(buf)) { WARN("Template is not correct\n"); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 43a7fde..f6874a4 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -427,7 +427,7 @@ static void test_templates(void) ok(ret == DXFILEERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_BADFILEFLOATSIZE); ret = IDirectXFile_RegisterTemplates(dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); - todo_wine ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); + ok(ret == DXFILEERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, DXFILEERR_PARSEERROR); IDirectXFile_Release(dxfile); }

1 0

Christian Costa : d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine.
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: 37d037749d9c8954a41818d03b9f073336021f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d037749d9c8954a41818d03… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 29 21:42:46 2013 +0200 d3dxof: Avoid dealing with remaining byte until next token or eof, check_TOKEN handles them fine. --- dlls/d3dxof/parsing.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 546166a..1c624d3 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1114,11 +1114,6 @@ static BOOL parse_template(parse_buffer * buf) return FALSE; if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; - if (buf->txt) - { - /* Go to the next template */ - go_to_next_definition(buf); - } TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); buf->pdxf->nb_xtemplates++; @@ -1128,7 +1123,7 @@ static BOOL parse_template(parse_buffer * buf) BOOL parse_templates(parse_buffer * buf) { - while (buf->rem_bytes && (check_TOKEN(buf) == TOKEN_TEMPLATE)) + while (check_TOKEN(buf) == TOKEN_TEMPLATE) { if (!parse_template(buf)) {

1 0

Hans Leidekker : winhttp: Add support for NTLM and Negotiate authentication .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: a506d0aa3bb3ab19f9cea71f279a618761a02978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a506d0aa3bb3ab19f9cea71f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:32:59 2013 +0200 winhttp: Add support for NTLM and Negotiate authentication. --- dlls/winhttp/request.c | 424 +++++++++++++++++++++++++++++++++------- dlls/winhttp/session.c | 3 + dlls/winhttp/winhttp_private.h | 28 +++- 3 files changed, 380 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a506d0aa3bb3ab19f9cea…

1 0

Hans Leidekker : winhttp: Resend any request data when handling an authentication or redirect response .
by Alexandre Julliard 30 Apr '13

30 Apr '13

Module: wine Branch: master Commit: d63ef4d855654a60ebc8b8660cf161ee837db46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d63ef4d855654a60ebc8b8660… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 30 11:32:31 2013 +0200 winhttp: Resend any request data when handling an authentication or redirect response. --- dlls/winhttp/request.c | 18 +++++++++++++----- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bab576e..8d579b3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1124,9 +1124,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len heap_free( req_ascii ); if (!ret) goto end; - if (optional_len && !netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; - len += optional_len; - + if (optional_len) + { + if (!netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; + request->optional = optional; + request->optional_len = optional_len; + len += optional_len; + } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(DWORD) ); end: @@ -1951,6 +1955,8 @@ static BOOL handle_redirect( request_t *request, DWORD status ) { heap_free( request->verb ); request->verb = strdupW( getW ); + request->optional = NULL; + request->optional_len = 0; } ret = TRUE; @@ -1987,7 +1993,8 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; - send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + /* recurse synchronously */ + send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); continue; } else if (status == HTTP_STATUS_DENIED || status == HTTP_STATUS_PROXY_AUTH_REQ) @@ -2000,7 +2007,8 @@ static BOOL receive_response( request_t *request, BOOL async ) ret = TRUE; break; } - send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); + /* recurse synchronously */ + send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ); continue; } break; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 82b4582..d47bed3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -156,6 +156,8 @@ typedef struct LPWSTR path; LPWSTR version; LPWSTR raw_headers; + void *optional; + DWORD optional_len; netconn_t netconn; int resolve_timeout; int connect_timeout;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013