July 2008 - Wine-commits - list.winehq.org

Francois Gouget : wintrust/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 32974e25a2d1cb0d429f6f4e5b27677443ed216b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32974e25a2d1cb0d429f6f4e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 20 22:39:26 2008 +0200 wintrust/tests: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/tests/softpub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index aa27333..01902dd 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -437,7 +437,7 @@ static void test_wintrust(void) wtd.dwUIChoice = WTD_UI_NONE; wtd.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; wtd.dwUnionChoice = WTD_CHOICE_FILE; - wtd.pFile = &file; + U(wtd).pFile = &file; wtd.dwStateAction = WTD_STATEACTION_VERIFY; memset(&file, 0, sizeof(file)); file.cbStruct = sizeof(file);

1 0

Piotr Caban : msxml3/tests: Added tests for ISAXXMLReader_putErrorHandler and ISAXXMLReader_getErrorHandler .
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 918a46ce2cd6d749d56715ea2a431fd3ab125ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918a46ce2cd6d749d56715ea2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jul 19 22:32:03 2008 +0200 msxml3/tests: Added tests for ISAXXMLReader_putErrorHandler and ISAXXMLReader_getErrorHandler. --- dlls/msxml3/tests/saxreader.c | 82 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5547d72..3bb7983 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -125,7 +125,7 @@ static void test_locator(unsigned line, int loc_line, int loc_column) ok_(__FILE__,line) (rline == loc_line, "unexpected line %d, expected %d\n", rline, loc_line); ok_(__FILE__,line) (rcolumn == loc_column, - "unexpected columnt %d, expected %d\n", rcolumn, loc_column); + "unexpected column %d, expected %d\n", rcolumn, loc_column); } static HRESULT WINAPI contentHandler_QueryInterface( @@ -357,6 +357,75 @@ static const ISAXContentHandlerVtbl contentHandlerVtbl = static ISAXContentHandler contentHandler = { &contentHandlerVtbl }; +static HRESULT WINAPI isaxerrorHandler_QueryInterface( + ISAXErrorHandler* iface, + REFIID riid, + void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISAXErrorHandler)) + { + *ppvObject = iface; + } + else + { + return E_NOINTERFACE; + } + + return S_OK; +} + +static ULONG WINAPI isaxerrorHandler_AddRef( + ISAXErrorHandler* iface) +{ + return 2; +} + +static ULONG WINAPI isaxerrorHandler_Release( + ISAXErrorHandler* iface) +{ + return 1; +} + +static HRESULT WINAPI isaxerrorHandler_error( + ISAXErrorHandler* iface, + ISAXLocator *pLocator, + const WCHAR *pErrorMessage, + HRESULT hrErrorCode) +{ + return S_OK; +} + +static HRESULT WINAPI isaxerrorHandler_fatalError( + ISAXErrorHandler* iface, + ISAXLocator *pLocator, + const WCHAR *pErrorMessage, + HRESULT hrErrorCode) +{ + return S_OK; +} + +static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( + ISAXErrorHandler* iface, + ISAXLocator *pLocator, + const WCHAR *pErrorMessage, + HRESULT hrErrorCode) +{ + return S_OK; +} + +static const ISAXErrorHandlerVtbl errorHandlerVtbl = +{ + isaxerrorHandler_QueryInterface, + isaxerrorHandler_AddRef, + isaxerrorHandler_Release, + isaxerrorHandler_error, + isaxerrorHandler_fatalError, + isaxerrorHanddler_ignorableWarning +}; + +static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; static void test_saxreader(void) { @@ -364,6 +433,7 @@ static void test_saxreader(void) ISAXXMLReader *reader = NULL; VARIANT var; ISAXContentHandler *lpContentHandler; + ISAXErrorHandler *lpErrorHandler; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); @@ -377,16 +447,26 @@ static void test_saxreader(void) hr = ISAXXMLReader_getContentHandler(reader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + hr = ISAXXMLReader_getErrorHandler(reader, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + hr = ISAXXMLReader_getContentHandler(reader, &lpContentHandler); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(lpContentHandler == NULL, "Expected %p, got %p\n", NULL, lpContentHandler); + hr = ISAXXMLReader_getErrorHandler(reader, &lpErrorHandler); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(lpErrorHandler == NULL, "Expected %p, got %p\n", NULL, lpErrorHandler); + hr = ISAXXMLReader_putContentHandler(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); hr = ISAXXMLReader_putContentHandler(reader, &contentHandler); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = ISAXXMLReader_putErrorHandler(reader, &errorHandler); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = ISAXXMLReader_getContentHandler(reader, &lpContentHandler); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(lpContentHandler == &contentHandler, "Expected %p, got %p\n", &contentHandler, lpContentHandler);

1 0

Piotr Caban : msxml3: Add error handling.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: bba7eb5825ad4bc1e38052d0222869f3c49f3837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba7eb5825ad4bc1e38052d02… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jul 19 22:32:10 2008 +0200 msxml3: Add error handling. --- dlls/msxml3/saxreader.c | 90 +++++++++++++++++++++++++++++++++------------- 1 files changed, 64 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 26ba454..9250c61 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -83,6 +83,26 @@ static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); } +static void format_error_message_from_id(saxlocator *This, HRESULT hr) +{ + xmlStopParser(This->pParserCtxt); + This->ret = hr; + + if(This->saxreader->errorHandler) + { + WCHAR msg[1024]; + if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, + NULL, hr, 0, msg, sizeof(msg), NULL)) + { + FIXME("MSXML errors not yet supported.\n"); + msg[0] = '\0'; + } + + ISAXErrorHandler_fatalError(This->saxreader->errorHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl, msg, hr); + } +} + /*** LibXML callbacks ***/ static void libxmlStartDocument(void *ctx) { @@ -92,11 +112,8 @@ static void libxmlStartDocument(void *ctx) if(This->saxreader->contentHandler) { hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); - if(FAILED(hr)) - { - xmlStopParser(This->pParserCtxt); - This->ret = hr; - } + if(hr != S_OK) + format_error_message_from_id(This, hr); } This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt); @@ -116,11 +133,8 @@ static void libxmlEndDocument(void *ctx) if(This->saxreader->contentHandler) { hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); - if(FAILED(hr)) - { - xmlStopParser(This->pParserCtxt); - This->ret = hr; - } + if(hr != S_OK) + format_error_message_from_id(This, hr); } } @@ -161,11 +175,8 @@ static void libxmlStartElementNS( SysFreeString(LocalName); SysFreeString(QName); - if(FAILED(hr)) - { - xmlStopParser(This->pParserCtxt); - This->ret = hr; - } + if(hr != S_OK) + format_error_message_from_id(This, hr); } } @@ -198,11 +209,8 @@ static void libxmlEndElementNS( SysFreeString(LocalName); SysFreeString(QName); - if(FAILED(hr)) - { - xmlStopParser(This->pParserCtxt); - This->ret = hr; - } + if(hr != S_OK) + format_error_message_from_id(This, hr); } } @@ -242,11 +250,8 @@ static void libxmlCharacters( hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, len); SysFreeString(Chars); - if(FAILED(hr)) - { - xmlStopParser(This->pParserCtxt); - This->ret = hr; - } + if(hr != S_OK) + format_error_message_from_id(This, hr); } } @@ -261,10 +266,41 @@ static void libxmlSetDocumentLocator( (ISAXLocator*)&This->lpSAXLocatorVtbl); if(FAILED(hr)) + format_error_message_from_id(This, hr); +} + +void libxmlFatalError(void *ctx, const char *msg, ...) +{ + saxlocator *This = ctx; + char message[1024]; + WCHAR *wszError; + DWORD len; + va_list args; + + if(!This->saxreader->errorHandler) { xmlStopParser(This->pParserCtxt); - This->ret = hr; + This->ret = E_FAIL; + return; } + + FIXME("Error handling is not compatible.\n"); + + va_start(args, msg); + vsprintf(message, msg, args); + va_end(args); + + len = MultiByteToWideChar(CP_ACP, 0, message, -1, NULL, 0); + wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); + + ISAXErrorHandler_fatalError(This->saxreader->errorHandler, + (ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); + + HeapFree(GetProcessHeap(), 0, wszError); + + xmlStopParser(This->pParserCtxt); + This->ret = E_FAIL; } /*** ISAXLocator interface ***/ @@ -1102,6 +1138,8 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.endElementNs = libxmlEndElementNS; reader->sax.characters = libxmlCharacters; reader->sax.setDocumentLocator = libxmlSetDocumentLocator; + reader->sax.error = libxmlFatalError; + reader->sax.fatalError = libxmlFatalError; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added support for SafeArrays in ISAXXMLReader_parse.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 75681ef314461517052af38c2a533138e049b05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75681ef314461517052af38c2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jul 19 22:41:39 2008 +0200 msxml3: Added support for SafeArrays in ISAXXMLReader_parse. --- dlls/msxml3/saxreader.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9250c61..f0d1ef5 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1064,6 +1064,25 @@ static HRESULT WINAPI isaxxmlreader_parse( if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; else hr = locator->ret; break; + case VT_ARRAY|VT_UI1: + locator->pParserCtxt = xmlNewParserCtxt(); + if(!locator->pParserCtxt) + { + hr = E_FAIL; + break; + } + + hr = SafeArrayAccessData(V_ARRAY(&varInput), (void**)&data); + if(hr != S_OK) break; + xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + SafeArrayUnaccessData(V_ARRAY(&varInput)); + + locator->pParserCtxt->sax = &locator->saxreader->sax; + locator->pParserCtxt->userData = locator; + + if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; + else hr = locator->ret; + break; default: hr = E_NOTIMPL; }

