November 2007 - Wine-Commits

Rob Shearman : ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 33abd94d35338b64588ee9ebeae52642b419dfe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33abd94d35338b64588ee9ebe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 14 17:23:24 2007 +0000 ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket. --- dlls/ole32/marshal.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d918347..fcfbd64 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -511,15 +511,31 @@ static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, IUnknown *pProxy, DWORD *pAuthnSvc, DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, + OLECHAR **ppServerPrincName, DWORD *pAuthnLevel, DWORD *pImpLevel, void **pAuthInfo, DWORD *pCapabilities) { FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, - pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, + pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, pCapabilities); + + if (pAuthnSvc) + *pAuthnSvc = 0; + if (pAuthzSvc) + *pAuthzSvc = 0; + if (ppServerPrincName) + *ppServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = EOAC_NONE; + return E_NOTIMPL; }

1 0

Huw Davies : inetcomm: Add a class factory for MimeBody.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: cc3fcf0a2d87d26a6373c458a439193090cc4d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3fcf0a2d87d26a6373c458a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 16:39:02 2007 +0000 inetcomm: Add a class factory for MimeBody. --- dlls/inetcomm/inetcomm_main.c | 97 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 952efcb..81303b3 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -25,6 +25,9 @@ #include "windef.h" #include "winbase.h" #include "winnt.h" +#include "winuser.h" +#include "ole2.h" +#include "mimeole.h" #include "inetcomm_private.h" @@ -54,14 +57,104 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +/****************************************************************************** + * ClassFactory + */ +typedef struct +{ + const struct IClassFactoryVtbl *lpVtbl; + HRESULT (*create_object)(IUnknown *, void **); +} cf; + +static inline cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (cf *)((char*)iface - FIELD_OFFSET(cf, lpVtbl)); +} + +static HRESULT WINAPI cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + cf *This = impl_from_IClassFactory( iface ); + HRESULT r; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + r = This->create_object( pOuter, (LPVOID*) &punk ); + if (FAILED(r)) + return r; + + r = IUnknown_QueryInterface( punk, riid, ppobj ); + IUnknown_Release( punk ); + + return r; +} + +static HRESULT WINAPI cf_LockServer( IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl cf_vtbl = +{ + cf_QueryInterface, + cf_AddRef, + cf_Release, + cf_CreateInstance, + cf_LockServer +}; + +static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; + /*********************************************************************** * DllGetClassObject (INETCOMM.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); - return CLASS_E_CLASSNOTAVAILABLE; + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); + + if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) + { + cf = (IClassFactory*) &mime_body_cf.lpVtbl; + } + + if ( !cf ) + { + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + return IClassFactory_QueryInterface( cf, iid, ppv ); } /***********************************************************************

1 0

