wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Michael Stefaniuc : hlink: Use ifaces instead of vtbl pointers in ExtensionService.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 4a6c525659a8a372e0780c76dcaf7db132c208c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c525659a8a372e0780c76d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:36:48 2011 +0100 hlink: Use ifaces instead of vtbl pointers in ExtensionService. --- dlls/hlink/extserv.c | 103 ++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a6c525659a8a372e0780…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLEmbedElement iface.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1503a1ff4039a62fa4d1ebf78f9100850236959a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1503a1ff4039a62fa4d1ebf78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 5 00:35:12 2011 +0100 mshtml: COM cleanup for the IHTMLEmbedElement iface. --- dlls/mshtml/htmlembed.c | 61 +++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index a3ea1cc..aa1d249 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -35,45 +35,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLEmbedElementVtbl *lpIHTMLEmbedElementVtbl; + IHTMLEmbedElement IHTMLEmbedElement_iface; } HTMLEmbedElement; -#define HTMLEMBED(x) (&(x)->lpIHTMLEmbedElementVtbl) - -#define HTMLEMBED_THIS(iface) DEFINE_THIS(HTMLEmbedElement, IHTMLEmbedElement, iface) +static inline HTMLEmbedElement *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLEmbedElement, IHTMLEmbedElement_iface); +} static HRESULT WINAPI HTMLEmbedElement_QueryInterface(IHTMLEmbedElement *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLEmbedElement_AddRef(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfoCount(IHTMLEmbedElement *iface, UINT *pctinfo) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -81,7 +82,7 @@ static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UIN static HRESULT WINAPI HTMLEmbedElement_GetIDsOfNames(IHTMLEmbedElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,111 +91,109 @@ static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEmbedElement_put_hidden(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_palete(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_pluginspage(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_src(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_src(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_units(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_units(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_name(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_name(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_width(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_width(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_height(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_height(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = HTMLEMBED_THIS(iface); + HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLEMBED_THIS - static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_QueryInterface, HTMLEmbedElement_AddRef, @@ -230,13 +229,13 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IHTMLEmbedElement, riid)) { TRACE("(%p)->(IID_IHTMLEmbedElement %p)\n", This, ppv); - *ppv = HTMLEMBED(This); + *ppv = &This->IHTMLEmbedElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -278,7 +277,7 @@ HRESULT HTMLEmbedElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem if(!ret) return E_OUTOFMEMORY; - ret->lpIHTMLEmbedElementVtbl = &HTMLEmbedElementVtbl; + ret->IHTMLEmbedElement_iface.lpVtbl = &HTMLEmbedElementVtbl; ret->element.node.vtbl = &HTMLEmbedElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLEmbedElement_dispex);

1 0