1 0

Piotr Caban : msxml3/tests: Added test for ISAXXMLReader_parse with SafeArray as argument.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 0a8b28401086a4bfc9f20ce869ac9777829a8cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8b28401086a4bfc9f20ce86… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jul 19 22:32:26 2008 +0200 msxml3/tests: Added test for ISAXXMLReader_parse with SafeArray as argument. --- dlls/msxml3/tests/saxreader.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 3bb7983..26f232b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -52,6 +52,13 @@ static const WCHAR szSimpleXML[] = { '<','/','B','a','n','k','A','c','c','o','u','n','t','>','\n','\0' }; +static CHAR szTestXML[] = +"<?xml version=\"1.0\" ?>\n" +"<BankAccount>\n" +" <Number>1234</Number>\n" +" <Name>Captain Ahab</Name>\n" +"</BankAccount>\n"; + typedef struct _contenthandlercheck { CH id; int line; @@ -434,6 +441,9 @@ static void test_saxreader(void) VARIANT var; ISAXContentHandler *lpContentHandler; ISAXErrorHandler *lpErrorHandler; + SAFEARRAY *pSA; + SAFEARRAYBOUND SADim[1]; + char *pSAData = NULL; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); @@ -479,6 +489,22 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + SADim[0].lLbound= 0; + SADim[0].cElements= sizeof(szTestXML)-1; + pSA = SafeArrayCreate(VT_UI1, 1, SADim); + SafeArrayAccessData(pSA, (void**)&pSAData); + memcpy(pSAData, szTestXML, sizeof(szTestXML)-1); + SafeArrayUnaccessData(pSA); + V_VT(&var) = VT_ARRAY|VT_UI1; + V_ARRAY(&var) = pSA; + + expectCall = contentHandlerTest1; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + SafeArrayDestroy(pSA); + ISAXXMLReader_Release(reader); }

