wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Qian Hong : appwiz.cpl: Fixed typo.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 7f29fc7e91aa7eb88cdb3220ebcbb7a4937301e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f29fc7e91aa7eb88cdb3220e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Sep 24 22:29:01 2014 +0800 appwiz.cpl: Fixed typo. --- dlls/appwiz.cpl/addons.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 1f219d5..b986c6c 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -723,11 +723,11 @@ BOOL install_addon(addon_t addon_type) /* * Try to find addon .msi file in following order: - * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key + * - directory stored in $dir_config_key value of HKCU/Software/Wine/$config_key key * - $datadir/$addon_subdir/ * - $INSTALL_DATADIR/wine/$addon_subdir/ * - /usr/share/wine/$addon_subdir/ - * - download from URL stored in $url_config_key value of HKCU/Wine/Software/$config_key key + * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key */ if (install_from_registered_dir() == INSTALL_NEXT && install_from_default_dir() == INSTALL_NEXT

1 0

Jacek Caban : mshtml: Don't share nslink reference with nsnode.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: a57d87d265380b92ac0ad2efd486ce3693ea0e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57d87d265380b92ac0ad2efd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 16:05:40 2014 +0200 mshtml: Don't share nslink reference with nsnode. --- dlls/mshtml/htmlinput.c | 1 - dlls/mshtml/htmllink.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index d6567a0..62eff21 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1255,7 +1255,6 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO return IHTMLInputElement_get_disabled(&This->IHTMLInputElement_iface, p); } - static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index e636872..39853e4 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -397,6 +397,25 @@ static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p); } +static void HTMLLinkElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nslink) + note_cc_edge((nsISupports*)This->nslink, "This->nslink", cb); +} + +static void HTMLLinkElement_unlink(HTMLDOMNode *iface) +{ + HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nslink) { + nsIDOMHTMLLinkElement *nslink = This->nslink; + + This->nslink = NULL; + nsIDOMHTMLLinkElement_Release(nslink); + } +} static const NodeImplVtbl HTMLLinkElementImplVtbl = { HTMLLinkElement_QI, HTMLElement_destructor, @@ -408,6 +427,13 @@ static const NodeImplVtbl HTMLLinkElementImplVtbl = { NULL, HTMLLinkElementImpl_put_disabled, HTMLLinkElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLLinkElement_traverse, + HTMLLinkElement_unlink }; static const tid_t HTMLLinkElement_iface_tids[] = { @@ -437,10 +463,7 @@ HRESULT HTMLLinkElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLLinkElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLLinkElement, (void**)&ret->nslink); - - /* Share nslink reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nslink == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsstyle reference with nsnode.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 316417cc3df175aeb8290709d6c48f47c7af1488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316417cc3df175aeb8290709d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 16:05:32 2014 +0200 mshtml: Don't share nsstyle reference with nsnode. --- dlls/mshtml/htmlstyleelem.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 3976300..a888059 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -319,13 +319,44 @@ static void HTMLStyleElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(iface); } +static void HTMLStyleElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsstyle) + note_cc_edge((nsISupports*)This->nsstyle, "This->nsstyle", cb); +} + +static void HTMLStyleElement_unlink(HTMLDOMNode *iface) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsstyle) { + nsIDOMHTMLStyleElement *nsstyle = This->nsstyle; + + This->nsstyle = NULL; + nsIDOMHTMLStyleElement_Release(nsstyle); + } +} + static const NodeImplVtbl HTMLStyleElementImplVtbl = { HTMLStyleElement_QI, HTMLStyleElement_destructor, HTMLElement_cpc, HTMLElement_clone, HTMLElement_handle_event, - HTMLElement_get_attr_col + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLStyleElement_traverse, + HTMLStyleElement_unlink }; static const tid_t HTMLStyleElement_iface_tids[] = { @@ -355,10 +386,7 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLStyleElement, (void**)&ret->nsstyle); - - /* Share nsstyle reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsstyle == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don' t share nsframe and nsiframe reference with nsnode.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 727c1ceb1e5341b50ddad6154f35777fc02c27ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=727c1ceb1e5341b50ddad6154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 16:05:25 2014 +0200 mshtml: Don't share nsframe and nsiframe reference with nsnode. --- dlls/mshtml/htmlframe.c | 24 +++++++++++++++++++++++- dlls/mshtml/htmlframebase.c | 5 +---- dlls/mshtml/htmliframe.c | 24 +++++++++++++++++++++++- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index cb4dd5f..fd9fe0b 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -266,6 +266,26 @@ static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) return hres; } +static void HTMLFrameElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFrameElement *This = impl_from_HTMLDOMNode(iface); + + if(This->framebase.nsframe) + note_cc_edge((nsISupports*)This->framebase.nsframe, "This->nsframe", cb); +} + +static void HTMLFrameElement_unlink(HTMLDOMNode *iface) +{ + HTMLFrameElement *This = impl_from_HTMLDOMNode(iface); + + if(This->framebase.nsframe) { + nsIDOMHTMLFrameElement *nsframe = This->framebase.nsframe; + + This->framebase.nsframe = NULL; + nsIDOMHTMLFrameElement_Release(nsframe); + } +} + static const NodeImplVtbl HTMLFrameElementImplVtbl = { HTMLFrameElement_QI, HTMLFrameElement_destructor, @@ -281,7 +301,9 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { HTMLFrameElement_get_readystate, HTMLFrameElement_get_dispid, HTMLFrameElement_invoke, - HTMLFrameElement_bind_to_tree + HTMLFrameElement_bind_to_tree, + HTMLFrameElement_traverse, + HTMLFrameElement_unlink }; static const tid_t HTMLFrameElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 380691f..92421b5 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -707,12 +707,9 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl if(NS_FAILED(nsres)) { This->nsframe = NULL; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); - assert(nsres == NS_OK && (nsIDOMNode*)This->nsiframe == This->element.node.nsnode); + assert(nsres == NS_OK); }else { assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; } - - /* Share the reference with nsnode */ - nsIDOMNode_Release(This->element.node.nsnode); } diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 854d897..47e182a 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -539,6 +539,26 @@ static HRESULT HTMLIFrame_bind_to_tree(HTMLDOMNode *iface) return hres; } +static void HTMLIFrame_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLIFrame *This = impl_from_HTMLDOMNode(iface); + + if(This->framebase.nsiframe) + note_cc_edge((nsISupports*)This->framebase.nsiframe, "This->nsiframe", cb); +} + +static void HTMLIFrame_unlink(HTMLDOMNode *iface) +{ + HTMLIFrame *This = impl_from_HTMLDOMNode(iface); + + if(This->framebase.nsiframe) { + nsIDOMHTMLIFrameElement *nsiframe = This->framebase.nsiframe; + + This->framebase.nsiframe = NULL; + nsIDOMHTMLIFrameElement_Release(nsiframe); + } +} + static const NodeImplVtbl HTMLIFrameImplVtbl = { HTMLIFrame_QI, HTMLIFrame_destructor, @@ -554,7 +574,9 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { HTMLIFrame_get_readystate, HTMLIFrame_get_dispid, HTMLIFrame_invoke, - HTMLIFrame_bind_to_tree + HTMLIFrame_bind_to_tree, + HTMLIFrame_traverse, + HTMLIFrame_unlink }; static const tid_t HTMLIFrame_iface_tids[] = {

1 0

Jacek Caban : mshtml: Don't share nsinput reference with nsnode.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 5f149f52d1125e3ee3c1546868ea76bd3322abd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f149f52d1125e3ee3c154686… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 16:05:18 2014 +0200 mshtml: Don't share nsinput reference with nsnode. --- dlls/mshtml/htmlinput.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 2492579..d6567a0 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1255,6 +1255,27 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO return IHTMLInputElement_get_disabled(&This->IHTMLInputElement_iface, p); } + +static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsinput) + note_cc_edge((nsISupports*)This->nsinput, "This->nsinput", cb); +} + +static void HTMLInputElement_unlink(HTMLDOMNode *iface) +{ + HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsinput) { + nsIDOMHTMLInputElement *nsinput = This->nsinput; + + This->nsinput = NULL; + nsIDOMHTMLInputElement_Release(nsinput); + } +} + static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, HTMLElement_destructor, @@ -1266,6 +1287,13 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElementImpl_fire_event, HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_get_disabled, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLInputElement_traverse, + HTMLInputElement_unlink }; static const tid_t HTMLInputElement_iface_tids[] = { @@ -1296,10 +1324,7 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement, (void**)&ret->nsinput); - - /* Share nsinput reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsinput == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Don't share nsform reference with nsnode.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: c0f8d17c05ac6e4d38cac0e6eba6d66e29e7d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f8d17c05ac6e4d38cac0e6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 16:05:12 2014 +0200 mshtml: Don't share nsform reference with nsnode. --- dlls/mshtml/htmlform.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index df425d1..b85cf4d 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -726,6 +726,26 @@ static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, n return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } +static void HTMLFormElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsform) + note_cc_edge((nsISupports*)This->nsform, "This->nsform", cb); +} + +static void HTMLFormElement_unlink(HTMLDOMNode *iface) +{ + HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + + if(This->nsform) { + nsIDOMHTMLFormElement *nsform = This->nsform; + + This->nsform = NULL; + nsIDOMHTMLFormElement_Release(nsform); + } +} + static const NodeImplVtbl HTMLFormElementImplVtbl = { HTMLFormElement_QI, HTMLElement_destructor, @@ -740,7 +760,10 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { NULL, NULL, HTMLFormElement_get_dispid, - HTMLFormElement_invoke + HTMLFormElement_invoke, + NULL, + HTMLFormElement_traverse, + HTMLFormElement_unlink }; static const tid_t HTMLFormElement_iface_tids[] = { @@ -771,10 +794,7 @@ HRESULT HTMLFormElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement_Init(&ret->element, doc, nselem, &HTMLFormElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLFormElement, (void**)&ret->nsform); - - /* Share the reference with nsnode */ - assert(nsres == NS_OK && (nsIDOMNode*)ret->nsform == ret->element.node.nsnode); - nsIDOMNode_Release(ret->element.node.nsnode); + assert(nsres == NS_OK); *elem = &ret->element; return S_OK;

