September 2014 - Wine-commits

Henri Verbeet : wined3d: Use the texture resource in wined3d_surface_depth_fill().
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 8aa113750974dde5a6b3e0bb434eeee5c2d758dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa113750974dde5a6b3e0bb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 19 10:41:49 2014 +0200 wined3d: Use the texture resource in wined3d_surface_depth_fill(). --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9603e21..73f964d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1102,7 +1102,7 @@ static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const RECT *rect, float depth) { - const struct wined3d_resource *resource = &surface->resource; + const struct wined3d_resource *resource = &surface->container->resource; struct wined3d_device *device = resource->device; const struct blit_shader *blitter;

1 0

Nikolay Sivov : dwrite: Added IDWriteTypography implementation.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: c67f930a9f191d68890c8915612c396d2eacac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67f930a9f191d68890c89156… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 19 07:54:00 2014 +0400 dwrite: Added IDWriteTypography implementation. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 127 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/layout.c | 46 ++++++++++++++++ 4 files changed, 176 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 77834cd..626230e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -88,6 +88,7 @@ extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; +extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 82525d8..0b33b92 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -122,6 +122,15 @@ struct dwrite_trimmingsign { LONG ref; }; +struct dwrite_typography { + IDWriteTypography IDWriteTypography_iface; + LONG ref; + + DWRITE_FONT_FEATURE *features; + UINT32 allocated; + UINT32 count; +}; + static const IDWriteTextFormatVtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) @@ -152,6 +161,11 @@ static inline struct dwrite_trimmingsign *impl_from_IDWriteInlineObject(IDWriteI return CONTAINING_RECORD(iface, struct dwrite_trimmingsign, IDWriteInlineObject_iface); } +static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypography *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_typography, IDWriteTypography_iface); +} + /* To be used in IDWriteTextLayout methods to validate and fix passed range */ static inline BOOL validate_text_range(struct dwrite_textlayout *layout, DWRITE_TEXT_RANGE *r) { @@ -1787,3 +1801,116 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle return S_OK; } + +static HRESULT WINAPI dwritetypography_QueryInterface(IDWriteTypography *iface, REFIID riid, void **obj) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + + TRACE("(%p)->(%s %p)\n", typography, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteTypography) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IDWriteTypography_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritetypography_AddRef(IDWriteTypography *iface) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + ULONG ref = InterlockedIncrement(&typography->ref); + TRACE("(%p)->(%d)\n", typography, ref); + return ref; +} + +static ULONG WINAPI dwritetypography_Release(IDWriteTypography *iface) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + ULONG ref = InterlockedDecrement(&typography->ref); + + TRACE("(%p)->(%d)\n", typography, ref); + + if (!ref) { + heap_free(typography->features); + heap_free(typography); + } + + return ref; +} + +static HRESULT WINAPI dwritetypography_AddFontFeature(IDWriteTypography *iface, DWRITE_FONT_FEATURE feature) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + + TRACE("(%p)->(%x %u)\n", typography, feature.nameTag, feature.parameter); + + if (typography->count == typography->allocated) { + DWRITE_FONT_FEATURE *ptr = heap_realloc(typography->features, 2*typography->allocated*sizeof(DWRITE_FONT_FEATURE)); + if (!ptr) + return E_OUTOFMEMORY; + + typography->features = ptr; + typography->allocated *= 2; + } + + typography->features[typography->count++] = feature; + return S_OK; +} + +static UINT32 WINAPI dwritetypography_GetFontFeatureCount(IDWriteTypography *iface) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + TRACE("(%p)\n", typography); + return typography->count; +} + +static HRESULT WINAPI dwritetypography_GetFontFeature(IDWriteTypography *iface, UINT32 index, DWRITE_FONT_FEATURE *feature) +{ + struct dwrite_typography *typography = impl_from_IDWriteTypography(iface); + + TRACE("(%p)->(%u %p)\n", typography, index, feature); + + if (index >= typography->count) + return E_INVALIDARG; + + *feature = typography->features[index]; + return S_OK; +} + +static const IDWriteTypographyVtbl dwritetypographyvtbl = { + dwritetypography_QueryInterface, + dwritetypography_AddRef, + dwritetypography_Release, + dwritetypography_AddFontFeature, + dwritetypography_GetFontFeatureCount, + dwritetypography_GetFontFeature +}; + +HRESULT create_typography(IDWriteTypography **ret) +{ + struct dwrite_typography *typography; + + *ret = NULL; + + typography = heap_alloc(sizeof(*typography)); + if (!typography) + return E_OUTOFMEMORY; + + typography->IDWriteTypography_iface.lpVtbl = &dwritetypographyvtbl; + typography->ref = 1; + typography->allocated = 2; + typography->count = 0; + + typography->features = heap_alloc(typography->allocated*sizeof(DWRITE_FONT_FEATURE)); + if (!typography->features) { + heap_free(typography); + return E_OUTOFMEMORY; + } + + *ret = &typography->IDWriteTypography_iface; + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bcddbba..c626201 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -696,8 +696,8 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p): stub\n", This, typography); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, typography); + return create_typography(typography); } static HRESULT WINAPI dwritefactory_GetGdiInterop(IDWriteFactory *iface, IDWriteGdiInterop **gdi_interop) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b778a80..2e4618a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -750,6 +750,51 @@ todo_wine IDWriteTextLayout_Release(layout); } +static void test_typography(void) +{ + DWRITE_FONT_FEATURE feature; + IDWriteTypography *typography; + UINT32 count; + HRESULT hr; + + hr = IDWriteFactory_CreateTypography(factory, &typography); + ok(hr == S_OK, "got 0x%08x\n", hr); + + feature.nameTag = DWRITE_FONT_FEATURE_TAG_KERNING; + feature.parameter = 1; + hr = IDWriteTypography_AddFontFeature(typography, feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = IDWriteTypography_GetFontFeatureCount(typography); + ok(count == 1, "got %u\n", count); + + /* duplicated features work just fine */ + feature.nameTag = DWRITE_FONT_FEATURE_TAG_KERNING; + feature.parameter = 0; + hr = IDWriteTypography_AddFontFeature(typography, feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = IDWriteTypography_GetFontFeatureCount(typography); + ok(count == 2, "got %u\n", count); + + memset(&feature, 0, sizeof(feature)); + hr = IDWriteTypography_GetFontFeature(typography, 0, &feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); + ok(feature.parameter == 1, "got %u\n", feature.parameter); + + memset(&feature, 0, sizeof(feature)); + hr = IDWriteTypography_GetFontFeature(typography, 1, &feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); + ok(feature.parameter == 0, "got %u\n", feature.parameter); + + hr = IDWriteTypography_GetFontFeature(typography, 2, &feature); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IDWriteTypography_Release(typography); +} + START_TEST(layout) { HRESULT hr; @@ -773,6 +818,7 @@ START_TEST(layout) test_fontweight(); test_SetInlineObject(); test_draw_sequence(); + test_typography(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : mshtml: Don't include leading '?' in nsIURL:: GetSearch implementation.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 47a7d835d4e62f45516f76464c7661b6a5482a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a7d835d4e62f45516f76464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 13:00:01 2014 +0200 mshtml: Don't include leading '?' in nsIURL::GetSearch implementation. --- dlls/mshtml/nsio.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 901b5b9..9335428 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2627,10 +2627,27 @@ static nsresult NSAPI nsURL_SetFilePath(nsIFileURL *iface, const nsACString *aFi static nsresult NSAPI nsURL_GetQuery(nsIFileURL *iface, nsACString *aQuery) { nsWineURI *This = impl_from_nsIFileURL(iface); + WCHAR *ptr; + BSTR query; + nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aQuery); - return get_uri_string(This, Uri_PROPERTY_QUERY, aQuery); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetQuery(This->uri, &query); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + ptr = query; + if(ptr && *ptr == '?') + ptr++; + + nsres = return_wstr_nsacstr(aQuery, ptr, -1); + SysFreeString(query); + return nsres; } static nsresult NSAPI nsURL_SetQuery(nsIFileURL *iface, const nsACString *aQuery)

