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

Jacek Caban : vbscript: Added support for VARIANT references to interp_newenum.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 86ee4e959a71a9715dec98b0df59f82fb3cb91aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ee4e959a71a9715dec98b0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 8 14:53:10 2014 +0100 vbscript: Added support for VARIANT references to interp_newenum. --- dlls/vbscript/interp.c | 63 +++++++++++++++++++++++------------------- dlls/vbscript/tests/lang.vbs | 13 ++++++++- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d05c961..066d675 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -309,33 +309,42 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } -static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) +static void stack_pop_deref(exec_ctx_t *ctx, variant_val_t *r) { - VARIANT *var; - - var = stack_pop(ctx); + VARIANT *v; - if(V_VT(var) == (VT_BYREF|VT_VARIANT)) { - v->owned = FALSE; - var = V_VARIANTREF(var); + v = stack_pop(ctx); + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { + r->owned = FALSE; + r->v = V_VARIANTREF(v); }else { - v->owned = TRUE; + r->owned = TRUE; + r->v = v; } +} + +static inline void release_val(variant_val_t *v) +{ + if(v->owned) + VariantClear(v->v); +} + +static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) +{ + stack_pop_deref(ctx, r); - if(V_VT(var) == VT_DISPATCH) { + if(V_VT(r->v) == VT_DISPATCH) { DISPPARAMS dp = {0}; HRESULT hres; - hres = disp_call(ctx->script, V_DISPATCH(var), DISPID_VALUE, &dp, &v->store); - if(v->owned) - IDispatch_Release(V_DISPATCH(var)); + hres = disp_call(ctx->script, V_DISPATCH(r->v), DISPID_VALUE, &dp, &r->store); + if(r->owned) + IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) return hres; - v->owned = TRUE; - v->v = &v->store; - }else { - v->v = var; + r->owned = TRUE; + r->v = &r->store; } return S_OK; @@ -370,12 +379,6 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) return S_OK; } -static inline void release_val(variant_val_t *v) -{ - if(v->owned) - VariantClear(v->v); -} - static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) { variant_val_t val; @@ -1079,21 +1082,23 @@ static HRESULT interp_step(exec_ctx_t *ctx) static HRESULT interp_newenum(exec_ctx_t *ctx) { - VARIANT *v, r; + variant_val_t v; + VARIANT r; HRESULT hres; TRACE("\n"); - v = stack_pop(ctx); - switch(V_VT(v)) { + stack_pop_deref(ctx, &v); + + switch(V_VT(v.v)) { case VT_DISPATCH|VT_BYREF: case VT_DISPATCH: { IEnumVARIANT *iter; DISPPARAMS dp = {0}; VARIANT iterv; - hres = disp_call(ctx->script, V_ISBYREF(v) ? *V_DISPATCHREF(v) : V_DISPATCH(v), DISPID_NEWENUM, &dp, &iterv); - VariantClear(v); + hres = disp_call(ctx->script, V_ISBYREF(v.v) ? *V_DISPATCHREF(v.v) : V_DISPATCH(v.v), DISPID_NEWENUM, &dp, &iterv); + release_val(&v); if(FAILED(hres)) return hres; @@ -1115,8 +1120,8 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) break; } default: - FIXME("Unsupported for %s\n", debugstr_variant(v)); - VariantClear(v); + FIXME("Unsupported for %s\n", debugstr_variant(v.v)); + release_val(&v); return E_NOTIMPL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 374a986..c1af191 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -19,6 +19,7 @@ Option Explicit dim x, y, z +Dim obj call ok(true, "true is not true?") ok true, "true is not true?" @@ -486,6 +487,17 @@ next Call ok(y = 1, "y = " & y) Call ok(x = 2, "x = " & x) +Set obj = collectionObj +Call obj.reset() +y = 0 +x = 10 +for each x in obj + y = y+1 + Call ok(x = y, "x <> y") +next +Call ok(y = 3, "y = " & y) +Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) + x = false select case 3 case 2 @@ -767,7 +779,6 @@ Stop set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) -Dim obj Set obj = New EmptyClass Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj))

1 0

