wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Matteo Bruni : d3d8: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 955744e0c9749210f8dc379a979dad6c2acaf868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955744e0c9749210f8dc379a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:07 2019 +0100 d3d8: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ab34d..a113e57 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2385,7 +2385,7 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2480,7 +2480,7 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : d3d9: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: f891bb847b67505cb8e22d8e5d8b0ac6ffc0ff68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f891bb847b67505cb8e22d8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:06 2019 +0100 d3d9: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed1fedf..83db304 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2856,7 +2856,7 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2961,7 +2961,7 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 8384452d199f234bf2fb61ca64e1c87571e28f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8384452d199f234bf2fb61ca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:05 2019 +0100 d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 213 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8384452d199f234bf2fb…

1 0

Matteo Bruni : d3d9/tests: Test D3D9Ex vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 2feea1a4b1fb582fbb0c383e05b7da1c4a5f95dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2feea1a4b1fb582fbb0c383e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:04 2019 +0100 d3d9/tests: Test D3D9Ex vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 3e94c2b..5260fcd 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -33,6 +33,7 @@ static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -178,6 +179,8 @@ static IDirect3DDevice9Ex *create_device(HWND focus_window, const struct device_ present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; } mode.Size = sizeof(mode); @@ -4753,6 +4756,99 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_pinned_buffers(void) +{ + static const struct + { + DWORD device_flags; + DWORD usage; + D3DPOOL pool; + } + tests[] = + { + {CREATE_DEVICE_SWVP_ONLY, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DPOOL_DEFAULT}, + {0, 0, D3DPOOL_SYSTEMMEM}, + }; + static const unsigned int vertex_count = 1024; + struct device_desc device_desc; + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9Ex *device; + D3DVERTEXBUFFER_DESC desc; + unsigned int i, test; + struct vec3 + { + float x, y, z; + } *ptr, *ptr2; + UINT refcount; + HWND window; + HRESULT hr; + + window = create_window(); + + for (test = 0; test < ARRAY_SIZE(tests); ++test) + { + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = tests[test].device_flags; + if (!(device = create_device(window, &device_desc))) + { + skip("Test %u: failed to create a D3D device.\n", test); + continue; + } + + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), + tests[test].usage, 0, tests[test].pool, &buffer, NULL); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(desc.Pool == tests[test].pool, "Test %u: got unexpected pool %#x.\n", test, desc.Pool); + ok(desc.Usage == tests[test].usage, "Test %u: got unexpected usage %#x.\n", test, desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DDevice9Ex_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_BeginScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_EndScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(ptr2 == ptr, "Test %u: got unexpected ptr2 %p, expected %p.\n", test, ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Test %u: got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + test, i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Test %u: device has %u references left.\n", test, refcount); + } + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4806,4 +4902,5 @@ START_TEST(d3d9ex) test_frame_latency(); test_resource_access(); test_sysmem_draw(); + test_pinned_buffers(); }

1 0

Matteo Bruni : d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 4ee4b35cb274cfecbeff7d3452f85f7b38d33696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4b35cb274cfecbeff7d34… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:03 2019 +0100 d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 218 +++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ee4b35cb274cfecbeff…

1 0

Sven Baars : gdiplus/tests: Add some font family pointer tests.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 5f25d7a9a9f2ed626e5342adef8879fee26a73e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f25d7a9a9f2ed626e5342ad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 26 15:23:04 2019 +0100 gdiplus/tests: Add some font family pointer tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 03e7a04..33b75c5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -141,6 +141,8 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); +todo_wine + ok (fontfamily == fontfamily2, "Unexpected family instance.\n"); ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); @@ -343,6 +345,8 @@ static void test_fontfamily (void) ZeroMemory (itsName, sizeof(itsName)); stat = GdipCloneFontFamily(family, &clonedFontFamily); expect (Ok, stat); +todo_wine + ok (family == clonedFontFamily, "Unexpected family instance.\n"); GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); @@ -1187,8 +1191,9 @@ todo_wine static void test_GdipGetFontCollectionFamilyList(void) { - GpFontFamily *family, *family2; + GpFontFamily *family, *family2, **families; GpFontCollection *collection; + UINT i; INT found, count; GpStatus status; @@ -1228,15 +1233,32 @@ static void test_GdipGetFontCollectionFamilyList(void) ok(found == 1, "Unexpected list count %d.\n", found); ok(family != NULL, "Expected family instance.\n"); - family = NULL; + family2 = NULL; found = 0; status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); ok(status == Ok, "Failed to get family list, status %d.\n", status); ok(found == 1, "Unexpected list count %d.\n", found); - ok(family2 != family, "Unexpected family instance.\n"); +todo_wine + ok(family2 == family, "Unexpected family instance.\n"); - GdipDeleteFontFamily(family); - GdipDeleteFontFamily(family2); + status = GdipDeleteFontFamily(family); + expect(Ok, status); + + status = GdipDeleteFontFamily(family2); + expect(Ok, status); + + families = GdipAlloc((count + 1) * sizeof(*families)); + found = 0; + status = GdipGetFontCollectionFamilyList(collection, count + 1, families, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == count, "Unexpected list count %d, extected %d.\n", found, count); + + for (i = 0; i < found; i++) + { + status = GdipDeleteFontFamily(families[i]); + expect(Ok, status); + } + GdipFree(families); } static void test_GdipGetFontCollectionFamilyCount(void)

