February 2021 - Wine-Commits

Nikolay Sivov : d2d1/tests: Add return value test (Coverity).
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 33e0d15d1789af8e413047e0c69180c921ec978c URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e0d15d1789af8e413047e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:59:50 2021 +0300 d2d1/tests: Add return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c1ff9dc197..8d584605819 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7701,7 +7701,8 @@ static void test_gdi_interop(BOOL d3d11) todo_wine ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ID2D1RenderTarget_Release(rt);

1 0

Alexandre Julliard : ntdll: Load the main module before the other dlls.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 72baffdb6d7ce2d8c2bb0656b48e6b963faa4de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72baffdb6d7ce2d8c2bb0656… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 10:12:16 2021 +0100 ntdll: Load the main module before the other dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6a90770b3b4..d507250f0d1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4031,29 +4031,6 @@ static NTSTATUS process_init(void) load_global_options(); version_init(); - /* setup the load callback and create ntdll modref */ - RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - NtQueryVirtualMemory( GetCurrentProcess(), process_init, MemoryBasicInformation, - &meminfo, sizeof(meminfo), NULL ); - status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); - assert( !status ); - - if ((status = load_dll( params->DllPath.Buffer, L"C:\\windows\\system32\\kernel32.dll", - NULL, 0, &wm )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); - if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name, - 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) - { - MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - - init_locale( wm->ldr.DllBase ); - if (!(status = load_dll( params->DllPath.Buffer, params->ImagePathName.Buffer, NULL, DONT_RESOLVE_DLL_REFERENCES, &wm ))) { @@ -4115,11 +4092,27 @@ static NTSTATUS process_init(void) } #endif - /* the main exe needs to be the first in the load order list */ - RemoveEntryList( &wm->ldr.InLoadOrderLinks ); - InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks ); - RemoveEntryList( &wm->ldr.InMemoryOrderLinks ); - InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderLinks ); + RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); + NtQueryVirtualMemory( GetCurrentProcess(), process_init, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + status = build_builtin_module( params->DllPath.Buffer, &nt_name, meminfo.AllocationBase, 0, &wm ); + assert( !status ); + + if ((status = load_dll( params->DllPath.Buffer, L"C:\\windows\\system32\\kernel32.dll", + NULL, 0, &wm )) != STATUS_SUCCESS) + { + MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); + if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name, + 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) + { + MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + + init_locale( wm->ldr.DllBase ); RtlCreateUserStack( 0, 0, 0, 0x10000, 0x10000, &stack ); teb->Tib.StackBase = stack.StackBase;

1 0

Christian Costa : d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 8f6c832b3178279321140d4a79f2b66bdd069c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6c832b3178279321140d4a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Jan 30 13:50:48 2021 -0600 d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48563 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 045d7267c96..362113386ea 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -887,6 +887,41 @@ static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) return TRUE; } +/* windowscodecs always returns xRGB, but we should return ARGB if and only if + * at least one pixel has a non-zero alpha component. */ +static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *info) +{ + unsigned int size, i; + BYTE *buffer; + HRESULT hr; + + if (info->Format != D3DFMT_X8R8G8B8 || info->ImageFileFormat != D3DXIFF_BMP) + return FALSE; + + size = info->Width * info->Height * 4; + if (!(buffer = malloc(size))) + return FALSE; + + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, info->Width * 4, size, buffer))) + { + ERR("Failed to copy pixels, hr %#x.\n", hr); + free(buffer); + return FALSE; + } + + for (i = 0; i < info->Width * info->Height; ++i) + { + if (buffer[i * 4 + 3]) + { + free(buffer); + return TRUE; + } + } + + free(buffer); + return FALSE; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -1006,6 +1041,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } } + if (SUCCEEDED(hr) && image_is_argb(frame, info)) + info->Format = D3DFMT_A8R8G8B8; + if (frame) IWICBitmapFrameDecode_Release(frame); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4590a758d78..1d32b68c3a6 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -698,7 +698,7 @@ static void test_D3DXGetImageInfo(void) ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format); hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); + ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); /* Grayscale PNG */ hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info);

1 0

Alexandre Julliard : server: Fetch the data for the debug events from the process memory views.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 123023eac779f7fe82feae3dd4a7922f877257f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=123023eac779f7fe82feae3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 10:12:56 2021 +0100 server: Fetch the data for the debug events from the process memory views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++---- include/wine/server_protocol.h | 8 ++++---- server/debugger.c | 35 ++++++++++++++++------------------- server/file.h | 9 ++++++--- server/mapping.c | 28 ++++++++++++++++------------ server/object.h | 2 +- server/process.c | 11 +++++------ server/process.h | 2 -- server/protocol.def | 4 ++-- server/request.h | 4 +--- server/trace.c | 4 +--- 11 files changed, 54 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=123023eac779f7fe82fe…

