wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Henri Verbeet : wined3d: Fix a variable name inside a VTRACE.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 4b354e8e6215e784c3a9f223080d6292ecab5964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b354e8e6215e784c3a9f2230… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:26:38 2008 +0200 wined3d: Fix a variable name inside a VTRACE. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 24c7d1a..126eb3a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -680,7 +680,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa } /* Start drawing in GL */ - VTRACE(("glBegin(%x)\n", glPrimType)); + VTRACE(("glBegin(%x)\n", glPrimitiveType)); glBegin(glPrimitiveType); for (vx_index = 0; vx_index < numberOfVertices; ++vx_index) {

1 0

Henri Verbeet : wined3d: Use the correct representative for texture transform states.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 5fd7a59e707f449b4827f4d51424b74572467d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd7a59e707f449b4827f4d51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:25:58 2008 +0200 wined3d: Use the correct representative for texture transform states. --- dlls/wined3d/state.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969b9fa..da02b51 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5034,13 +5034,13 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_TRANSFORM(WINED3DTS_VIEW), { STATE_TRANSFORM(WINED3DTS_VIEW), transform_view }, 0 }, { STATE_TRANSFORM(WINED3DTS_PROJECTION), { STATE_TRANSFORM(WINED3DTS_PROJECTION), transform_projection}, 0 }, { STATE_TRANSFORM(WINED3DTS_TEXTURE0), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), transform_world }, 0 },

1 0