1 0

Thomas Faber : wined3d: Use correct FXCAPS constant in wined3d_get_device_caps.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: c5b9bdc75a4fc5fe6f19e3fd82f2913dd7128890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b9bdc75a4fc5fe6f19e3fd8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Sep 24 13:01:59 2014 +0200 wined3d: Use correct FXCAPS constant in wined3d_get_device_caps. --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d84533..43f4cdd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4602,7 +4602,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDFXCAPS_BLTSHRINKX | WINEDDFXCAPS_BLTSHRINKXN | WINEDDFXCAPS_BLTSHRINKY | - WINEDDFXCAPS_BLTSHRINKXN | + WINEDDFXCAPS_BLTSHRINKYN | WINEDDFXCAPS_BLTSTRETCHX | WINEDDFXCAPS_BLTSTRETCHXN | WINEDDFXCAPS_BLTSTRETCHY |

1 0

Ralf Habacker : wineps.drv: For each printer start page size and source index with the same value.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 6485c76ed311f2441deffbecf5403fae4637dea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6485c76ed311f2441deffbecf… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Tue Sep 23 12:10:40 2014 +0200 wineps.drv: For each printer start page size and source index with the same value. --- dlls/wineps.drv/ppd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 520355a..f8de57b 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -179,9 +179,6 @@ static const struct { {NULL, 0} }; -static WORD UserPageType = DMPAPER_USER; -static WORD UserBinType = DMBIN_USER; - /*********************************************************************** * * PSDRV_PPDDecodeHex @@ -695,6 +692,8 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) char *def_pagesize_override = NULL, *def_duplex_override = NULL; PAGESIZE *page, *page_cursor2; struct map_context c; + WORD UserPageType = DMPAPER_USER; + WORD UserBinType = DMBIN_USER; TRACE("file %s\n", debugstr_w(fname));

1 0

Nikolay Sivov : dwrite: Implement itemization by script id using Unicode.org data.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: e36025a2a84123af238d6bf68310078ce4cd160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36025a2a84123af238d6bf68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 23 16:35:04 2014 +0400 dwrite: Implement itemization by script id using Unicode.org data. --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/analyzer.c | 262 ++-------------- dlls/dwrite/scripts.c | 796 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/scripts.h | 121 ++++++++ tools/make_unicode | 119 +++++++- 5 files changed, 1053 insertions(+), 248 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e36025a2a84123af238d6…

1 0

André Hentschel : winemenubuilder: Respect TMPDIR environment variable.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: b5eec8131507773eb6688b84e90b072f2ca71812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5eec8131507773eb6688b84e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 23 22:23:35 2014 +0200 winemenubuilder: Respect TMPDIR environment variable. --- programs/winemenubuilder/winemenubuilder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fba3664..5d3bb27 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1141,6 +1141,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; int i; + const char* tmpdir; char *icnsPath = NULL; LARGE_INTEGER zero; HRESULT hr; @@ -1210,7 +1211,8 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico hr = E_OUTOFMEMORY; goto end; } - icnsPath = heap_printf("/tmp/%s.icns", *nativeIdentifier); + if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; + icnsPath = heap_printf("%s/%s.icns", tmpdir, *nativeIdentifier); if (icnsPath == NULL) { hr = E_OUTOFMEMORY;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014