Huw Davies : inetcomm: Register a couple more classes.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 98c74280bdbe157ae65ffbd7ef1df7f9c136b364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c74280bdbe157ae65ffbd7e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 12:12:38 2007 +0000 inetcomm: Register a couple more classes. --- dlls/inetcomm/regsvr.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index ac3d3f3..9bd9930 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -432,6 +432,18 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IMimeBody, + "CLSID_IMimeBody", + NULL, + "inetcomm.dll", + "Both" + }, + { &CLSID_IMimeMessage, + "CLSID_IMimeMessage", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Rob Shearman : msxml3: Don' t leak node in xmldoc_createElement in the wrong type was specified.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 306129c92e6c814b575a2cc713548ec96bec2f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=306129c92e6c814b575a2cc71… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 14 10:49:34 2007 +0000 msxml3: Don't leak node in xmldoc_createElement in the wrong type was specified. --- dlls/msxml3/xmldoc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index e387921..6d44c78 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -449,11 +449,10 @@ static HRESULT WINAPI xmldoc_createElement(IXMLDocument *iface, VARIANT vType, *ppElem = NULL; - node = xmlNewNode(NULL, empty); - if (V_VT(&vType) != VT_I4) return E_INVALIDARG; + node = xmlNewNode(NULL, empty); node->type = type_msxml_to_libxml(V_I4(&vType)); /* FIXME: create xmlNodePtr based on vType and var1 */

1 0

Hans Leidekker : wininet: Fix a number of problems with InternetSetCookie.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: b6ee3c1d6bbecb5d8fda0da6eb45500ae1285293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ee3c1d6bbecb5d8fda0da6e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Nov 14 13:15:16 2007 +0100 wininet: Fix a number of problems with InternetSetCookie. --- dlls/wininet/cookie.c | 103 ++++++++++++++++++++++------------------ dlls/wininet/tests/internet.c | 6 ++- 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index f5f3975..a7445b8 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -174,7 +174,7 @@ static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path) return newDomain; } -static void COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen) +static BOOL COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen) { URL_COMPONENTSW UrlComponents; @@ -191,7 +191,7 @@ static void COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostName UrlComponents.dwHostNameLength = hostNameLen; UrlComponents.dwUrlPathLength = pathLen; - InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents); + return InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents); } /* match a domain. domain must match if the domain is not NULL. path must match if the path is not NULL */ @@ -392,6 +392,34 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, return r; } +static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) +{ + cookie_domain *thisCookieDomain = NULL; + cookie *thisCookie; + struct list *cursor; + + LIST_FOR_EACH(cursor, &domain_list) + { + thisCookieDomain = LIST_ENTRY(cursor, cookie_domain, entry); + if (COOKIE_matchDomain(domain, NULL /* FIXME: path */, thisCookieDomain, FALSE)) + break; + thisCookieDomain = NULL; + } + + if (!thisCookieDomain) + thisCookieDomain = COOKIE_addDomain(domain, path); + + if ((thisCookie = COOKIE_findCookie(thisCookieDomain, cookie_name))) + COOKIE_deleteCookie(thisCookie, FALSE); + + TRACE("setting cookie %s=%s for domain %s\n", debugstr_w(cookie_name), + debugstr_w(cookie_data), debugstr_w(thisCookieDomain->lpCookieDomain)); + + if (!COOKIE_addCookie(thisCookieDomain, cookie_name, cookie_data)) + return FALSE; + + return TRUE; +} /*********************************************************************** * InternetSetCookieW (WININET.@) @@ -406,64 +434,47 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPCWSTR lpCookieData) { - cookie_domain *thisCookieDomain = NULL; - cookie *thisCookie; + BOOL ret; WCHAR hostName[2048], path[2048]; - struct list * cursor; TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); - if (!lpCookieData) + if (!lpszUrl || !lpCookieData) { SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return FALSE; } + + hostName[0] = 0; + ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); + if (!ret || !hostName[0]) return FALSE; + if (!lpszCookieName) { - /* some apps (or is it us??) try to add a cookie with no cookie name, but - * the cookie data in the form of name=data. */ - /* FIXME, probably a bug here, for now I don't care */ - WCHAR *ourCookieName, *ourCookieData; - int ourCookieNameSize; - BOOL ret; - - if (!(ourCookieData = strchrW(lpCookieData, '='))) - { - TRACE("something terribly wrong with cookie data %s\n", - debugstr_w(ourCookieData)); - return FALSE; - } - ourCookieNameSize = ourCookieData - lpCookieData; - ourCookieData += 1; - ourCookieName = HeapAlloc(GetProcessHeap(), 0, - (ourCookieNameSize + 1)*sizeof(WCHAR)); - memcpy(ourCookieName, lpCookieData, ourCookieNameSize * sizeof(WCHAR)); - ourCookieName[ourCookieNameSize] = '\0'; - TRACE("setting (hacked) cookie of %s, %s\n", - debugstr_w(ourCookieName), debugstr_w(ourCookieData)); - ret = InternetSetCookieW(lpszUrl, ourCookieName, ourCookieData); - HeapFree(GetProcessHeap(), 0, ourCookieName); - return ret; - } + unsigned int len; + WCHAR *cookie, *data; - COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); + len = strlenW(lpCookieData); + if (!(cookie = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + strcpyW(cookie, lpCookieData); - LIST_FOR_EACH(cursor, &domain_list) - { - thisCookieDomain = LIST_ENTRY(cursor, cookie_domain, entry); - if (COOKIE_matchDomain(hostName, NULL /* FIXME: path */, thisCookieDomain, FALSE)) - break; - thisCookieDomain = NULL; - } - if (!thisCookieDomain) - thisCookieDomain = COOKIE_addDomain(hostName, path); + /* some apps (or is it us??) try to add a cookie with no cookie name, but + * the cookie data in the form of name[=data]. + */ + if (!(data = strchrW(cookie, '='))) data = cookie + len; + else data++; - if ((thisCookie = COOKIE_findCookie(thisCookieDomain, lpszCookieName))) - COOKIE_deleteCookie(thisCookie, FALSE); + ret = set_cookie(hostName, path, cookie, data); - thisCookie = COOKIE_addCookie(thisCookieDomain, lpszCookieName, lpCookieData); - return TRUE; + HeapFree(GetProcessHeap(), 0, cookie); + return ret; + } + return set_cookie(hostName, path, lpszCookieName, lpCookieData); } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index c441bf2..8a83132 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -218,6 +218,7 @@ static void test_null(void) static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; static const WCHAR szEmpty[] = { 0 }; static const WCHAR szUrl[] = { 'h','t','t','p',':','/','/','a','.','b','.','c',0 }; + static const WCHAR szUrlEmpty[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szExpect[] = { 's','e','r','v','e','r',';',' ','s','e','r','v','e','r',0 }; WCHAR buffer[0x20]; BOOL r; @@ -267,14 +268,15 @@ static void test_null(void) r = InternetSetCookieW(szUrl, szServer, szServer); ok(r == TRUE, "return wrong\n"); - todo_wine { r = InternetSetCookieW(szUrl, NULL, szServer); ok(r == TRUE, "return wrong\n"); - } r = InternetSetCookieW(szUrl, szServer, szEmpty); ok(r == TRUE, "return wrong\n"); + r = InternetSetCookieW(szUrlEmpty, szServer, szServer); + ok(r == FALSE, "return wrong\n"); + r = InternetSetCookieW(szServer, NULL, szServer); todo_wine { ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n");

1 0

Kirill K. Smirnov : wineconsole: Do not show "Apply" button - it is not used anyway.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: bd5869f19cf92a9796c3305eb9de3d0e1ac499d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5869f19cf92a9796c3305eb… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Nov 14 19:17:55 2007 +0400 wineconsole: Do not show "Apply" button - it is not used anyway. --- programs/wineconsole/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 36805e1..5c27017 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -833,6 +833,7 @@ BOOL WCUSER_GetProperties(struct inner_data* data, BOOL current) psHead.nPages = 3; psHead.hwndParent = data->hWnd; psHead.u3.phpage = psPage; + psHead.dwFlags = PSH_NOAPPLYNOW; WINECON_DumpConfig("init", refcfg);

1 0

Hans Leidekker : wininet: Fix a number of problems with InternetGetCookie.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 5ccfec64281120e8498431dc8c09675c31506dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccfec64281120e8498431dc8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Nov 14 13:15:29 2007 +0100 wininet: Fix a number of problems with InternetGetCookie. This version incorporates Lei Zhang's changes to the test, with his consent. --- dlls/wininet/cookie.c | 52 +++++++++++++++++++++++----------------- dlls/wininet/tests/internet.c | 23 +++++++++++------- 2 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index a7445b8..b44c4a6 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -258,21 +258,23 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain) BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LPWSTR lpCookieData, LPDWORD lpdwSize) { + BOOL ret; struct list * cursor; - int cnt = 0, domain_count = 0; - int cookie_count = 0; + unsigned int cnt = 0, domain_count = 0, cookie_count = 0; WCHAR hostName[2048], path[2048]; TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), - lpCookieData, lpdwSize); + lpCookieData, lpdwSize); if (!lpszUrl) { - SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); + hostName[0] = 0; + ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); + if (!ret || !hostName[0]) return FALSE; LIST_FOR_EACH(cursor, &domain_list) { @@ -288,22 +290,29 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry); if (lpCookieData == NULL) /* return the size of the buffer required to lpdwSize */ { - if (cookie_count != 0) - cnt += 2; /* '; ' */ + unsigned int len; + + if (cookie_count) cnt += 2; /* '; ' */ cnt += strlenW(thisCookie->lpCookieName); - cnt += 1; /* = */ - cnt += strlenW(thisCookie->lpCookieData); + if ((len = strlenW(thisCookie->lpCookieData))) + { + cnt += 1; /* = */ + cnt += len; + } } else { static const WCHAR szsc[] = { ';',' ',0 }; - static const WCHAR szpseq[] = { '%','s','=','%','s',0 }; - if (cookie_count != 0) - cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szsc); - cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szpseq, - thisCookie->lpCookieName, - thisCookie->lpCookieData); - TRACE("Cookie: %s=%s\n", debugstr_w(thisCookie->lpCookieName), debugstr_w(thisCookie->lpCookieData)); + static const WCHAR szname[] = { '%','s',0 }; + static const WCHAR szdata[] = { '=','%','s',0 }; + + if (cookie_count) cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szsc); + cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szname, thisCookie->lpCookieName); + + if (thisCookie->lpCookieData[0]) + cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szdata, thisCookie->lpCookieData); + + TRACE("Cookie: %s\n", debugstr_w(lpCookieData)); } cookie_count++; } @@ -319,15 +328,14 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if (lpCookieData == NULL) { - cnt += 1; /* NULL */ - *lpdwSize = cnt*sizeof(WCHAR); - TRACE("returning\n"); - return TRUE; + *lpdwSize = (cnt + 1) * sizeof(WCHAR); + TRACE("returning %u\n", *lpdwSize); + return TRUE; } - *lpdwSize = (cnt + 1)*sizeof(WCHAR); + *lpdwSize = cnt + 1; - TRACE("Returning %i (from %i domains): %s\n", cnt, domain_count, + TRACE("Returning %u (from %u domains): %s\n", cnt, domain_count, debugstr_w(lpCookieData)); return (cnt ? TRUE : FALSE); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8a83132..8704f7d 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -285,7 +285,7 @@ static void test_null(void) sz = 0; r = InternetGetCookieW(NULL, NULL, NULL, &sz); - ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); ok( r == FALSE, "return wrong\n"); r = InternetGetCookieW(szServer, NULL, NULL, &sz); @@ -295,25 +295,30 @@ static void test_null(void) ok( r == FALSE, "return wrong\n"); sz = 0; + r = InternetGetCookieW(szUrlEmpty, szServer, NULL, &sz); + ok( r == FALSE, "return wrong\n"); + + sz = 0; r = InternetGetCookieW(szUrl, szServer, NULL, &sz); ok( r == TRUE, "return wrong\n"); - todo_wine { - ok( sz == 30, "sz wrong\n"); - } + + /* sz is 14 on XP SP2 and beyond, 30 on XP SP1 and before */ + ok( sz == 14 || sz == 30, "sz wrong, got %u, expected 14 or 30\n", sz); sz = 0x20; memset(buffer, 0, sizeof buffer); r = InternetGetCookieW(szUrl, szServer, buffer, &sz); ok( r == TRUE, "return wrong\n"); - todo_wine { - ok( sz == lstrlenW(buffer), "sz wrong\n"); - ok( !lstrcmpW(szExpect, buffer), "cookie data wrong\n"); - } + + /* sz == lstrlenW(buffer) only in XP SP1 */ + ok( sz == 1 + lstrlenW(buffer), "sz wrong\n"); + + /* before XP SP2, buffer is "server; server" */ + ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); ok(r == TRUE, "ret %d\n", r); - } /* ############################### */

1 0

Rob Shearman : msxml3: Fix some memory leaks of name in test_xmldoc.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 76d0cab17ddfd11c73d9e13ef421c7b884b46333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d0cab17ddfd11c73d9e13ef… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 14 10:45:29 2007 +0000 msxml3: Fix some memory leaks of name in test_xmldoc. --- dlls/msxml3/tests/xmldoc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index feada7c..1186c9b 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -127,6 +127,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(element, &name); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(!lstrcmpW(name, szBankAccount), "Expected BANKACCOUNT\n"); + SysFreeString(name); hr = IXMLElement_get_children(element, &collection); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); @@ -151,6 +152,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(child, &name); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(!lstrcmpW(name, szNumber), "Expected NUMBER\n"); + SysFreeString(name); hr = IXMLElement_get_children(child, &inner); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); @@ -171,6 +173,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_text(value, &name); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(!lstrcmpW(name, szNumVal), "Expected '1234'\n"); + SysFreeString(name); IXMLElementCollection_Release(inner); @@ -196,6 +199,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_tagName(child, &name); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(!lstrcmpW(name, szName), "Expected NAME\n"); + SysFreeString(name); hr = IXMLElement_get_children(child, &inner); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); @@ -217,6 +221,7 @@ static void test_xmldoc(void) hr = IXMLElement_get_text(value, &name); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(!lstrcmpW(name, szNameVal), "Expected 'Captain Ahab'\n"); + SysFreeString(name); IXMLElementCollection_Release(inner);