1 0

Piotr Caban : ucrtbase: Fix _Syserror_map behavior on unknown error.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: b54ab691a7a484b7ce3d38b2d77088fb8f946257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b54ab691a7a484b7ce3d38b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:13:11 2021 +0100 ucrtbase: Fix _Syserror_map behavior on unknown error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50407 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 14 ++++++++++++++ dlls/msvcp140/tests/msvcp140.c | 15 +++++++++++++++ dlls/msvcp90/misc.c | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 54d959b694c..35e90cfa29c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -216,6 +216,7 @@ static void (CDECL *p__Do_call)(void *this); static short (__cdecl *p__Dtest)(double *d); static short (__cdecl *p__Dscale)(double *d, int exp); static short (__cdecl *p__FExp)(float *x, float y, int exp); +static const char* (__cdecl *p__Syserror_map)(int err); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -575,6 +576,8 @@ static BOOL init(void) "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00(a)Z"); SET(p_vector_base_v4__Internal_resize, "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAX_K00P6AXPEAX0(a)ZP6AX1PEBX0@Z3(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -648,6 +651,8 @@ static BOOL init(void) "?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z"); SET(p_vector_base_v4__Segment_index_of, "?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z"); + SET(p__Syserror_map, + "?_Syserror_map(a)std@@YAPBDH(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1170,6 +1175,14 @@ static void test__FExp(void) ok(ret == FP_NORMAL, "ret = %x\n", ret); } +static void test__Syserror_map(void) +{ + const char *r; + + r = p__Syserror_map(0); + ok(!r, "_Syserror_map(0) returned %p\n", r); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -3306,6 +3319,7 @@ START_TEST(msvcp120) test__Dtest(); test__Dscale(); test__FExp(); + test__Syserror_map(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index ae21feaf9e4..8a3771842a0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -196,6 +196,7 @@ static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); static int (__cdecl *p__Winerror_map)(int); +static const char* (__cdecl *p__Syserror_map)(int err); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -234,6 +235,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPEAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPEADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPEBDH(a)Z"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AAA(a)XZ"); @@ -264,6 +266,7 @@ static BOOL init(void) SET(p__Reschedule_chore, "?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z"); SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); SET(p__Winerror_message, "?_Winerror_message(a)std@@YAKKPADK(a)Z"); + SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPBDH(a)Z"); } SET(p_Close_dir, "_Close_dir"); @@ -1314,6 +1317,17 @@ static void test__Winerror_map(void) } } +static void test__Syserror_map(void) +{ + const char *r1, *r2; + + r1 = p__Syserror_map(0); + ok(r1 != NULL, "_Syserror_map(0) returned NULL\n"); + r2 = p__Syserror_map(1234); + ok(r2 != NULL, "_Syserror_map(1234) returned NULL\n"); + ok(r1 == r2, "r1 = %p(%s), r2 = %p(%s)\n", r1, r1, r2, r2); +} + static void test_Equivalent(void) { int val, i; @@ -1391,6 +1405,7 @@ START_TEST(msvcp140) test_Last_write_time(); test__Winerror_message(); test__Winerror_map(); + test__Syserror_map(); test_Equivalent(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 76f730c2344..f70de9e5600 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2864,7 +2864,11 @@ const char* __cdecl _Syserror_map(int err) if(syserror_map[i].err == err) return syserror_map[i].str; } +#if _MSVCP_VER >= 140 + return "unknown error"; +#else return NULL; +#endif } #endif

1 0