1 0

Luis Busquets : d3dx9: Implement D3DXGetShaderVersion().
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: fb70f818b7e6d06f4d70aa953aac6ca69d63cc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb70f818b7e6d06f4d70aa953… Author: Luis Busquets <luis.busquets(a)ilidium.com> Date: Sun Jul 20 22:07:42 2008 +0200 d3dx9: Implement D3DXGetShaderVersion(). --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 7 +++++++ include/d3dx9shader.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 93ba132..1619f16 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -163,7 +163,7 @@ @ stub D3DXGetShaderOutputSemantics @ stub D3DXGetShaderSamplers @ stdcall D3DXGetShaderSize(ptr) -@ stub D3DXGetShaderVersion +@ stdcall D3DXGetShaderVersion(ptr) @ stub D3DXGetVertexShaderProfile @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersect @ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersectSubset diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index bbda961..326331c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -47,3 +47,10 @@ UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code) /* Return the shader size in bytes */ return (ptr - byte_code) * sizeof(*ptr); } + +DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code) +{ + TRACE("byte_code %p\n", byte_code); + + return byte_code ? *byte_code : 0; +} diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 5eb4fe6..6d2aa41 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -26,6 +26,7 @@ extern "C" { #endif UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); +DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); #ifdef __cplusplus }

1 0

Piotr Caban : msxml3: Do not invoke ISAXXMLReader_endDocument when parser was stopped.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 2cb215b51f626412b9998440a5e859ae55a77c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb215b51f626412b9998440a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Jul 19 22:31:56 2008 +0200 msxml3: Do not invoke ISAXXMLReader_endDocument when parser was stopped. --- dlls/msxml3/saxreader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d544fdf..26ba454 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -111,6 +111,8 @@ static void libxmlEndDocument(void *ctx) This->lastColumn = 0; This->lastLine = 0; + if(This->ret != S_OK) return; + if(This->saxreader->contentHandler) { hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler);

1 0

Hans Leidekker : wininet: Fix cookie buffer overflow.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 216d4c0834d4e9e52e18821b85706c4fa77ffe17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216d4c0834d4e9e52e18821b8… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:55:52 2008 +0200 wininet: Fix cookie buffer overflow. Spotted by Yann Droneaud. --- dlls/wininet/http.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 154dc97..2a78670 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3124,11 +3124,11 @@ static void HTTP_InsertCookies(LPWININETHTTPREQW lpwhr) { static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; LPWSTR lpszCookies, lpszUrl = NULL; - DWORD nCookieSize, len; + DWORD nCookieSize, size; LPHTTPHEADERW Host = HTTP_GetHeader(lpwhr,szHost); - len = lstrlenW(Host->lpszValue) + strlenW(szUrlForm); - lpszUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + size = (strlenW(Host->lpszValue) + strlenW(szUrlForm)) * sizeof(WCHAR); + if (!(lpszUrl = HeapAlloc(GetProcessHeap(), 0, size))) return; sprintfW( lpszUrl, szUrlForm, Host->lpszValue ); if (InternetGetCookieW(lpszUrl, NULL, NULL, &nCookieSize)) @@ -3137,15 +3137,16 @@ static void HTTP_InsertCookies(LPWININETHTTPREQW lpwhr) static const WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; static const WCHAR szcrlf[] = {'\r','\n',0}; - lpszCookies = HeapAlloc(GetProcessHeap(), 0, (nCookieSize + 1 + 8)*sizeof(WCHAR)); - - cnt += sprintfW(lpszCookies, szCookie); - InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); - strcatW(lpszCookies, szcrlf); + size = sizeof(szCookie) + nCookieSize * sizeof(WCHAR) + sizeof(szcrlf); + if ((lpszCookies = HeapAlloc(GetProcessHeap(), 0, size))) + { + cnt += sprintfW(lpszCookies, szCookie); + InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); + strcatW(lpszCookies, szcrlf); - HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), - HTTP_ADDREQ_FLAG_ADD); - HeapFree(GetProcessHeap(), 0, lpszCookies); + HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), HTTP_ADDREQ_FLAG_ADD); + HeapFree(GetProcessHeap(), 0, lpszCookies); + } } HeapFree(GetProcessHeap(), 0, lpszUrl); }