André Hentschel : winemaker: Add def file support.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 564c7a571889699fdead758642ef93d636a3a547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564c7a571889699fdead75864… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 4 22:43:01 2011 +0100 winemaker: Add def file support. --- tools/winemaker | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 7e98d77..a0d525b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -3,7 +3,7 @@ use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers # Copyright 2004 Dimitrie O. Paun -# Copyright 2009 André Hentschel +# Copyright 2009-2011 André Hentschel # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.5"; +my $version="0.7.6"; use Cwd; use File::Basename; @@ -266,6 +266,10 @@ my $TF_NODLLS=16; my $TF_NOMSVCRT=32; ## +# This target has a def file (only use it with TT_DLL) +my $TF_HASDEF=64; + +## # Initialize a target: # - set the target type to TT_SETTINGS, i.e. no real target will # be generated. @@ -800,6 +804,8 @@ sub source_scan_project_file($$$) } } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; + } elsif ($sfilet =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { push @sources_misc,$sfilet; if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @@ -889,6 +895,8 @@ sub source_scan_project_file($$$) } } elsif ($sfilet =~ /\.rc$/i) { push @sources_rc,$sfilet; + } elsif ($sfilet =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($sfilet =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { push @sources_misc,$sfilet; if ($sfilet =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @@ -1012,7 +1020,11 @@ sub source_scan_project_file($$$) push @local_depends,"$prj_name.so"; push @local_dlls,$prj_name; my $canon=canonize($prj_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + if (@$project_settings[$T_FLAGS] & $TF_HASDEF) { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)"); + } else { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + } } @$target[$T_NAME]=$prj_name; @@ -1295,6 +1307,8 @@ sub source_scan_directory($$$$) } } elsif ($dentry =~ /\.rc$/i) { push @sources_rc,"$dentry"; + } elsif ($dentry =~ /\.def$/i) { + @$project_settings[$T_FLAGS]|=$TF_HASDEF; } elsif ($dentry =~ /\.(h|hxx|hpp|inl|rc2|dlg)$/i) { $has_headers=1; push @sources_misc,"$dentry"; @@ -1507,7 +1521,11 @@ sub source_scan_directory($$$$) push @local_depends,"$target_name.so"; push @local_dlls,$target_name; my $canon=canonize($target_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + if (@$project_settings[$T_FLAGS] & $TF_HASDEF) { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)"); + } else { + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); + } } else { @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target; @@ -1736,7 +1754,7 @@ sub fix_file_and_directory_names($) `head -n 1 "$dirname/$dentry"` =~ /Generated by Winemaker/); # Leave non-source files alone - next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc))$/i); + next if ($new_name !~ /(^makefile|\.(c|cpp|h|rc|spec|def))$/i); # Only all lowercase extensions are supported (because of # rules like '.c.o:'). @@ -2480,7 +2498,9 @@ sub generate_project_files($) my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; - if (@$target[$T_TYPE] == $TT_DLL) { + if (@$target[$T_TYPE] == $TT_DLL && (@$project_settings[$T_FLAGS] & $TF_HASDEF)) { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.def)\n"; + } elsif (@$target[$T_TYPE] == $TT_DLL) { print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; } else { print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; @@ -2553,9 +2573,9 @@ $opt_no_banner=0; sub print_banner() { print "Winemaker $version\n"; - print "Copyright 2000 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; + print "Copyright 2000-2004 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; print "Copyright 2004 Dimitrie O. Paun\n"; - print "Copyright 2009 André Hentschel\n"; + print "Copyright 2009-2011 André Hentschel\n"; } sub usage()

1 0

Vincent Povirk : windowscodecs: Store an impl pointer instead of an iface pointer.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 5fd834fc956f9b54bbe653b651747f8c28809478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd834fc956f9b54bbe653b65… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jan 4 14:01:45 2011 -0600 windowscodecs: Store an impl pointer instead of an iface pointer. --- dlls/windowscodecs/bmpencode.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b79a19b..4b3b9ea 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -410,7 +410,7 @@ typedef struct BmpEncoder { const IWICBitmapEncoderVtbl *lpVtbl; LONG ref; IStream *stream; - IWICBitmapFrameEncode *frame; + BmpFrameEncode *frame; } BmpEncoder; static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, @@ -456,7 +456,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); - if (This->frame) IWICBitmapFrameEncode_Release(This->frame); + if (This->frame) IWICBitmapFrameEncode_Release((IWICBitmapFrameEncode*)This->frame); HeapFree(GetProcessHeap(), 0, This); } @@ -553,7 +553,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->committed = FALSE; *ppIFrameEncode = (IWICBitmapFrameEncode*)encode; - This->frame = (IWICBitmapFrameEncode*)encode; + This->frame = encode; return S_OK; } @@ -561,10 +561,9 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) { BmpEncoder *This = (BmpEncoder*)iface; - BmpFrameEncode *frame = (BmpFrameEncode*)This->frame; TRACE("(%p)\n", iface); - if (!frame || !frame->committed) return WINCODEC_ERR_WRONGSTATE; + if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE; return S_OK; }

1 0

