February 2022 - Wine-Commits

Eric Pouech : vdhcp.vxd: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 6c505ec991fbe0cecd2381f8e229ee9d3ea7190f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c505ec991fbe0cecd2381f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:20 2022 +0100 vdhcp.vxd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdhcp.vxd/Makefile.in | 1 - dlls/vdhcp.vxd/vdhcp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in index 715a2acf6b0..b27d520f256 100644 --- a/dlls/vdhcp.vxd/Makefile.in +++ b/dlls/vdhcp.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdhcp.vxd C_SRCS = \ diff --git a/dlls/vdhcp.vxd/vdhcp.c b/dlls/vdhcp.vxd/vdhcp.c index a7b97a338cb..b00d0380e7b 100644 --- a/dlls/vdhcp.vxd/vdhcp.c +++ b/dlls/vdhcp.vxd/vdhcp.c @@ -62,7 +62,7 @@ BOOL WINAPI VDHCP_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, break; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,

1 0

Eric Pouech : vbscript: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: d92d623d3260ae46cd3b89d630ffd5457ef9af50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92d623d3260ae46cd3b89d6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:57:56 2022 +0100 vbscript: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 1 - dlls/vbscript/global.c | 12 +++---- dlls/vbscript/interp.c | 14 ++++---- dlls/vbscript/parser.y | 2 +- dlls/vbscript/regexp.c | 6 ++-- dlls/vbscript/utils.c | 6 ++-- dlls/vbscript/vbdisp.c | 74 +++++++++++++++++++++---------------------- dlls/vbscript/vbregexp.c | 54 +++++++++++++++---------------- dlls/vbscript/vbscript.c | 36 ++++++++++----------- dlls/vbscript/vbscript_main.c | 2 +- 10 files changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d92d623d3260ae46cd3b…

1 0

Nikolay Sivov : mfplat: Add VT_R4 case for propvariant tracing.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 6dc3d258ce69c8ee34f7399ebf0460300f210b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc3d258ce69c8ee34f7399e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 18:48:12 2022 +0300 mfplat: Add VT_R4 case for propvariant tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index dc29545df73..8418c8eb2ef 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -133,6 +133,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); case VT_I8: return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID:

1 0

Nikolay Sivov : usp10/tests: Remove workarounds for missing functions.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 2a4b57624f26ffe1839f7185753d8901d3074e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4b57624f26ffe1839f7185… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 19 11:45:22 2022 +0300 usp10/tests: Remove workarounds for missing functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 122 +++++++++++++++-------------------------------- include/usp10.h | 15 ++++++ 2 files changed, 53 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a4b57624f26ffe1839f…

1 0

Eric Pouech : vcruntime140: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 581de3085aabae19f3f04dc5745a3596beec8ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=581de3085aabae19f3f04dc5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:08 2022 +0100 vcruntime140: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/Makefile.in | 1 - dlls/vcruntime140/misc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index af1b62c0b40..2b4d6af7c91 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcruntime140.dll C_SRCS = \ diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index cc641754389..cc0af902677 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -46,7 +46,7 @@ void CDECL __telemetry_main_return_trigger(HINSTANCE hinst) BOOL CDECL __vcrt_InitializeCriticalSectionEx( CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) { - TRACE("(%p %x %x)\n", cs, spin_count, flags); + TRACE("(%p %lx %lx)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); }

1 0

Nikolay Sivov : shcore/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: f3a87a92e9780e85d42e89c98547a28d98a32c4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a87a92e9780e85d42e89c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 19:31:10 2022 +0300 shcore/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/tests/Makefile.in | 1 - dlls/shcore/tests/shcore.c | 136 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3a87a92e9780e85d42e…

1 0

Eric Pouech : vdmdbg: Enable compilation with long types.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: fdc7a21748c35407f901a1cd868f1780e91a08e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc7a21748c35407f901a1cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 21 07:58:26 2022 +0100 vdmdbg: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdmdbg/Makefile.in | 1 - dlls/vdmdbg/vdmdbg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 8b99c6ba891..63051c1c23c 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdmdbg.dll IMPORTLIB = vdmdbg diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c index b56c62535ac..c988fd6461f 100644 --- a/dlls/vdmdbg/vdmdbg.c +++ b/dlls/vdmdbg/vdmdbg.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vdmdbg); */ INT WINAPI VDMEnumTaskWOW(DWORD dwProcessId, TASKENUMPROC fp, LPARAM lparam) { - FIXME("(%d, %p): stub!\n", dwProcessId, fp); + FIXME("(%ld, %p): stub!\n", dwProcessId, fp); return 0; }

1 0

Nikolay Sivov : usp10/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 258f83ded3a7d929828731812c5859323e9e4059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258f83ded3a7d92982873181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 19 11:45:21 2022 +0300 usp10/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/Makefile.in | 1 - dlls/usp10/tests/usp10.c | 473 +++++++++++++++++++++---------------------- 2 files changed, 234 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=258f83ded3a7d9298287…

1 0

Nikolay Sivov : scrrun: Move IO mode check to writing helper.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: a9c4bda48138627b9f98bda403bea7f7a74e185c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c4bda48138627b9f98bda4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:14 2022 +0300 scrrun: Move IO mode check to writing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4794437a71d..0e51929ea54 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -609,11 +609,14 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) return read_from_buffer(This, This->read_buf_size, text, 0) ? S_FALSE : E_OUTOFMEMORY; } -static HRESULT textstream_writestr(struct textstream *stream, BSTR text) +static HRESULT textstream_write(struct textstream *stream, BSTR text) { DWORD written = 0; BOOL ret; + if (textstream_check_iomode(stream, IOWrite)) + return CTL_E_BADFILEMODE; + if (stream->unicode) { ret = WriteFile(stream->file, text, SysStringByteLen(text), &written, NULL); return (ret && written == SysStringByteLen(text)) ? S_OK : create_error(GetLastError()); @@ -636,14 +639,11 @@ static HRESULT textstream_writestr(struct textstream *stream, BSTR text) static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + struct textstream *stream = impl_from_ITextStream(iface); - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - return textstream_writestr(This, text); + return textstream_write(stream, text); } static HRESULT textstream_writecrlf(struct textstream *stream) @@ -669,17 +669,14 @@ static HRESULT textstream_writecrlf(struct textstream *stream) static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); + struct textstream *stream = impl_from_ITextStream(iface); HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); - - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - hr = textstream_writestr(This, text); + hr = textstream_write(stream, text); if (SUCCEEDED(hr)) - hr = textstream_writecrlf(This); + hr = textstream_writecrlf(stream); return hr; }

1 0

Nikolay Sivov : wshom: Implement standard streams properties for Exec object.
by Alexandre Julliard Feb. 21, 2022

Feb. 21, 2022

Module: wine Branch: master Commit: 1128970a757a4b31a531e7c9178a44acec78bbfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128970a757a4b31a531e7c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 20 17:09:17 2022 +0300 wshom: Implement standard streams properties for Exec object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38210 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d1942c73cea..e04844458b1 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -230,29 +230,38 @@ static HRESULT WINAPI WshExec_get_Status(IWshExec *iface, WshExecStatus *status) static HRESULT WINAPI WshExec_get_StdIn(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stdin_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_StdOut(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stdout_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) { - WshExecImpl *This = impl_from_IWshExec(iface); + WshExecImpl *exec = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, stream); + TRACE("%p, %p.\n", iface, stream); - return E_NOTIMPL; + *stream = exec->stderr_stream; + ITextStream_AddRef(*stream); + + return S_OK; } static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid)

1 0