1 0

Jacek Caban : mshtml: Make listStyle tests less strict about value order.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 8b4c120453461cd40f5ae38f3bfd8f1d30f12678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4c120453461cd40f5ae38f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 13:19:47 2014 +0200 mshtml: Make listStyle tests less strict about value order. --- dlls/mshtml/tests/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d8c86b1..ed9338d 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2351,7 +2351,7 @@ static void test_body_style(IHTMLStyle *style) if (hres != E_INVALIDARG) { hres = IHTMLStyle_get_listStyle(style, &str); ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); - ok(strstr_wa(str, "decimal-leading-zero") == str && + ok(strstr_wa(str, "decimal-leading-zero") && strstr_wa(str, "none") != NULL && strstr_wa(str, "inside") != NULL, "listStyle = %s\n", wine_dbgstr_w(str));

1 0

Jacek Caban : mshtml: Don't use nsIDOMHTMLParamElement.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 2f849ce3c9d2915d2915353fd68a538527a64ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f849ce3c9d2915d2915353fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 13:26:10 2014 +0200 mshtml: Don't use nsIDOMHTMLParamElement. It will be removed in the next Gecko update anyway. --- dlls/mshtml/nsiface.idl | 17 ----------------- dlls/mshtml/propbag.c | 25 +++++++++++-------------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 89a9740..a5275e7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2220,23 +2220,6 @@ interface nsIDOMHTMLObjectElement : nsIDOMHTMLElement [ object, - uuid(f85e1b05-6dc4-442d-bea8-7cf551f9bc9f), - local -] -interface nsIDOMHTMLParamElement : nsIDOMHTMLElement -{ - nsresult GetName(nsAString *aName); - nsresult SetName(const nsAString *aName); - nsresult GetType(nsAString *aType); - nsresult SetType(const nsAString *aType); - nsresult GetValue(nsAString *aValue); - nsresult SetValue(const nsAString *aValue); - nsresult GetValueType(nsAString *aValueType); - nsresult SetValueType(const nsAString *aValueType); -} - -[ - object, uuid(e81273e1-d440-4dd3-9073-8199f7a9525e), local ] diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index 2aacb53..f9ae158 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -270,15 +270,18 @@ static const IPropertyBag2Vtbl PropertyBag2Vtbl = { static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) { - nsIDOMHTMLParamElement *nsparam; + const PRUnichar *name, *value; nsAString name_str, value_str; nsIDOMHTMLCollection *params; + nsIDOMHTMLElement *param_elem; UINT32 length, i; nsIDOMNode *nsnode; nsresult nsres; HRESULT hres = S_OK; + static const PRUnichar nameW[] = {'n','a','m','e',0}; static const PRUnichar paramW[] = {'p','a','r','a','m',0}; + static const PRUnichar valueW[] = {'v','a','l','u','e',0}; nsAString_InitDepend(&name_str, paramW); nsres = nsIDOMHTMLElement_GetElementsByTagName(nselem, &name_str, &params); @@ -297,31 +300,25 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) break; } - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLParamElement, (void**)&nsparam); + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&param_elem); nsIDOMNode_Release(nsnode); if(NS_FAILED(nsres)) { hres = E_FAIL; break; } - nsAString_Init(&name_str, NULL); - nsres = nsIDOMHTMLParamElement_GetName(nsparam, &name_str); + nsres = get_elem_attr_value(param_elem, nameW, &name_str, &name); if(NS_SUCCEEDED(nsres)) { - nsAString_Init(&value_str, NULL); - nsres = nsIDOMHTMLParamElement_GetValue(nsparam, &value_str); + nsres = get_elem_attr_value(param_elem, valueW, &value_str, &value); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *name, *value; - - nsAString_GetData(&name_str, &name); - nsAString_GetData(&value_str, &value); - hres = add_prop(prop_bag, name, value); + nsAString_Finish(&value_str); } - nsAString_Finish(&value_str); + + nsAString_Finish(&name_str); } - nsAString_Finish(&name_str); - nsIDOMHTMLParamElement_Release(nsparam); + nsIDOMHTMLElement_Release(param_elem); if(FAILED(hres)) break; if(NS_FAILED(nsres)) {

1 0

Alexandre Julliard : Release 1.7.27.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 2a257f06843061db4840814462c44951e019a8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a257f06843061db484081446… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 20:10:47 2014 +0200 Release 1.7.27. --- ANNOUNCE | 421 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 191 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a257f06843061db48408…

1 0

Tag wine-1.7.27 : Alexandre Julliard : Release 1.7.27
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: refs/tags/wine-1.7.27 Tag: 4be2dad7a2ce0c5d23df61ceb264a1fc20e6aa96 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4be2dad7a2ce0c5d23df61ceb264… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 20:10:47 2014 +0200 Release 1.7.27

1 0

Henri Verbeet : d3d10core: Set the initial blend factors to 1.0f.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 0ed857fdcc6d1f7b1f32464113603e4ab6e02482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed857fdcc6d1f7b1f3246411… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:28 2014 +0200 d3d10core: Set the initial blend factors to 1.0f. --- dlls/d3d10core/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f8c9d37..a1ecd5c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2324,6 +2324,10 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) WARN("Failed to initialize blend state rbtree.\n"); return E_FAIL; } + device->blend_factor[0] = 1.0f; + device->blend_factor[1] = 1.0f; + device->blend_factor[2] = 1.0f; + device->blend_factor[3] = 1.0f; if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) {

1 0

Henri Verbeet : d3d10core: Set the initial sample mask to D3D10_DEFAULT_SAMPLE_MASK.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: f50e543c7adc5b6ed5cd84a5e854bb46446639b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50e543c7adc5b6ed5cd84a5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 18 10:56:29 2014 +0200 d3d10core: Set the initial sample mask to D3D10_DEFAULT_SAMPLE_MASK. --- dlls/d3d10core/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index a1ecd5c..5bdb8af 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2328,6 +2328,7 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) device->blend_factor[1] = 1.0f; device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; + device->sample_mask = D3D10_DEFAULT_SAMPLE_MASK; if (wine_rb_init(&device->depthstencil_states, &d3d10_depthstencil_state_rb_ops) == -1) {

1 0

Jacek Caban : wininet: Properly clean up in InternetGetCookieExW if no cookies were found.
by Alexandre Julliard 18 Sep '14

18 Sep '14

Module: wine Branch: master Commit: 1f12306144aad4c550be9a6d700dd605c88b56fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f12306144aad4c550be9a6d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 18 13:01:36 2014 +0200 wininet: Properly clean up in InternetGetCookieExW if no cookies were found. --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index aec3edd..d2fbec3 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -794,7 +794,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, }else { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; + ret = FALSE; } heap_free(cookie_set.cookies);

1 0