Lauri Kenttä : readme: Add Finnish translation.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 11c3150ba90c02847893d0b924fd9016cf7b51df URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c3150ba90c02847893d0b92… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Jan 4 18:03:21 2011 +0200 readme: Add Finnish translation. --- documentation/README.fi | 172 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi new file mode 100644 index 0000000..fa9c9cd --- /dev/null +++ b/documentation/README.fi @@ -0,0 +1,172 @@ +1. JOHDANTO + +Wine on ohjelma, jonka avulla Windows-ohjelmia (mukaan luettuna DOS-, +Windows 3.x, Win32 ja Win64 -ohjelmat) voi ajaa Unix-järjestelmissä. +Wine koostuu ohjelmanlataajasta, joka lataa ja käynnistää Windowsin +ohjelmatiedostoja, sekä kirjastosta nimeltä Winelib, joka toteuttaa +Windowsin API-kutsuja niiden Unix- ja X11-vastineiden avulla. Kirjaston +avulla voidaan myös kääntää Windows-koodia natiiveiksi Unix-ohjelmiksi. + +Wine on vapaa ohjelma, ja se on julkaistu GNU LGPL:n alaisena; lisätietoja +lisenssistä on englanniksi tiedostossa LICENSE. + +2. PIKAOPAS + +Kun Wine käännetään lähdekoodeistaan, on suositeltavaa käyttää Winen omaa +asennusohjelmaa, joka ajetaan seuraavalla komennolla Winen lähdekoodin +juurihakemistosta: + +./tools/wineinstall + +Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien +ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä +ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. + + +3. JÄRJESTELMÄVAATIMUKSET + +Winen kääntämiseen tarvitaan jokin seuraavista: + + Linuxin versio 2.0.36 tai uudempi + FreeBSD 6.3 tai uudempi + Solaris x86 9 tai uudempi + NetBSD-current + Mac OS X 10.4 tai uudempi + +Wine vaatii kerneliltä tuen säikeille. Tämän takia toistaiseksi vain yllä +mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tuki +muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. + +Tietoa Linuxille: + Vaikka Linux 2.2.x:n pitäisi yhä toimia ja Linux 2.0.x saattaa toimia + (varhaisissa 2.0.x-versioissa oli säikeisiin liittyviä ongelmia), + on parasta käyttää ajantasaista versiota kuten 2.4.x tai 2.6.x. + +Tietoa FreeBSD:lle: + Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin 6.3 tai 7.0. + FreeBSD 6.3 on mahdollista päivittää niin, että se tukee Wineä; osoitteessa + http://wiki.freebsd.org/Wine kerrotaan tästä lisää. + +Tietoa Solarikselle: + Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.). + Varoitus: vaikka gas olisi asennettu, ei ole varmaa, että gcc käyttää sitä; + voi olla tarpeen joko kääntää gcc uudestaan tai luoda symboliset linkit + ohjelmista "cc", "as" ja "ld" vastaaviin GNU-työkaluihin. + +Tietoa NetBSD:lle: + USER_LDT, SYSVSHM, SYSVSEM ja SYSVMSG täytyy aktivoida kernelistä. + +Tietoa Mac OS X:lle: + Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. + + +Tuetut tiedostojärjestelmät: + Wine toimii useimmilla tiedostojärjestelmillä, mutta Samban kanssa on + ilmoitettu ilmenevän ongelmia. Myöskään NTFS ei tue kaikkia ominaisuuksia, + joita jotkin ohjelmat vaativat. Linuxin tyypillisten tiedostojärjestelmien + (ext3 ym.) käyttö on suositeltavaa. + +Perusvaatimukset: + Koneella täytyy olla X11:n kehitystiedostot (Debianissa xlib6g-dev, + Red Hatissa XFree86-devel). + + Luonnollisesti myös make (yleensä GNU make) on tarpeen. + + Lisäksi tarvitaan flex 2.5.33 tai uudempi sekä bison. + +Valinnaisia tukikirjastoja: + configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. + Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä + paketit ovat hyödyksi. + + 64-bittisissä järjestelmissä täytyy olla kirjastojen 32-bittiset versiot + 32-bittistä Wineä varten. Sivulla http://wiki.winehq.org/WineOn64bit + kerrotaan tästä lisää. Sivulla http://wiki.winehq.org/Wine64 kerrotaan + 64-bittisen Winen kääntämisestä (erikseen tai 32-bittisen version kanssa). + +4. KÄÄNTÄMINEN + +Aiemmin mainitun wineinstall-skriptin sijaan Winen voi kääntää myös +seuraavilla komennoilla: + +./configure +make + +Tämä kääntää ohjelman "wine" sekä lukuisia tukikirjastoja ja -ohjelmia. +Ohjelma "wine" lataa ja käynnistää Windows-ohjelmia. +Kirjastoa "libwine" ("Winelib") voidaan käyttää Windows-lähdekoodin +kääntämiseen Unixissa. + +Komento './configure --help' näyttää asetuksia ja valintoja, joita +käännösprosessiin voi lisätä. + +5. ASENNUS + +Kun Wine on käännetty, komento "make install" asentaa Winen sekä sen man-sivut +ja joitakin muita hyödyllisiä tiedostoja. + +Ennen asennusta pitää muistaa poistaa aiemmat Winen versiot. Poistamista +voi yrittää komennolla "dpkg -r wine", "rpm -e wine" tai "make uninstall". + +Kun Wine on asennettu, voidaan ajaa asetusohjelma "winecfg". Sivustolla +http://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. + + +6. OHJELMIEN AJAMINEN + +Winelle voi antaa joko ohjelmatiedoston koko polun tai pelkän nimen. + +Esimerkiksi Notepad eli Muistio voitaisiin ajaa näin: + + wine notepad (ohjelma yritetään löytää Winen + wine notepad.exe rekisterissä luetelluista paikoista) + + wine c:\\windows\\notepad.exe (kokonainen DOS-polku) + + wine ~/.wine/drive_c/windows/notepad.exe (kokonainen Unix-polku) + + wine notepad.exe readme.txt (ajetaan ohjelma parametrin kanssa) + +Wine ei ole täydellinen, joten on mahdollista, että jotkin ohjelmat kaatuvat. +Siinä tapauksessa komentoriville tulostuu virheloki, joka on syytä liittää +mukaan, jos raportoi virheestä. + + +7. LISÄTIETOJA + +WWW: Winestä on paljon tietoa WineHQ:ssa, http://www.winehq.org/. + Oppaita, ohjelmatietokanta sekä Bugzilla vikojen listaamiseen. + Täältä kannattaa yleensä aloittaa. + +Kysymyksiä: + Sivulle http://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. + +Wiki: Wine Wiki on osoitteessa http://wiki.winehq.org/. + +Postituslistat: + Winen käyttäjille ja kehittäjille on joitakin postituslistoja, + sivulla http://www.winehq.org/forums kerrotaan niistä lisää. + +Virheet: + Ilmoita virheistä Winen Bugzillaan, http://bugs.winehq.org/. + Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta + ilmoitettu jo aiemmin. + +IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. + +Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. + Sivulla http://www.winehq.org/git kerrotaan tästä lisää. + + +Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi +(mieluiten komennon git-format-patch avulla) listalle wine-patches(a)winehq.org, +jotta se voidaan lisätä Winen seuraavaan versioon. + +-- +Alkuperäisen version tekstistä on kirjoittanut +Alexandre Julliard +julliard(a)winehq.org + +Suomeksi kääntänyt +Lauri Kenttä +lauri.kentta(a)gmail.com