1 0

Hans Leidekker : wininet: Move insertion of cookie header from HttpOpenRequest to HttpSendRequest.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: 572b0bab88345421c436501df61c339a43b39c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=572b0bab88345421c436501df… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:55:39 2008 +0200 wininet: Move insertion of cookie header from HttpOpenRequest to HttpSendRequest. Based on a patch by Yann Droneaud. --- dlls/wininet/http.c | 64 +++++++++++++++++++++++--------------------- dlls/wininet/tests/http.c | 54 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4f73602..154dc97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1888,15 +1888,10 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, { LPWININETAPPINFOW hIC = NULL; LPWININETHTTPREQW lpwhr; - LPWSTR lpszCookies; - LPWSTR lpszUrl = NULL; LPWSTR lpszHostName = NULL; - DWORD nCookieSize; HINTERNET handle = NULL; - static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; static const WCHAR szHostForm[] = {'%','s',':','%','u',0}; DWORD len; - LPHTTPHEADERW Host; TRACE("-->\n"); @@ -2008,32 +2003,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) HTTP_DealWithProxy( hIC, lpwhs, lpwhr ); - Host = HTTP_GetHeader(lpwhr,szHost); - - len = lstrlenW(Host->lpszValue) + strlenW(szUrlForm); - lpszUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - sprintfW( lpszUrl, szUrlForm, Host->lpszValue ); - - if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && - InternetGetCookieW(lpszUrl, NULL, NULL, &nCookieSize)) - { - int cnt = 0; - static const WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; - static const WCHAR szcrlf[] = {'\r','\n',0}; - - lpszCookies = HeapAlloc(GetProcessHeap(), 0, (nCookieSize + 1 + 8)*sizeof(WCHAR)); - - cnt += sprintfW(lpszCookies, szCookie); - InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); - strcatW(lpszCookies, szcrlf); - - HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), - HTTP_ADDREQ_FLAG_ADD); - HeapFree(GetProcessHeap(), 0, lpszCookies); - } - HeapFree(GetProcessHeap(), 0, lpszUrl); - - INTERNET_SendCallback(&lpwhs->hdr, dwContext, INTERNET_STATUS_HANDLE_CREATED, &handle, sizeof(handle)); @@ -3151,6 +3120,36 @@ static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) return TRUE; } +static void HTTP_InsertCookies(LPWININETHTTPREQW lpwhr) +{ + static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; + LPWSTR lpszCookies, lpszUrl = NULL; + DWORD nCookieSize, len; + LPHTTPHEADERW Host = HTTP_GetHeader(lpwhr,szHost); + + len = lstrlenW(Host->lpszValue) + strlenW(szUrlForm); + lpszUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + sprintfW( lpszUrl, szUrlForm, Host->lpszValue ); + + if (InternetGetCookieW(lpszUrl, NULL, NULL, &nCookieSize)) + { + int cnt = 0; + static const WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; + static const WCHAR szcrlf[] = {'\r','\n',0}; + + lpszCookies = HeapAlloc(GetProcessHeap(), 0, (nCookieSize + 1 + 8)*sizeof(WCHAR)); + + cnt += sprintfW(lpszCookies, szCookie); + InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); + strcatW(lpszCookies, szcrlf); + + HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), + HTTP_ADDREQ_FLAG_ADD); + HeapFree(GetProcessHeap(), 0, lpszCookies); + } + HeapFree(GetProcessHeap(), 0, lpszUrl); +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -3240,6 +3239,9 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_InsertAuthorization(lpwhr, lpwhr->pAuthInfo, szAuthorization); HTTP_InsertAuthorization(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization); + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) + HTTP_InsertCookies(lpwhr); + /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength ) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e9dad82..8209b22 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1489,6 +1489,13 @@ static DWORD CALLBACK server_thread(LPVOID param) recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); } + if (strstr(buffer, "/testC")) + { + if (strstr(buffer, "Cookie: cookie=biscuit")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1815,6 +1822,52 @@ static void test_http1_1(int port) InternetCloseHandle(ses); } +static void test_cookie_header(int port) +{ + HINTERNET ses, con, req; + DWORD size, status, error; + BOOL ret; + char buffer[64]; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + InternetSetCookie("http://localhost", "cookie", "biscuit"); + + req = HttpOpenRequest(con, NULL, "/testC", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + buffer[0] = 0; + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = HttpQueryInfo(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + error = GetLastError(); + ok(!ret, "HttpQueryInfo succeeded\n"); + ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "got %u expected ERROR_HTTP_HEADER_NOT_FOUND\n", error); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_COOKIE | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "cookie=biscuit"), "got '%s' expected \'cookie=biscuit\'\n", buffer); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -1840,6 +1893,7 @@ static void test_http_connection(void) test_basic_request(si.port, "GET", "/test6"); test_connection_header(si.port); test_http1_1(si.port); + test_cookie_header(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Hans Leidekker : wininet: Make another test pass on IE6.
by Alexandre Julliard 21 Jul '08

21 Jul '08

Module: wine Branch: master Commit: a5c64551931056d0a206268375ef1d50e837b0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c64551931056d0a20626837… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Jul 19 19:53:09 2008 +0200 wininet: Make another test pass on IE6. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6e27669..e9dad82 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1688,7 +1688,7 @@ static void test_header_handling_order(int port) size = sizeof(status); ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status); InternetCloseHandle(request); @@ -1705,7 +1705,7 @@ static void test_header_handling_order(int port) size = sizeof(status); ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200 || status == 400 /* IE6 */, "request failed with status %u\n", status); + ok(status == 200 || status == 400 /* IE6 */, "got status %u, expected 200 or 400\n", status); InternetCloseHandle(request); InternetCloseHandle(connect);

1 0