November 2019 - Wine-Commits

Nikolay Sivov : ole32: Add separate IEnumSTATPROPSTG implementation.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: ecb2c8dd2e5e2076e4fd624fdb77224eed930cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb2c8dd2e5e2076e4fd624f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:39:23 2019 +0300 ole32: Add separate IEnumSTATPROPSTG implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 - dlls/ole32/enumx.c | 205 ------------------------------------ dlls/ole32/enumx.h | 34 ------ dlls/ole32/stg_prop.c | 281 ++++++++++++++++++++++++++++++------------------- 4 files changed, 175 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecb2c8dd2e5e2076e4fd…

1 0

Nikolay Sivov : comsvcs: Support progid in "new" moniker serialization stream.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: wine Branch: master Commit: f055e369ee5cd0da036451ccbb6e1937c3b166ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f055e369ee5cd0da036451cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 11 10:36:56 2019 +0300 comsvcs: Support progid in "new" moniker serialization stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 71 ++++++++++++++++++++------ dlls/comsvcs/tests/comsvcs.c | 115 ++++++++++++++++++++++++++++++------------- 2 files changed, 138 insertions(+), 48 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 7bfde03b34..9ab77dfced 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -57,6 +57,7 @@ struct new_moniker IROTData IROTData_iface; LONG refcount; CLSID clsid; + WCHAR *progid; }; static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); @@ -481,7 +482,10 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + heap_free(moniker->progid); heap_free(moniker); + } return refcount; } @@ -508,10 +512,10 @@ static HRESULT WINAPI new_moniker_IsDirty(IMoniker* iface) static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) { struct new_moniker *moniker = impl_from_IMoniker(iface); - ULARGE_INTEGER pad; + DWORD progid_len = 0, len, pad = ~0u; + WCHAR *progid = NULL; CLSID clsid; HRESULT hr; - DWORD len; TRACE("%p, %p.\n", iface, stream); @@ -519,29 +523,49 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (FAILED(hr)) return hr; - pad.QuadPart = 1; - hr = IStream_Read(stream, &pad, sizeof(pad), &len); - if (FAILED(hr)) - return hr; + if (SUCCEEDED(hr)) + hr = IStream_Read(stream, &progid_len, sizeof(progid_len), &len); - if (pad.QuadPart != 0) - return E_FAIL; + if (SUCCEEDED(hr) && progid_len) + { + if (!(progid = heap_alloc(progid_len))) + return E_OUTOFMEMORY; + hr = IStream_Read(stream, progid, progid_len, &len); + } - moniker->clsid = clsid; + /* Skip terminator. */ + if (SUCCEEDED(hr)) + hr = IStream_Read(stream, &pad, sizeof(pad), &len); - return S_OK; + if (SUCCEEDED(hr) && pad == 0) + { + moniker->clsid = clsid; + heap_free(moniker->progid); + moniker->progid = progid; + progid = NULL; + } + + heap_free(progid); + + return hr; } static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { struct new_moniker *moniker = impl_from_IMoniker(iface); - static const ULARGE_INTEGER pad; - ULONG written; + ULONG written, pad = 0, progid_len = 0; HRESULT hr; TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + if (moniker->progid) + progid_len = lstrlenW(moniker->progid) * sizeof(WCHAR); + hr = IStream_Write(stream, &moniker->clsid, sizeof(moniker->clsid), &written); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &progid_len, sizeof(progid_len), &written); + if (SUCCEEDED(hr) && progid_len) + hr = IStream_Write(stream, moniker->progid, progid_len, &written); if (SUCCEEDED(hr)) hr = IStream_Write(stream, &pad, sizeof(pad), &written); @@ -550,12 +574,16 @@ static HRESULT WINAPI new_moniker_Save(IMoniker *iface, IStream *stream, BOOL cl static HRESULT WINAPI new_moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { + struct new_moniker *moniker = impl_from_IMoniker(iface); + TRACE("%p, %p.\n", iface, size); if (!size) return E_POINTER; size->QuadPart = sizeof(CLSID) + 2 * sizeof(DWORD); + if (moniker->progid) + size->QuadPart += lstrlenW(moniker->progid) * sizeof(WCHAR); return S_OK; } @@ -867,15 +895,21 @@ static HRESULT guid_from_string(const WCHAR *s, GUID *ret) static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { struct new_moniker *moniker; + WCHAR *progid = NULL, *str; GUID guid; *ret = NULL; if (wcsnicmp(name, L"new:", 4)) return MK_E_SYNTAX; + str = name + 4; - if (!guid_from_string(name + 4, &guid) && FAILED(CLSIDFromProgID(name + 4, &guid))) - return MK_E_SYNTAX; + if (!guid_from_string(str, &guid)) + { + if (FAILED(CLSIDFromProgID(str, &guid))) + return MK_E_SYNTAX; + progid = str; + } moniker = heap_alloc_zero(sizeof(*moniker)); if (!moniker) @@ -885,6 +919,15 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->IROTData_iface.lpVtbl = &new_moniker_rotdata_vtbl; moniker->refcount = 1; moniker->clsid = guid; + if (progid) + { + if (!(moniker->progid = heap_alloc((lstrlenW(progid) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&moniker->IMoniker_iface); + return E_OUTOFMEMORY; + } + lstrcpyW(moniker->progid, progid); + } *ret = &moniker->IMoniker_iface; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 3b15a1f7e6..e6717e0ea3 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -293,23 +293,90 @@ static void create_dispenser(void) IDispenserManager_Release(dispenser); } +static void test_new_moniker_serialize(const WCHAR *clsid, const WCHAR *progid, IMoniker *moniker) +{ + DWORD expected_size, progid_len = 0; + ULARGE_INTEGER size; + IStream *stream; + HGLOBAL hglobal; + CLSID guid; + HRESULT hr; + DWORD *ptr; + + hr = IMoniker_GetSizeMax(moniker, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + expected_size = sizeof(GUID) + 2 * sizeof(DWORD); + if (progid) + { + progid_len = lstrlenW(progid) * sizeof(*progid); + expected_size += progid_len; + } + + size.QuadPart = 0; + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); + ok(size.QuadPart == expected_size, "Unexpected size %s, expected %#x.\n", wine_dbgstr_longlong(size.QuadPart), + expected_size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = IMoniker_Save(moniker, stream, FALSE); + ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); + + ptr = GlobalLock(hglobal); + ok(!!ptr, "Failed to get data pointer.\n"); + + hr = CLSIDFromString(clsid, &guid); + ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); + ok(IsEqualGUID((GUID *)ptr, &guid), "Unexpected buffer content.\n"); + ptr += sizeof(GUID)/sizeof(DWORD); + + /* Serialization format: + + GUID guid; + DWORD progid_len; + WCHAR progid[progid_len/2]; + DWORD null; + */ + + if (progid) + { + ok(*ptr == progid_len, "Unexpected progid length.\n"); + ptr++; + ok(!memcmp(ptr, progid, progid_len), "Unexpected progid.\n"); + ptr += progid_len / sizeof(DWORD); + } + else + { + ok(*ptr == 0, "Unexpected progid length.\n"); + ptr++; + } + ok(*ptr == 0, "Unexpected terminator.\n"); + + GlobalUnlock(hglobal); + + IStream_Release(stream); +} + static void test_new_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *class_moniker, *moniker_left; IRunningObjectTable *rot; IUnknown *obj, *obj2; BIND_OPTS2 bind_opts; - ULARGE_INTEGER size; DWORD moniker_type; IROTData *rot_data; IBindCtx *bindctx; FILETIME filetime; DWORD hash, eaten; - IStream *stream; - HGLOBAL hglobal; CLSID clsid; HRESULT hr; - void *ptr; + WCHAR *str; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); @@ -424,36 +491,7 @@ todo_wine ok(obj == NULL, "Unexpected return value.\n"); /* Serialization. */ - hr = IMoniker_GetSizeMax(moniker, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - - size.QuadPart = 0; - hr = IMoniker_GetSizeMax(moniker, &size); - ok(hr == S_OK, "Failed to get size, hr %#x.\n", hr); - ok(size.QuadPart == (sizeof(GUID) + 2 * sizeof(DWORD)), "Unexpected size %s.\n", - wine_dbgstr_longlong(size.QuadPart)); - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - - hr = IMoniker_Save(moniker, stream, FALSE); - ok(hr == S_OK, "Failed to save moniker, hr %#x.\n", hr); - - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "Failed to get a handle, hr %#x.\n", hr); - - ptr = GlobalLock(hglobal); - ok(!!ptr, "Failed to get data pointer.\n"); - - hr = CLSIDFromString(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", &clsid); - ok(hr == S_OK, "Failed to get CLSID, hr %#x.\n", hr); - ok(IsEqualGUID((GUID *)ptr, &clsid), "Unexpected buffer content.\n"); - ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID)) == 0, "Unexpected buffer content.\n"); - ok(*(DWORD *)((BYTE *)ptr + sizeof(GUID) + sizeof(DWORD)) == 0, "Unexpected buffer content.\n"); - - GlobalUnlock(hglobal); - - IStream_Release(stream); + test_new_moniker_serialize(L"{20d04fe0-3aea-1069-a2d8-08002b30309d}", NULL, moniker); hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); @@ -483,6 +521,15 @@ todo_wine ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten, "Unexpected eaten length %u.\n", eaten); + hr = CLSIDFromProgID(L"msxml2.domdocument", &clsid); + ok(hr == S_OK, "Failed to get clsid, hr %#x.\n", hr); + + hr = StringFromCLSID(&clsid, &str); + ok(hr == S_OK, "Failed to get guid string, hr %#x.\n", hr); + + test_new_moniker_serialize(str, L"msxml2.domdocument", moniker); + CoTaskMemFree(str); + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&obj); ok(hr == S_OK, "Failed to bind to object, hr %#x.\n", hr); EXPECT_REF(obj, 1);

1 0

Julian Rüger : German translation, remembering Józef Kucia.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: website Branch: master Commit: 845a3aad07695031cf3968862c87be66a1bcdac8 URL: https://source.winehq.org/git/website.git/?a=commit;h=845a3aad07695031cf396… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 19:04:23 2019 +0100 German translation, remembering Józef Kucia. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019091101.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/news/de/2019091101.xml b/news/de/2019091101.xml new file mode 100644 index 00000000..5585ee34 --- /dev/null +++ b/news/de/2019091101.xml @@ -0,0 +1,24 @@ +<news> +<date>11. September 2019</date> +<title>Gedenken an Józef Kucia</title> +<body> +<a href="{$root}/images/Józef-Kucia.png"><img src="{$root}/images/Józef-Kucia.png" + style="margin: 0 20px 20px 0;"/></a> + Mit großer Trauer verkünden wir den Tod unseres Freundes Józef Kucia. + Józef war ein wichtiger Mitwirkender am Wine-Projekt mit über 2500 Patches seit seinem ersten +Beitrag im Jahr 2012. Er war ein außerordentlich talentierter Entwickler mit Fokus auf Wines +Direct3D-Subsystem. Józef gründete und leitete das vkd3d-Projekt und unterstützte die Vulkan-Arbeitsgruppe +mit seinem Sachverständnis und gutem Rat. Er leistete auch wertvolle Beiträge zu anderen Open-Source-Projekten, +unter anderem Mesa und Debian. + Józef war ein regelmäßiger Teilnehmer an der jährlichen WineConf. Als ein Mann weniger Worte +war er dennoch stets hilfsbereit und zeigte stille Freundlichkeit und Güte. Seine Fähigkeiten +erweckten das Interesse von CodeWeavers und so trat Józef <a +href="https://www.codeweavers.com/about/blogs/jwhite/2019/09/08/a-tragic-loss">ihrem Team</a> +2015 bei. Das erlaubte ihm, Wine noch mehr seiner Zeit zu widmen. + Józef starb letzten Monat im Alter von 30 Jahren bei einem Unfall in der Jaskinia +Wielka Śnieżna ("Die große Schneehöhle") im Tatra-Gebirge in Polen. Das Höhlenwandern war seine +Leidenschaft. + + Józef wird allen, die mit ihm zusammengearbeitet haben, in wohliger Erinnnerung bleiben. +Unsere Gedanken und unser Beileid sind bei Józefs Familie, Freunden, Liebsten und jedem, der um ihn trauert. +</body></news>

1 0

Julian Rüger : German translation for release 4.17.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: website Branch: master Commit: ae7c29cf73c244de3d6bb775ed5927595968e05f URL: https://source.winehq.org/git/website.git/?a=commit;h=ae7c29cf73c244de3d6bb… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:49:17 2019 +0100 German translation for release 4.17. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019092701.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2019092701.xml b/news/de/2019092701.xml new file mode 100644 index 00000000..883cf81d --- /dev/null +++ b/news/de/2019092701.xml @@ -0,0 +1,18 @@ +<news> +<date>27. September 2019</date> +<title>Wine 4.17 freigegeben</title> +<body> + Die Entwicklungsversion 4.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine mit Korrekturen aus dem Upstream-Projekt.</li> + <li>Unterstützung von DXTn-komprimierten Texturen.</li> + <li>Anfängliche Version der Windows-Script-Laufzeitbibliothek.</li> + <li>Unterstützung von XRandR-Geräteänderungsbenachrichtigungen.</li> + <li>Unterstützung für das Erzeugen von RSA-Schlüsseln.</li> + <li>Stubless-Proxies-Unterstützung unter ARM64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.17.tar.xz">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

Julian Rüger : German translation for release 4.19.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: website Branch: master Commit: 29be6c21c7c9b5095002f5cb75351f0a5d4c0699 URL: https://source.winehq.org/git/website.git/?a=commit;h=29be6c21c7c9b5095002f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:53:33 2019 +0100 German translation for release 4.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019110101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019110101.xml b/news/de/2019110101.xml new file mode 100644 index 00000000..116653a5 --- /dev/null +++ b/news/de/2019110101.xml @@ -0,0 +1,15 @@ +<news> +<date>1. November 2019</date> +<title>Wine 4.19 freigegeben</title> +<body> + Die Entwicklungsversion 4.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehrere zusätzliche VBScript-Features.</li> + <li>Weitere Stateblock-Unterstützung in WineD3D.</li> + <li>Einige Korrekturen an der ARM64-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz">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

Julian Rüger : German translation for release 4.18.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: website Branch: master Commit: 18d4ec16f185a71038a6686d82523c37c01694c6 URL: https://source.winehq.org/git/website.git/?a=commit;h=18d4ec16f185a71038a66… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:51:42 2019 +0100 German translation for release 4.18. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019101801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019101801.xml b/news/de/2019101801.xml new file mode 100644 index 00000000..09525f38 --- /dev/null +++ b/news/de/2019101801.xml @@ -0,0 +1,15 @@ +<news> +<date>18. Oktober 2019</date> +<title>Wine 4.18 freigegeben</title> +<body> + Die Entwicklungsversion 4.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele neue VBScript-Funktionen.</li> + <li>Einige Aufräumarbeiten und Verbesserungen an Quartz.</li> + <li>Korrektur von etlichen Test-Fehlschlägen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz">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

Julian Rüger : German translation for release 4.16.
by Alexandre Julliard Nov. 11, 2019

Nov. 11, 2019

Module: website Branch: master Commit: 6ca99513c85bbe5105575f3ba1a519d0480712d1 URL: https://source.winehq.org/git/website.git/?a=commit;h=6ca99513c85bbe5105575… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 11 14:45:13 2019 +0100 German translation for release 4.16. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019091301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019091301.xml b/news/de/2019091301.xml new file mode 100644 index 00000000..77ee5c17 --- /dev/null +++ b/news/de/2019091301.xml @@ -0,0 +1,15 @@ +<news> +<date>13. September 2019</date> +<title>Wine 4.16 freigegeben</title> +<body> + Die Entwicklungsversion 4.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Zuverlässigeres "Einfangen" der Maus in Spielen.</li> + <li>Bessere Unterstützung von Cross-Compilierung in WineGCC.</li> + <li>Verbesserte Kompatibilität mit Windows-Debuggern.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.16.tar.xz">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

Jacek Caban : widl: Use strmake in get_name.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: wine Branch: master Commit: c15f83a2a32d0026e22c8e3bf14231482d756d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15f83a2a32d0026e22c8e3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:01:43 2019 +0100 widl: Use strmake in get_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 61fadcf72f..c00a3e1bb3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -180,18 +180,16 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) const char *get_name(const var_t *v) { - static char buffer[256]; - + static char *buffer; + free( buffer ); if (is_attr( v->attrs, ATTR_PROPGET )) - strcpy( buffer, "get_" ); - else if (is_attr( v->attrs, ATTR_PROPPUT )) - strcpy( buffer, "put_" ); - else if (is_attr( v->attrs, ATTR_PROPPUTREF )) - strcpy( buffer, "putref_" ); - else - buffer[0] = 0; - strcat( buffer, v->name ); - return buffer; + return buffer = strmake( "get_%s", v->name ); + if (is_attr( v->attrs, ATTR_PROPPUT )) + return buffer = strmake( "put_%s", v->name ); + if (is_attr( v->attrs, ATTR_PROPPUTREF )) + return buffer = strmake( "putref_%s", v->name ); + buffer = NULL; + return v->name; } static void write_fields(FILE *h, var_list_t *fields)

1 0

Jacek Caban : configure: Get rid of no longer needed __builtin_clz check.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: wine Branch: master Commit: a94c8d5b6b68b883d3951b0064f39d427d269b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a94c8d5b6b68b883d3951b00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 20:03:06 2019 +0100 configure: Get rid of no longer needed __builtin_clz check. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 --------------------------------- configure.ac | 9 --------- include/config.h.in | 3 --- 3 files changed, 45 deletions(-) diff --git a/configure b/configure index f1797bf603..ad0b149b7d 100755 --- a/configure +++ b/configure @@ -19490,39 +19490,6 @@ done LIBS="$ac_save_LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5 -$as_echo_n "checking for __builtin_clz... " >&6; } -if ${ac_cv_have___builtin_clz+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -return __builtin_clz(1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_have___builtin_clz="yes" -else - ac_cv_have___builtin_clz="no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___builtin_clz" >&5 -$as_echo "$ac_cv_have___builtin_clz" >&6; } -if test "$ac_cv_have___builtin_clz" = "yes" -then - -$as_echo "#define HAVE___BUILTIN_CLZ 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 $as_echo_n "checking for __builtin_popcount... " >&6; } if ${ac_cv_have___builtin_popcount+:} false; then : diff --git a/configure.ac b/configure.ac index e5003f769c..4f651efbd5 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,15 +2738,6 @@ AC_CHECK_FUNCS(\ ) LIBS="$ac_save_LIBS" -dnl Check for __builtin_clz -AC_CACHE_CHECK([for __builtin_clz], ac_cv_have___builtin_clz, - AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_clz(1)]])], - [ac_cv_have___builtin_clz="yes"], [ac_cv_have___builtin_clz="no"])) -if test "$ac_cv_have___builtin_clz" = "yes" -then - AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) -fi - dnl Check for __builtin_popcount AC_CACHE_CHECK([for __builtin_popcount], ac_cv_have___builtin_popcount, AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_popcount(1)]])], diff --git a/include/config.h.in b/include/config.h.in index 9c7a49ae9a..858ee9bfd8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1304,9 +1304,6 @@ /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP -/* Define to 1 if you have the `__builtin_clz' built-in function. */ -#undef HAVE___BUILTIN_CLZ - /* Define to 1 if you have the `__builtin_popcount' built-in function. */ #undef HAVE___BUILTIN_POPCOUNT

1 0

Jacek Caban : jscript: Treat only ASCII digits as digits.
by Alexandre Julliard Nov. 8, 2019

Nov. 8, 2019

Module: wine Branch: master Commit: f34cecbae27a484f1aa026840dc6d224ffa0b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34cecbae27a484f1aa02684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 21:26:08 2019 +0100 jscript: Treat only ASCII digits as digits. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 2 +- dlls/jscript/global.c | 18 ++++++++++-------- dlls/jscript/jscript.h | 5 +++++ dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 30 +++++++++++++++--------------- dlls/jscript/string.c | 4 ++-- dlls/jscript/tests/api.js | 1 + 9 files changed, 40 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f34cecbae27a484f1aa0…

1 0