1 0

Henri Verbeet : wined3d: Remove IWineD3DBaseTexture::BindTexture() from the public interface.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: d72520b5cc587c8fcf8a599384a21b924072e781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72520b5cc587c8fcf8a59938… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 4 17:42:03 2011 +0100 wined3d: Remove IWineD3DBaseTexture::BindTexture() from the public interface. --- dlls/wined3d/basetexture.c | 7 +- dlls/wined3d/cubetexture.c | 75 ++++++++++++---------- dlls/wined3d/device.c | 4 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 8 ++- dlls/wined3d/texture.c | 135 +++++++++++++++++++++------------------- dlls/wined3d/volume.c | 3 +- dlls/wined3d/volumetexture.c | 37 ++++++----- dlls/wined3d/wined3d_private.h | 14 +++- include/wine/wined3d.idl | 3 - 10 files changed, 155 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d72520b5cc587c8fcf8a5…

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to create_primary_opengl_context().
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: f9a1e8813e2bf57e62c9b168122f9aae7b64f407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a1e8813e2bf57e62c9b1681… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 4 17:42:02 2011 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to create_primary_opengl_context(). --- dlls/wined3d/device.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 645af74..f470d45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6219,9 +6219,8 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain } /* Do not call while under the GL lock. */ -static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain) +static HRESULT create_primary_opengl_context(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; HRESULT hr; IWineD3DSurfaceImpl *target; @@ -6244,40 +6243,40 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap swapchain->context[0] = context; swapchain->num_contexts = 1; - create_dummy_textures(This); + create_dummy_textures(device); context_release(context); - hr = This->shader_backend->shader_alloc_private(This); + hr = device->shader_backend->shader_alloc_private(device); if (FAILED(hr)) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); goto err; } - hr = This->frag_pipe->alloc_private(This); + hr = device->frag_pipe->alloc_private(device); if (FAILED(hr)) { ERR("Failed to allocate fragment pipe private data, hr %#x.\n", hr); - This->shader_backend->shader_free_private(This); + device->shader_backend->shader_free_private(device); goto err; } - hr = This->blitter->alloc_private(This); + hr = device->blitter->alloc_private(device); if (FAILED(hr)) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - This->frag_pipe->free_private(This); - This->shader_backend->shader_free_private(This); + device->frag_pipe->free_private(device); + device->shader_backend->shader_free_private(device); goto err; } return WINED3D_OK; err: - context_acquire(This, NULL); - destroy_dummy_textures(This, context->gl_info); + context_acquire(device, NULL); + destroy_dummy_textures(device, context->gl_info); context_release(context); - context_destroy(This, context); + context_destroy(device, context); HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->num_contexts = 0; return hr; @@ -6537,7 +6536,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, } } - hr = create_primary_opengl_context(iface, swapchain); + hr = create_primary_opengl_context(This, swapchain); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); /* All done. There is no need to reload resources or shaders, this will happen automatically on the

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to delete_opengl_contexts().
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 7e0909d0585107e2b0d37ca3e5632d6b471fe3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0909d0585107e2b0d37ca3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 4 17:42:01 2011 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to delete_opengl_contexts(). --- dlls/wined3d/device.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f9d877..645af74 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6172,45 +6172,46 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRE } /* Do not call while under the GL lock. */ -static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain) +static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; IWineD3DBaseShaderImpl *shader; - context = context_acquire(This, NULL); + context = context_acquire(device, NULL); gl_info = context->gl_info; - IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); - LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) + IWineD3DDevice_EnumResources((IWineD3DDevice *)device, reset_unload_resources, NULL); + LIST_FOR_EACH_ENTRY(shader, &device->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { - This->shader_backend->shader_destroy(shader); + device->shader_backend->shader_destroy(shader); } ENTER_GL(); - if(This->depth_blt_texture) { - glDeleteTextures(1, &This->depth_blt_texture); - This->depth_blt_texture = 0; + if (device->depth_blt_texture) + { + glDeleteTextures(1, &device->depth_blt_texture); + device->depth_blt_texture = 0; } - if (This->depth_blt_rb) { - gl_info->fbo_ops.glDeleteRenderbuffers(1, &This->depth_blt_rb); - This->depth_blt_rb = 0; - This->depth_blt_rb_w = 0; - This->depth_blt_rb_h = 0; + if (device->depth_blt_rb) + { + gl_info->fbo_ops.glDeleteRenderbuffers(1, &device->depth_blt_rb); + device->depth_blt_rb = 0; + device->depth_blt_rb_w = 0; + device->depth_blt_rb_h = 0; } LEAVE_GL(); - This->blitter->free_private(This); - This->frag_pipe->free_private(This); - This->shader_backend->shader_free_private(This); - destroy_dummy_textures(This, gl_info); + device->blitter->free_private(device); + device->frag_pipe->free_private(device); + device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, gl_info); context_release(context); - while (This->numContexts) + while (device->numContexts) { - context_destroy(This, This->contexts[0]); + context_destroy(device, device->contexts[0]); } HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->context = NULL; @@ -6387,7 +6388,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock); IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock); - delete_opengl_contexts(iface, swapchain); + delete_opengl_contexts(This, swapchain); if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width;

