Jacek Caban : wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 4 14:07:33 CDT 2014
Module: wine
Branch: master
Commit: b3cfae810853b4cc59519c1255bd796e6de9301e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cfae810853b4cc59519c1255bd796e6de9301e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Jul 4 14:45:17 2014 +0200
wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around.
---
dlls/wininet/cookie.c | 77 +++++++++++++++++++++----------------------------
dlls/wininet/internet.h | 2 +-
2 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index fbc6949..015f99d 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -810,7 +810,7 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 )
return TRUE;
}
-BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data)
+DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data)
{
cookie_domain *thisCookieDomain = NULL;
cookie *thisCookie;
@@ -825,7 +825,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
if (!data)
{
ERR("could not allocate the cookie data buffer\n");
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
memset(&expiry,0,sizeof(expiry));
@@ -851,7 +851,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
{
heap_free(data);
ERR("could not allocate the cookie value buffer\n");
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
strcpyW(value, data);
@@ -873,7 +873,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
if(value != data)
heap_free(value);
heap_free(data);
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
if(end_ptr)
@@ -941,7 +941,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
heap_free(data);
if (value != data) heap_free(value);
LeaveCriticalSection(&cookie_cs);
- return TRUE;
+ return COOKIE_STATE_ACCEPT;
}
}
@@ -965,7 +965,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
heap_free(data);
if (value != data) heap_free(value);
LeaveCriticalSection(&cookie_cs);
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
heap_free(data);
if (value != data) heap_free(value);
@@ -973,50 +973,49 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki
if (!update_persistent || save_persistent_cookie(thisCookieDomain))
{
LeaveCriticalSection(&cookie_cs);
- return TRUE;
+ return COOKIE_STATE_ACCEPT;
}
LeaveCriticalSection(&cookie_cs);
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
/***********************************************************************
- * InternetSetCookieW (WININET.@)
+ * InternetSetCookieExW (WININET.@)
*
* Sets cookie for the specified url
- *
- * RETURNS
- * TRUE on success
- * FALSE on failure
- *
*/
-BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
- LPCWSTR lpCookieData)
+DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
+ LPCWSTR lpCookieData, DWORD flags, DWORD_PTR reserved)
{
BOOL ret;
WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH];
- TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl),
- debugstr_w(lpszCookieName), debugstr_w(lpCookieData));
+ TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName),
+ debugstr_w(lpCookieData), flags, reserved);
+
+ if (flags)
+ FIXME("flags %x not supported\n", flags);
if (!lpszUrl || !lpCookieData)
{
SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
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 (!ret || !hostName[0]) return COOKIE_STATE_UNKNOWN;
if (!lpszCookieName)
{
WCHAR *cookie, *data;
+ DWORD res;
cookie = heap_strdupW(lpCookieData);
if (!cookie)
{
SetLastError(ERROR_OUTOFMEMORY);
- return FALSE;
+ return COOKIE_STATE_UNKNOWN;
}
/* some apps (or is it us??) try to add a cookie with no cookie name, but
@@ -1025,14 +1024,25 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie);
else *data++ = 0;
- ret = set_cookie(hostName, path, cookie, data);
+ res = set_cookie(hostName, path, cookie, data);
heap_free(cookie);
- return ret;
+ return res;
}
return set_cookie(hostName, path, lpszCookieName, lpCookieData);
}
+/***********************************************************************
+ * InternetSetCookieW (WININET.@)
+ *
+ * Sets a cookie for the specified URL.
+ */
+BOOL WINAPI InternetSetCookieW(const WCHAR *url, const WCHAR *name, const WCHAR *data)
+{
+ TRACE("(%s, %s, %s)\n", debugstr_w(url), debugstr_w(name), debugstr_w(data));
+
+ return InternetSetCookieExW(url, name, data, 0, 0) == COOKIE_STATE_ACCEPT;
+}
/***********************************************************************
* InternetSetCookieA (WININET.@)
@@ -1092,27 +1102,6 @@ DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR
}
/***********************************************************************
- * InternetSetCookieExW (WININET.@)
- *
- * Sets a cookie for the specified URL.
- *
- * RETURNS
- * TRUE on success
- * FALSE on failure
- *
- */
-DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData,
- DWORD dwFlags, DWORD_PTR dwReserved)
-{
- TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n",
- debugstr_w(lpszURL), debugstr_w(lpszCookieName), debugstr_w(lpszCookieData),
- dwFlags, dwReserved);
-
- if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags);
- return InternetSetCookieW(lpszURL, lpszCookieName, lpszCookieData);
-}
-
-/***********************************************************************
* InternetClearAllPerSiteCookieDecisions (WININET.@)
*
* Clears all per-site decisions about cookies.
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index b823e43..45a13ca 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -421,7 +421,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN;
DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN;
-BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN;
+DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN;
void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;
DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list