1 0

Alexandre Julliard : kernel32/tests: Add tests for dll fallback when image type doesn' t match current platform.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: b1dbe76d7a61740004be6328d1b26ea058d0204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dbe76d7a61740004be6328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:43 2019 +0100 kernel32/tests: Add tests for dll fallback when image type doesn't match current platform. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 118 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 89a3f31..165c05e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winnls.h" #include "wine/test.h" #include "delayloadhandler.h" @@ -67,6 +68,9 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pLdrLoadDll)(LPCWSTR,DWORD,const UNICODE_STRING *,HMODULE*); +static NTSTATUS (WINAPI *pLdrUnloadDll)(HMODULE); +static void (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING,LPCWSTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -508,6 +512,53 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static const WCHAR wldr_nameW[] = {'w','l','d','r','t','e','s','t','.','d','l','l',0}; +static WCHAR load_test_name[MAX_PATH], load_fallback_name[MAX_PATH]; +static WCHAR load_path[MAX_PATH]; + +static void init_load_path( const char *fallback_dll ) +{ + static const WCHAR pathW[] = {'P','A','T','H',0}; + static const WCHAR ldrW[] = {'l','d','r',0}; + static const WCHAR sepW[] = {';',0}; + static const WCHAR bsW[] = {'\\',0}; + WCHAR path[MAX_PATH]; + + GetTempPathW( MAX_PATH, path ); + GetTempFileNameW( path, ldrW, 0, load_test_name ); + GetTempFileNameW( path, ldrW, 0, load_fallback_name ); + DeleteFileW( load_test_name ); + ok( CreateDirectoryW( load_test_name, NULL ), "failed to create dir\n" ); + DeleteFileW( load_fallback_name ); + ok( CreateDirectoryW( load_fallback_name, NULL ), "failed to create dir\n" ); + lstrcpyW( load_path, load_test_name ); + lstrcatW( load_path, sepW ); + lstrcatW( load_path, load_fallback_name ); + lstrcatW( load_path, sepW ); + GetEnvironmentVariableW( pathW, load_path + lstrlenW(load_path), + ARRAY_SIZE(load_path) - lstrlenW(load_path) ); + lstrcatW( load_test_name, bsW ); + lstrcatW( load_test_name, wldr_nameW ); + lstrcatW( load_fallback_name, bsW ); + lstrcatW( load_fallback_name, wldr_nameW ); + MultiByteToWideChar( CP_ACP, 0, fallback_dll, -1, path, MAX_PATH ); + MoveFileW( path, load_fallback_name ); +} + +static void delete_load_path(void) +{ + WCHAR *p; + + DeleteFileW( load_test_name ); + for (p = load_test_name + lstrlenW(load_test_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_test_name ); + DeleteFileW( load_fallback_name ); + for (p = load_fallback_name + lstrlenW(load_fallback_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_fallback_name ); +} + static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) { if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) @@ -521,12 +572,14 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG const void *section_data, int line ) { char dll_name[MAX_PATH]; + WCHAR path[MAX_PATH]; + UNICODE_STRING name; LARGE_INTEGER size; HANDLE file, map; - NTSTATUS status; + NTSTATUS status, expect_status, ldr_status; ULONG file_size; - BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; - HMODULE mod; + BOOL has_code = FALSE, il_only = FALSE, want_32bit = FALSE, expect_fallback = FALSE, wrong_machine = FALSE; + HMODULE mod = 0, ldr_mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -536,6 +589,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + expect_status = status; + if (get_com_dir_size( nt_header )) { /* invalid COR20 header seems to corrupt internal loader state on Windows */ @@ -587,8 +642,56 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( mod != NULL || broken(il_only) || /* <= win7 */ broken( wrong_machine ), /* win8 */ "%u: loading failed err %u\n", line, GetLastError() ); + if (!mod && wrong_machine) expect_status = STATUS_INVALID_IMAGE_FORMAT; } if (mod) FreeLibrary( mod ); + expect_fallback = !mod; + } + + /* test fallback to another dll further in the load path */ + + MultiByteToWideChar( CP_ACP, 0, dll_name, -1, path, MAX_PATH ); + CopyFileW( path, load_test_name, FALSE ); + pRtlInitUnicodeString( &name, wldr_nameW ); + ldr_status = pLdrLoadDll( load_path, 0, &name, &ldr_mod ); + if (!ldr_status) + { + GetModuleFileNameW( ldr_mod, path, MAX_PATH ); + if (!lstrcmpiW( path, load_test_name )) + { + if (!expect_status) + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + else + ok( !expect_fallback, "%u: got test dll but expected failure %x\n", line, expect_status ); + } + else if (!lstrcmpiW( path, load_fallback_name )) + { + trace( "%u: loaded fallback\n", line ); + if (!expect_status) + ok( expect_fallback || + /* win10 also falls back for 32-bit dll without code, even though it could be loaded */ + (is_win64 && !has_code && + nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC), + "%u: got fallback but expected test dll\n", line ); + else + ok( broken(expect_status == STATUS_INVALID_IMAGE_FORMAT), /* <= vista */ + "%u: got fallback but expected failure %x\n", line, expect_status ); + } + else ok( 0, "%u: got unexpected path %s instead of %s\n", line, wine_dbgstr_w(path), wine_dbgstr_w(load_test_name)); + pLdrUnloadDll( ldr_mod ); + } + else if (ldr_status == STATUS_DLL_INIT_FAILED || ldr_status == STATUS_ACCESS_VIOLATION) + { + /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + } + else todo_wine_if( !expect_status ) + { + ok( ldr_status == expect_status || + broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), + "%u: wrong status %x/%x\n", line, ldr_status, expect_status ); + ok( !expect_fallback || broken(il_only) || broken(wrong_machine), + "%u: failed with %x expected fallback\n", line, ldr_status ); } done: @@ -995,7 +1098,6 @@ static void test_Loader(void) nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.OptionalHeader.SectionAlignment = page_size; - nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; nt_header.OptionalHeader.FileAlignment = page_size; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); @@ -1006,6 +1108,10 @@ static void test_Loader(void) section.VirtualAddress = page_size; section.Misc.VirtualSize = page_size; + create_test_dll_sections( &dos_header, &nt_header, &section, section_data, dll_name ); + init_load_path( dll_name ); + + nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); @@ -1336,6 +1442,7 @@ static void test_Loader(void) } section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; + delete_load_path(); } static void test_filenames(void) @@ -3721,6 +3828,9 @@ START_TEST(loader) pNtFreeVirtualMemory = (void *)GetProcAddress(ntdll, "NtFreeVirtualMemory"); pLdrLockLoaderLock = (void *)GetProcAddress(ntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); + pLdrLoadDll = (void *)GetProcAddress(ntdll, "LdrLoadDll"); + pLdrUnloadDll = (void *)GetProcAddress(ntdll, "LdrUnloadDll"); + pRtlInitUnicodeString = (void *)GetProcAddress(ntdll, "RtlInitUnicodeString"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData");

