July 2014 - Wine-Commits - list.winehq.org

Ken Thomases : dbghelp: Ignore the __PAGEZERO segment.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 5acf1510fbe4f17d35443666ddd9d123de253e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acf1510fbe4f17d35443666d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 7 15:36:14 2014 -0500 dbghelp: Ignore the __PAGEZERO segment. It made it seem as though the wineloader always started at address 0. Issue identified by Jacek Caban. --- dlls/dbghelp/macho_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ebea4fd..2eb2b94 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -398,6 +398,11 @@ static int macho_accum_segs_range(struct macho_file_map* fmap, TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); return 0; } + if (!strncmp(sc->segname, "__PAGEZERO", 10)) + { + TRACE("Ignoring __PAGEZERO segment\n"); + return 0; + } /* If this segment starts before previously-known earliest, record * new earliest. */

1 0

Stefan Dösinger : ddraw: Refuse SetPalette and GetPalette on lost surfaces.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 403d7c1dee11959dfaa781a14ed6f4c8fae90292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403d7c1dee11959dfaa781a14… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 6 18:06:43 2014 +0200 ddraw: Refuse SetPalette and GetPalette on lost surfaces. The SetPalette check is outside of ddraw_surface_set_palette to make sure the palettes are properly freed when a lost P8 surface is destroyed. --- dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e0fdf81..3d61e61 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4515,6 +4515,11 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir if (!palette) return DDERR_INVALIDPARAMS; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } wined3d_mutex_lock(); if ((palette_impl = surface->palette)) @@ -4705,6 +4710,11 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } return ddraw_surface_set_palette(surface, palette); } @@ -4715,6 +4725,12 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface4_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4724,6 +4740,12 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface3_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4733,6 +4755,12 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface2_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); } @@ -4742,6 +4770,12 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); + if (IDirectDrawSurface_IsLost(iface) == DDERR_SURFACELOST) + { + WARN("Surface lost, returning DDERR_SURFACELOST.\n"); + return DDERR_SURFACELOST; + } + return ddraw_surface_set_palette(surface, palette); }

1 0