Henri Verbeet : wined3d: Depth stencil tracking depends on the value of This->render_offscreen.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: d37c6fc0a94b3ac3b4cce58afeafbdf225107b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37c6fc0a94b3ac3b4cce58af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:25:44 2008 +0200 wined3d: Depth stencil tracking depends on the value of This->render_offscreen. --- dlls/wined3d/drawprim.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3be34d3..24c7d1a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -928,20 +928,21 @@ void drawPrimitive(IWineD3DDevice *iface, } } + /* Signals other modules that a drawing is in progress and the stateblock finalized */ + This->isInDraw = TRUE; + + ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); + if (This->stencilBufferTarget) { + /* Note that this depends on the ActivateContext call above to set + * This->render_offscreen properly */ DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; surface_load_ds_location(This->stencilBufferTarget, location); surface_modify_ds_location(This->stencilBufferTarget, location); } - /* Signals other modules that a drawing is in progress and the stateblock finalized */ - This->isInDraw = TRUE; - /* Ok, we will be updating the screen from here onwards so grab the lock */ - - ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); ENTER_GL(); - { GLenum glPrimType; BOOL emulation = FALSE;

1 0

Henri Verbeet : wined3d: Be more careful when deleting FBOs.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 4b6887b8e374826156305094ba547b42b5673da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6887b8e374826156305094b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 3 16:25:38 2008 +0200 wined3d: Be more careful when deleting FBOs. Clear all attachments before deleting FBOs. It should be valid to delete FBOs that still have attachments, but for some reason the nvidia drivers don't like it. The resulting memory corruption can be pretty nasty, and this workaround seems clean enough. --- dlls/wined3d/context.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/device.c | 1 + 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66206bd..2f30aff 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -632,6 +632,25 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con HeapFree(GetProcessHeap(), 0, oldArray); } +static void destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) +{ + int i = 0; + + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); + checkGLcall("glBindFramebuffer()"); + for (i = 0; i < GL_LIMITS(buffers); ++i) + { + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + i, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2D()"); + } + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2D()"); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebuffer()"); + GL_EXTCALL(glDeleteFramebuffersEXT(1, fbo)); + checkGLcall("glDeleteFramebuffers()"); +} + /***************************************************************************** * DestroyContext * @@ -655,13 +674,16 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { ENTER_GL(); if (context->fbo) { - GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->fbo)); + TRACE("Destroy FBO %d\n", context->fbo); + destroy_fbo(This, &context->fbo); } if (context->src_fbo) { - GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->src_fbo)); + TRACE("Destroy src FBO %d\n", context->src_fbo); + destroy_fbo(This, &context->src_fbo); } if (context->dst_fbo) { - GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->dst_fbo)); + TRACE("Destroy dst FBO %d\n", context->dst_fbo); + destroy_fbo(This, &context->dst_fbo); } LEAVE_GL(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2085b07..d12aebd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6128,6 +6128,7 @@ void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { if (!*fbo) { GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); checkGLcall("glGenFramebuffersEXT()"); + TRACE("Created FBO %d\n", *fbo); } GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); checkGLcall("glBindFramebuffer()");

1 0

Hans Leidekker : winhttp: Implement some more options.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: e078f618eb7c05c3cbec915f69a1d69fd3b35bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078f618eb7c05c3cbec915f6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 16:58:06 2008 +0200 winhttp: Implement some more options. --- dlls/winhttp/request.c | 4 +- dlls/winhttp/session.c | 72 ++++++++++++++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 7 +++- dlls/winhttp/winhttp_private.h | 3 ++ 4 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6bcfb87..be951c5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -768,7 +768,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len sprintfW( length, length_fmt, total_len ); process_header( request, attr_content_length, length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } - if (!(request->hdr.flags & WINHTTP_DISABLE_KEEP_ALIVE)) + if (!(request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE)) { process_header( request, attr_connection, keep_alive, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } @@ -1097,7 +1097,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) if (status == 200) break; if (status == 301 || status == 302) { - if (request->hdr.flags & WINHTTP_DISABLE_REDIRECTS) break; + if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; drain_content( request ); if (!(ret = handle_redirect( request ))) break; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4d855c3..d429fcb 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -69,11 +69,36 @@ static void session_destroy( object_header_t *hdr ) heap_free( session ); } +static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) +{ + switch (option) + { + case WINHTTP_OPTION_PROXY: + { + WINHTTP_PROXY_INFO *pi = buffer; + + FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + return TRUE; + } + case WINHTTP_OPTION_REDIRECT_POLICY: + { + DWORD policy = *(DWORD *)buffer; + + TRACE("0x%x\n", policy); + hdr->redirect_policy = policy; + return TRUE; + } + default: + FIXME("unimplemented option %u\n", option); + return TRUE; + } +} + static const object_vtbl_t session_vtbl = { session_destroy, NULL, - NULL + session_set_option }; /*********************************************************************** @@ -220,11 +245,52 @@ static void request_destroy( object_header_t *hdr ) heap_free( request ); } +static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) +{ + switch (option) + { + case WINHTTP_OPTION_PROXY: + { + WINHTTP_PROXY_INFO *pi = buffer; + + FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + return TRUE; + } + case WINHTTP_OPTION_DISABLE_FEATURE: + { + DWORD disable = *(DWORD *)buffer; + + TRACE("0x%x\n", disable); + hdr->disable_flags &= disable; + return TRUE; + } + case WINHTTP_OPTION_AUTOLOGON_POLICY: + { + DWORD policy = *(DWORD *)buffer; + + TRACE("0x%x\n", policy); + hdr->logon_policy = policy; + return TRUE; + } + case WINHTTP_OPTION_REDIRECT_POLICY: + { + DWORD policy = *(DWORD *)buffer; + + TRACE("0x%x\n", policy); + hdr->redirect_policy = policy; + return TRUE; + } + default: + FIXME("unimplemented option %u\n", option); + return TRUE; + } +} + static const object_vtbl_t request_vtbl = { request_destroy, NULL, - NULL + request_set_option }; /*********************************************************************** @@ -350,7 +416,7 @@ BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, LPVOID buffer, L static BOOL set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) { - BOOL ret = FALSE; + BOOL ret = TRUE; switch (option) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5b3bd38..012d703 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -532,12 +532,16 @@ static void test_secure_connection(void) static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; HANDLE ses, con, req; - DWORD size, status; + DWORD size, status, policy; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + policy = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_REDIRECT_POLICY, &policy, sizeof(policy)); + ok(ret, "failed to set redirect policy %u\n", GetLastError()); + con = WinHttpConnect(ses, google, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); @@ -569,6 +573,7 @@ static void test_secure_connection(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 04dd7dc..9bf48d4 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -51,6 +51,9 @@ struct _object_header_t HINTERNET handle; const object_vtbl_t *vtbl; DWORD flags; + DWORD disable_flags; + DWORD logon_policy; + DWORD redirect_policy; DWORD error; DWORD_PTR context; LONG refs;

1 0

Alexandre Julliard : libwine: Reserve some malloc space on Solaris before we start mapping other things.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: c614a2481a9f8377103d203e85dde926fa45431a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c614a2481a9f8377103d203e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 3 17:22:13 2008 +0200 libwine: Reserve some malloc space on Solaris before we start mapping other things. --- libs/wine/mmap.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 8b79580..ff117cc 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -286,7 +286,30 @@ static void reserve_area( void *addr, void *end ) } #endif } + + +/*********************************************************************** + * reserve_malloc_space + * + * Solaris malloc is not smart enough to obtain space through mmap(), so try to make + * sure that there is some available sbrk() space before we reserve other things. + */ +static void reserve_malloc_space( size_t size ) +{ +#ifdef __sun + size_t i, count = size / 1024; + void **ptrs = malloc( count * sizeof(ptrs[0]) ); + + if (!ptrs) return; + + for (i = 0; i < count; i++) if (!(ptrs[i] = malloc( 1024 ))) break; + if (i--) /* free everything except the last one */ + while (i) free( ptrs[--i] ); + free( ptrs ); #endif +} + +#endif /* __i386__ */ /*********************************************************************** @@ -325,6 +348,8 @@ void mmap_init(void) char * const stack_ptr = &stack; char *user_space_limit = (char *)0x7ffe0000; + reserve_malloc_space( 8 * 1024 * 1024 ); + /* check for a reserved area starting at the user space limit */ /* to avoid wasting time trying to allocate it again */ LIST_FOR_EACH( ptr, &reserved_areas )

1 0

Alistair Leslie-Hughes : msxml3: Add IDispatchEx test.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 5e1ac66b258415a33d96bb983c7e2ec3c7eea968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1ac66b258415a33d96bb983… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 3 20:25:28 2008 +1000 msxml3: Add IDispatchEx test. --- dlls/msxml3/tests/domdoc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8af6b02..2bff372 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1877,6 +1877,7 @@ static void test_IXMLDOMDocument2(void) BSTR str; IXMLDOMDocument *doc; IXMLDOMDocument2 *doc2; + IDispatchEx *dispex; VARIANT var; int ref; @@ -1895,6 +1896,13 @@ static void test_IXMLDOMDocument2(void) ok( r == S_OK, "ret %08x\n", r ); ok( doc == (IXMLDOMDocument*)doc2, "interfaces differ\n"); + r = IXMLDOMDocument_QueryInterface( doc, &IID_IDispatchEx, (void**)&dispex ); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + { + IDispatchEx_Release(dispex); + } + /* we will check if the variant got cleared */ ref = IXMLDOMDocument2_AddRef(doc2); expect_eq(ref, 3, int, "%d"); /* doc, doc2, AddRef*/

1 0

Hans Leidekker : winhttp: A non-standard port must be included in the host header.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 6bb3090732ef5a4dd4584e22738d0df418e5a8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb3090732ef5a4dd4584e227… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:33:44 2008 +0200 winhttp: A non-standard port must be included in the host header. --- dlls/winhttp/request.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0c954b6..6bcfb87 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -721,6 +721,25 @@ void close_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } +static BOOL add_host_header( request_t *request, WCHAR *hostname, INTERNET_PORT port, DWORD modifier ) +{ + BOOL ret; + DWORD len; + WCHAR *host; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; + + if (port == INTERNET_DEFAULT_HTTP_PORT || port == INTERNET_DEFAULT_HTTPS_PORT) + { + return process_header( request, attr_host, hostname, modifier, TRUE ); + } + len = strlenW( hostname ) + 7; /* sizeof(":65335") */ + if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; + sprintfW( host, fmt, hostname, port ); + ret = process_header( request, attr_host, host, modifier, TRUE ); + heap_free( host ); + return ret; +} + static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len, LPVOID optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) { @@ -741,9 +760,9 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); if (connect->hostname) - process_header( request, attr_host, connect->hostname, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); + add_host_header( request, connect->hostname, connect->hostport, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); - if (total_len || !strcmpW( request->verb, post )) + if (total_len || (request->verb && !strcmpW( request->verb, post ))) { WCHAR length[21]; /* decimal long int + null */ sprintfW( length, length_fmt, total_len ); @@ -980,12 +999,12 @@ static BOOL handle_redirect( request_t *request ) { heap_free( connect->servername ); connect->servername = hostname; - connect->serverport = port; + connect->serverport = connect->hostport = port; netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; } - if (!(ret = process_header( request, attr_host, hostname, WINHTTP_ADDREQ_FLAG_REPLACE, TRUE ))) goto end; + if (!(ret = add_host_header( request, hostname, port, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; heap_free( request->path );

1 0

Hans Leidekker : winhttp: Add zero value content length header to POST requests without additional data .
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 04a11bb11718337bd398658330d9e1529ff4b34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a11bb11718337bd39865833… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:33:04 2008 +0200 winhttp: Add zero value content length header to POST requests without additional data. --- dlls/winhttp/request.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 68145d7..0c954b6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -727,6 +727,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len static const WCHAR keep_alive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR no_cache[] = {'n','o','-','c','a','c','h','e',0}; static const WCHAR length_fmt[] = {'%','l','d',0}; + static const WCHAR post[] = {'P','O','S','T',0}; BOOL ret = FALSE; connect_t *connect = request->connect; @@ -742,10 +743,10 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len if (connect->hostname) process_header( request, attr_host, connect->hostname, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); - if (optional_len) + if (total_len || !strcmpW( request->verb, post )) { WCHAR length[21]; /* decimal long int + null */ - sprintfW( length, length_fmt, optional_len ); + sprintfW( length, length_fmt, total_len ); process_header( request, attr_content_length, length, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); } if (!(request->hdr.flags & WINHTTP_DISABLE_KEEP_ALIVE))

1 0

Hans Leidekker : winhttp: Add status notification tests. Make them pass.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 96bf72f27e3244e6fcad4677ca749e9e370f412c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96bf72f27e3244e6fcad4677c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 3 12:31:52 2008 +0200 winhttp: Add status notification tests. Make them pass. --- dlls/winhttp/request.c | 12 +- dlls/winhttp/session.c | 4 +- dlls/winhttp/tests/Makefile.in | 1 + dlls/winhttp/tests/notification.c | 267 +++++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96bf72f27e3244e6fcad4…

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 September 2008