1 0

Alexandre Julliard : kernel32/tests: Try loading the dll also for matching platform type.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 5613526bd41a76b3e0effa10868ced85b77d8efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5613526bd41a76b3e0effa10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:00 2019 +0100 kernel32/tests: Try loading the dll also for matching platform type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 54 +++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cc5af21..89a3f31 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -508,6 +508,14 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) +{ + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + return ((const IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + else + return ((const IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; +} + /* helper to test image section mapping */ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAGE_SECTION_HEADER *sections, const void *section_data, int line ) @@ -517,7 +525,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG HANDLE file, map; NTSTATUS status; ULONG file_size; - BOOL has_code; + BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; HMODULE mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -528,6 +536,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + if (get_com_dir_size( nt_header )) + { + /* invalid COR20 header seems to corrupt internal loader state on Windows */ + if (get_com_dir_size( nt_header ) < sizeof(IMAGE_COR20_HEADER)) goto done; + if (!((const IMAGE_COR20_HEADER *)section_data)->Flags) goto done; + } + if (!status) { SECTION_BASIC_INFORMATION info; @@ -540,21 +555,22 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", info.Size.u.HighPart, info.Size.u.LowPart, file_size ); has_code = query_image_section( line, dll_name, nt_header, section_data ); + + if (get_com_dir_size( nt_header )) + { + const IMAGE_COR20_HEADER *cor_header = section_data; + il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; + if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; + } + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); /* test loading dll of wrong 32/64 bitness */ if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR32_MAGIC : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) { - SetLastError( 0xdeadbeef ); - mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); - if (!has_code && nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + if (!has_code && is_win64) { - BOOL il_only = FALSE, want_32bit = FALSE; - if (((const IMAGE_NT_HEADERS32 *)nt_header)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress) - { - const IMAGE_COR20_HEADER *cor_header = section_data; - il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; - if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; - } ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ "%u: loading failed err %u\n", line, GetLastError() ); } @@ -563,9 +579,19 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); } - if (mod) FreeLibrary( mod ); } + else + { + wrong_machine = (nt_header->FileHeader.Machine == get_alt_machine( nt_header_template.FileHeader.Machine )); + + ok( mod != NULL || broken(il_only) || /* <= win7 */ + broken( wrong_machine ), /* win8 */ + "%u: loading failed err %u\n", line, GetLastError() ); + } + if (mod) FreeLibrary( mod ); } + +done: if (map) CloseHandle( map ); CloseHandle( file ); DeleteFileA( dll_name ); @@ -736,6 +762,7 @@ static void test_Loader(void) nt_header.OptionalHeader.SizeOfImage = td[i].size_of_image; nt_header.OptionalHeader.SizeOfHeaders = td[i].size_of_headers; + section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); SetLastError(0xdeadbeef); @@ -3728,7 +3755,6 @@ START_TEST(loader) return; } - test_Loader(); test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); @@ -3736,4 +3762,6 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + /* loader test must be last, it can corrupt the internal loader state on Windows */ + test_Loader(); }

1 0

Alexandre Julliard : kernel32/tests: Add helper function for machine type manipulations.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 27193d36af35f7cae981eba70aebe44b4c282c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27193d36af35f7cae981eba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:22:08 2019 +0100 kernel32/tests: Add helper function for machine type manipulations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 23dfc93..cc5af21 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -167,6 +167,32 @@ static IMAGE_SECTION_HEADER section = static const char filler[0x1000]; static const char section_data[0x10] = "section data"; +/* return an alternate machine of the same 32/64 bitness */ +static WORD get_alt_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_ARMNT; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_AMD64; + } + return 0; +} + +/* return the machine of the alternate 32/64 bitness */ +static WORD get_alt_bitness_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_AMD64; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_ARMNT; + } + return 0; +} + static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, const IMAGE_NT_HEADERS *nt_header, char dll_name[MAX_PATH] ) { @@ -692,7 +718,7 @@ static void test_Loader(void) SIZE_T size; BOOL ret; NTSTATUS status; - WORD alt_machine, orig_machine = nt_header_template.FileHeader.Machine; + WORD orig_machine = nt_header_template.FileHeader.Machine; IMAGE_NT_HEADERS nt_header; IMAGE_COR20_HEADER cor_header; @@ -1013,26 +1039,12 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); @@ -1118,7 +1130,7 @@ static void test_Loader(void) ok( status == (is_wow64 ? STATUS_INVALID_IMAGE_FORMAT : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); - nt64.FileHeader.Machine = alt_machine; + nt64.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, section_data, __LINE__ ); ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); @@ -1232,7 +1244,7 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(!status) /* win8 */, "NtCreateSection error %08x\n", status ); - nt32.FileHeader.Machine = alt_machine; + nt32.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status );

