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

Thomas Faber : quartz/tests: Fix memory leaks.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: cf45bec65b6ae1db6f4f96cf44eaa7f98026a9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45bec65b6ae1db6f4f96cf4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 23:52:29 2014 +0200 quartz/tests: Fix memory leaks. --- dlls/quartz/tests/filtergraph.c | 1 + dlls/quartz/tests/referenceclock.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 713df7b..2f56151 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1884,6 +1884,7 @@ START_TEST(filtergraph) skip("Creating filtergraph returned %08x, skipping tests\n", hr); return; } + IGraphBuilder_Release(pgraph); test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index a96bd48..eb6fbda 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -28,19 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - IUnknown *pF; + void *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); } /* The following method expects a reference clock that will keep ticking for

1 0

Thomas Faber : quartz: Avoid side-effects in asserts.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: bab08e690ee7b11bd3e0aee5e4de247d30348d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab08e690ee7b11bd3e0aee5e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 22:04:29 2014 +0200 quartz: Avoid side-effects in asserts. --- dlls/quartz/avisplit.c | 22 +++++++++++++++++----- dlls/quartz/parser.c | 7 +++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d74c8ab..1f57045 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -151,6 +151,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe PullPin *pin = This->Parser.pInputPin; IMediaSample *sample = NULL; HRESULT hr; + ULONG ref; TRACE("(%p, %u)->()\n", This, streamnumber); @@ -264,7 +265,10 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) - assert(IMediaSample_Release(sample) == 0); + { + ref = IMediaSample_Release(sample); + assert(ref == 0); + } } else { @@ -278,7 +282,8 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (sample) { ERR("There should be no sample!\n"); - assert(IMediaSample_Release(sample) == 0); + ref = IMediaSample_Release(sample); + assert(ref == 0); } } TRACE("--> %08x\n", hr); @@ -510,8 +515,8 @@ static HRESULT AVISplitter_first_request(LPVOID iface) static HRESULT AVISplitter_done_process(LPVOID iface) { AVISplitterImpl *This = iface; - DWORD x; + ULONG ref; for (x = 0; x < This->Parser.cStreams; ++x) { @@ -525,7 +530,10 @@ static HRESULT AVISplitter_done_process(LPVOID iface) stream->thread = NULL; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); @@ -1219,6 +1227,7 @@ static HRESULT AVISplitter_Flush(LPVOID iface) { AVISplitterImpl *This = iface; DWORD x; + ULONG ref; TRACE("(%p)->()\n", This); @@ -1227,7 +1236,10 @@ static HRESULT AVISplitter_Flush(LPVOID iface) StreamData *stream = This->streams + x; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index b57bae4..cd8d93d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -170,6 +170,7 @@ void Parser_Destroy(ParserImpl *This) { IPin *connected = NULL; ULONG pinref; + HRESULT hr; assert(!This->filter.refCount); PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -178,9 +179,11 @@ void Parser_Destroy(ParserImpl *This) IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect(&This->pInputPin->pin.IPin_iface) == S_OK); + hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); + assert(hr == S_OK); } pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); if (pinref)

1 0

Bruno Jesus : dmime/tests: Fix a crash in Windows 2000.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 147bf5bd6f3c5f96ad8725ebfbba23fcfe406fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147bf5bd6f3c5f96ad8725ebf… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 23:31:42 2014 -0300 dmime/tests: Fix a crash in Windows 2000. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 1258d40..03b0a37 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -380,6 +380,10 @@ static void test_audiopathconfig(void) hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("DirectMusicAudioPathConfig not registered\n"); + return; + } ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); /* IPersistStream */

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::navigate implementation.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: be2128fd059ec1e1786c70fda347d6ce37de2cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2128fd059ec1e1786c70fda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 23:56:43 2014 +0200 mshtml: Added IHTMLWindow2::navigate implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/tests/nav_test.html | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fab227e..bc648f3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1010,8 +1010,10 @@ static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 * static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(url)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + + return navigate_url(This->outer_window, url, This->outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index d106dfc..bc629a4 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -18,6 +18,7 @@ function nav_back_test() { } iframe.onload = function() { + iframe.onload = null; var href = iframe.contentWindow.location.href; ok(/.*blank2.html/.test(href), "Unexpected href " + href); next_test(); @@ -27,8 +28,24 @@ function nav_back_test() { subframe.src = "blank.html"; } +function window_navigate_test() { + external.trace("Runnint window.navigate() tests..."); + + var iframe = document.getElementById("testframe"); + + iframe.onload = function() { + iframe.onlod = null; + var href = iframe.contentWindow.location.href; + ok(href === "about:blank", "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.navigate("about:blank"); +} + var tests = [ nav_back_test, + window_navigate_test, function() { external.reportSuccess(); } ];

1 0

Thomas Faber : quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 7c5d0789d0616556e57253f4fcd0e54c326569a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5d0789d0616556e57253f4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:39:55 2014 +0200 quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release. --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 96d83a1..84e4214 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -849,7 +849,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) CloseHandle(This->hFile); This->csList.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csList); - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); return 0; } return refCount;

1 0

Gerald Pfeifer : dbghelp: Do not try to ignore the return codes in PEV_ERROR and and PEV_ERROR1.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: a910704ccf6814c4aa0de247f68058bbd9fc8697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a910704ccf6814c4aa0de247f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 26 00:18:42 2014 +0200 dbghelp: Do not try to ignore the return codes in PEV_ERROR and and PEV_ERROR1. --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5e8804f..636655f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2924,8 +2924,8 @@ struct zvalue struct hash_table_elt elt; }; -#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)),FALSE -#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)),FALSE +#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)) +#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)) #if 0 static void pev_dump_stack(struct pevaluator* pev)

