December 2019 - Wine-Commits

Francois Gouget : winevulkan: Fix the spelling of a make_vulkan comment.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 8b86f185115e1b1b7c9f898a191ef52099618364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b86f185115e1b1b7c9f898a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:16 2019 +0100 winevulkan: Fix the spelling of a make_vulkan comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b8335ca3ad..f9b1e1cf96 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -235,7 +235,7 @@ class VkBaseType(object): Args: name (:obj:'str'): Name of the base type. - _type (:obj:'str'): Underlaying type + _type (:obj:'str'): Underlying type alias (bool): type is an alias or not. requires (:obj:'str', optional): Other types required. Often bitmask values pull in a *FlagBits type.

1 0

Zebediah Figura : wineqtdecoder: Use base sink streaming methods.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: ddd77e7460a952dd73a8a666f678d5a59e02ee9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd77e7460a952dd73a8a666… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:38 2019 -0600 wineqtdecoder: Use base sink streaming methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 01ec4c2ced..df6e8ea5d2 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1030,31 +1030,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) return hr; } -static HRESULT WINAPI QTInPin_EndOfStream(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_BeginFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_EndFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_NewSegment(IPin *iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) -{ - BasePinImpl_NewSegment(iface, tStart, tStop, dRate); - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, @@ -1070,10 +1045,10 @@ static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, - QTInPin_EndOfStream, - QTInPin_BeginFlush, - QTInPin_EndFlush, - QTInPin_NewSegment + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment }; static inline QTOutPin *impl_source_from_strmbase_pin(struct strmbase_pin *iface)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: b958cfd39ff9d894fa118534b9853d71db039e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b958cfd39ff9d894fa118534… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Dec 13 10:37:27 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/lt.po b/po/lt.po index 76eae14623..68ab5b3d03 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-01 13:42+0200\n" +"PO-Revision-Date: 2019-12-13 10:36+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8297,26 +8297,20 @@ msgid "Off" msgstr "Išjungta" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vaizdas" +msgstr "Tiekėjas" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Išrinkite formatą, kurį norite naudoti:" +msgstr "Išrinkite duomenis, prie kurių norite jungtis:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Savybės" +msgstr "Duomenų saito savybės" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB tiekėjai" #: oledlg.rc:55 msgid "Insert Object"

1 0

Francois Gouget : shlwapi: Fix the spelling of a couple of comments.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 1f552719bd47f0a59826d9269e44fb1d48176dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f552719bd47f0a59826d926… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:02 2019 +0100 shlwapi: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index fbdd83a425..c5c4fa14ad 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4635,7 +4635,7 @@ static const struct objcompat_entry objcompat_table[] = { * in registry for CLSID under ShellCompatibility subkey. * * PARAMS - * pUnk: pointer to object IUnknown interface, idetifies CLSID + * pUnk: pointer to object IUnknown interface, identifies CLSID * clsid: pointer to CLSID to retrieve data for * * RETURNS diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6781b09432..135d82ead1 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1485,7 +1485,7 @@ static void test_IConnectionPoint(void) rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); -/* MSDN says this should be required but it crashs on XP +/* MSDN says this should be required but it crashes on XP IUnknown_Release(point); */ ref = IUnknown_Release((IUnknown*)container);

1 0

Michael Stefaniuc : dmloader: Simplify tracing of DMUS_CONTAINED_OBJF_KEEP flag.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: ee639a55e634bef5aea871d38813cd41efa85e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee639a55e634bef5aea871d3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:47:18 2019 +0100 dmloader: Simplify tracing of DMUS_CONTAINED_OBJF_KEEP flag. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/debug.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 30e3fd69cc..1be92e72af 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -43,33 +43,6 @@ const char *resolve_STREAM_SEEK (DWORD flag) { } } -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_CONTAINED_OBJF flags */ -static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_CONTAINED_OBJF_KEEP) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { char buffer[1024], *ptr = buffer; @@ -90,7 +63,8 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); - ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINED_OBJF_FLAGS (pHeader->dwFlags)); + ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + pHeader->dwFlags & DMUS_CONTAINED_OBJF_KEEP ? " (DMUS_CONTAINED_OBJF_KEEP)" : ""); ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType));

1 0