Nikolay Sivov : msxml3: Remove dynamic properties support.
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 5b43c42c8832f3e6d0b70a54b01938f43b950647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43c42c8832f3e6d0b70a54b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 8 19:06:11 2014 +0400 msxml3: Remove dynamic properties support. --- dlls/msxml3/dispex.c | 105 ----------------------------------------- dlls/msxml3/domimpl.c | 3 -- dlls/msxml3/msxml_private.h | 2 - dlls/msxml3/mxnamespace.c | 1 - dlls/msxml3/mxwriter.c | 2 - dlls/msxml3/node.c | 1 - dlls/msxml3/nodemap.c | 1 - dlls/msxml3/parseerror.c | 1 - dlls/msxml3/saxreader.c | 1 - dlls/msxml3/schema.c | 1 - dlls/msxml3/selection.c | 1 - dlls/msxml3/stylesheet.c | 2 - dlls/msxml3/tests/domdoc.c | 16 ++++++- dlls/msxml3/tests/saxreader.c | 28 +++++++++-- dlls/msxml3/tests/schema.c | 17 ++++++- 15 files changed, 55 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b43c42c8832f3e6d0b70…

1 0

Marcus Meissner : hhctrl.ocx: Free the correct buffer (Coverity).
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 0d00e16327cbc0952a06646065f4a3983641cfa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d00e16327cbc0952a0664606… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 8 10:00:53 2014 +0100 hhctrl.ocx: Free the correct buffer (Coverity). --- dlls/hhctrl.ocx/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 4dc9645..6e831e5 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -145,7 +145,7 @@ BOOL next_node(stream_t *stream, strbuf_t *buf) strbuf_init(&tmpbuf); if(!find_node_end(stream, &tmpbuf)) { - strbuf_free(buf); + strbuf_free(&tmpbuf); return FALSE; } strbuf_free(&tmpbuf);

1 0

Marcus Meissner : crypt32: Fixed copy and paste error in engine creation ( Coverity).
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 221fd399378fb8819cea3ba647248da0a128aec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221fd399378fb8819cea3ba64… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 8 09:41:10 2014 +0100 crypt32: Fixed copy and paste error in engine creation (Coverity). --- dlls/crypt32/chain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 9e319d3..94d228a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -185,14 +185,14 @@ static CertificateChainEngine *get_chain_engine(HCERTCHAINENGINE handle, BOOL al if(!allow_default) return NULL; - if(!default_cu_engine) { + if(!default_lm_engine) { handle = CRYPT_CreateChainEngine(NULL, CERT_SYSTEM_STORE_LOCAL_MACHINE, &config); InterlockedCompareExchangePointer((void**)&default_lm_engine, handle, NULL); if(default_lm_engine != handle) CertFreeCertificateChainEngine(handle); } - return default_cu_engine; + return default_lm_engine; } return (CertificateChainEngine*)handle;

1 0

Marcus Meissner : msxml3: Mirror the NULL checking logic (Coverity).
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 6e25c34f2f4ef0a7f3151fca6768699585f2eeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e25c34f2f4ef0a7f3151fca6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 8 09:43:55 2014 +0100 msxml3: Mirror the NULL checking logic (Coverity). --- dlls/msxml3/mxwriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 01e21a7..6c2eeb8 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1202,7 +1202,7 @@ static void mxwriter_write_starttag(mxwriter *writer, const WCHAR *qname, int le write_node_indent(writer); write_output_buffer(writer->buffer, ltW, 1); - write_output_buffer(writer->buffer, qname, len); + write_output_buffer(writer->buffer, qname ? qname : emptyW, qname ? len : 0); writer_inc_indent(writer); }

1 0

Marcus Meissner : msi: Fixed missing free in an error path (Coverity).
by Alexandre Julliard March 10, 2014

March 10, 2014

Module: wine Branch: master Commit: 3fa41c9e701a2bc4a9173738dfcf233ff565fe4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa41c9e701a2bc4a9173738d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 8 09:48:58 2014 +0100 msi: Fixed missing free in an error path (Coverity). --- dlls/msi/action.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0d9fb69..4c6d6af 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5813,7 +5813,11 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) ERR("Query failed\n"); goto done; } - if (!(key = MSI_RecordGetString(row, 6))) goto done; + if (!(key = MSI_RecordGetString(row, 6))) + { + msiobj_release(&row->hdr); + goto done; + } file = msi_get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file)

1 0

Andrey Gusev : Ukrainian translation for release 1.7.14
by Jeremy Newman March 10, 2014

March 10, 2014