1 0

Daniel Lehman : ucrtbase/tests: Add tests for C locale.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 20f5abf4fb269a2ee596456fac1aa249b67705a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f5abf4fb269a2ee596456f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:27 2019 +0100 ucrtbase/tests: Add tests for C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 34f5a78..38aa6b3 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -90,6 +91,13 @@ static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static char* (__cdecl *p_setlocale)(int, const char*); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); static BOOL init(void) { @@ -107,6 +115,13 @@ static BOOL init(void) p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_towlower = (void*)GetProcAddress(module, "towlower"); + p__towlower_l = (void*)GetProcAddress(module, "_towlower_l"); + p_towupper = (void*)GetProcAddress(module, "towupper"); + p__towupper_l = (void*)GetProcAddress(module, "_towupper_l"); + p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p__create_locale = (void*)GetProcAddress(module, "_create_locale"); + p__free_locale = (void*)GetProcAddress(module, "_free_locale"); return TRUE; } @@ -285,6 +300,63 @@ static void test___strncnt(void) "Cannot reset invalid parameter handler\n"); } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + p_setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { if (!init()) return; @@ -292,4 +364,5 @@ START_TEST(string) test__memicmp(); test__memicmp_l(); test___strncnt(); + test_C_locale(); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
50
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 January 2019