Francois Gouget : shlwapi/tests: Make test_PathIsRelative[AW]() static.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: ece6f5c3e00fc3834fe9944cb370e9b972446cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece6f5c3e00fc3834fe9944cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 5 11:15:09 2014 +0200 shlwapi/tests: Make test_PathIsRelative[AW]() static. --- dlls/shlwapi/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 9fe70cd..1599313 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1600,7 +1600,7 @@ static const struct { {"file:///C:/test.txt", TRUE} }; -void test_PathIsRelativeA(void) +static void test_PathIsRelativeA(void) { BOOL ret; int i, num; @@ -1619,7 +1619,7 @@ void test_PathIsRelativeA(void) } } -void test_PathIsRelativeW(void) +static void test_PathIsRelativeW(void) { BOOL ret; int i, num;

1 0

Stefan Dösinger : wined3d: Do not write a FIXME about WINED3DUSAGE_WRITEONLY.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 4b88d51bc9ce7c41c01a2c046f7b412eace5f380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b88d51bc9ce7c41c01a2c046… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 6 18:06:42 2014 +0200 wined3d: Do not write a FIXME about WINED3DUSAGE_WRITEONLY. --- dlls/wined3d/resource.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 999dc5c..3a54dd8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -26,6 +26,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static DWORD resource_access_from_pool(enum wined3d_pool pool) { @@ -51,6 +52,7 @@ static void resource_check_usage(DWORD usage) { static const DWORD handled = WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL @@ -59,6 +61,8 @@ static void resource_check_usage(DWORD usage) if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); + if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used without WINED3DUSAGE_WRITEONLY.\n"); } HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device,

1 0

Bruno Jesus : dnsapi: Do not fail if NETDB_INTERNAL is not present.
by Alexandre Julliard July 7, 2014

July 7, 2014

Module: wine Branch: master Commit: 836e6690d456c0f5e095be42a8ed15252160ff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836e6690d456c0f5e095be42a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 6 22:22:18 2014 -0300 dnsapi: Do not fail if NETDB_INTERNAL is not present. --- dlls/dnsapi/query.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 578239e..e05205b 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -147,7 +147,9 @@ static DNS_STATUS dns_map_h_errno( int error ) case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR; case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE; case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED; +#ifdef NETDB_INTERNAL case NETDB_INTERNAL: return DNS_ERROR_RCODE; +#endif default: FIXME( "unmapped error code: %d\n", error ); return DNS_ERROR_RCODE_NOT_IMPLEMENTED;

1 0

Jactry Zeng : riched20: Return nonzero value instead of zero when EM_SETREADONLY succeeds.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 455eca6d228a4850214345be2cccc665bece5a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=455eca6d228a4850214345be2… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Jul 4 22:51:35 2014 +0800 riched20: Return nonzero value instead of zero when EM_SETREADONLY succeeds. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f0d6590..43d74ec 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3479,7 +3479,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->styleFlags |= ES_READONLY; else editor->styleFlags &= ~ES_READONLY; - return 0; + return 1; } case EM_SETEVENTMASK: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5421614..3bd3ec0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7576,6 +7576,25 @@ static void test_reset_default_para_fmt( void ) DestroyWindow( richedit ); } +static void test_EM_SETREADONLY(void) +{ + HWND richedit = new_richeditW(NULL); + DWORD dwStyle; + LRESULT res; + + res = SendMessageA(richedit, EM_SETREADONLY, TRUE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + res = SendMessageA(richedit, EM_SETREADONLY, FALSE, 0); + ok(res == 1, "EM_SETREADONLY\n"); + dwStyle = GetWindowLongA(richedit, GWL_STYLE); + ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + + DestroyWindow(richedit); +} + START_TEST( editor ) { BOOL ret; @@ -7639,6 +7658,7 @@ START_TEST( editor ) test_enter(); test_WM_CREATE(); test_reset_default_para_fmt(); + test_EM_SETREADONLY(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Vincent Povirk : urlmon: Add tests for implicit file uri' s with percent encodings.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: dd1423d97b1ef715fb90d88672aee597014913f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1423d97b1ef715fb90d8867… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 3 11:45:54 2014 -0500 urlmon: Add tests for implicit file uri's with percent encodings. --- dlls/urlmon/tests/uri.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 737d1bb..d448566 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4571,7 +4571,107 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_MAILTO,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "c:\\test file.html", Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file://c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test%20file.html", Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file://c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test file.html", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file:///c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/test%20file.html",S_OK,FALSE}, + {"/c:/test%20file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "c:\\test%20file.html", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, S_OK, FALSE, + { + {"file:///c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/test%2520file.html",S_OK,FALSE}, + {"/c:/test%2520file.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test%20file.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + } }; typedef struct _invalid_uri {

1 0

Akihiro Sagawa : winmm: Fallback to SND_FILENAME if the alias isn' t found in the profile.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 113a2abbc8257fc4d83682c5c5fe4f344569806f URL: http://source.winehq.org/git/wine.git/?a=commit;h=113a2abbc8257fc4d83682c5c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 5 00:37:12 2014 +0900 winmm: Fallback to SND_FILENAME if the alias isn't found in the profile. --- dlls/winmm/playsound.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 64db333..f8bd91f 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -338,6 +338,11 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) else goto errCleanUp; } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); + if (!hmmio) + { + wps->fdwSound &= ~SND_ALIAS; + wps->fdwSound |= SND_FILENAME; + } } if (!hmmio && wps->fdwSound & SND_FILENAME) {

1 0

Jacek Caban : wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 314e295820660a2aa325e0dbc244dc7990514b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314e295820660a2aa325e0dbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:26 2014 +0200 wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetSetCookieEx. --- dlls/wininet/cookie.c | 24 ++++++++++++++++-------- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 015f99d..36e0f60 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -810,7 +810,7 @@ BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) return TRUE; } -DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) +DWORD set_cookie(const WCHAR *domain, const WCHAR *path, const WCHAR *cookie_name, const WCHAR *cookie_data, DWORD flags) { cookie_domain *thisCookieDomain = NULL; cookie *thisCookie; @@ -819,7 +819,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook WCHAR *ptr; FILETIME expiry, create; BOOL expired = FALSE, update_persistent = FALSE; - DWORD flags = 0; + DWORD cookie_flags = 0; value = data = heap_strdupW(cookie_data); if (!data) @@ -910,7 +910,15 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook } else if (strncmpiW(ptr, szHttpOnly, 8) == 0) { - FIXME("httponly not handled (%s)\n",debugstr_w(ptr)); + if(!(flags & INTERNET_COOKIE_HTTPONLY)) { + WARN("HTTP only cookie added without INTERNET_COOKIE_HTTPONLY flag\n"); + heap_free(data); + if (value != data) heap_free(value); + SetLastError(ERROR_INVALID_OPERATION); + return COOKIE_STATE_REJECT; + } + + cookie_flags |= INTERNET_COOKIE_HTTPONLY; ptr += strlenW(szHttpOnly); } else if (*ptr) @@ -946,7 +954,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook } if(!expiry.dwLowDateTime && !expiry.dwHighDateTime) - flags |= INTERNET_COOKIE_IS_SESSION; + cookie_flags |= INTERNET_COOKIE_IS_SESSION; else update_persistent = TRUE; @@ -960,7 +968,7 @@ DWORD set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cook TRACE("setting cookie %s=%s for domain %s path %s\n", debugstr_w(cookie_name), debugstr_w(value), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath)); - if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, flags)) + if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name, value, expiry, create, cookie_flags)) { heap_free(data); if (value != data) heap_free(value); @@ -993,7 +1001,7 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData), flags, reserved); - if (flags) + if (flags & ~INTERNET_COOKIE_HTTPONLY) FIXME("flags %x not supported\n", flags); if (!lpszUrl || !lpCookieData) @@ -1024,12 +1032,12 @@ DWORD WINAPI InternetSetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie); else *data++ = 0; - res = set_cookie(hostName, path, cookie, data); + res = set_cookie(hostName, path, cookie, data, flags); heap_free(cookie); return res; } - return set_cookie(hostName, path, lpszCookieName, lpCookieData); + return set_cookie(hostName, path, lpszCookieName, lpCookieData, flags); } /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bb53a03..af57d9e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -767,7 +767,7 @@ static void HTTP_ProcessCookies( http_request_t *request ) continue; data++; - set_cookie(host->lpszValue, request->path, name, data); + set_cookie(host->lpszValue, request->path, name, data, INTERNET_COOKIE_HTTPONLY); heap_free(name); } } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 45a13ca..233c40c 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; -DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: b3cfae810853b4cc59519c1255bd796e6de9301e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cfae810853b4cc59519c125… Author: Jacek Caban <jacek(a)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;

1 0