wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Nikolay Sivov : d3dxof: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 08c6560e7460485e1c128def34af4e8129927e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c6560e7460485e1c128def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 12 20:28:08 2022 +0200 d3dxof: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/Makefile.in | 1 - dlls/d3dxof/d3dxof.c | 561 ++++++++++++++++++++++++------------------------ dlls/d3dxof/parsing.c | 76 +++---- 3 files changed, 322 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08c6560e7460485e1c12…

1 0

Zebediah Figura : server: Return STATUS_BUFFER_TOO_SMALL instead of STATUS_BUFFER_OVERFLOW from get_directory_entry.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 2d147ce9851311338ddb0703eaf4b39ef7176e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d147ce9851311338ddb0703… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 10 23:29:51 2022 -0500 server: Return STATUS_BUFFER_TOO_SMALL instead of STATUS_BUFFER_OVERFLOW from get_directory_entry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- server/directory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 064caddf10a..91eb2919cb6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2637,7 +2637,7 @@ static void test_query_directory(void) size = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); diff --git a/server/directory.c b/server/directory.c index 2cd61be0838..caaf8c43d33 100644 --- a/server/directory.c +++ b/server/directory.c @@ -556,7 +556,7 @@ DECL_HANDLER(get_directory_entry) memcpy( (char *)ptr + name_len, type_name->str, type_name->len ); } } - else set_error( STATUS_BUFFER_OVERFLOW ); + else set_error( STATUS_BUFFER_TOO_SMALL ); release_object( obj ); }

1 0

