wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Ivan Chikish : wmvcore/tests: Check out value for NULL in check_interface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 2ae2d2fd07ad90804be33baf9e5974162f49b951 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ae2d2fd07ad90804be33baf9e5974… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 15:45:35 2023 +0300 wmvcore/tests: Check out value for NULL in check_interface. --- dlls/wmvcore/tests/wmvcore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index ae6071159f6..f07abb8d4bb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -134,7 +134,7 @@ static WCHAR *load_resource(const WCHAR *name) static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported) { HRESULT hr, expected_hr; - IUnknown *unknown = iface, *out; + IUnknown *unknown = iface, *out = (IUnknown *)0xbeef; expected_hr = supported ? S_OK : E_NOINTERFACE; @@ -142,6 +142,8 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); + else if (!supported) + ok_(__FILE__, line)(out == NULL, "Expected out == NULL\n"); return hr; }

1 0

Ivan Chikish : wmvcore: Add missing *out=NULL in WMReader_QueryInterface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: d6ccab8ecd507b54aab59028c1e64e75687c03bc URL: https://gitlab.winehq.org/wine/wine/-/commit/d6ccab8ecd507b54aab59028c1e64e… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 03:17:14 2023 +0300 wmvcore: Add missing *out=NULL in WMReader_QueryInterface. QueryInterface should set *out to NULL on failure. Also change the log level on failure to FIXME. --- dlls/wmvcore/async_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index a51018260b1..47de592c95c 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -544,7 +544,8 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID iid, void *out = &reader->IReferenceClock_iface; else { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Ivan Chikish : winegstreamer: Add missing *out=NULL in unknown_inner_QueryInterface.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: efc7a42bd5cf6297d6d51e4ad0556ba2f4f1bba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/efc7a42bd5cf6297d6d51e4ad0556b… Author: Ivan Chikish <nekotekina(a)gmail.com> Date: Wed Feb 8 03:14:49 2023 +0300 winegstreamer: Add missing *out=NULL in unknown_inner_QueryInterface. QueryInterface should set *out to NULL on failure. Also change the log level on failure to FIXME. --- dlls/winegstreamer/wm_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 18b0e8a90bc..50e2c5fc175 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1700,7 +1700,8 @@ static HRESULT WINAPI unknown_inner_QueryInterface(IUnknown *iface, REFIID iid, *out = &reader->IWMReaderTimecode_iface; else { - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; return E_NOINTERFACE; }

1 0

Alex Henrie : httpapi: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: cd2002fd23f4cf862c7a7835bc19f53338caa77f URL: https://gitlab.winehq.org/wine/wine/-/commit/cd2002fd23f4cf862c7a7835bc19f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 7 22:05:18 2023 -0700 httpapi: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/httpapi/httpapi_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 10131fdd029..b808b627174 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -185,7 +185,7 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); IO_STATUS_BLOCK iosb; TRACE("handle %p, reserved %#lx.\n", handle, reserved); @@ -193,7 +193,6 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) if (!handle) return ERROR_INVALID_PARAMETER; - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); @@ -741,7 +740,7 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); IO_STATUS_BLOCK iosb; TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", @@ -753,7 +752,6 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, if (flags) FIXME("Unhandled flags %#lx.\n", flags); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT;

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: a6847dd9fb3d9ce876e59e776b2a17f6b26bdf3f URL: https://gitlab.winehq.org/wine/wine/-/commit/a6847dd9fb3d9ce876e59e776b2a17… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 13:06:08 2023 -0500 vbscript: Fix memory leak in Split(). --- dlls/vbscript/interp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b3be3bea6cf..4881efa9454 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1375,24 +1375,31 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) if(array == NULL || array->cDims == 0) { /* can initially allocate the array */ array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); - VariantClear(v); - V_VT(v) = VT_ARRAY|VT_VARIANT; - V_ARRAY(v) = array; - return S_OK; + if(!array) + hres = E_OUTOFMEMORY; + else { + VariantClear(v); + V_VT(v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(v) = array; + } } else if(array->cDims != dim_cnt) { /* can't otherwise change the number of dimensions */ TRACE("Can't resize %s, cDims %d != %d\n", debugstr_w(identifier), array->cDims, dim_cnt); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); } else { /* can resize the last dimensions (if others match */ for(i = 0; i+1 < dim_cnt; ++i) { if(array->rgsabound[array->cDims - 1 - i].cElements != bounds[i].cElements) { TRACE("Can't resize %s, bound[%d] %ld != %ld\n", debugstr_w(identifier), i, array->rgsabound[i].cElements, bounds[i].cElements); - return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + hres = MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS); + break; } } - return SafeArrayRedim(array, &bounds[dim_cnt-1]); + if(SUCCEEDED(hres)) + hres = SafeArrayRedim(array, &bounds[dim_cnt-1]); } + free(bounds); + return hres; } static HRESULT interp_step(exec_ctx_t *ctx)

1 0

