wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Piotr Caban : qcap: Fix some memory leaks in Avi Mux.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 98d0ab3a9fce4fa400bc80d32e1562897c73439e URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d0ab3a9fce4fa400bc80d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 13:37:19 2014 +0100 qcap: Fix some memory leaks in Avi Mux. --- dlls/qcap/avimux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index b12dfc0..6c8959f 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -192,8 +192,12 @@ static ULONG WINAPI AviMux_Release(IBaseFilter *iface) BaseOutputPinImpl_Release(&This->out->pin.pin.IPin_iface); - for(i=0; i<This->input_pin_no; i++) + for(i=0; i<This->input_pin_no; i++) { + IPin_Disconnect(&This->in[i]->pin.pin.IPin_iface); + IMemAllocator_Release(This->in[i]->samples_allocator); + This->in[i]->samples_allocator = NULL; BaseInputPinImpl_Release(&This->in[i]->pin.pin.IPin_iface); + } HeapFree(GetProcessHeap(), 0, This->idx1); HeapFree(GetProcessHeap(), 0, This);

1 0

Piotr Caban : qcap: Fix strf chunk size in AviMuxIn_ReceiveConnection.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: f4e201ad46c78512b3fb267d45ef31f5223b6512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e201ad46c78512b3fb267d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 13:36:58 2014 +0100 qcap: Fix strf chunk size in AviMuxIn_ReceiveConnection. --- dlls/qcap/avimux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index a1c4f85..b12dfc0 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1809,9 +1809,9 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, } size = pmt->cbFormat - FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); - avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[iPALETTE_COLORS]))); + avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[vih->bmiHeader.biClrUsed]))); avimuxin->strf->fcc = ckidSTREAMFORMAT; - avimuxin->strf->cb = FIELD_OFFSET(BITMAPINFO, bmiColors[iPALETTE_COLORS]); + avimuxin->strf->cb = FIELD_OFFSET(BITMAPINFO, bmiColors[vih->bmiHeader.biClrUsed]); if(size > avimuxin->strf->cb) size = avimuxin->strf->cb; memcpy(avimuxin->strf->data, &vih->bmiHeader, size);

1 0