Zebediah Figura : ntdll: Do not write the "ret_size" parameter of NtQueryDirectoryObject on failure.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: ccf706b456eb54853128586b30860e88a75bee73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf706b456eb54853128586b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 10 23:29:50 2022 -0500 ntdll: Do not write the "ret_size" parameter of NtQueryDirectoryObject on failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/unix/sync.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 8912080b21d..064caddf10a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2574,7 +2574,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); + ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 373afd69b2b..e1cc2d818b4 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1125,11 +1125,12 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; *context = index + 1; + + if (ret_size) + *ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer); } } SERVER_END_REQ; - if (ret_size) - *ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer); } else {

1 0

Zebediah Figura : ntdll: Do not write the "context" parameter of NtQueryDirectoryObject on failure.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 07d93d9f685dd208952d46a27151824faee09471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d93d9f685dd208952d46a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 10 23:29:49 2022 -0500 ntdll: Do not write the "context" parameter of NtQueryDirectoryObject on failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 12 ++++++------ dlls/ntdll/unix/sync.c | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b86d1e003a2..8912080b21d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2531,14 +2531,14 @@ static void test_query_directory(void) size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); context = 0xdeadbeef; @@ -2546,7 +2546,7 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2556,7 +2556,7 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2573,7 +2573,7 @@ static void test_query_directory(void) size = 0xdeadbeef; status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_INVALID_HANDLE, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == 0xdeadbeef || broken(!size) /* WoW64 */, "got size %lu\n", size); size = 0xdeadbeef; @@ -2631,7 +2631,7 @@ static void test_query_directory(void) context = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); - todo_wine ok( context == 0xdeadbeef, "got context %#lx\n", context ); + ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); size = 0xdeadbeef; diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 0786454dad2..373afd69b2b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1099,10 +1099,9 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI ULONG size, BOOLEAN single_entry, BOOLEAN restart, ULONG *context, ULONG *ret_size ) { + ULONG index = restart ? 0 : *context; NTSTATUS ret; - if (restart) *context = 0; - if (single_entry) { if (size <= sizeof(*buffer) + 2 * sizeof(WCHAR)) return STATUS_BUFFER_OVERFLOW; @@ -1110,7 +1109,7 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI SERVER_START_REQ( get_directory_entry ) { req->handle = wine_server_obj_handle( handle ); - req->index = *context; + req->index = index; wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2*sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { @@ -1125,7 +1124,7 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectTypeName.Length ); buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; - (*context)++; + *context = index + 1; } } SERVER_END_REQ;

1 0

Zebediah Figura : ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 7a5c26f7f2d2f9e1d3053fb99bd39510e09a9276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5c26f7f2d2f9e1d3053fb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 10 23:29:48 2022 -0500 ntdll/tests: Add some tests for NtQueryDirectoryObject(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a5c26f7f2d2f9e1d305…

1 0

Eric Pouech : windowscodecs/tests: Simplify printf for 64 bit integers.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: c25bd520ac5469500eaa487f306580b83c8f0471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c25bd520ac5469500eaa487f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 09:43:47 2022 +0200 windowscodecs/tests: Simplify printf for 64 bit integers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 14 +++++++------- dlls/windowscodecs/tests/pngformat.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 57d8e2b1bea..7902a5fcb8d 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -713,27 +713,27 @@ static void compare_metadata(IWICMetadataReader *reader, const struct test_data case VT_UI1: ok(td[i].count == U(value).caub.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caub.cElems); for (j = 0; j < U(value).caub.cElems; j++) - ok(td[i].value[j] == U(value).caub.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caub.pElems[j]); + ok(td[i].value[j] == U(value).caub.pElems[j], "%lu: expected value[%ld] %#I64x, got %#x\n", i, j, td[i].value[j], U(value).caub.pElems[j]); break; case VT_I2: case VT_UI2: ok(td[i].count == U(value).caui.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caui.cElems); for (j = 0; j < U(value).caui.cElems; j++) - ok(td[i].value[j] == U(value).caui.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#x\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caui.pElems[j]); + ok(td[i].value[j] == U(value).caui.pElems[j], "%lu: expected value[%ld] %#I64x, got %#x\n", i, j, td[i].value[j], U(value).caui.pElems[j]); break; case VT_I4: case VT_UI4: case VT_R4: ok(td[i].count == U(value).caul.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caul.cElems); for (j = 0; j < U(value).caul.cElems; j++) - ok(td[i].value[j] == U(value).caul.pElems[j], "%lu: expected value[%ld] %#lx/%#lx, got %#lx\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).caul.pElems[j]); + ok(td[i].value[j] == U(value).caul.pElems[j], "%lu: expected value[%ld] %#I64x, got %#lx\n", i, j, td[i].value[j], U(value).caul.pElems[j]); break; case VT_I8: case VT_UI8: case VT_R8: ok(td[i].count == U(value).cauh.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).cauh.cElems); for (j = 0; j < U(value).cauh.cElems; j++) - ok(td[i].value[j] == U(value).cauh.pElems[j].QuadPart, "%lu: expected value[%ld] %08lx/%08lx, got %08lx/%08lx\n", i, j, (ULONG)td[i].value[j], (ULONG)(td[i].value[j] >> 32), U(value).cauh.pElems[j].u.LowPart, U(value).cauh.pElems[j].u.HighPart); + ok(td[i].value[j] == U(value).cauh.pElems[j].QuadPart, "%lu: expected value[%ld] %I64x, got %08lx/%08lx\n", i, j, td[i].value[j], U(value).cauh.pElems[j].u.LowPart, U(value).cauh.pElems[j].u.HighPart); break; case VT_LPSTR: ok(td[i].count == U(value).calpstr.cElems, "%lu: expected cElems %d, got %ld\n", i, td[i].count, U(value).caub.cElems); @@ -760,8 +760,8 @@ static void compare_metadata(IWICMetadataReader *reader, const struct test_data ok(!memcmp(td[i].string, U(value).blob.pBlobData, td[i].count), "%lu: expected %s, got %s\n", i, td[i].string, U(value).blob.pBlobData); } else - ok(U(value).uhVal.QuadPart == td[i].value[0], "%lu: expected value %#x/%#x got %#lx/%#lx\n", - i, (UINT)td[i].value[0], (UINT)(td[i].value[0] >> 32), U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); + ok(U(value).uhVal.QuadPart == td[i].value[0], "%lu: expected value %#I64x got %#lx/%#lx\n", + i, td[i].value[0], U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); PropVariantClear(&schema); PropVariantClear(&id); @@ -2082,7 +2082,7 @@ static void test_metadata_APE(void) ok(value.vt == (VT_UI1|VT_VECTOR), "unexpected vt: %i\n", id.vt); ok(td[1].count == U(value).caub.cElems, "expected cElems %d, got %ld\n", td[1].count, U(value).caub.cElems); for (i = 0; i < U(value).caub.cElems; i++) - ok(td[1].value[i] == U(value).caub.pElems[i], "%u: expected value %#lx/%#lx, got %#x\n", i, (ULONG)td[1].value[i], (ULONG)(td[1].value[i] >> 32), U(value).caub.pElems[i]); + ok(td[1].value[i] == U(value).caub.pElems[i], "%u: expected value %#I64x, got %#x\n", i, td[1].value[i], U(value).caub.pElems[i]); PropVariantClear(&value); hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 1181ebbe369..ca5a220d40d 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -300,8 +300,8 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma zero.QuadPart = 0; IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); - ok(pos.QuadPart < image_size, "seek beyond the end of stream: %x%08x >= %x\n", - (UINT)(pos.QuadPart >> 32), (UINT)pos.QuadPart, image_size); + ok(pos.QuadPart < image_size, "seek beyond the end of stream: %I64x >= %x\n", + pos.QuadPart, image_size); refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n");

1 0

Gabriel Ivăncescu : jscript: Treat NULL disps as actual null values in html mode.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 4fd955ae074c6e09ad07aea7bec86f56ecd0206d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd955ae074c6e09ad07aea7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 12 17:47:32 2022 +0300 jscript: Treat NULL disps as actual null values in html mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 14 +++++++------- dlls/jscript/enumerator.c | 10 +++++----- dlls/jscript/jsutils.c | 8 ++++---- dlls/jscript/jsval.h | 2 +- dlls/jscript/vbarray.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 7 ++----- dlls/mshtml/tests/es5.js | 8 ++++++++ 7 files changed, 29 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd955ae074c6e09ad07…

1 0

Gabriel Ivăncescu : mshtml/tests: Add initial tests for NULL Dispatch objects in scripts.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 3485f162e918e35c9cdceda89d90e841135677a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3485f162e918e35c9cdceda8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 12 17:47:31 2022 +0300 mshtml/tests: Add initial tests for NULL Dispatch objects in scripts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 58 +++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 96 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/script.c | 68 +++++++++++++++++++++++++++ 3 files changed, 222 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3485f162e918e35c9cdc…

1 0

Gabriel Ivăncescu : jscript: Accept DISPATCH_PROPERTYPUTREF for jsdisps.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: 3349dc5eeacd2abdaf3ae9b2f3aa67cca391f9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3349dc5eeacd2abdaf3ae9b2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 12 17:47:30 2022 +0300 jscript: Accept DISPATCH_PROPERTYPUTREF for jsdisps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45493 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 ++ dlls/jscript/tests/run.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 319617b7a52..7f4d1e10ba4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1627,6 +1627,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } break; } + case DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT: { jsval_t val; DWORD i; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5e797a19cb9..e4408be2662 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2787,6 +2787,91 @@ static void test_retval(void) close_script(engine); } +static void test_propputref(void) +{ + static DISPID propput_dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {0}, dp_get = {0}; + IActiveScript *script, *script2; + IDispatch *disp, *obj; + HRESULT hres; + VARIANT v; + DISPID id; + BSTR str; + + hres = parse_script_expr(L"new Object()", &v, &script2); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + obj = V_DISPATCH(&v); + + hres = parse_script_expr(L"var disp = new Object(); disp.a = disp; disp", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + str = SysAllocString(L"a"); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, 0, &id); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + SysFreeString(str); + + dp.cArgs = dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + dp.rgvarg = &v; + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = obj; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + VariantClear(&v); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = obj; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + IDispatch_Release(obj); + close_script(script2); + VariantClear(&v); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_DISPATCH(&v), "V_DISPATCH(v) = %p\n", V_DISPATCH(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_I4; + V_I4(&v) = 42; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %ld\n", V_I4(&v)); + + IDispatch_Release(disp); + close_script(script); +} + static void test_default_value(void) { static DISPID propput_dispid = DISPID_PROPERTYPUT; @@ -2888,6 +2973,10 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); IDispatch_Release(disp); close_script(script); @@ -2899,6 +2988,10 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); IDispatch_Release(disp); close_script(script); } @@ -2968,6 +3061,7 @@ static void test_script_exprs(void) VariantClear(&v); test_default_value(); + test_propputref(); test_retval(); testing_expr = FALSE;

1 0

Eric Pouech : kernelbase: Provide a pseudo console environment for initial CUI processes not tied to a Unix tty.
by Alexandre Julliard 12 Apr '22

12 Apr '22

Module: wine Branch: master Commit: eff83cd4e00e8ccd4daad05bdd6d76e77664ddd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff83cd4e00e8ccd4daad05b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 15:05:09 2022 +0200 kernelbase: Provide a pseudo console environment for initial CUI processes not tied to a Unix tty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52771 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52761 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52743 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 18 ++++++++++++++---- dlls/ntdll/unix/env.c | 2 ++ include/wine/condrv.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 046eee6147c..590198cf7bf 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -86,6 +86,12 @@ static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_co IO_STATUS_BLOCK io; NTSTATUS status; + if (handle == CONSOLE_HANDLE_SHELL_NO_WINDOW) + { + WARN("Incorrect access to Shell-no-window console (ioctl=%lx)\n", code); + SetLastError( ERROR_INVALID_ACCESS ); + return FALSE; + } status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, code, in_buff, in_count, out_buff, out_count ); switch( status ) @@ -621,10 +627,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { RtlEnterCriticalSection( &console_section ); - NtClose( console_connection ); - console_connection = NULL; + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != CONSOLE_HANDLE_SHELL_NO_WINDOW) + { + NtClose( console_connection ); + console_connection = NULL; - NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); + NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); + } RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; if (console_flags & CONSOLE_INPUT_HANDLE) NtClose( GetStdHandle( STD_INPUT_HANDLE )); @@ -2303,5 +2312,6 @@ void init_console( void ) if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) alloc_console( no_window ); } - else if (params->ConsoleHandle) create_console_connection( params->ConsoleHandle ); + else if (params->ConsoleHandle && params->ConsoleHandle != CONSOLE_HANDLE_SHELL_NO_WINDOW) + create_console_connection( params->ConsoleHandle ); } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 89297472a34..3976e5b4365 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1354,6 +1354,8 @@ static void get_initial_console( RTL_USER_PROCESS_PARAMETERS *params ) params->hStdOutput = (HANDLE)((UINT_PTR)params->hStdOutput | 1); output_fd = 1; } + if (!params->ConsoleHandle && main_image_info.SubSystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) + params->ConsoleHandle = CONSOLE_HANDLE_SHELL_NO_WINDOW; if (output_fd != -1) { diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 2d763d0b821..3355d7177b0 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -191,5 +191,6 @@ struct condrv_ctrl_event #define CONSOLE_HANDLE_ALLOC LongToHandle(-1) #define CONSOLE_HANDLE_ALLOC_NO_WINDOW LongToHandle(-2) #define CONSOLE_HANDLE_SHELL LongToHandle(-3) +#define CONSOLE_HANDLE_SHELL_NO_WINDOW LongToHandle(-4) #endif /* _INC_CONDRV */

1 0

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 April 2022