1 0

Gerald Pfeifer : winebuild: Remove unused empty_name_table.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 4a8d186bbcadc65d7f3c944c971b22d45fc06662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8d186bbcadc65d7f3c944c9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 25 23:23:26 2014 +0200 winebuild: Remove unused empty_name_table. --- tools/winebuild/import.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6bafd86..3ad5cab 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -115,15 +115,6 @@ static inline void remove_name( struct name_table *table, unsigned int idx ) table->count--; } -/* make a name table empty */ -static inline void empty_name_table( struct name_table *table ) -{ - unsigned int i; - - for (i = 0; i < table->count; i++) free( table->names[i] ); - table->count = 0; -} - /* locate a name in a (sorted) list */ static inline const char *find_name( const char *name, const struct name_table *table ) {

1 0

Jactry Zeng : include: Fix wrong type in tom.idl.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 58ba839be385bfa9e0501a5d98b3ca759f08d2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ba839be385bfa9e0501a5d9… Author: Jactry Zeng <wine(a)jactry.com> Date: Sun Jul 27 14:04:52 2014 +0800 include: Fix wrong type in tom.idl. --- include/tom.idl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index daa907b..769e31b 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -335,22 +335,22 @@ interface ITextFont : IDispatch HRESULT SetEngrave([in]LONG Value); HRESULT GetItalic([retval, out]LONG *pValue); HRESULT SetItalic([in]LONG Value); - HRESULT GetKerning([retval, out]LONG *pValue); - HRESULT SetKerning([in]LONG Value); + HRESULT GetKerning([retval, out]float *pValue); + HRESULT SetKerning([in]float Value); HRESULT GetLanguageID([retval, out]LONG *pValue); HRESULT SetLanguageID([in]LONG Value); HRESULT GetName([retval, out]BSTR *pValue); HRESULT SetName([in]BSTR Value); HRESULT GetOutline([retval, out]LONG *pValue); HRESULT SetOutline([in]LONG Value); - HRESULT GetPosition([retval, out]LONG *pValue); - HRESULT SetPosition([in]LONG Value); + HRESULT GetPosition([retval, out]float *pValue); + HRESULT SetPosition([in]float Value); HRESULT GetProtected([retval, out]LONG *pValue); HRESULT SetProtected([in]LONG Value); HRESULT GetShadow([retval, out]LONG *pValue); HRESULT SetShadow([in]LONG Value); - HRESULT GetSize([retval, out]LONG *pValue); - HRESULT SetSize([in]LONG Value); + HRESULT GetSize([retval, out]float *pValue); + HRESULT SetSize([in]float Value); HRESULT GetSmallCaps([retval, out]LONG *pValue); HRESULT SetSmallCaps([in]LONG Value); HRESULT GetSpacing([retval, out]float *pValue); @@ -398,8 +398,8 @@ interface ITextPara : IDispatch HRESULT SetListLevelIndex([in]LONG Value); HRESULT GetListStart([retval, out]LONG *pValue); HRESULT SetListStart([in]LONG Value); - HRESULT GetListTab([retval, out]LONG *pValue); - HRESULT SetListTab([in]LONG Value); + HRESULT GetListTab([retval, out]float *pValue); + HRESULT SetListTab([in]float Value); HRESULT GetListType([retval, out]LONG *pValue); HRESULT SetListType([in]LONG Value); HRESULT GetNoLineNumber([retval, out]LONG *pValue); @@ -414,8 +414,8 @@ interface ITextPara : IDispatch HRESULT SetSpaceAfter([in]float Value); HRESULT GetSpaceBefore([retval, out]float *pValue); HRESULT SetSpaceBefore([in]float Value); - HRESULT GetWindowControl([retval, out]float *pValue); - HRESULT SetWindowControl([in]float Value); + HRESULT GetWidowControl([retval, out]LONG *pValue); + HRESULT SetWidowControl([in]LONG Value); HRESULT GetTabCount([retval, out]LONG *pCount); HRESULT AddTab([in]float tbPos, [in]LONG tbAlign, [in]LONG tbLeader); HRESULT ClearAllTabs();

1 0

Frédéric Delanoy : French translation for release 1.7.23
by Jeremy Newman July 28, 2014

July 28, 2014

Module: website Branch: master Commit: 2f23a1bb8d402adc9ee42454d32c229467f005b8 URL: http://source.winehq.org/git/website.git/?a=commit;h=2f23a1bb8d402adc9ee424… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 26 09:24:15 2014 +0200 French translation for release 1.7.23 --- news/fr/2014072501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014072501.xml b/news/fr/2014072501.xml new file mode 100644 index 0000000..2143356 --- /dev/null +++ b/news/fr/2014072501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 juillet 2014</date> +<title>Sortie de Wine 1.7.23</title> +<body> + La version de développement 1.7.23 de Wine est disponible. + <a href="{$root}/announce/1.7.23">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge du glisser-déposer de fichiers.</li> + <li>Améliorations dans la gestion des cookies HTTP.</li> + <li>Prise en charge initiale des constructions Android 64 bits.</li> + <li>Correctifs dans la gestion des certificats cryptographiques.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.23
by Jeremy Newman July 28, 2014

July 28, 2014

Module: website Branch: master Commit: 643bede0b39aeacf014a0317e4c3ba82d99bbf9d URL: http://source.winehq.org/git/website.git/?a=commit;h=643bede0b39aeacf014a03… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jul 27 17:30:00 2014 +0200 German translation for release 1.7.23 --- news/de/2014072501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014072501.xml b/news/de/2014072501.xml new file mode 100644 index 0000000..17bfc18 --- /dev/null +++ b/news/de/2014072501.xml @@ -0,0 +1,16 @@ +<news> +<date>25. Juli 2014</date> +<title>Wine 1.7.23 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.23 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.23">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Unterstützung für Drag & Drop von Dateien.</li> + <li>Verbesserungen an der HTTP Cookie-Verwaltung.</li> + <li>Anfängliche Unterstützung für 64-Bit Android Builds.</li> + <li>Korrekturen an der Crypto-Zertifikat-Verwaltung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.23
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: website Branch: master Commit: e7ab3df83e33bf5cdbb8422c8591ed4c6e2921e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=e7ab3df83e33bf5cdbb842… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 17:00:41 2014 +0200 Wine release 1.7.23 --- news/en/2014072501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014072501.xml b/news/en/2014072501.xml new file mode 100644 index 0000000..0424c22 --- /dev/null +++ b/news/en/2014072501.xml @@ -0,0 +1,16 @@ +<news> +<date>July 25, 2014</date> +<title>Wine 1.7.23 Released</title> +<body> + The Wine development release 1.7.23 is now available. + <a href="{$root}/announce/1.7.23">What's new</a> in this release: +<ul> + <li>Better support for files drag & drop.</li> + <li>Improvements to the HTTP cookie management.</li> + <li>Initial support for 64-bit Android builds.</li> + <li>Fixes to crypto certificates management.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sebastian Lackner : wine.inf: Fix timezone information for Israel Standard Time.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: wine Branch: master Commit: b320fe77b2c0206bd70a0f109fce75feb5f828e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b320fe77b2c0206bd70a0f109… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 25 11:11:05 2014 +0200 wine.inf: Fix timezone information for Israel Standard Time. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 76da3ac..25bc098 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2755,7 +2755,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00, HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Display",,"Asia/Jerusalem" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Dlt",,"Israel Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Std",,"Israel Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Display",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Dlt",,"Jordan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time"

1 0

Tag wine-1.7.23 : Alexandre Julliard : Release 1.7.23
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: wine Branch: refs/tags/wine-1.7.23 Tag: 3d088fa59b6cbc44b1aeb0906e4537f59a143458 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3d088fa59b6cbc44b1aeb0906e45… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 16:52:03 2014 +0200 Release 1.7.23

1 0

Alexandre Julliard : Release 1.7.23.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: wine Branch: master Commit: 65507cc83f8c39d5d47cacc11355ad6481cab31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65507cc83f8c39d5d47cacc11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 16:52:03 2014 +0200 Release 1.7.23. --- ANNOUNCE | 462 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +-- 3 files changed, 246 insertions(+), 236 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65507cc83f8c39d5d47ca…

1 0

Francois Gouget : winetest: Standardize handling of winetest.cgi' s arguments and add prototypes.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: de41663f2f8b98a97f6750c369bbbfa426f4688f URL: http://source.winehq.org/git/tools.git/?a=commit;h=de41663f2f8b98a97f6750c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 10:20:00 2014 +0200 winetest: Standardize handling of winetest.cgi's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. --- winetest/winetest.cgi | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 2cc1190..2daf5cc 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -33,7 +33,8 @@ $CGI::POST_MAX = $maxfilesize + 1024; my $name = param ("reportfile"); my $error = cgi_error (); -sub test_reportfile { +sub test_reportfile() +{ my $buffer; my $fh = upload "reportfile"; read $fh, $buffer, 1024; @@ -41,15 +42,17 @@ sub test_reportfile { return $1; } -sub move_file { - my $orig = tmpFileName (shift); +sub move_file($) +{ + my ($filename) = @_; + my $orig = tmpFileName($filename); my $tmpdir = tempdir ("repXXXXX", DIR=>$ENV{TMPDIR}); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig; (rename $orig, "$tmpdir/report")? - "Received $name ($size bytes).\n": - "Error: can't store $name: $!\n"; + "Received $filename ($size bytes).\n": + "Error: can't store $filename: $!\n"; } # Invoked by winetest @@ -59,13 +62,13 @@ if (user_agent ("Winetest Shell")) { if ($error) { print "Error: $error\n"; } elsif ($name) { - my $build = test_reportfile $name; + my $build = test_reportfile(); if (!defined $build) { print "Error: submission corrupted"; } elsif ($build eq "-") { print "Error: build ID unset"; } else { - print move_file $name; + print move_file($name); } } else { print "Error: empty request\n"; @@ -90,13 +93,13 @@ if ($error) { print h2 ("Error during file upload ($name)"), strong ($error); } elsif ($name) { - my $build = test_reportfile $name; + my $build = test_reportfile(); if (!defined $build) { print h2 ("Error: submission corrupted"); } elsif ($build eq "-") { print h2 ("Error: build ID unset"); } else { - print h2 (move_file $name); + print h2 (move_file($name)); } } print end_html;

1 0

Francois Gouget : testbot: Don' t let the scripts blindly overwrite the VM status.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: b1653d3e85f37e711be0e5232e81f063c0d8c7df URL: http://source.winehq.org/git/tools.git/?a=commit;h=b1653d3e85f37e711be0e523… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 11:23:53 2014 +0200 testbot: Don't let the scripts blindly overwrite the VM status. This makes it possible for the administrator to step in and mark a VM for maintenance while a script is using it. --- testbot/bin/RevertVM.pl | 19 +++++++++++++++---- testbot/bin/WineRunBuild.pl | 21 ++++++++++++--------- testbot/bin/WineRunReconfig.pl | 26 ++++++++++++-------------- testbot/bin/WineRunTask.pl | 29 +++++++++++++++++------------ 4 files changed, 56 insertions(+), 39 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 3712c4d..17eb800 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -48,11 +48,16 @@ sub FatalError($$) LogMsg $ErrMessage, "\n"; - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - + # Get the up-to-date VM status and update it if nobody else changed it my $VMKey = $VM->GetKey(); + $VM = CreateVMs()->GetItem($VMKey); + if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") + { + $VM->Status("offline"); + $VM->ChildPid(undef); + $VM->Save(); + } + my $VMSnapshot = $VM->IdleSnapshot; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; @@ -110,6 +115,9 @@ if (defined($ErrMessage)) $VM; } +# Get the up-to-date VM status and exit if someone else changed it +$VM = CreateVMs()->GetItem($VMKey); +exit 1 if ($VM->Status ne "reverting"); $VM->Status("sleeping"); ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -134,6 +142,9 @@ if ($SleepAfterRevert != 0) sleep($SleepAfterRevert); } +# Get the up-to-date VM status and exit if someone else changed it +$VM = CreateVMs()->GetItem($VMKey); +exit 1 if ($VM->Status ne "sleeping"); $VM->Status("idle"); $VM->ChildPid(undef); ($ErrProperty, $ErrMessage) = $VM->Save(); diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b07454b..8f1defa 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -39,6 +39,7 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -69,14 +70,15 @@ sub FatalError($$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); if ($VM->Status eq 'running') { $VM->Status('dirty'); $VM->Save(); + RescheduleJobs(); } - RescheduleJobs(); exit 1; } @@ -326,14 +328,15 @@ $Task->ChildPid(undef); $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Status('dirty'); -$VM->Save(); - -$Task = undef; -$Step = undef; -$Job = undef; -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 555f4e4..c898a52 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -39,6 +39,7 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -69,14 +70,15 @@ sub FatalError($$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); if ($VM->Status eq 'running') { $VM->Status('dirty'); $VM->Save(); + RescheduleJobs(); } - RescheduleJobs(); exit 1; } @@ -272,12 +274,6 @@ if ($NewStatus eq "completed") FatalError "Can't take snapshot: $ErrMessage\n", $FullErrFileName, $Job, $Task; } - - $VM->Status("idle"); -} -else -{ - $VM->Status("dirty"); } $Task->Status($NewStatus); @@ -285,13 +281,15 @@ $Task->ChildPid(undef); $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Save(); -$Task = undef; -$Step = undef; -$Job = undef; - -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status($NewStatus eq 'completed' ? 'idle' : 'dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 86073e6..353b9b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -38,6 +38,7 @@ sub BEGIN use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::Engine::Notify; @@ -80,11 +81,15 @@ sub FatalError($$$$$) $Task->Save(); $Job->UpdateStatus(); - my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + # Get the up-to-date VM status and update it if nobody else changed it + my $VM = CreateVMs()->GetItem($Task->VM->GetKey()); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); + } - RescheduleJobs(); exit 1; } @@ -376,14 +381,14 @@ $Task->Ended(time); $Task->Save(); $Job->UpdateStatus(); -$VM->Status('dirty'); -$VM->Save(); - -$Task = undef; -$Step = undef; -$Job = undef; - -RescheduleJobs(); +# Get the up-to-date VM status and update it if nobody else changed it +$VM = CreateVMs()->GetItem($VM->GetKey()); +if ($VM->Status eq 'running') +{ + $VM->Status('dirty'); + $VM->Save(); + RescheduleJobs(); +} LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0;

1 0

Francois Gouget : winetest: Consistently use strict and warnings in the error.cgi and service.cgi scripts.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: c98dfc11aedd2054ba203c3fee7250f038b9b92a URL: http://source.winehq.org/git/tools.git/?a=commit;h=c98dfc11aedd2054ba203c3f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 10:20:20 2014 +0200 winetest: Consistently use strict and warnings in the error.cgi and service.cgi scripts. --- winetest/error.cgi | 4 ++++ winetest/service.cgi | 26 +++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/winetest/error.cgi b/winetest/error.cgi index ea77204..4c1bc8a 100755 --- a/winetest/error.cgi +++ b/winetest/error.cgi @@ -19,6 +19,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # + +use strict; +use warnings; + use CGI qw(:standard); $CGI::POST_MAX = 50 * 1024; diff --git a/winetest/service.cgi b/winetest/service.cgi index 53e5f10..f9f4563 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -38,13 +38,16 @@ # <name>.cookie contains a unique identifier of a program that # winrash clients can download, must be writable +use strict; +use warnings; + use Digest::MD5; use CGI qw(:standard); $CGI::POST_MAX = 50 * 1024; -$data_root="/home/winehq/opt/winetest"; -$lynx="/usr/bin/lynx"; -(a)valid_programs=("winrash", "winetest"); +my $data_root="/home/winehq/opt/winetest"; +my $lynx="/usr/bin/lynx"; +my @valid_programs=("winrash", "winetest"); ########################################################################## @@ -67,7 +70,7 @@ sub debug($) sub md5sum($) { my ($string) = @_; - local $md5 = Digest::MD5->new; + my $md5 = Digest::MD5->new; $md5->add($string); return $md5->hexdigest; } @@ -88,7 +91,7 @@ sub read_one_line($) my ($filename) = @_; open(GENERIC_FH, $filename) or ( debug("Can't open $filename."), die ); - $this_line = <GENERIC_FH>; + my $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -124,8 +127,8 @@ sub releases_read($) my ($project) = @_; my (%urls, %cookies, $thisrelease); - @files = split(/\n/, `ls $data_root/*/$project/*.url`); - foreach $file (@files) { + my @files = split(/\n/, `ls $data_root/*/$project/*.url`); + foreach my $file (@files) { if (open(GENERIC_FH, $file)) { my ($cookiefile, $key, $url, $this_line); $this_line = <GENERIC_FH>; @@ -168,7 +171,7 @@ sub releases_make($) ($program, $build, $publisher, @other) = split(/-/, $name); # check that it's a recognized program - foreach $prg (@valid_programs) { + foreach my $prg (@valid_programs) { if ($prg eq $program) { $program_ok = 1; last; @@ -199,9 +202,9 @@ sub releases_make($) } # check to see that the URL has the right format - $base_path = "$data_root/$publisher/$program"; + my $base_path = "$data_root/$publisher/$program"; - $url_mask = read_one_line("<$base_path/url.mask"); + my $url_mask = read_one_line("<$base_path/url.mask"); if (!($url =~ $url_mask)) { return "Unrecognized URL format"; } @@ -292,7 +295,8 @@ sub main() } # for each of the programs we know about, see if they need an update - foreach $program (@valid_programs) { + my ($winetest_history, $update_sent); + foreach my $program (@valid_programs) { ($build, $urls, $cookies) = releases_read($program); if (param($program)) { my @history = split(/,/, param("$program" . "_history"));

1 0

Francois Gouget : testbot: Handle the umask in a consistent way in the WineRun* scripts.
by Alexandre Julliard July 25, 2014

July 25, 2014

Module: tools Branch: master Commit: 169d1eba31fd66d7dbbccd4d43adbeedf5735489 URL: http://source.winehq.org/git/tools.git/?a=commit;h=169d1eba31fd66d7dbbccd4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 25 11:24:16 2014 +0200 testbot: Handle the umask in a consistent way in the WineRun* scripts. Don't set it at startup to avoid impacting other modules. --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 7 +++++-- testbot/bin/build/Build.pl | 8 ++++---- testbot/bin/build/Reconfig.pl | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8f1defa..5c6e897 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -46,13 +46,16 @@ use WineTestBot::Engine::Notify; sub LogTaskError($$) { my ($ErrMessage, $FullErrFileName) = @_; + my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { + umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { + umask($OldUMask); LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; } } @@ -182,10 +185,11 @@ if (!defined $Task) exit 1; } -umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c898a52..2c36afc 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,13 +46,16 @@ use WineTestBot::Engine::Notify; sub LogTaskError($$) { my ($ErrMessage, $FullErrFileName) = @_; + my $OldUMask = umask(002); if (open(my $ErrFile, ">>", $FullErrFileName)) { + umask($OldUMask); print $ErrFile $ErrMessage; close($ErrFile); } else { + umask($OldUMask); LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; } } @@ -182,10 +185,11 @@ if (!defined $Task) exit 1; } -umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 353b9b4..9b8f43f 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -100,13 +100,16 @@ sub TakeScreenshot($$) my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); if (! defined($ErrMessage)) { + my $OldUMask = umask(002); if (open SCREENSHOT, ">$FullScreenshotFileName") { + umask($OldUMask); print SCREENSHOT $ImageBytes; close SCREENSHOT; } else { + umask($OldUMask); LogMsg "Can't save screenshot: $!\n"; } } @@ -201,11 +204,11 @@ if (!defined $Task) exit 1; } -my $oldumask = umask(002); +my $OldUMask = umask(002); mkdir "$DataDir/jobs/$JobId"; mkdir "$DataDir/jobs/$JobId/$StepNo"; mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; -umask($oldumask); +umask($OldUMask); my $VM = $Task->VM; my $TA = $VM->GetAgent(); diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index f94b87e..fb3235d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -42,24 +42,24 @@ use WineTestBot::Config; sub InfoMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") { print LOGFILE @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub LogMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Build.log") { print LOGFILE "Build: ", @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub FatalError(@) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index f5ffcab..81a487f 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -42,13 +42,13 @@ use WineTestBot::Config; sub LogMsg(@) { - my $oldumask = umask(002); + my $OldUMask = umask(002); if (open LOGFILE, ">>$LogDir/Reconfig.log") { print LOGFILE "Reconfig: ", @_; close LOGFILE; } - umask($oldumask); + umask($OldUMask); } sub FatalError(@)

1 0

Alexandre Julliard : scrrun/tests: Allow the drive total size to fit into an int.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: b27735e807043b6e24af971f74237b9e58aa75d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27735e807043b6e24af971f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 21:13:43 2014 +0200 scrrun/tests: Allow the drive total size to fit into an int. --- dlls/scrrun/tests/filesystem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6042241..faa0b0c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1289,8 +1289,11 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_TotalSize(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size);

1 0

Alexandre Julliard : ntdll: Define arch_prctl since it is missing on Android.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: d7f6f8ee6cec032fb375cb53182436de0500208c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f6f8ee6cec032fb375cb531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:43:33 2014 +0200 ntdll: Define arch_prctl since it is missing on Android. --- dlls/ntdll/signal_x86_64.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5658537..05581c2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -38,6 +38,13 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif +#ifdef HAVE_SYSCALL_H +# include <syscall.h> +#else +# ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +# endif +#endif #ifdef HAVE_SYS_SIGNAL_H # include <sys/signal.h> #endif @@ -131,7 +138,7 @@ struct MSVCRT_JUMP_BUFFER #ifdef linux #include <asm/prctl.h> -extern int arch_prctl(int func, void *ptr); +static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } #define RAX_sig(context) ((context)->uc_mcontext.gregs[REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.gregs[REG_RBX])

1 0

Francois Gouget : ntdll: Fix the compilation by using the right mcontext_t field names for the signal context on FreeBSD.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 09ffb97fddacbd5f6c424fcd6eb1320aff2f9f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ffb97fddacbd5f6c424fcd6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 24 19:23:55 2014 +0200 ntdll: Fix the compilation by using the right mcontext_t field names for the signal context on FreeBSD. --- dlls/ntdll/signal_i386.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 447e97c..12aa5a4 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -265,27 +265,27 @@ typedef struct trapframe ucontext_t; #include <machine/trap.h> -#define EAX_sig(context) ((context)->sc_eax) -#define EBX_sig(context) ((context)->sc_ebx) -#define ECX_sig(context) ((context)->sc_ecx) -#define EDX_sig(context) ((context)->sc_edx) -#define ESI_sig(context) ((context)->sc_esi) -#define EDI_sig(context) ((context)->sc_edi) -#define EBP_sig(context) ((context)->sc_ebp) - -#define CS_sig(context) ((context)->sc_cs) -#define DS_sig(context) ((context)->sc_ds) -#define ES_sig(context) ((context)->sc_es) -#define FS_sig(context) ((context)->sc_fs) -#define GS_sig(context) ((context)->sc_gs) -#define SS_sig(context) ((context)->sc_ss) - -#define TRAP_sig(context) ((context)->sc_trapno) -#define ERROR_sig(context) ((context)->sc_err) -#define EFL_sig(context) ((context)->sc_eflags) - -#define EIP_sig(context) ((context)->sc_eip) -#define ESP_sig(context) ((context)->sc_esp) +#define EAX_sig(context) ((context)->uc_mcontext.mc_eax) +#define EBX_sig(context) ((context)->uc_mcontext.mc_ebx) +#define ECX_sig(context) ((context)->uc_mcontext.mc_ecx) +#define EDX_sig(context) ((context)->uc_mcontext.mc_edx) +#define ESI_sig(context) ((context)->uc_mcontext.mc_esi) +#define EDI_sig(context) ((context)->uc_mcontext.mc_edi) +#define EBP_sig(context) ((context)->uc_mcontext.mc_ebp) + +#define CS_sig(context) ((context)->uc_mcontext.mc_cs) +#define DS_sig(context) ((context)->uc_mcontext.mc_ds) +#define ES_sig(context) ((context)->uc_mcontext.mc_es) +#define FS_sig(context) ((context)->uc_mcontext.mc_fs) +#define GS_sig(context) ((context)->uc_mcontext.mc_gs) +#define SS_sig(context) ((context)->uc_mcontext.mc_ss) + +#define TRAP_sig(context) ((context)->uc_mcontext.mc_trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.mc_err) +#define EFL_sig(context) ((context)->uc_mcontext.mc_eflags) + +#define EIP_sig(context) ((context)->uc_mcontext.mc_eip) +#define ESP_sig(context) ((context)->uc_mcontext.mc_esp) #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */

1 0

Alexandre Julliard : loader: Avoid ELF32_ST_INFO macro that is missing on Android.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 8b4ed00b59397c4d8658ff588c058feaa233e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4ed00b59397c4d8658ff588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:34:39 2014 +0200 loader: Avoid ELF32_ST_INFO macro that is missing on Android. --- loader/preloader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index f38e17a..25aaacd 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -999,7 +999,8 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int do { if ((chains[idx] & ~1u) == (hash & ~1u) && - symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; } while (!(chains[idx++] & 1u)); @@ -1011,9 +1012,10 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int const Elf32_Word *buckets = hashtab + 2; const Elf32_Word *chains = buckets + nbuckets; - for (idx = buckets[hash % nbuckets]; idx != STN_UNDEF; idx = chains[idx]) + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) { - if (symtab[idx].st_info == ELF32_ST_INFO( STB_GLOBAL, type ) && + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && !wld_strcmp( strings + symtab[idx].st_name, var )) goto found; }

1 0

Alexandre Julliard : winhttp/tests: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: 97d8ae9e7edd3892731a2be00891891b409fff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d8ae9e7edd3892731a2be00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 20:10:33 2014 +0200 winhttp/tests: Include winsock2.h before other headers. --- dlls/winhttp/tests/winhttp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 354f46f..6a2d8c6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -20,9 +20,7 @@ #define COBJMACROS #include <stdarg.h> -#include <stdlib.h> #include <windef.h> -#include <winbase.h> #include <winsock2.h> #include <ws2tcpip.h> #include <winhttp.h>

1 0

Alexandre Julliard : secur32/tests: Include winsock2.h before other headers.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: d0d6dcb70eb90462301e520a8969291fa3a5b1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d6dcb70eb90462301e520a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 24 19:51:52 2014 +0200 secur32/tests: Include winsock2.h before other headers. --- dlls/secur32/tests/schannel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 078aec7..2b68c3d 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -17,15 +17,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> + #include <stdarg.h> #include <windef.h> -#include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #define SECURITY_WIN32 #include <security.h> #include <schannel.h> -#include <winsock2.h> -#include <ws2tcpip.h> #include "wine/test.h"

1 0

Jacek Caban : wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations.
by Alexandre Julliard July 24, 2014

July 24, 2014

Module: wine Branch: master Commit: e18ef3cf4c8b2b831203a4fa7bed74a25415ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18ef3cf4c8b2b831203a4fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 24 16:26:02 2014 +0200 wine/debug.h: Added wine_dbgstr_variant and wine_dbgstr_vt implementations. --- dlls/oleaut32/variant.c | 75 +----------------------------- include/wine/debug.h | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 73 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index addc5a0..21d1941 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -44,7 +44,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); - static const char * const variant_types[] = { "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", @@ -81,82 +80,12 @@ static const char * const variant_flags[16] = const char *debugstr_vt(VARTYPE vt) { - if(vt & ~VT_TYPEMASK) - return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - - if(vt < sizeof(variant_types)/sizeof(*variant_types)) - return variant_types[vt]; - - if(vt == VT_BSTR_BLOB) - return "VT_BSTR_BLOB"; - - return wine_dbg_sprintf("vt(invalid %x)", vt); + return wine_dbgstr_vt(vt); } const char *debugstr_variant(const VARIANT *v) { - if(!v) - return "(null)"; - - if(V_VT(v) & VT_BYREF) { - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) - return wine_dbg_sprintf("%p {VT_VARIANT|VT_BYREF: %s}", v, debugstr_variant(V_VARIANTREF(v))); - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_BYREF(v)); - } - - if(V_ISARRAY(v) || V_ISVECTOR(v)) - return wine_dbg_sprintf("%p {%s %p}", v, debugstr_vt(V_VT(v)), V_ARRAY(v)); - - switch(V_VT(v)) { - case VT_EMPTY: - return wine_dbg_sprintf("%p {VT_EMPTY}", v); - case VT_NULL: - return wine_dbg_sprintf("%p {VT_NULL}", v); - case VT_I2: - return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); - case VT_I4: - return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); - case VT_R4: - return wine_dbg_sprintf("%p {VT_R4: %f}", v, V_R4(v)); - case VT_R8: - return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); - case VT_CY: - return wine_dbg_sprintf("%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64)); - case VT_DATE: - return wine_dbg_sprintf("%p {VT_DATE: %lf}", v, V_DATE(v)); - case VT_BSTR: - return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); - case VT_DISPATCH: - return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); - case VT_ERROR: - return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); - case VT_BOOL: - return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); - case VT_UNKNOWN: - return wine_dbg_sprintf("%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v)); - case VT_I1: - return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); - case VT_UI1: - return wine_dbg_sprintf("%p {VT_UI1: %u}", v, V_UI1(v)); - case VT_UI2: - return wine_dbg_sprintf("%p {VT_UI2: %d}", v, V_UI2(v)); - case VT_UI4: - return wine_dbg_sprintf("%p {VT_UI4: %d}", v, V_UI4(v)); - case VT_I8: - return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v))); - case VT_UI8: - return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v))); - case VT_INT: - return wine_dbg_sprintf("%p {VT_INT: %d}", v, V_INT(v)); - case VT_UINT: - return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); - case VT_VOID: - return wine_dbg_sprintf("%p {VT_VOID}", v); - case VT_RECORD: - return wine_dbg_sprintf("%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo); - default: - return wine_dbg_sprintf("%p {vt %s}", v, debugstr_vt(V_VT(v))); - } + return wine_dbgstr_variant(v); } /* Convert a variant from one type to another */ diff --git a/include/wine/debug.h b/include/wine/debug.h index ba6fabe..ca25e0a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -219,6 +219,124 @@ static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); } +#if defined(__oaidl_h__) && defined(V_VT) + +static inline const char *wine_dbgstr_vt( VARTYPE vt ) +{ + static const char *const variant_types[] = + { + "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", + "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", + "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", + "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", + "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", + "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", + "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", + "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" + }; + + static const char *const variant_flags[16] = + { + "", + "|VT_VECTOR", + "|VT_ARRAY", + "|VT_VECTOR|VT_ARRAY", + "|VT_BYREF", + "|VT_VECTOR|VT_ARRAY", + "|VT_ARRAY|VT_BYREF", + "|VT_VECTOR|VT_ARRAY|VT_BYREF", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", + }; + + if (vt & ~VT_TYPEMASK) + return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); + + if (vt < sizeof(variant_types)/sizeof(*variant_types)) + return variant_types[vt]; + + if (vt == VT_BSTR_BLOB) + return "VT_BSTR_BLOB"; + + return wine_dbg_sprintf( "vt(invalid %x)", vt ); +} + +static inline const char *wine_dbgstr_variant( const VARIANT *v ) +{ + if (!v) + return "(null)"; + + if (V_VT(v) & VT_BYREF) { + if (V_VT(v) == (VT_VARIANT|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); + } + + if (V_ISARRAY(v) || V_ISVECTOR(v)) + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_ARRAY(v) ); + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf( "%p {VT_EMPTY}", v ); + case VT_NULL: + return wine_dbg_sprintf( "%p {VT_NULL}", v ); + case VT_I2: + return wine_dbg_sprintf( "%p {VT_I2: %d}", v, V_I2(v) ); + case VT_I4: + return wine_dbg_sprintf( "%p {VT_I4: %d}", v, V_I4(v) ); + case VT_R4: + return wine_dbg_sprintf( "%p {VT_R4: %f}", v, V_R4(v) ); + case VT_R8: + return wine_dbg_sprintf( "%p {VT_R8: %lf}", v, V_R8(v) ); + case VT_CY: + return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); + case VT_DATE: + return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "%p {VT_DISPATCH: %p}", v, V_DISPATCH(v) ); + case VT_ERROR: + return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, V_ERROR(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "%p {VT_BOOL: %x}", v, V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v) ); + case VT_I1: + return wine_dbg_sprintf( "%p {VT_I1: %d}", v, V_I1(v) ); + case VT_UI1: + return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); + case VT_UI2: + return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + case VT_UI4: + return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + case VT_I8: + return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); + case VT_UI8: + return wine_dbg_sprintf( "%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v)) ); + case VT_INT: + return wine_dbg_sprintf( "%p {VT_INT: %d}", v, V_INT(v) ); + case VT_UINT: + return wine_dbg_sprintf( "%p {VT_UINT: %u}", v, V_UINT(v) ); + case VT_VOID: + return wine_dbg_sprintf( "%p {VT_VOID}", v ); + case VT_RECORD: + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + default: + return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); + } +} + +#endif /* defined(__oaidl_h__) && defined(V_VT) */ + #ifndef WINE_TRACE #define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) #define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch)

1 0