1 0

Henri Verbeet : wined3d: Use surface_modify_location() to manipulate location flags in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: e5d1a0c72d41d630cd32b1b67c79149e76699dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d1a0c72d41d630cd32b1b67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 4 17:42:00 2011 +0100 wined3d: Use surface_modify_location() to manipulate location flags in IWineD3DSurfaceImpl_Unmap(). Directly setting SFLAG_INFRAWABLE breaks for offscreen render targets, where the drawable and texture are the same thing. Before commit d3fd7b247b35d7c8c453afa2fc07e121ea75214b the explicit load of the texture location with the default RTL_READTEX render target lock mode would have prevented the flags from becomming inconsistent. --- dlls/wined3d/surface.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 278eb5e..96b897a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1884,19 +1884,15 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); + /* Partial rectangle tracking is not commonly implemented, it is only + * done for render targets. INSYSMEM was set before to tell + * surface_load_location() where to read the rectangle from. + * Indrawable is set because all modifications from the partial + * sysmem copy are written back to the drawable, thus the surface is + * merged again in the drawable. The sysmem copy is not fully up to + * date because only a subrectangle was read in Map(). */ if (!fullsurface) - { - /* Partial rectangle tracking is not commonly implemented, it is - * only done for render targets. Overwrite the flags to bring - * them back into a sane state. INSYSMEM was set before to tell - * surface_load_location() where to read the rectangle from. - * Indrawable is set because all modifications from the partial - * sysmem copy are written back to the drawable, thus the surface - * is merged again in the drawable. The sysmem copy is not fully - * up to date because only a subrectangle was read in Map(). */ - This->flags &= ~SFLAG_INSYSMEM; - This->flags |= SFLAG_INDRAWABLE; - } + surface_modify_location(This, SFLAG_INDRAWABLE, TRUE); This->dirtyRect.left = This->currentDesc.Width; This->dirtyRect.top = This->currentDesc.Height;

1 0

Alexandre Julliard : wrc: Do not use translations that are marked fuzzy.
by Alexandre Julliard 05 Jan '11

05 Jan '11

Module: wine Branch: master Commit: 1898f22ca5d2d79750e9820cfe2b4204ea9432cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1898f22ca5d2d79750e9820cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 20:26:13 2011 +0100 wrc: Do not use translations that are marked fuzzy. --- tools/wrc/po.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index fff4c36..2b7ed6d 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -772,8 +772,13 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) msg = find_message( po, msgid, context, &iterator ); po_message_iterator_free( iterator ); - if (msg) (*found)++; - transl = msg ? po_message_msgstr( msg ) : msgid; + if (msg && !po_message_is_fuzzy( msg )) + { + (*found)++; + transl = po_message_msgstr( msg ); + } + else transl = msgid; + new = xmalloc( sizeof(*new) ); new->type = str_unicode; new->size = wine_utf8_mbstowcs( 0, transl, strlen(transl), NULL, 0 );

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
88
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 January 2011