Module: website Branch: master Commit: e92610c8855de50328a7b9d7ab8508a47a0b82fb URL: http://source.winehq.org/git/website.git/?a=commit;h=e92610c8855de50328a7b9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Mar 8 01:27:45 2014 +0200 Ukrainian translation for release 1.7.14 --- news/uk/2014030701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014030701.xml b/news/uk/2014030701.xml new file mode 100644 index 0000000..f1485f4 --- /dev/null +++ b/news/uk/2014030701.xml @@ -0,0 +1,17 @@ +<news> +<date>7 березня 2014</date> +<title>Випущено Wine 1.7.14</title> +<body> + Розробницький реліз Wine 1.7.14 наразі доступний. + <a href="{$root}/announce/1.7.14">Що нового</a> в цьому релізі: +<ul> + <li>Збільшено підтримку планувальника завдань.</li> + <li>Покращення в підтримці кодування для AVI.</li> + <li>Більше інтерфейсів VisualBasic в MSXML.</li> + <li>Підтримка для кодування deflate контенту в Wininet.</li> + <li>Деякі виправлення для монохромних принтерів.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.14.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

André Hentschel : Wine 1.7.14 freigegeben
by Jeremy Newman March 10, 2014

March 10, 2014

Module: website Branch: master Commit: 864a66cb0e36657c4ef5f8894c1e84d43727faa1 URL: http://source.winehq.org/git/website.git/?a=commit;h=864a66cb0e36657c4ef5f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 8 20:55:40 2014 +0100 Wine 1.7.14 freigegeben --- news/de/2014030701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014030701.xml b/news/de/2014030701.xml new file mode 100644 index 0000000..623a910 --- /dev/null +++ b/news/de/2014030701.xml @@ -0,0 +1,17 @@ +<news> +<date>7. März 2014</date> +<title>Wine 1.7.14 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Task Scheduler Unterstützung.</li> + <li>Verbesserungen an der AVI Kodierer Unterstützung.</li> + <li>Verbesserte VisualBasic Schnittstellen in MSXML.</li> + <li>Unterstützung für "deflate content encoding" in Wininet.</li> + <li>Einige Fehlerbehebungen für Schwarz-Weiß-Drucker .</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.14.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

Frédéric Delanoy : French translation for release 1.7.14
by Jeremy Newman March 10, 2014

March 10, 2014

Module: website Branch: master Commit: 5b2ab705e1c7dff82562cc361e4c52e01446735e URL: http://source.winehq.org/git/website.git/?a=commit;h=5b2ab705e1c7dff82562cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Mar 8 10:15:08 2014 +0100 French translation for release 1.7.14 --- news/fr/2014030701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014030701.xml b/news/fr/2014030701.xml new file mode 100644 index 0000000..64c96ee --- /dev/null +++ b/news/fr/2014030701.xml @@ -0,0 +1,16 @@ +<news> +<date>7 mars 2014</date> +<title>Sortie de Wine 1.7.14</title> +<body> + La version de développement 1.7.14 de Wine est disponible. + <a href="{$root}/announce/1.7.14">Nouveautés</a> de cette version : +<ul> + <li>Progrès dans le planificateur de tâches.</li> + <li>Prise en charge améliorée de l'encodage AVI.</li> + <li>Interfaces VisualBasic supplémentaires dans MSXML.</li> + <li>Prise en charge du codage de contenu Deflate dans Wininet.</li> + <li>Quelques correctifs pour les imprimantes monochromes.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.14.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

Łukasz Wojniłowicz : Polish translation for release 1.7.14
by Jeremy Newman March 10, 2014

March 10, 2014

Module: website Branch: master Commit: b70b4e231caf16afd1e613bdd9af50ae586d8581 URL: http://source.winehq.org/git/website.git/?a=commit;h=b70b4e231caf16afd1e613… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 8 06:59:57 2014 +0100 Polish translation for release 1.7.14 --- news/pl/2014030701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014030701.xml b/news/pl/2014030701.xml new file mode 100644 index 0000000..8c769c4 --- /dev/null +++ b/news/pl/2014030701.xml @@ -0,0 +1,17 @@ +<news> +<date>Marzec 7, 2014</date> +<title>Wydano Wine 1.7.14</title> +<body> + Wydanie rozwojowe Wine 1.7.14 jest już dostępne. + <a href="{$root}/announce/1.7.14">Co nowego</a> w tym wydaniu: +<ul> + <li>Większe wsparcie dla Harmonogramu Zadań.</li> + <li>Usprawnienia w obsłudze kodowania AVI .</li> + <li>Więcej interfejsów VisualBasic w MSXML.</li> + <li>Wsparcie dla kodowania zawartości deflate w Wininet.</li> + <li>Kilka poprawek w obsłudze monochromatycznych drukarek.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.14.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0