Jason Millard : vbscript: Fix memory leak in Split().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: f8b76d3da549f8f08a0413de438f929702a380af URL: https://gitlab.winehq.org/wine/wine/-/commit/f8b76d3da549f8f08a0413de438f92… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 11:06:24 2023 -0500 vbscript: Fix memory leak in Split(). --- dlls/vbscript/global.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8c2e5b85982..7ca2c2b9c72 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2578,12 +2578,12 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimiter = NULL; + BSTR string, delimiter = NULL; int count, max, mode, len, start, end, ret, delimiterlen = 1; int i, *indices = NULL, *new_indices, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; - VARIANT *data, var; + VARIANT *data; HRESULT hres = S_OK; TRACE("%s %u...\n", debugstr_variant(args), args_cnt); @@ -2691,19 +2691,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, start = 0; for (i = 0; i < count; i++) { - str = SysAllocStringLen(string + start, indices[i] - start); - if (!str) { + V_VT(&data[i]) = VT_BSTR; + V_BSTR(&data[i]) = SysAllocStringLen(string + start, indices[i] - start); + + if (!V_BSTR(&data[i])) { hres = E_OUTOFMEMORY; break; } - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = str; - - hres = VariantCopyInd(data+i, &var); - if(FAILED(hres)) { - SafeArrayUnaccessData(sa); - goto error; - } start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa);

1 0

Alex Henrie : ole32: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: da403f0b31636c8dbb8c73ad751cd650c9c14390 URL: https://gitlab.winehq.org/wine/wine/-/commit/da403f0b31636c8dbb8c73ad751cd6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 7 22:07:21 2023 -0700 ole32: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/ole32/compobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8d2591c1211..1eb5dc6e8f5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -252,7 +252,7 @@ static HKEY create_classes_root_hkey(DWORD access) { HKEY hkey, ret = 0; OBJECT_ATTRIBUTES attr; - UNICODE_STRING name; + UNICODE_STRING name = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes"); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -260,7 +260,6 @@ static HKEY create_classes_root_hkey(DWORD access) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name, L"\\Registry\\Machine\\Software\\Classes" ); if (create_key( &hkey, access, &attr )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey );

1 0

Alexandre Julliard : gitlab: Force updating configure.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 42daeba8b8eb58fbe9a12f71ed14672cacc92eaa URL: https://gitlab.winehq.org/wine/wine/-/commit/42daeba8b8eb58fbe9a12f71ed1467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 17:32:19 2023 +0100 gitlab: Force updating configure. --- tools/gitlab/build-linux | 2 +- tools/gitlab/build-mac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gitlab/build-linux b/tools/gitlab/build-linux index 659ff0a0c17..d77ca9cdb8e 100755 --- a/tools/gitlab/build-linux +++ b/tools/gitlab/build-linux @@ -7,7 +7,7 @@ set -Eeuxo pipefail ./tools/make_requests ./tools/make_makefiles -autoreconf +autoreconf -f cd build64 ../configure -q -C --enable-win64 --enable-werror --with-mingw diff --git a/tools/gitlab/build-mac b/tools/gitlab/build-mac index 20c1054150e..5c37aa6bcc9 100755 --- a/tools/gitlab/build-mac +++ b/tools/gitlab/build-mac @@ -7,7 +7,7 @@ set -Eeuxo pipefail ./tools/make_requests ./tools/make_makefiles -autoreconf +autoreconf -f cd build64 ../configure -C --enable-win64 --with-mingw BISON=/usr/local/opt/bison/bin/bison

1 0

Alexandre Julliard : winedump: Initial support for dumping PE dynamic relocations.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: cd7e86599ef44a306fe493511c6725261a7d5d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/cd7e86599ef44a306fe493511c6725… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 12:10:13 2023 +0100 winedump: Initial support for dumping PE dynamic relocations. --- include/winnt.h | 59 +++++++++++++++++++ tools/winedump/main.c | 2 +- tools/winedump/pe.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 214 insertions(+), 6 deletions(-)

1 0

Huw Davies : rpcrt4/tests: Remove a failing test.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: fc6af061faf1dadeb4193a91a0d7145d10bbb54f URL: https://gitlab.winehq.org/wine/wine/-/commit/fc6af061faf1dadeb4193a91a0d714… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 07:53:10 2023 +0000 rpcrt4/tests: Remove a failing test. --- dlls/rpcrt4/tests/rpc.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index a4653fd603f..2a3d43cfc2d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -158,41 +158,27 @@ static void test_UuidFromString(void) static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; - char buffer [1024]; /* The required size is not documented but would - * appear to be 256. - */ + char buffer [1024]; DWORD dwCount; + RPC_STATUS status; dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); + ok(dwCount, "Cannot set up for DceErrorInqText\n"); - /* A random sample of DceErrorInqText */ /* 0 is success */ - ok ((DceErrorInqTextA (0, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(0...)\n"); - /* A real RPC_S error */ - ok ((DceErrorInqTextA (RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(valid...)\n"); + status = DceErrorInqTextA(0, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); - if (dwCount) - { - /* A message for which FormatMessage should fail - * which should return RPC_S_OK and the - * fixed "not valid" message - */ - ok ((DceErrorInqTextA (35, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(unformattable...)\n"); - /* One for which FormatMessage should succeed but - * DceErrorInqText should "fail" - * 3814 is generally quite a long message - */ - ok ((DceErrorInqTextA (3814, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(deviation...)\n"); - } - else - ok (0, "Cannot set up for DceErrorInqText\n"); + /* A real RPC_S error */ + status = DceErrorInqTextA(RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + + /* A message for which FormatMessage should fail which should return RPC_S_OK and the + * fixed "not valid" message */ + status = DceErrorInqTextA(35, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + ok(!strcmp(buffer, bufferInvalid), "got %s vs %s\n", wine_dbgstr_a(buffer), wine_dbgstr_a(bufferInvalid)); } static RPC_DISPATCH_FUNCTION IFoo_table[] =

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2023