April 2022 - Wine-Commits - list.winehq.org

Eric Pouech : kernelbase: Provide a pseudo console environment for initial CUI processes not tied to a Unix tty.
by Alexandre Julliard April 12, 2022

April 12, 2022

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

Gabriel Ivăncescu : mshtml/tests: Add initial tests for NULL Dispatch objects in scripts.
by Alexandre Julliard April 12, 2022

April 12, 2022

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: Treat NULL disps as actual null values in html mode.
by Alexandre Julliard April 12, 2022

April 12, 2022

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

Zebediah Figura : ntdll: Do not write the "context" parameter of NtQueryDirectoryObject on failure.
by Alexandre Julliard April 12, 2022

April 12, 2022

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

Eric Pouech : server: Use negative values for console pseudo handles.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 95202ea4da95f724a6d98320cacd04b41b4f234e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95202ea4da95f724a6d98320… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Apr 11 15:05:03 2022 +0200 server: Use negative values for console pseudo handles. 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> --- include/wine/condrv.h | 6 +++--- server/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 452ce552da1..2d763d0b821 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -188,8 +188,8 @@ struct condrv_ctrl_event }; /* Wine specific values for console inheritance (params->ConsoleHandle) */ -#define CONSOLE_HANDLE_ALLOC UlongToHandle(1) -#define CONSOLE_HANDLE_ALLOC_NO_WINDOW UlongToHandle(2) -#define CONSOLE_HANDLE_SHELL UlongToHandle(3) +#define CONSOLE_HANDLE_ALLOC LongToHandle(-1) +#define CONSOLE_HANDLE_ALLOC_NO_WINDOW LongToHandle(-2) +#define CONSOLE_HANDLE_SHELL LongToHandle(-3) #endif /* _INC_CONDRV */ diff --git a/server/process.c b/server/process.c index 65e2aa70de2..d1407204718 100644 --- a/server/process.c +++ b/server/process.c @@ -1333,8 +1333,8 @@ DECL_HANDLER(new_process) /* connect to the window station */ connect_process_winstation( process, parent_thread, parent ); - /* set the process console */ - if (info->data->console > 3) + /* inherit the process console, but keep pseudo handles (< 0), and 0 (= not attached to a console) as is */ + if ((int)info->data->console > 0) info->data->console = duplicate_handle( parent, info->data->console, process, 0, 0, DUPLICATE_SAME_ACCESS );

1 0

Nikolay Sivov : d3dx10: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: 74adbac296a786144e15833ff4918765d5bb32aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=74adbac296a786144e15833f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 12 20:28:09 2022 +0200 d3dx10: 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/d3dx10_43/Makefile.in | 1 - dlls/d3dx10_43/compiler.c | 6 +++--- dlls/d3dx10_43/font.c | 4 ++-- dlls/d3dx10_43/mesh.c | 4 ++-- dlls/d3dx10_43/sprite.c | 4 ++-- dlls/d3dx10_43/texture.c | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 67cf4863b0f..0fab62f4834 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 0083ab267f1..91a99110d0b 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -37,7 +37,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c ID3D10Blob *code; HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," + TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," "effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); @@ -51,7 +51,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile, shader_flags, effect_flags, &code, errors))) { - WARN("Effect compilation failed, hr %#x.\n", hr); + WARN("Effect compilation failed, hr %#lx.\n", hr); return hr; } @@ -84,7 +84,7 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags, effect_flags, &code, errors))) { - WARN("Effect compilation failed, hr %#x.\n", hr); + WARN("Effect compilation failed, hr %#lx.\n", hr); return hr; } diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index b59d2f9be4b..1589c3a0eef 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -66,7 +66,7 @@ static ULONG WINAPI d3dx_font_AddRef(ID3DX10Font *iface) struct d3dx_font *font = impl_from_ID3DX10Font(iface); ULONG refcount = InterlockedIncrement(&font->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -75,7 +75,7 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface) struct d3dx_font *font = impl_from_ID3DX10Font(iface); ULONG refcount = InterlockedDecrement(&font->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c index 276319719f8..7b8b0c80956 100644 --- a/dlls/d3dx10_43/mesh.c +++ b/dlls/d3dx10_43/mesh.c @@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); ULONG refcount = InterlockedIncrement(&mesh->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); ULONG refcount = InterlockedDecrement(&mesh->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) heap_free(mesh); diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c index b2045e72a27..307bb575d7a 100644 --- a/dlls/d3dx10_43/sprite.c +++ b/dlls/d3dx10_43/sprite.c @@ -64,7 +64,7 @@ static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface) struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); ULONG refcount = InterlockedIncrement(&sprite->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -74,7 +74,7 @@ static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface) struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); ULONG refcount = InterlockedDecrement(&sprite->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 3488c80ab29..dd3ad1497d5 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -442,10 +442,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - unsigned int size; HRSRC res_info; void *buffer; HRESULT hr; + DWORD size; TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); @@ -482,7 +482,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat GUID container_format; HRESULT hr; - TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", + TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n", src_data, src_data_size, pump, img_info, hresult); if (!src_data || !src_data_size || !img_info) @@ -697,7 +697,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s GUID src_format; HRESULT hr; - TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n", + TRACE("device %p, src_data %p, src_data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n", device, src_data, src_data_size, load_info, pump, texture, hresult); if (!src_data || !src_data_size || !texture)

1 0

Zebediah Figura : server: Return STATUS_BUFFER_TOO_SMALL instead of STATUS_BUFFER_OVERFLOW from get_directory_entry.
by Alexandre Julliard April 12, 2022

April 12, 2022

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

Eric Pouech : d3dxof: Don't cast ptrdiff_t to ULONG in traces, use %I instead.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: master Commit: ae9266992a54db660da08f881798c69c55033d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9266992a54db660da08f88… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 12 20:28:10 2022 +0200 d3dxof: Don't cast ptrdiff_t to ULONG in traces, use %I instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 5446124234e..c853060dea1 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -274,8 +274,8 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) } if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size) - ERR("Size of all decompressed chunks (%lu) does not match decompressed file size (%lu).\n", - (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); + ERR("Size of all decompressed chunks (%Iu) does not match decompressed file size (%lu).\n", + decomp_buffer - *decomp_buffer_ptr, decomp_file_size); /* Use decompressed data */ buf->buffer = *decomp_buffer_ptr;

1 0

Zebediah Figura : ntdll: Do not write the "ret_size" parameter of NtQueryDirectoryObject on failure.
by Alexandre Julliard April 12, 2022

April 12, 2022

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/tests: Add some tests for NtQueryDirectoryObject().
by Alexandre Julliard April 12, 2022

April 12, 2022

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