Piotr Caban : qcap: Add Avi Mux IBaseFilter::Stop implementation.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: dddc278b4d4a8054ad41f4c056b21e044e95770b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddc278b4d4a8054ad41f4c05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 13:36:45 2014 +0100 qcap: Add Avi Mux IBaseFilter::Stop implementation. --- dlls/qcap/avimux.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 8ec15ba..a1c4f85 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -444,8 +444,143 @@ static HRESULT queue_sample(AviMux *avimux, AviMuxIn *avimuxin, IMediaSample *sa static HRESULT WINAPI AviMux_Stop(IBaseFilter *iface) { AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hr; + int i; + + TRACE("(%p)\n", This); + + if(This->filter.state == State_Stopped) + return S_OK; + + if(This->out->stream) { + AVIEXTHEADER dmlh; + RIFFCHUNK rc; + RIFFLIST rl; + int idx1_off, empty_stream; + + empty_stream = This->out->cur_stream; + for(i=empty_stream+1; ; i++) { + if(i >= This->input_pin_no-1) + i = 0; + if(i == empty_stream) + break; + + This->out->cur_stream = i; + hr = flush_queue(This, This->in[This->out->cur_stream], TRUE); + if(FAILED(hr)) + return hr; + } + + idx1_off = This->out->size; + rc.fcc = ckidAVIOLDINDEX; + rc.cb = This->idx1_entries * sizeof(*This->idx1); + hr = out_write(This, &rc, sizeof(rc)); + if(FAILED(hr)) + return hr; + hr = out_write(This, This->idx1, This->idx1_entries * sizeof(*This->idx1)); + if(FAILED(hr)) + return hr; + /* native writes 8 '\0' characters after the end of RIFF data */ + i = 0; + hr = out_write(This, &i, sizeof(i)); + if(FAILED(hr)) + return hr; + hr = out_write(This, &i, sizeof(i)); + if(FAILED(hr)) + return hr; + + for(i=0; i<This->input_pin_no; i++) { + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + hr = out_seek(This, This->in[i]->ix_off); + if(FAILED(hr)) + return hr; + + This->in[i]->indx->aIndex[This->in[i]->indx->nEntriesInUse].qwOffset = This->in[i]->ix_off; + This->in[i]->indx->aIndex[This->in[i]->indx->nEntriesInUse].dwSize = sizeof(This->in[i]->ix_data); + This->in[i]->indx->aIndex[This->in[i]->indx->nEntriesInUse].dwDuration = This->in[i]->strh.dwLength; + if(This->in[i]->indx->nEntriesInUse) { + This->in[i]->indx->aIndex[This->in[i]->indx->nEntriesInUse].dwDuration -= + This->in[i]->indx->aIndex[This->in[i]->indx->nEntriesInUse-1].dwDuration; + } + This->in[i]->indx->nEntriesInUse++; + hr = out_write(This, This->in[i]->ix, sizeof(This->in[i]->ix_data)); + if(FAILED(hr)) + return hr; + } + + hr = out_seek(This, 0); + if(FAILED(hr)) + return hr; + + rl.fcc = FCC('R','I','F','F'); + rl.cb = This->out->size-sizeof(RIFFCHUNK)-2*sizeof(int); + rl.fccListType = FCC('A','V','I',' '); + hr = out_write(This, &rl, sizeof(rl)); + if(FAILED(hr)) + return hr; + + rl.fcc = FCC('L','I','S','T'); + rl.cb = This->out->movi_off - sizeof(RIFFLIST) - sizeof(RIFFCHUNK); + rl.fccListType = FCC('h','d','r','l'); + hr = out_write(This, &rl, sizeof(rl)); + if(FAILED(hr)) + return hr; + + /* FIXME: set This->avih.dwMaxBytesPerSec value */ + This->avih.dwTotalFrames = (This->stop-This->start) / 10 / This->avih.dwMicroSecPerFrame; + hr = out_write(This, &This->avih, sizeof(This->avih)); + if(FAILED(hr)) + return hr; + + for(i=0; i<This->input_pin_no; i++) { + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + rl.cb = sizeof(FOURCC) + sizeof(AVISTREAMHEADER) + sizeof(RIFFCHUNK) + + This->in[i]->strf->cb + sizeof(This->in[i]->indx_data); + rl.fccListType = ckidSTREAMLIST; + hr = out_write(This, &rl, sizeof(rl)); + if(FAILED(hr)) + return hr; + + hr = out_write(This, &This->in[i]->strh, sizeof(AVISTREAMHEADER)); + if(FAILED(hr)) + return hr; + + hr = out_write(This, This->in[i]->strf, sizeof(RIFFCHUNK) + This->in[i]->strf->cb); + if(FAILED(hr)) + return hr; + + hr = out_write(This, This->in[i]->indx, sizeof(This->in[i]->indx_data)); + if(FAILED(hr)) + return hr; + } + + rl.cb = sizeof(dmlh) + sizeof(FOURCC); + rl.fccListType = ckidODML; + hr = out_write(This, &rl, sizeof(rl)); + if(FAILED(hr)) + return hr; + + memset(&dmlh, 0, sizeof(dmlh)); + dmlh.fcc = ckidAVIEXTHEADER; + dmlh.cb = sizeof(dmlh) - sizeof(RIFFCHUNK); + dmlh.dwGrandFrames = This->in[0]->strh.dwLength; + hr = out_write(This, &dmlh, sizeof(dmlh)); + + rl.cb = idx1_off - This->out->movi_off - sizeof(RIFFCHUNK); + rl.fccListType = FCC('m','o','v','i'); + out_write(This, &rl, sizeof(rl)); + out_flush(This); + + IStream_Release(This->out->stream); + This->out->stream = NULL; + } + + This->filter.state = State_Stopped; + return S_OK; } static HRESULT WINAPI AviMux_Pause(IBaseFilter *iface)

1 0

Jacek Caban : wmp: Added IWMPPlayer4::get_settings implementation.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: fea6fedf29ace809b77be9294350229ed7ffcebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea6fedf29ace809b77be9294… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 12:07:15 2014 +0100 wmp: Added IWMPPlayer4::get_settings implementation. --- dlls/wmp/oleobj.c | 3 + dlls/wmp/player.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 25 +++++ dlls/wmp/wmp_private.h | 1 + 4 files changed, 286 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fea6fedf29ace809b77be…

1 0

Jacek Caban : urlmon: Query bind info object for BINDSTRING_ROOTDOC_URL.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: b61c63af567931f1c825b099368b1980359b8ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61c63af567931f1c825b0993… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 14:40:48 2014 +0100 urlmon: Query bind info object for BINDSTRING_ROOTDOC_URL. --- dlls/urlmon/http.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index d5cef5c..16e5fad 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -282,7 +282,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques HINTERNET internet_session, IInternetBindInfo *bind_info) { HttpProtocol *This = impl_from_Protocol(prot); - LPWSTR addl_header = NULL, post_cookie = NULL; + WCHAR *addl_header = NULL, *post_cookie = NULL, *rootdoc_url = NULL; IServiceProvider *service_provider = NULL; IHttpNegotiate2 *http_negotiate2 = NULL; BSTR url, host, user, pass, path; @@ -326,6 +326,13 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques return INET_E_CANNOT_CONNECT; } + num = 0; + hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ROOTDOC_URL, &rootdoc_url, 1, &num); + if(hres == S_OK && num) { + FIXME("Use root doc URL %s\n", debugstr_w(rootdoc_url)); + CoTaskMemFree(rootdoc_url); + } + num = sizeof(accept_mimes)/sizeof(accept_mimes[0])-1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); if(hres == INET_E_USE_DEFAULT_SETTING) {

1 0

Jacek Caban : urlmon: Fixed protocol tests on IE11.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 9c642455f08bf13fd22417261b191a6ad086fd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c642455f08bf13fd22417261… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 14:40:37 2014 +0100 urlmon: Fixed protocol tests on IE11. --- dlls/urlmon/tests/protocol.c | 14 +++++++++++++- include/urlmon.idl | 8 +++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 8a19329..9ffa04d 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -90,6 +90,7 @@ DEFINE_EXPECT(GetBindString_ACCEPT_MIMES); DEFINE_EXPECT(GetBindString_USER_AGENT); DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(GetBindString_URL); +DEFINE_EXPECT(GetBindString_ROOTDOC_URL); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(QueryService_HttpSecurity); @@ -430,7 +431,12 @@ static IServiceProvider service_provider = { &ServiceProviderVtbl }; static HRESULT WINAPI Stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + static const IID IID_strm_unknown = {0x2f68429a,0x199a,0x4043,{0x93,0x11,0xf2,0xfe,0x7c,0x13,0xcc,0xb9}}; + + if(!IsEqualGUID(&IID_strm_unknown, riid)) /* IE11 */ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + + *ppv = NULL; return E_NOINTERFACE; } @@ -1384,6 +1390,10 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS memcpy(*ppwzStr, binding_urls[tested_protocol], size); return S_OK; } + case BINDSTRING_ROOTDOC_URL: + CHECK_EXPECT(GetBindString_ROOTDOC_URL); + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + return E_NOTIMPL; default: ok(0, "unexpected ulStringType %d\n", ulStringType); } @@ -2843,6 +2853,7 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL use_iuri) SET_EXPECT(ReportProgress_DIRECTBIND); if(!got_user_agent) SET_EXPECT(GetBindString_USER_AGENT); + SET_EXPECT(GetBindString_ROOTDOC_URL); SET_EXPECT(GetBindString_ACCEPT_MIMES); SET_EXPECT(QueryService_HttpNegotiate); SET_EXPECT(BeginningTransaction); @@ -2884,6 +2895,7 @@ static BOOL http_protocol_start(LPCWSTR url, BOOL use_iuri) CHECK_CALLED(GetBindString_USER_AGENT); got_user_agent = TRUE; } + CLEAR_CALLED(GetBindString_ROOTDOC_URL); /* New in IE11 */ CHECK_CALLED(GetBindString_ACCEPT_MIMES); CHECK_CALLED(QueryService_HttpNegotiate); CHECK_CALLED(BeginningTransaction); diff --git a/include/urlmon.idl b/include/urlmon.idl index 94d444a..2ccba5b 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -722,7 +722,13 @@ interface IInternetBindInfo : IUnknown BINDSTRING_URL, BINDSTRING_IID, BINDSTRING_FLAG_BIND_TO_OBJECT, - BINDSTRING_PTR_BIND_CONTEXT + BINDSTRING_PTR_BIND_CONTEXT, + BINDSTRING_XDR_ORIGIN, + BINDSTRING_DOWNLOADPATH, + BINDSTRING_ROOTDOC_URL, + BINDSTRING_INITIAL_FILENAME, + BINDSTRING_PROXY_USERNAME, + BINDSTRING_PROXY_PASSWORD } BINDSTRING; HRESULT GetBindInfo(

1 0

Francois Gouget : d3d10_1: Make debug_d3d10_{driver_type, feature_level}() static.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 305ff1287b224ac7e1b7584ec737cdbb7d08067f URL: http://source.winehq.org/git/wine.git/?a=commit;h=305ff1287b224ac7e1b7584ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 24 23:57:16 2014 +0100 d3d10_1: Make debug_d3d10_{driver_type,feature_level}() static. --- dlls/d3d10_1/d3d10_1_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index c1aa5eb..721fe7d 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -31,7 +31,7 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte #define WINE_D3D10_TO_STR(x) case x: return #x -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) +static const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) { switch (driver_type) { @@ -46,7 +46,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } -const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) +static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) { switch (feature_level) {

1 0

Lauri Kenttä : readme: Update Swedish translation.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: ccd8daf0f8564949e0811decf6a110b95be1a57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd8daf0f8564949e0811decf… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 25 22:10:14 2014 +0200 readme: Update Swedish translation. --- documentation/README.sv | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index d5fe643..7c2ea4c 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -10,6 +10,7 @@ till att porta Windows-kod till vanliga Unix-program. Wine �r fri programvara, utgett under villkoren i GNU LGPL; se filen LICENSE f�r detaljer. + 2. KOM IG�NG N�r du bygger Wine fr�n k�llkod s� rekommenderas du anv�nda Wines @@ -36,24 +37,25 @@ Wine kr operativsystemen ovan som st�ds. Andra operativsystem som st�der kerneltr�dar kommer eventuellt att st�djas i framtiden. -Information f�r FreeBSD +Information f�r FreeBSD: Wine kommer i regel inte att fungera p� FreeBSD-versioner �ldre �n 7.0. Se http://wiki.freebsd.org/Wine f�r mer information. -Information f�r Solaris +Information f�r Solaris: Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). Varning: �ven om gas installeras s� �r det inte s�kert att det anv�nds av gcc. Det s�gs att det �r n�dv�ndigt att antingen bygga gcc p� nytt, eller skapa symboliska l�nkar fr�n "cc", "as" och "ld" till GNU toolchain. -Information f�r NetBSD +Information f�r NetBSD: USER_LDT, SYSVSHM, SYSVSEM och SYSVMSG m�ste vara aktiverade i kerneln. Information f�r Mac OS X: Du beh�ver Xcode 2.4 eller senare f�r att korrekt kunna bygga Wine p� x86. + Mac-drivrutinen kr�ver OS X 10.6 eller senare och kommer inte att byggas p� 10.5. -St�dda filsystem +St�dda filsystem: Wine kan k�ra p� de flesta filsystem, men det har rapporterats problem vad g�ller kompatibilitet d� samba anv�nds f�r att ansluta till filer. NTFS tillhandah�ller inte heller alla filsystemsfunktioner som beh�vs av alla @@ -133,6 +135,12 @@ Internet: Mycket information om Wine finns samlat p Fr�gor: Fr�gor och svar om Wine finns samlade p� http://www.winehq.org/FAQ +Wiki: Wines Wiki finns p� http://wiki.winehq.org + +E-postlistor: + Det finns flera e-postlistor f�r Wine-anv�ndare och -utvecklare; se + http://www.winehq.org/forums f�r mer information. + Fel: Rapportera fel till Wines Bugzilla p� http://bugs.winehq.org S�k i Bugzilla-databasen f�r att se om problemet redan finns rapporterat innan du s�nder en felrapport. @@ -143,12 +151,6 @@ IRC: Hj Git: Wines nuvarande utvecklingsversion finns tillg�nglig genom Git. G� till http://www.winehq.org/git f�r mer information. -E-postlistor: - Det finns flera e-postlistor f�r Wine-anv�ndare och -utvecklare; se - http://www.winehq.org/forums f�r mer information. - -Wiki: Wines Wiki finns p� http://wiki.winehq.org - Om du l�gger till n�got eller fixar ett fel, �r det bra om du s�nder en patch (f�rslagsvis med git-format-patch) till listan wine-patches(a)winehq.org f�r inkludering i n�sta utg�va av Wine.

1 0

Lauri Kenttä : readme: Update Norwegian Bokmål translation.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 66084de7b42e4032af8466d75dd29f5475d0e17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66084de7b42e4032af8466d75… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 25 22:09:14 2014 +0200 readme: Update Norwegian Bokmål translation. --- documentation/README.no | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/documentation/README.no b/documentation/README.no index b6fdfe7..313e197 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -10,6 +10,7 @@ Windows-kode i vanlige Unix-programmer. Wine er fri programvare, utgitt under vilkårene i GNU LGPL; se filen «LICENSE» for detaljer. + 2. KOM I GANG Det anbefales å bruke Wines installasjonsprogram for å bygge og @@ -22,12 +23,13 @@ Kjør programmer som «wine program». Se resten av denne filen, Wines man-side og http://www.winehq.org/ for mer informasjon og problemløsing. + 3. SYSTEMKRAV -Følgende kreves for å bygge og kjøre Wine +Følgende kreves for å bygge og kjøre Wine: Linux versjon 2.0.36 eller nyere - FreeBSD 6.3 eller nyere + FreeBSD 7.0 eller nyere Solaris x86 9 eller nyere NetBSD-current Mac OS X 10.5 eller nyere @@ -36,36 +38,31 @@ Wine krever støtte for tråder på kjernenivå, og derfor er det bare operativsystemene ovenfor som støttes. Andre operativsystemer som støtter kjernetråder støttes kanskje i framtiden. -Informasjon for Linux - Selv om Linux 2.2.x antakelig virker, og Linux 2.0x kanskje virker - (tidligere 2.0.x-versjoner hadde problemer med tråder), er det - best å ha en ny kjerne som 2.4.x eller 2.6.x. - -Informasjon for FreeBSD - Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 6.3 eller 7.0. - FreeBSD 6.3 kan oppdateres for å forbedre støtten for Wine; se - <http://wiki.freebsd.org/Wine> for mer informasjon. +Informasjon for FreeBSD: + Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 7.0. + Se <http://wiki.freebsd.org/Wine> for mer informasjon. -Informsjon for Solaris +Informsjon for Solaris: Wine må antakelig bygges med GNU-verktøyene (gcc, gas etc.). Advarsel: selv om gas installeres er det ikke sikkert det brukes av gcc. Det sies at gcc må bygges på nytt, eller at symbolske koblinger for «cc», «as» og «ld» må legges til GNU-verktøyene. -Informasjon for NetBSD +Informasjon for NetBSD: USER_LDT, SYSVSHM, SYSVSEM og SYSVMSG må være aktivert i kjernen. Informasjon for Mac OS X: Du må ha Xcode 2.4 eller nyere for å bygge Wine ordentlig på x86. + Mac-driveren krever OS X 10.6 eller nyere og vil ikke bli bygget på 10.5. -Støttede filsystemer +Støttede filsystemer: Wine kan kjøre på de fleste filsystemer. Det har imidlertid vært rapportert om problemer med filtilgang gjennom Samba. Vi anbefaler ikke bruk av NTFS, siden dette ikke støtter funksjoner som noen - programmer trenger. Det anbefales å bruke et Linux-filsystem som ext3. + programmer trenger. Det anbefales å bruke et ekte Unix-filsystem. -Basiskrav +Basiskrav: Inkluderingsfilene for X11 må være installert (kalt «xlib6g-dev» i Debian og «XFree86-devel» i RedHat). @@ -87,7 +84,7 @@ Valgfrie støttebiblioteker: 4. BYGGING -Kjør følgende kommandoer for å bygge Wine hvis du ikke bruker wineinstall +Kjør følgende kommandoer for å bygge Wine hvis du ikke bruker wineinstall: ./configure make @@ -97,7 +94,7 @@ Programfilen «wine» laster og kjører Windows-programmer. Biblioteket «libwine» («Winelib») kan brukes til å bygge og koble Windows-kildekode i Unix. -Kjør «./configue --help» for å se valg for bygging. +Kjør «./configure --help» for å se valg for bygging. 5. INSTALLASJON @@ -116,7 +113,7 @@ Se støtteområdet på http://www.winehq.org/ for hint om oppsett. Når du bruker Wine kan du oppgi hele stien til programfilen, eller bare et filnavn. -For å kjøre Notisblokk +Eksempel: for å kjøre Notisblokk: wine notepad (ved å bruke søkestien oppgitt i wine notepad.exe Wine-registeret for å finne filen) @@ -130,14 +127,14 @@ For å kjøre Notisblokk Wine er ikke helt ferdig ennå, så det er mulig at noen programmer klikker. -Hvis dette skjer vil Wine lage en logg som beskriver problemet; bruk -denne når du lager en feilrapport på http://bugs.winehq.org/ +Hvis dette skjer vil Wine lage en krasjlogg som du bør vedlegge til rapporten +når du rapporterer en feil. 7. MER INFORMASJON Internett: En god del informasjon om Wine finnes hos WineHQ på - http://www.winehq.org/: diverse veiledere, en programdatabase + http://www.winehq.org/ : diverse veiledere, en programdatabase og feilsporing. Dette er antakelig det beste stedet å begynnne. Svar: Wines spørsmål og svar finnes på http://www.winehq.org/FAQ @@ -159,7 +156,8 @@ Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. Gå til http://www.winehq.org/git for mer informasjon. Hvis du legger til noe eller fikser en feil er det fint som du sender -en oppdateringsfil (helst laget med git format-patch) til listen wine-patches(a)winehq.org, slik at endringen kan tas med i neste Wine-utgivelse. +en oppdateringsfil (helst laget med git format-patch) til listen +wine-patches(a)winehq.org, slik at endringen kan tas med i neste Wine-utgivelse. -- Den originale versjonen ble skrevet av

1 0

Alexandre Julliard : ntdll: Detect 16-bit modules and resolve imports for them.
by Alexandre Julliard 25 Feb '14

25 Feb '14

Module: wine Branch: master Commit: 0e42fd97c05beb50c0788164647631c00485623b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e42fd97c05beb50c07881646… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 25 16:08:24 2014 -0600 ntdll: Detect 16-bit modules and resolve imports for them. --- dlls/ntdll/loader.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a8d675a..d458a31 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1464,6 +1464,22 @@ static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) } +/************************************************************************* + * is_16bit_builtin + */ +static BOOL is_16bit_builtin( HMODULE module ) +{ + const IMAGE_EXPORT_DIRECTORY *exports; + DWORD exp_size; + + if (!(exports = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + return FALSE; + + return find_named_export( module, exports, exp_size, "__wine_spec_dos_header", -1, NULL ) != NULL; +} + + /*********************************************************************** * load_builtin_callback * @@ -1511,7 +1527,8 @@ static void load_builtin_callback( void *module, const char *filename ) wm->ldr.Flags |= LDR_WINE_INTERNAL; if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || - nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE) + nt->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE || + is_16bit_builtin( module )) { /* fixup imports */

1 0

← Newer
1
2
3
4
5
6
7
...
51
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 February 2014