Nikolay Sivov : mf: Add missing const for vtable structures.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 10f9a88de08fd79a91d2958edbfb8c830a1abb56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10f9a88de08fd79a91d2958e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 19:56:15 2021 +0300 mf: Add missing const for vtable structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 94454cd2f2a..942212d5bf2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -549,7 +549,7 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) return refcount; } -static IUnknownVtbl session_op_vtbl = +static const IUnknownVtbl session_op_vtbl = { session_op_QueryInterface, session_op_AddRef, @@ -4918,7 +4918,7 @@ static HRESULT WINAPI standard_quality_manager_Shutdown(IMFQualityManager *iface return S_OK; } -static IMFQualityManagerVtbl standard_quality_manager_vtbl = +static const IMFQualityManagerVtbl standard_quality_manager_vtbl = { standard_quality_manager_QueryInterface, standard_quality_manager_AddRef,

1 0

Nikolay Sivov : mfplat/tests: Test texture parameters used by sample allocator.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 5ae005a3faeaca0183897f9b12fc1e0a4b609219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ae005a3faeaca0183897f9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 19:56:14 2021 +0300 mfplat/tests: Test texture parameters used by sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8271454b0f9..3f4dd48b2a8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6219,6 +6219,9 @@ static void test_sample_allocator(void) IMFVideoSampleAllocator *allocator; IMFDXGIDeviceManager *manager; IMFSample *sample, *sample2; + IMFDXGIBuffer *dxgi_buffer; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; IMFMediaBuffer *buffer; ID3D11Device *device; LONG refcount, count; @@ -6403,6 +6406,29 @@ static void test_sample_allocator(void) check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); check_interface(buffer, &IID_IMFGetService, FALSE); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.Width == 320, "Unexpected width %u.\n", desc.Width); + ok(desc.Height == 240, "Unexpected height %u.\n", desc.Height); + ok(desc.MipLevels == 1, "Unexpected miplevels %u.\n", desc.MipLevels); + ok(desc.ArraySize == 1, "Unexpected array size %u.\n", desc.ArraySize); + ok(desc.Format == DXGI_FORMAT_B8G8R8X8_UNORM, "Unexpected format %u.\n", desc.Format); + ok(desc.SampleDesc.Count == 1, "Unexpected sample count %u.\n", desc.SampleDesc.Count); + ok(desc.SampleDesc.Quality == 0, "Unexpected sample quality %u.\n", desc.SampleDesc.Quality); + ok(desc.Usage == D3D11_USAGE_DEFAULT, "Unexpected usage %u.\n", desc.Usage); + ok(desc.BindFlags == (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET), "Unexpected bind flags %#x.\n", + desc.BindFlags); + ok(desc.CPUAccessFlags == 0, "Unexpected CPU access flags %#x.\n", desc.CPUAccessFlags); + ok(desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll/tests: Add tests for a few more object types.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 451663cfb8e4bb9a5ce1e8cadb8a907add34383a URL: https://source.winehq.org/git/wine.git/?a=commit;h=451663cfb8e4bb9a5ce1e8ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 13:45:19 2021 +0100 ntdll/tests: Add tests for a few more object types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index f5e37dd5dac..21de385a8bc 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -21,6 +21,8 @@ #include "ntdll_test.h" #include "winternl.h" +#include "winuser.h" +#include "ddk/wdm.h" #include "stdio.h" #include "winnt.h" #include "stdlib.h" @@ -189,9 +191,6 @@ static void test_namespace_pipe(void) pNtClose(pipe); } -#define DIRECTORY_QUERY (0x0001) -#define SYMBOLIC_LINK_QUERY 0x0001 - #define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) static void check_create_open_dir_( int line, HANDLE parent, const WCHAR *name, NTSTATUS expect ) { @@ -1299,7 +1298,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name ) { char buffer[1024]; - UNICODE_STRING *str = (UNICODE_STRING *)buffer, expect; + OBJECT_TYPE_INFORMATION *type = (OBJECT_TYPE_INFORMATION *)buffer; + UNICODE_STRING expect; ULONG len = 0; NTSTATUS status; @@ -1309,8 +1309,9 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length, "unexpected len %u\n", len ); - ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); + ok_(__FILE__,line)( len >= sizeof(*type) + type->TypeName.Length, "unexpected len %u\n", len ); + ok_(__FILE__,line)(compare_unicode_string( &type->TypeName, expected_name ), "wrong name %s\n", + debugstr_w( type->TypeName.Buffer )); } #define test_object_name(a,b,c) _test_object_name(__LINE__,a,b,c) @@ -1339,7 +1340,7 @@ static void test_query_object(void) NTSTATUS status; ULONG len, expected_len; OBJECT_ATTRIBUTES attr; - UNICODE_STRING path, *str; + UNICODE_STRING path, target, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; WCHAR expect[100]; LARGE_INTEGER size; @@ -1457,12 +1458,77 @@ static void test_query_object(void) RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_debug" ); status = pNtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); ok(!status, "NtCreateDebugObject failed: %x\n", status); - test_object_name( handle, L"\\BaseNamedObjects\\test_debug", FALSE ); test_object_type( handle, L"DebugObject" ); test_no_file_info( handle ); pNtClose(handle); + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_mutant" ); + status = pNtCreateMutant( &handle, MUTANT_ALL_ACCESS, &attr, 0 ); + ok(!status, "NtCreateMutant failed: %x\n", status); + test_object_name( handle, L"\\BaseNamedObjects\\test_mutant", FALSE ); + test_object_type( handle, L"Mutant" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_sem" ); + status = pNtCreateSemaphore( &handle, SEMAPHORE_ALL_ACCESS, &attr, 1, 2 ); + ok(!status, "NtCreateSemaphore failed: %x\n", status); + test_object_name( handle, L"\\BaseNamedObjects\\test_sem", FALSE ); + test_object_type( handle, L"Semaphore" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_keyed" ); + status = pNtCreateKeyedEvent( &handle, KEYEDEVENT_ALL_ACCESS, &attr, 0 ); + ok(!status, "NtCreateKeyedEvent failed: %x\n", status); + test_object_name( handle, L"\\BaseNamedObjects\\test_keyed", FALSE ); + test_object_type( handle, L"KeyedEvent" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_compl" ); + status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, &attr, 0 ); + ok(!status, "NtCreateIoCompletion failed: %x\n", status); + test_object_name( handle, L"\\BaseNamedObjects\\test_compl", FALSE ); + test_object_type( handle, L"IoCompletion" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_job" ); + status = pNtCreateJobObject( &handle, JOB_OBJECT_ALL_ACCESS, &attr ); + ok(!status, "NtCreateJobObject failed: %x\n", status); + test_object_name( handle, L"\\BaseNamedObjects\\test_job", FALSE ); + test_object_type( handle, L"Job" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\BaseNamedObjects\\test_timer" ); + status = pNtCreateTimer( &handle, TIMER_ALL_ACCESS, &attr, NotificationTimer ); + ok(!status, "NtCreateTimer failed: %x\n", status); + test_object_type( handle, L"Timer" ); + test_no_file_info( handle ); + pNtClose(handle); + + RtlInitUnicodeString( &path, L"\\DosDevices\\test_link" ); + RtlInitUnicodeString( &target, L"\\DosDevices" ); + status = pNtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &target ); + ok(!status, "NtCreateSymbolicLinkObject failed: %x\n", status); + test_object_type( handle, L"SymbolicLink" ); + test_no_file_info( handle ); + pNtClose(handle); + + handle = GetProcessWindowStation(); + swprintf( expect, ARRAY_SIZE(expect), L"\\Sessions\\%u\\Windows\\WindowStations\\WinSta0", NtCurrentTeb()->Peb->SessionId ); + test_object_name( handle, expect, FALSE ); + test_object_type( handle, L"WindowStation" ); + test_no_file_info( handle ); + + handle = GetThreadDesktop( GetCurrentThreadId() ); + test_object_name( handle, L"\\Default", FALSE ); + test_object_type( handle, L"Desktop" ); + test_no_file_info( handle ); + status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); ok(status == STATUS_SUCCESS, "Failed to create Directory %08x\n", status); @@ -1568,6 +1634,13 @@ static void test_query_object(void) test_no_file_info( handle ); pNtClose(handle); + + handle = CreateFileA( "nul", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + test_object_name( handle, L"\\Device\\Null", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + pNtClose( handle ); } static void test_type_mismatch(void)

1 0

Alexandre Julliard : server: Add a separate request to initialize the first thread of a process.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 44699c324f20690f9d6836919534ca1b5bcc3efe URL: https://source.winehq.org/git/wine.git/?a=commit;h=44699c324f20690f9d683691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 10:18:26 2021 +0100 server: Add a separate request to initialize the first thread of a process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/server.c | 190 ++++++++++++++++++++++++----------------- dlls/ntdll/unix/unix_private.h | 4 +- include/wine/server_protocol.h | 31 +++++-- server/process.c | 5 +- server/process.h | 2 +- server/protocol.def | 24 ++++-- server/request.h | 36 +++++--- server/thread.c | 103 ++++++++++++---------- server/trace.c | 25 +++++- 10 files changed, 265 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44699c324f20690f9d68…

1 0

Alexandre Julliard : server: Move the ldt_copy pointer to the init_first_thread request.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: d514c64a8c06d893901538f83fde98add3e2eda7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d514c64a8c06d893901538f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 10:26:20 2021 +0100 server: Move the ldt_copy pointer to the init_first_thread request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 6 +++--- include/wine/server_protocol.h | 6 +++--- server/process.c | 1 - server/protocol.def | 2 +- server/request.h | 14 +++++++------- server/thread.c | 1 + server/trace.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index c04a4273d4b..7b469959f66 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1535,6 +1535,9 @@ size_t server_init_process(void) req->unix_tid = get_unix_tid(); req->teb = wine_server_client_ptr( NtCurrentTeb() ); req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb ); +#ifdef __i386__ + req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); +#endif req->reply_fd = reply_pipe; req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; req->debug_level = (TRACE_ON(server) != 0); @@ -1611,9 +1614,6 @@ void server_init_process_done(void) SERVER_START_REQ( init_process_done ) { req->module = wine_server_client_ptr( peb->ImageBaseAddress ); -#ifdef __i386__ - req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); -#endif req->entry = wine_server_client_ptr( entry ); req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); status = wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 64b2ad78e87..59787c07c9a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -881,7 +881,6 @@ struct init_process_done_request struct request_header __header; int gui; mod_handle_t module; - client_ptr_t ldt_copy; client_ptr_t entry; }; struct init_process_done_reply @@ -901,10 +900,11 @@ struct init_first_thread_request int debug_level; client_ptr_t teb; client_ptr_t peb; + client_ptr_t ldt_copy; int reply_fd; int wait_fd; client_cpu_t cpu; - char __pad_52[4]; + char __pad_60[4]; }; struct init_first_thread_reply { @@ -6229,7 +6229,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 663 +#define SERVER_PROTOCOL_VERSION 664 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 5c4e47434a0..7da33178f6d 100644 --- a/server/process.c +++ b/server/process.c @@ -1369,7 +1369,6 @@ DECL_HANDLER(init_process_done) list_remove( &dll->entry ); list_add_head( &process->dlls, &dll->entry ); - process->ldt_copy = req->ldt_copy; process->start_time = current_time; current->entry_point = req->entry; diff --git a/server/protocol.def b/server/protocol.def index 2da77f419bb..c43218ea737 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -863,7 +863,6 @@ typedef struct @REQ(init_process_done) int gui; /* is it a GUI process? */ mod_handle_t module; /* main module base address */ - client_ptr_t ldt_copy; /* address of LDT copy (in thread address space) */ client_ptr_t entry; /* process entry point */ @REPLY int suspend; /* is process suspended? */ @@ -877,6 +876,7 @@ typedef struct int debug_level; /* new debug level */ client_ptr_t teb; /* TEB of new thread (in process address space) */ client_ptr_t peb; /* PEB of new process (in process address space) */ + client_ptr_t ldt_copy; /* address of LDT copy (in process address space) */ int reply_fd; /* fd for reply pipe */ int wait_fd; /* fd for blocking calls pipe */ client_cpu_t cpu; /* CPU that this thread is running on */ diff --git a/server/request.h b/server/request.h index 22d767649dc..a12242ce868 100644 --- a/server/request.h +++ b/server/request.h @@ -745,9 +745,8 @@ C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 8 ); C_ASSERT( sizeof(struct get_startup_info_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, gui) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_request, module) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_request, ldt_copy) == 24 ); -C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 32 ); -C_ASSERT( sizeof(struct init_process_done_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 24 ); +C_ASSERT( sizeof(struct init_process_done_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 8 ); C_ASSERT( sizeof(struct init_process_done_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_pid) == 12 ); @@ -755,10 +754,11 @@ C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, debug_level) == 20 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, teb) == 24 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, peb) == 32 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 40 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 44 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, cpu) == 48 ); -C_ASSERT( sizeof(struct init_first_thread_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, ldt_copy) == 40 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 48 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 52 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, cpu) == 56 ); +C_ASSERT( sizeof(struct init_first_thread_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 ); diff --git a/server/thread.c b/server/thread.c index 105e301fc43..b9d78c8c5c6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1434,6 +1434,7 @@ DECL_HANDLER(init_first_thread) current->unix_tid = req->unix_tid; current->teb = req->teb; process->peb = req->peb; + process->ldt_copy = req->ldt_copy; process->cpu = req->cpu; if (!process->parent_id) diff --git a/server/trace.c b/server/trace.c index ae0e9ab859c..bc09a5fc959 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1383,7 +1383,6 @@ static void dump_init_process_done_request( const struct init_process_done_reque { fprintf( stderr, " gui=%d", req->gui ); dump_uint64( ", module=", &req->module ); - dump_uint64( ", ldt_copy=", &req->ldt_copy ); dump_uint64( ", entry=", &req->entry ); } @@ -1399,6 +1398,7 @@ static void dump_init_first_thread_request( const struct init_first_thread_reque fprintf( stderr, ", debug_level=%d", req->debug_level ); dump_uint64( ", teb=", &req->teb ); dump_uint64( ", peb=", &req->peb ); + dump_uint64( ", ldt_copy=", &req->ldt_copy ); fprintf( stderr, ", reply_fd=%d", req->reply_fd ); fprintf( stderr, ", wait_fd=%d", req->wait_fd ); dump_client_cpu( ", cpu=", &req->cpu );

1 0