Zebediah Figura : strmbase: Introduce callbacks for streaming events.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 57a7d6d4c7d7854bafd464d5fd2a480a7951663f URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a7d6d4c7d7854bafd464d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:34 2019 -0600 strmbase: Introduce callbacks for streaming events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 42 ++++++++++++++++++++++++++++++------------ include/wine/strmbase.h | 4 ++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 3dd00b27cc..177d52740d 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,6 +718,9 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) TRACE("(%p)->()\n", This); + if (This->pFuncsTable->sink_eos) + return This->pFuncsTable->sink_eos(This); + EnterCriticalSection(&This->pin.filter->csFilter); if (This->flushing) hr = S_FALSE; @@ -735,15 +738,21 @@ static HRESULT deliver_beginflush(IPin* pin, LPVOID unused) HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) { - struct strmbase_sink *This = impl_sink_from_IPin(iface); + struct strmbase_sink *pin = impl_sink_from_IPin(iface); HRESULT hr; - TRACE("(%p) semi-stub\n", This); - EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = TRUE; + TRACE("pin %p.\n", pin); - hr = SendFurther(This, deliver_beginflush, NULL); - LeaveCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->csFilter); + + pin->flushing = TRUE; + + if (pin->pFuncsTable->sink_begin_flush) + hr = pin->pFuncsTable->sink_begin_flush(pin); + else + hr = SendFurther(pin, deliver_beginflush, NULL); + + LeaveCriticalSection(&pin->pin.filter->csFilter); return hr; } @@ -755,15 +764,21 @@ static HRESULT deliver_endflush(IPin* pin, LPVOID unused) HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) { - struct strmbase_sink *This = impl_sink_from_IPin(iface); + struct strmbase_sink *pin = impl_sink_from_IPin(iface); HRESULT hr; - TRACE("(%p)->()\n", This); - EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = FALSE; + TRACE("pin %p.\n", pin); - hr = SendFurther(This, deliver_endflush, NULL); - LeaveCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->csFilter); + + pin->flushing = FALSE; + + if (pin->pFuncsTable->sink_end_flush) + hr = pin->pFuncsTable->sink_end_flush(pin); + else + hr = SendFurther(pin, deliver_endflush, NULL); + + LeaveCriticalSection(&pin->pin.filter->csFilter); return hr; } @@ -788,6 +803,9 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, R TRACE("iface %p, start %s, stop %s, rate %.16e.\n", iface, debugstr_time(start), debugstr_time(stop), rate); + if (pin->pFuncsTable->sink_new_segment) + return pin->pFuncsTable->sink_new_segment(pin, start, stop, rate); + args.tStart = start; args.tStop = stop; args.rate = rate; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 83ad2e0bd6..c01ef6133f 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -95,6 +95,10 @@ struct strmbase_sink_ops BaseInputPin_Receive pfnReceive; HRESULT (*sink_connect)(struct strmbase_sink *pin, IPin *peer, const AM_MEDIA_TYPE *mt); void (*sink_disconnect)(struct strmbase_sink *pin); + HRESULT (*sink_eos)(struct strmbase_sink *pin); + HRESULT (*sink_begin_flush)(struct strmbase_sink *pin); + HRESULT (*sink_end_flush)(struct strmbase_sink *pin); + HRESULT (*sink_new_segment)(struct strmbase_sink *pin, REFERENCE_TIME start, REFERENCE_TIME stop, double rate); }; /* Base Pin */

1 0

Francois Gouget : winevulkan: Fix the spelling of an ERR() message.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 0d6f7d44a2f5390f74501376b9d9017855ac9c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6f7d44a2f5390f74501376… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:24 2019 +0100 winevulkan: Fix the spelling of an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 725bdf019e..59472bcef8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1050,7 +1050,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); if (!command_buffers) { - ERR("Unable to allocate memory for comman buffers!\n"); + ERR("Unable to allocate memory for command buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; goto done; }

1 0

Michael Stefaniuc : dmloader: Simplify tracing of the DMUS_CONTAINER_NOLOADS flag.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 1ca7f9a36fac0ac49f3629b47d70b103273ded35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca7f9a36fac0ac49f3629b4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:47:17 2019 +0100 dmloader: Simplify tracing of the DMUS_CONTAINER_NOLOADS flag. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/debug.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 398ce690d1..30e3fd69cc 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -62,14 +62,6 @@ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t n return ptr; } -/* dump DMUS_CONTAINER flags */ -static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_CONTAINER_NOLOADS) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - /* dump DMUS_CONTAINED_OBJF flags */ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { @@ -81,10 +73,11 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { char buffer[1024], *ptr = buffer; - + ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); - ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - + ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags, + pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : ""); + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)");

1 0

Alexandre Julliard : kernelbase: No longer import kernel32.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 3318278bfd9c69436421e0cc33ac3be14cf96c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3318278bfd9c69436421e0cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 09:50:15 2019 +0100 kernelbase: No longer import kernel32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/debug.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index aa2a79b910..9279ddbb57 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,6 +1,6 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase -IMPORTS = uuid ntdll winecrt0 kernel32 +IMPORTS = uuid ntdll winecrt0 EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin C_SRCS = \ diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index f79be7fa6f..53b95aa6dd 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -43,6 +43,8 @@ typedef INT (WINAPI *MessageBoxW_funcptr)(HWND,LPCWSTR,LPCWSTR,UINT); static PTOP_LEVEL_EXCEPTION_FILTER top_filter; +void *dummy = RtlUnwind; /* force importing RtlUnwind from ntdll */ + /*********************************************************************** * CheckRemoteDebuggerPresent (kernelbase.@) */

1 0

Alexandre Julliard : kernelbase: Remove support for LZ files in 32-bit version functions.
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 9fba161dfd842d6bd15d713496cacdbf2cdecf46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fba161dfd842d6bd15d7134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 09:49:52 2019 +0100 kernelbase: Remove support for LZ files in 32-bit version functions. Windows doesn't support it either. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 150 +++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fba161dfd842d6bd15d…

1 0