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

Bruno Jesus : dnsapi: Do not fail if NETDB_INTERNAL is not present.
by Alexandre Julliard 07 Jul '14

07 Jul '14

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

Stefan Dösinger : wined3d: Do not write a FIXME about WINED3DUSAGE_WRITEONLY.
by Alexandre Julliard 07 Jul '14

07 Jul '14

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

Stefan Dösinger : ddraw: Refuse SetPalette and GetPalette on lost surfaces.
by Alexandre Julliard 07 Jul '14

07 Jul '14

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

Ken Thomases : dbghelp: If the caller didn' t provide a module load address use the segment start address.
by Alexandre Julliard 07 Jul '14

07 Jul '14

Module: wine Branch: master Commit: 1f2680f5f39f14c3160d689a5237e365334938d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2680f5f39f14c3160d689a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 7 15:35:44 2014 -0500 dbghelp: If the caller didn't provide a module load address use the segment start address. --- dlls/dbghelp/macho_module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index c6270c8..ebea4fd 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1020,6 +1020,8 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, struct module_format* modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); if (!modfmt) goto leave; + if (!load_addr) + load_addr = fmap.segs_start; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module)

1 0

Ken Thomases : dbghelp: Ignore the __PAGEZERO segment.
by Alexandre Julliard 07 Jul '14

07 Jul '14

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

Alexandre Julliard : configure: Always build wine.inf even if we don' t install it.
by Alexandre Julliard 04 Jul '14

04 Jul '14

Module: wine Branch: master Commit: 3bbbb6d5a73d8c45329d72f1f980377ede79f4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbbb6d5a73d8c45329d72f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 21:20:38 2014 +0200 configure: Always build wine.inf even if we don't install it. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 97ee520..7c2a944 100755 --- a/configure +++ b/configure @@ -7535,6 +7535,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` LOADER_RULES=" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -17565,8 +17567,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else as_fn_append LOADER_RULES " -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls diff --git a/configure.ac b/configure.ac index 7d297b0..c913f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -684,6 +684,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` AC_SUBST(LOADER_RULES,[" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -3557,8 +3559,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AS_VAR_APPEND([LOADER_RULES],[" -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls

1 0

Vincent Povirk : urlmon: Add tests for implicit file uri' s with percent encodings.
by Alexandre Julliard 04 Jul '14

04 Jul '14

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

Jacek Caban : wininet: Forward InternetSetCookieExA to InternetSetCookieExW instead of InternetSetCookieA.
by Alexandre Julliard 04 Jul '14

04 Jul '14

Module: wine Branch: master Commit: 9228a3be52efc80b66951abbfe5999b3e18da4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9228a3be52efc80b66951abbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:01 2014 +0200 wininet: Forward InternetSetCookieExA to InternetSetCookieExW instead of InternetSetCookieA. --- dlls/wininet/cookie.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b48cc04..fbc6949 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -1073,12 +1073,22 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, DWORD dwFlags, DWORD_PTR dwReserved) { - TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n", - debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), - dwFlags, dwReserved); + WCHAR *data, *url, *name; + DWORD r; - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetSetCookieA(lpszURL, lpszCookieName, lpszCookieData); + TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName), + debugstr_a(lpszCookieData), dwFlags, dwReserved); + + url = heap_strdupAtoW(lpszURL); + name = heap_strdupAtoW(lpszCookieName); + data = heap_strdupAtoW(lpszCookieData); + + r = InternetSetCookieExW(url, name, data, dwFlags, dwReserved); + + heap_free( data ); + heap_free( name ); + heap_free( url ); + return r; } /***********************************************************************

1 0

Jacek Caban : wininet.h: Added InternetCookieState declaration.
by Alexandre Julliard 04 Jul '14

04 Jul '14

Module: wine Branch: master Commit: 0d5e3e74d5849c9ae0bc108f363dfe061e61f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5e3e74d5849c9ae0bc108f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:07 2014 +0200 wininet.h: Added InternetCookieState declaration. --- include/wininet.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index a1c332b..9e0fb40 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1305,6 +1305,16 @@ BOOLAPI HttpQueryInfoA(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); BOOLAPI HttpQueryInfoW(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); #define HttpQueryInfo WINELIB_NAME_AW(HttpQueryInfo) +typedef enum { + COOKIE_STATE_UNKNOWN, + COOKIE_STATE_ACCEPT, + COOKIE_STATE_PROMPT, + COOKIE_STATE_LEASH, + COOKIE_STATE_DOWNGRADE, + COOKIE_STATE_REJECT, + COOKIE_STATE_MAX = COOKIE_STATE_REJECT +} InternetCookieState; + BOOLAPI InternetClearAllPerSiteCookieDecisions(VOID); BOOLAPI InternetEnumPerSiteCookieDecisionA(LPSTR,ULONG *,ULONG *,ULONG);

1 0

Jacek Caban : wininet: Fixed InternetSetCookieExW return type and forward InternetSetCookieW to InternetSetCookieExW instead of the other way around.
by Alexandre Julliard 04 Jul '14

04 Jul '14

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