1 0

Alexander Nicolaysen Sørnes : application::objectGetEntries() do not select from user table
by Chris Morgan Nov. 15, 2007

Nov. 15, 2007

Module: appdb Branch: master Commit: eda9baadcaf1157fc870bf2321875a1cb338db0e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=eda9baadcaf1157fc870bf23… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Nov 14 09:16:33 2007 +0100 application::objectGetEntries() do not select from user table --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 79fc182..3c8b2ac 100644 --- a/include/application.php +++ b/include/application.php @@ -900,7 +900,7 @@ class Application { $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); } - $sQuery = "SELECT appFamily.*, vendor.vendorName AS vendorName FROM appFamily, user_list, vendor WHERE + $sQuery = "SELECT appFamily.*, vendor.vendorName AS vendorName FROM appFamily, vendor WHERE appFamily.vendorId = vendor.vendorId AND appFamily.queued = '?'";

1 0

Alex Villacís Lasso : user32: Conformance tests for LB_DIR on listboxes.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 56958984dd76b6d62af354c7d44f4a1f1f51a2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=56958984dd76b6d62af354c7d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 10 18:09:41 2007 -0500 user32: Conformance tests for LB_DIR on listboxes. --- dlls/user32/tests/listbox.c | 349 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 349 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56958984dd76b6d62af35…

1 0