- Wine-Devel - list.winehq.org

[PATCH] msvcirt: Set error when file can't be opened in fstream_open_ctor.
by Gijs Vermeulen Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcirt/msvcirt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3443261934..0b0a34940d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4627,13 +4627,14 @@ iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_ope } filebuf_ctor(fb); - filebuf_open(fb, name, mode, protection); iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init); base = istream_get_ios(&this->base1); base->delbuf = 1; + if (!filebuf_open(fb, name, mode, protection)) + base->state |= IOSTATE_failbit; return this; } -- 2.28.0

2 1

[PATCH v2] wine.inf: Add sRGB color profile
by Alex Henrie Sept. 17, 2020

Sept. 17, 2020

"This profile is made available by the International Color Consortium, and may be copied, distributed, embedded, made, used, and sold without restriction. Altered versions of this profile shall have the original identification and copyright information removed and shall not be misrepresented as the original profile." See http://www.color.org/srgbprofiles.xalter Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37396 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Add color directory to TOP_INSTALL_LIB The Microsoft version of this file is tagged "sRGB IEC61966-2.1". Any differences from the standard sRGB IEC61966-2.1 profile available on color.org are not likely to be perceptible. In addition to a couple of ICM files, on Windows the directory C:\Windows\System32\spool\drivers\color also has some CAMP, GMMP, and CDMP files. I have generically named the new source directory "color" so that we have a place for these other files in the future. --- Makefile.in | 1 + color/Makefile.in | 2 ++ color/sRGB_Color_Space_Profile.icm | Bin 0 -> 3024 bytes configure.ac | 2 ++ loader/wine.inf.in | 14 +++++++++----- tools/makedep.c | 12 ++++++++++++ 6 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 color/Makefile.in create mode 100644 color/sRGB_Color_Space_Profile.icm diff --git a/Makefile.in b/Makefile.in index 3f8196ed854..36bb6521d44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ includedir = @includedir@ +colordir = ${datadir}/wine/color fontdir = ${datadir}/wine/fonts nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine diff --git a/color/Makefile.in b/color/Makefile.in new file mode 100644 index 00000000000..f9f6f62a3b1 --- /dev/null +++ b/color/Makefile.in @@ -0,0 +1,2 @@ +SOURCES = \ + sRGB_Color_Space_Profile.icm diff --git a/color/sRGB_Color_Space_Profile.icm b/color/sRGB_Color_Space_Profile.icm new file mode 100644 index 0000000000000000000000000000000000000000..49afbfef10f22a1832590b68369d2f248ea553b9 GIT binary patch literal 3024 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 literal 0 HcmV?d00001 diff --git a/configure.ac b/configure.ac index 0204c8ffd53..0aca5178354 100644 --- a/configure.ac +++ b/configure.ac @@ -2810,6 +2810,7 @@ depend: \$(MAKEDEP) dummy WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"]) +WINE_CONFIG_MAKEFILE(color) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) @@ -4148,6 +4149,7 @@ clean:: else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ +color \ fonts \ loader/wine.inf \ loader/winebus.inf \ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index af4d4e48564..7e8e7a3203d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -2684,7 +2684,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,catroot, 11,mui, 11,tasks, -11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe 10,,hh.exe @@ -3900,6 +3899,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 +[ColorFiles] +"sRGB Color Space Profile.icm",sRGB_Color_Space_Profile.icm + [InfFiles] winebus.inf winehid.inf @@ -3982,10 +3984,12 @@ normnfkd.nls sortdefault.nls [WineSourceDirs] +ColorFiles = color NlsFiles = nls SortFiles = nls [DestinationDirs] +ColorFiles = 11,spool\drivers\color InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting diff --git a/tools/makedep.c b/tools/makedep.c index e819cbb9499..45d6f1ecb88 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2986,6 +2986,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, } +/******************************************************************* + * output_source_icm + */ +static void output_source_icm( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(colordir)/%s", source->name )); + output_srcdir_symlink( make, strmake( "%s.icm", obj )); +} + + /******************************************************************* * output_source_nls */ @@ -3202,6 +3213,7 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "icm", output_source_icm }, { "nls", output_source_nls }, { "desktop", output_source_desktop }, { "po", output_source_po }, -- 2.28.0

3 2

[PATCH 1/2] dxva2: Implement CreateSurface().
by Nikolay Sivov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 37 ++++++++++++++++++++++++--- dlls/dxva2/tests/dxva2.c | 54 ++++++++++++++++++++++++++++------------ 2 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index dd949b3d316..15d65a58344 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" #include "d3d9.h" @@ -132,12 +133,40 @@ static ULONG WINAPI device_manager_processor_service_Release(IDirectXVideoProces static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVideoProcessorService *iface, UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, - IDirect3DSurface9 **surface, HANDLE *shared_handle) + IDirect3DSurface9 **surfaces, HANDLE *shared_handle) { - FIXME("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, - surface, shared_handle); + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + unsigned int i, j; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + surfaces, shared_handle); + + if (backbuffers >= UINT_MAX) + return E_INVALIDARG; + + memset(surfaces, 0, (backbuffers + 1) * sizeof(*surfaces)); + + for (i = 0; i < backbuffers + 1; ++i) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(manager->device, width, height, format, + pool, &surfaces[i], NULL))) + break; + } + + if (FAILED(hr)) + { + for (j = 0; j < i; ++j) + { + if (surfaces[j]) + { + IDirect3DSurface9_Release(surfaces[j]); + surfaces[j] = NULL; + } + } + } + + return hr; } static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSoftwareDevice( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 49b192a1fad..58b0231420d 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -59,13 +59,31 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) return device; } +static void test_surface_desc(IDirect3DSurface9 *surface) +{ + D3DSURFACE_DESC desc = { 0 }; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(desc.Format == D3DFMT_X8R8G8B8, "Unexpected format %d.\n", desc.Format); + ok(desc.Type == D3DRTYPE_SURFACE, "Unexpected type %d.\n", desc.Type); + ok(desc.Usage == 0, "Unexpected usage %d.\n", desc.Usage); + ok(desc.Pool == D3DPOOL_DEFAULT, "Unexpected pool %d.\n", desc.Pool); + ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Unexpected multisample type %d.\n", desc.MultiSampleType); + ok(desc.MultiSampleQuality == 0, "Unexpected multisample quality %d.\n", desc.MultiSampleQuality); + ok(desc.Width == 64, "Unexpected width %u.\n", desc.Width); + ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; IDirectXVideoAccelerationService *accel_service; IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; - IDirect3DSurface9 *surface; + IDirect3DSurface9 *surfaces[2]; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -262,12 +280,20 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + surfaces[0] = surfaces[1] = NULL; + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(!!surfaces[0] && !surfaces[1], "Unexpected surfaces.\n"); + IDirect3DSurface9_Release(surfaces[0]); + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DSurface9_Release(surface); + ok(!!surfaces[0] && !!surfaces[1], "Unexpected surfaces.\n"); + test_surface_desc(surfaces[0]); + IDirect3DSurface9_Release(surfaces[0]); + IDirect3DSurface9_Release(surfaces[1]); IDirectXVideoAccelerationService_Release(accel_service); @@ -281,20 +307,16 @@ todo_wine hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirect3DSurface9_GetDevice(surface, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(device2 == device3, "Unexpected device.\n"); - IDirect3DDevice9_Release(device3); + hr = IDirect3DSurface9_GetDevice(surfaces[0], &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); - IDirect3DSurface9_Release(surface); - } + IDirect3DSurface9_Release(surfaces[0]); IDirectXVideoAccelerationService_Release(accel_service); -- 2.28.0

1 1

[PATCH 1/2] evr/mixer: Handle uninitialized input case in GetOutputAvailableType().
by Nikolay Sivov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 70199f37a1c..710e20815ab 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -533,7 +533,9 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform EnterCriticalSection(&mixer->cs); - if (index >= mixer->output.type_count) + if (!mixer->inputs[0].media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (index >= mixer->output.type_count) hr = MF_E_NO_MORE_TYPES; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ecf1f850c77..a68952c42a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -835,6 +835,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); -- 2.28.0

1 1

[PATCH] d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources.
by Paul Gofman Sept. 17, 2020

Sept. 17, 2020

Marvel's Avengers randomly hits this case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3d11/device.c | 9 +++++++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0508fa3f7b2..2a68e025852 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -965,6 +965,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -2438,6 +2441,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -4507,6 +4513,9 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d25113ff648..67d843ae9e5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12708,6 +12708,11 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D11DeviceContext_CopySubresourceRegion(context, NULL, 0, + 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box); -- 2.26.2

4 4

[PATCH 2/2] setupapi: Treat trailing \0 in field values same way as trailing spaces.
by Dmitry Timoshkov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/setupapi/parser.c | 4 ++-- dlls/setupapi/tests/parser.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 560c2401b8..c81a712ad8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -724,7 +724,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) set_state( parser, EOL_BACKSLASH ); return p; default: - if (!iswspace(*p)) token_end = p + 1; + if (*p && !iswspace(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -838,7 +838,7 @@ static const WCHAR *trailing_spaces_state( struct parser *parser, const WCHAR *p set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) break; + if (*p && !iswspace(*p)) break; } pop_state( parser ); return p; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8cde35b9de..c18063fbe3 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -370,6 +370,9 @@ static const struct { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb\0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb \0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=aaa\0bbb \0\n"), "foo", { "aaa bbb" } }, /* multiple sections with same name */ { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ @@ -470,12 +473,12 @@ static void test_key_names(void) ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) { - if (i == 49) + if (i == 52) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); - else if (i == 52) + else if (i == 55) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A4096), /* Win10 >= 1709 */ "line %u: bad field %s/%s\n", -- 2.26.2

1 0

[PATCH 1/2] setupapi/tests: Add explicit field for inf contents size.
by Dmitry Timoshkov Sept. 17, 2020

Sept. 17, 2020

To make possible testing embedded NULs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/setupapi/tests/parser.c | 234 ++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 111 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 06c674aa16..8cde35b9de 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -71,13 +71,13 @@ static const char tmpfilename[] = ".\\tmp.inf"; "verybig=" A1200 "\n" /* create a new file with specified contents and open it */ -static HINF test_file_contents( const char *data, UINT *err_line ) +static HINF test_file_contents( const char *data, int size, UINT *err_line ) { DWORD res; HANDLE handle = CreateFileA( tmpfilename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); if (handle == INVALID_HANDLE_VALUE) return 0; - if (!WriteFile( handle, data, strlen(data), &res, NULL )) trace( "write error\n" ); + if (!WriteFile( handle, data, size, &res, NULL )) trace( "write error\n" ); CloseHandle( handle ); return SetupOpenInfFileA( tmpfilename, 0, INF_STYLE_WIN4, err_line ); } @@ -102,50 +102,53 @@ static const char *get_line_text( INFCONTEXT *context ) static const struct { const char *data; + int data_size; DWORD error; UINT err_line; BOOL todo; } invalid_files[] = { - /* file contents expected error (or 0) errline todo */ - { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE }, - { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[version]\nsignature=$chicago$", 0, 0, FALSE }, - { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE }, - { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE }, - { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE }, - { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE }, - { STD_HEADER, 0, 0, FALSE }, - { STD_HEADER "[]\r\n", 0, 0, FALSE }, - { STD_HEADER "]\r\n", 0, 0, FALSE }, - { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE }, - { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, - { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, - { "[abc]\n" STD_HEADER, 0, 0, FALSE }, - { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, - { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, - { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, - { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, - { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, +#define C(s) s, sizeof(s)-1 + /* file contents expected error (or 0) errline todo */ + { C("\r\n"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("abcd\r\n"), ERROR_WRONG_INF_STYLE, 0, TRUE }, + { C("[Version]\r\n"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[Version]\nSignature="), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[Version]\nSignature=foo"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[version]\nsignature=$chicago$"), 0, 0, FALSE }, + { C("[VERSION]\nSIGNATURE=$CHICAGO$"), 0, 0, FALSE }, + { C("[Version]\nSignature=$chicago$,abcd"), 0, 0, FALSE }, + { C("[Version]\nabc=def\nSignature=$chicago$"), 0, 0, FALSE }, + { C("[Version]\nabc=def\n[Version]\nSignature=$chicago$"), 0, 0, FALSE }, + { C(STD_HEADER), 0, 0, FALSE }, + { C(STD_HEADER "[]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "[" A255 "]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "[ab\r\n"), ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { C(STD_HEADER "\n\n[ab\x1a]\n"), ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, + { C(STD_HEADER "[" A256 "]\r\n"), ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, + { C("[abc]\n" STD_HEADER), 0, 0, FALSE }, + { C("abc\r\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C(";\n;\nabc\r\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { C(";\n;\nab\nab\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { C(";aa\n;bb\n" STD_HEADER), 0, 0, FALSE }, + { C(STD_HEADER " [TestSection\x00]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [Test\x00Section]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [TestSection\x00]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [Test\x00Section]\n"), 0, 0, TRUE }, + { C("garbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C("garbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C("garbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C("garbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, +#undef C }; static void test_invalid_files(void) @@ -159,7 +162,7 @@ static void test_invalid_files(void) { SetLastError( 0xdeadbeef ); err_line = 0xdeadbeef; - hinf = test_file_contents( invalid_files[i].data, &err_line ); + hinf = test_file_contents( invalid_files[i].data, invalid_files[i].data_size, &err_line ); err = GetLastError(); trace( "hinf=%p err=0x%x line=%d\n", hinf, err, err_line ); if (invalid_files[i].error) /* should fail */ @@ -175,8 +178,11 @@ static void test_invalid_files(void) } else /* should succeed */ { - ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); - ok( err == 0, "file %u: Error code set to %u\n", i, err ); + todo_wine_if (invalid_files[i].todo) + { + ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); + ok( err == 0, "file %u: Error code set to %u\n", i, err ); + } } SetupCloseInfFile( hinf ); } @@ -233,7 +239,7 @@ static void test_section_names(void) for (i = 0; i < ARRAY_SIZE(section_names); i++) { SetLastError( 0xdeadbeef ); - hinf = test_file_contents( section_names[i].data, &err_line ); + hinf = test_file_contents( section_names[i].data, strlen(section_names[i].data), &err_line ); ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; @@ -273,7 +279,7 @@ static void test_enum_sections(void) return; } - hinf = test_file_contents( contents, &err ); + hinf = test_file_contents( contents, strlen(contents), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); for (index = 0; ; index++) @@ -309,84 +315,86 @@ static void test_enum_sections(void) static const struct { const char *data; + int data_size; const char *key; const char *fields[10]; } key_names[] = { -/* file contents expected key expected fields */ - { "ab=cd", "ab", { "cd" } }, - { "ab=cd,ef,gh,ij", "ab", { "cd", "ef", "gh", "ij" } }, - { "ab", "ab", { "ab" } }, - { "ab,cd", NULL, { "ab", "cd" } }, - { "ab,cd=ef", NULL, { "ab", "cd=ef" } }, - { "=abcd,ef", "", { "abcd", "ef" } }, +#define C(s) s, sizeof(s)-1 +/* file contents expected key expected fields */ + { C("ab=cd"), "ab", { "cd" } }, + { C("ab=cd,ef,gh,ij"), "ab", { "cd", "ef", "gh", "ij" } }, + { C("ab"), "ab", { "ab" } }, + { C("ab,cd"), NULL, { "ab", "cd" } }, + { C("ab,cd=ef"), NULL, { "ab", "cd=ef" } }, + { C("=abcd,ef"), "", { "abcd", "ef" } }, /* backslashes */ - { "ba\\\ncd=ef", "bacd", { "ef" } }, - { "ab \\ \ncd=ef", "abcd", { "ef" } }, - { "ab\\\ncd,ef", NULL, { "abcd", "ef" } }, - { "ab \\ ;cc\ncd=ef", "abcd", { "ef" } }, - { "ab \\ \\ \ncd=ef", "abcd", { "ef" } }, - { "ba \\ dc=xx", "ba \\ dc", { "xx" } }, - { "ba \\\\ \nc=d", "bac", { "d" } }, - { "a=b\\\\c", "a", { "b\\\\c" } }, - { "ab=cd \\ ", "ab", { "cd" } }, - { "ba=c \\ \n \\ \n a", "ba", { "ca" } }, - { "ba=c \\ \n \\ a", "ba", { "c\\ a" } }, - { " \\ a= \\ b", "\\ a", { "\\ b" } }, + { C("ba\\\ncd=ef"), "bacd", { "ef" } }, + { C("ab \\ \ncd=ef"), "abcd", { "ef" } }, + { C("ab\\\ncd,ef"), NULL, { "abcd", "ef" } }, + { C("ab \\ ;cc\ncd=ef"), "abcd", { "ef" } }, + { C("ab \\ \\ \ncd=ef"), "abcd", { "ef" } }, + { C("ba \\ dc=xx"), "ba \\ dc", { "xx" } }, + { C("ba \\\\ \nc=d"), "bac", { "d" } }, + { C("a=b\\\\c"), "a", { "b\\\\c" } }, + { C("ab=cd \\ "), "ab", { "cd" } }, + { C("ba=c \\ \n \\ \n a"), "ba", { "ca" } }, + { C("ba=c \\ \n \\ a"), "ba", { "c\\ a" } }, + { C(" \\ a= \\ b"), "\\ a", { "\\ b" } }, /* quotes */ - { "Ab\"Cd\"=Ef", "AbCd", { "Ef" } }, - { "Ab\"Cd=Ef\"", "AbCd=Ef", { "AbCd=Ef" } }, - { "ab\"\"\"cd,ef=gh\"", "ab\"cd,ef=gh", { "ab\"cd,ef=gh" } }, - { "ab\"\"cd=ef", "abcd", { "ef" } }, - { "ab\"\"cd=ef,gh", "abcd", { "ef", "gh" } }, - { "ab=cd\"\"ef", "ab", { "cdef" } }, - { "ab=cd\",\"ef", "ab", { "cd,ef" } }, - { "ab=cd\",ef", "ab", { "cd,ef" } }, - { "ab=cd\",ef\\\nab", "ab", { "cd,ef\\" } }, + { C("Ab\"Cd\"=Ef"), "AbCd", { "Ef" } }, + { C("Ab\"Cd=Ef\""), "AbCd=Ef", { "AbCd=Ef" } }, + { C("ab\"\"\"cd,ef=gh\""), "ab\"cd,ef=gh", { "ab\"cd,ef=gh" } }, + { C("ab\"\"cd=ef"), "abcd", { "ef" } }, + { C("ab\"\"cd=ef,gh"), "abcd", { "ef", "gh" } }, + { C("ab=cd\"\"ef"), "ab", { "cdef" } }, + { C("ab=cd\",\"ef"), "ab", { "cd,ef" } }, + { C("ab=cd\",ef"), "ab", { "cd,ef" } }, + { C("ab=cd\",ef\\\nab"), "ab", { "cd,ef\\" } }, /* single quotes (unhandled)*/ - { "HKLM,A,B,'C',D", NULL, { "HKLM", "A","B","'C'","D" } }, + { C("HKLM,A,B,'C',D"), NULL, { "HKLM", "A","B","'C'","D" } }, /* spaces */ - { " a b = c , d \n", "a b", { "c", "d" } }, - { " a b = c ,\" d\" \n", "a b", { "c", " d" } }, - { " a b\r = c\r\n", "a b", { "c" } }, + { C(" a b = c , d \n"), "a b", { "c", "d" } }, + { C(" a b = c ,\" d\" \n"), "a b", { "c", " d" } }, + { C(" a b\r = c\r\n"), "a b", { "c" } }, /* empty fields */ - { "a=b,,,c,,,d", "a", { "b", "", "", "c", "", "", "d" } }, - { "a=b,\"\",c,\" \",d", "a", { "b", "", "c", " ", "d" } }, - { "=,,b", "", { "", "", "b" } }, - { ",=,,b", NULL, { "", "=", "", "b" } }, - { "a=\n", "a", { "" } }, - { "=", "", { "" } }, + { C("a=b,,,c,,,d"), "a", { "b", "", "", "c", "", "", "d" } }, + { C("a=b,\"\",c,\" \",d"), "a", { "b", "", "c", " ", "d" } }, + { C("=,,b"), "", { "", "", "b" } }, + { C(",=,,b"), NULL, { "", "=", "", "b" } }, + { C("a=\n"), "a", { "" } }, + { C("="), "", { "" } }, /* eof */ - { "ab=c\032d", "ab", { "c" } }, - { "ab\032=cd", "ab", { "ab" } }, + { C("ab=c\032d"), "ab", { "c" } }, + { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ - { "abcd=ef\x0gh", "abcd", { "ef" } }, + { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, /* multiple sections with same name */ - { "[Test2]\nab\n[Test]\nee=ff\n", "ee", { "ff" } }, + { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ - { "%foo%=%bar%\n" STR_SECTION, "aaa", { "bbb" } }, - { "%foo%xx=%bar%yy\n" STR_SECTION, "aaaxx", { "bbbyy" } }, - { "%% %foo%=%bar%\n" STR_SECTION, "% aaa", { "bbb" } }, - { "%f\"o\"o%=ccc\n" STR_SECTION, "aaa", { "ccc" } }, - { "abc=%bar;bla%\n" STR_SECTION, "abc", { "%bar" } }, - { "loop=%loop%\n" STR_SECTION, "loop", { "%loop2%" } }, - { "%per%%cent%=100\n" STR_SECTION, "12", { "100" } }, - { "a=%big%\n" STR_SECTION, "a", { A400 } }, - { "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */ - { "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } }, - { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, - { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, + { C("%foo%=%bar%\n" STR_SECTION), "aaa", { "bbb" } }, + { C("%foo%xx=%bar%yy\n" STR_SECTION), "aaaxx", { "bbbyy" } }, + { C("%% %foo%=%bar%\n" STR_SECTION), "% aaa", { "bbb" } }, + { C("%f\"o\"o%=ccc\n" STR_SECTION), "aaa", { "ccc" } }, + { C("abc=%bar;bla%\n" STR_SECTION), "abc", { "%bar" } }, + { C("loop=%loop%\n" STR_SECTION), "loop", { "%loop2%" } }, + { C("%per%%cent%=100\n" STR_SECTION), "12", { "100" } }, + { C("a=%big%\n" STR_SECTION), "a", { A400 } }, + { C("a=%verybig%\n" STR_SECTION), "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */ + { C("a=%big%%big%%big%%big%\n" STR_SECTION), "a", { A400 A400 A400 A400 } }, + { C("a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION), "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, + { C("a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION), "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, /* Prove expansion of system entries removes extra \'s and string replacements doesn't */ - { "ab=\"%24%\"\n" STR_SECTION, "ab", { "C:\\" } }, - { "ab=\"%mydrive%\"\n" STR_SECTION, "ab", { "C:\\" } }, - { "ab=\"%24%\\fred\"\n" STR_SECTION, "ab", { "C:\\fred" } }, - { "ab=\"%mydrive%\\fred\"\n" STR_SECTION,"ab", { "C:\\\\fred" } }, + { C("ab=\"%24%\"\n" STR_SECTION), "ab", { "C:\\" } }, + { C("ab=\"%mydrive%\"\n" STR_SECTION), "ab", { "C:\\" } }, + { C("ab=\"%24%\\fred\"\n" STR_SECTION), "ab", { "C:\\fred" } }, + { C("ab=\"%mydrive%\\fred\"\n" STR_SECTION),"ab", { "C:\\\\fred" } }, /* Confirm duplicate \'s kept */ - { "ab=\"%24%\\\\fred\"", "ab", { "C:\\\\fred" } }, - { "ab=C:\\\\FRED", "ab", { "C:\\\\FRED" } }, + { C("ab=\"%24%\\\\fred\""), "ab", { "C:\\\\fred" } }, + { C("ab=C:\\\\FRED"), "ab", { "C:\\\\FRED" } }, }; /* check the key of a certain line */ @@ -421,10 +429,14 @@ static void test_key_names(void) for (i = 0; i < ARRAY_SIZE(key_names); i++) { + int data_size; + strcpy( buffer, STD_HEADER "[Test]\n" ); - strcat( buffer, key_names[i].data ); + data_size = strlen(buffer); + memcpy( buffer + data_size, key_names[i].data, key_names[i].data_size ); + data_size += key_names[i].data_size; SetLastError( 0xdeadbeef ); - hinf = test_file_contents( buffer, &err_line ); + hinf = test_file_contents( buffer, data_size, &err_line ); ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; @@ -560,7 +572,7 @@ static void test_pSetupGetField(void) unicode = FALSE; } - hinf = test_file_contents( contents, &err ); + hinf = test_file_contents( contents, strlen(contents), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); ret = SetupFindFirstLineA( hinf, "FileBranchInfo", NULL, &context ); @@ -651,7 +663,7 @@ static void test_SetupGetIntField(void) strcat( buffer, keys[i].key ); strcat( buffer, "=" ); strcat( buffer, keys[i].fields ); - hinf = test_file_contents( buffer, &err); + hinf = test_file_contents( buffer, strlen(buffer), &err); ok( hinf != NULL, "Expected valid INF file\n" ); SetupFindFirstLineA( hinf, "TestSection", keys[i].key, &context ); @@ -695,7 +707,7 @@ static void test_GLE(void) int bufsize = MAX_INF_STRING_LENGTH; DWORD retsize; - hinf = test_file_contents( inf, &err ); + hinf = test_file_contents( inf, strlen(inf), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); SetLastError(0xdeadbeef); -- 2.26.2

1 0

[PATCH] ntdll: Implement __C_specific_handler and _local_unwind for arm64
by Martin Storsjo Sept. 17, 2020

Sept. 17, 2020

The __C_specific_handler function is based on the existing one for x86_64, but with a few small changes: - The TargetIp field in DISPATCHER_CONTEXT is renamed to TargetPc - The handler/filter functions are called via wrapper functions that set up the nonvolatile registers before calling them - Adjust ControlPc backwards if ControlPcIsUnwound is set Signed-off-by: Martin Storsjo <martin(a)martin.st> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 +- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_arm64.c | 174 ++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- dlls/vcruntime140/vcruntime140.spec | 4 +- 5 files changed, 182 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f74cea4e14c..f9cfe67c1b0 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler @ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @@ -62,7 +62,7 @@ @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) ucrtbase._local_unwind +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) ucrtbase._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) ucrtbase._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) ucrtbase._local_unwind4 @ cdecl -arch=i386 _longjmpex(ptr long) ucrtbase._longjmpex diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 453c4827572..af1fac8df8e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1437,7 +1437,7 @@ @ cdecl -private -arch=i386 _CIpow() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) @ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @@ -1463,7 +1463,7 @@ @ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) @ cdecl _lfind(ptr ptr ptr long ptr) -@ stdcall -arch=x86_64 _local_unwind(ptr ptr) +@ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) @ cdecl _ltow(long ptr long) @ cdecl _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2335a6cc0a8..d585fe0d93c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -39,6 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +typedef struct _SCOPE_TABLE +{ + ULONG Count; + struct + { + ULONG BeginAddress; + ULONG EndAddress; + ULONG HandlerAddress; + ULONG JumpTarget; + } ScopeRecord[1]; +} SCOPE_TABLE, *PSCOPE_TABLE; + + /* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ struct MSVCRT_JUMP_BUFFER { @@ -63,6 +76,19 @@ struct MSVCRT_JUMP_BUFFER }; +static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) +{ + unsigned int i; + + TRACE( "scope table at %p\n", table ); + for (i = 0; i < table->Count; i++) + TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, + base + table->ScopeRecord[i].BeginAddress, + base + table->ScopeRecord[i].EndAddress, + base + table->ScopeRecord[i].HandlerAddress, + base + table->ScopeRecord[i].JumpTarget ); +} + /******************************************************************* * is_valid_frame */ @@ -1225,6 +1251,154 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); } +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); +} + +extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, + PEXCEPTION_FILTER filter, + PUCHAR nonvolatile); +__ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, + "stp x29, x30, [sp, #-96]!\n\t" + __ASM_SEH(".seh_save_fplr_x 96\n\t") + "stp x19, x20, [sp, #16]\n\t" + __ASM_SEH(".seh_save_regp x19, 16\n\t") + "stp x21, x22, [sp, #32]\n\t" + __ASM_SEH(".seh_save_regp x21, 32\n\t") + "stp x23, x24, [sp, #48]\n\t" + __ASM_SEH(".seh_save_regp x23, 48\n\t") + "stp x25, x26, [sp, #64]\n\t" + __ASM_SEH(".seh_save_regp x25, 64\n\t") + "stp x27, x28, [sp, #80]\n\t" + __ASM_SEH(".seh_save_regp x27, 80\n\t") + "mov x29, sp\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") + + __ASM_CFI(".cfi_def_cfa x29, 96\n\t") + __ASM_CFI(".cfi_offset x29, -96\n\t") + __ASM_CFI(".cfi_offset x30, -88\n\t") + __ASM_CFI(".cfi_offset x19, -80\n\t") + __ASM_CFI(".cfi_offset x20, -72\n\t") + __ASM_CFI(".cfi_offset x21, -64\n\t") + __ASM_CFI(".cfi_offset x22, -56\n\t") + __ASM_CFI(".cfi_offset x23, -48\n\t") + __ASM_CFI(".cfi_offset x24, -40\n\t") + __ASM_CFI(".cfi_offset x25, -32\n\t") + __ASM_CFI(".cfi_offset x26, -24\n\t") + __ASM_CFI(".cfi_offset x27, -16\n\t") + __ASM_CFI(".cfi_offset x28, -8\n\t") + + "ldp x19, x20, [x3, #0]\n\t" + "ldp x21, x22, [x3, #16]\n\t" + "ldp x23, x24, [x3, #32]\n\t" + "ldp x25, x26, [x3, #48]\n\t" + "ldp x27, x28, [x3, #64]\n\t" + /* Overwrite the frame parameter with Fp from the + * nonvolatile regs */ + "ldr x1, [x3, #80]\n\t" + "blr x2\n\t" + "ldp x19, x20, [sp, #16]\n\t" + "ldp x21, x22, [sp, #32]\n\t" + "ldp x23, x24, [sp, #48]\n\t" + "ldp x25, x26, [sp, #64]\n\t" + "ldp x27, x28, [sp, #80]\n\t" + "ldp x29, x30, [sp], #96\n\t" + "ret") + +extern void __C_ExecuteTerminationHandler(BOOL abnormal, PVOID frame, + PTERMINATION_HANDLER handler, + PUCHAR nonvolatile); +/* This is, implementation wise, identical to __C_ExecuteExceptionFilter. */ +__ASM_GLOBAL_FUNC( __C_ExecuteTerminationHandler, + "b " __ASM_NAME("__C_ExecuteExceptionFilter") "\n\t"); + +/******************************************************************* + * __C_specific_handler (NTDLL.@) + */ +EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, + void *frame, + CONTEXT *context, + struct _DISPATCHER_CONTEXT *dispatch ) +{ + SCOPE_TABLE *table = dispatch->HandlerData; + ULONG i; + DWORD64 ControlPc = dispatch->ControlPc; + + TRACE( "%p %p %p %p\n", rec, frame, context, dispatch ); + if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); + + if (dispatch->ControlPcIsUnwound) + ControlPc -= 4; + + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + for (i = dispatch->ScopeIndex; i < table->Count; i++) + { + if (ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + PTERMINATION_HANDLER handler; + + if (table->ScopeRecord[i].JumpTarget) continue; + + if (rec->ExceptionFlags & EH_TARGET_UNWIND && + dispatch->TargetPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + dispatch->TargetPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + break; + } + + handler = (PTERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + dispatch->ScopeIndex = i+1; + + TRACE( "calling __finally %p frame %p\n", handler, frame ); + __C_ExecuteTerminationHandler( TRUE, frame, handler, + dispatch->NonVolatileRegisters ); + } + } + return ExceptionContinueSearch; + } + + for (i = dispatch->ScopeIndex; i < table->Count; i++) + { + if (ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + if (!table->ScopeRecord[i].JumpTarget) continue; + if (table->ScopeRecord[i].HandlerAddress != EXCEPTION_EXECUTE_HANDLER) + { + EXCEPTION_POINTERS ptrs; + PEXCEPTION_FILTER filter; + + filter = (PEXCEPTION_FILTER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + ptrs.ExceptionRecord = rec; + ptrs.ContextRecord = context; + TRACE( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); + switch (__C_ExecuteExceptionFilter( &ptrs, frame, filter, + dispatch->NonVolatileRegisters )) + { + case EXCEPTION_EXECUTE_HANDLER: + break; + case EXCEPTION_CONTINUE_SEARCH: + continue; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + } + } + TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, + rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); + } + } + return ExceptionContinueSearch; +} + /*********************************************************************** * RtlRaiseException (NTDLL.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 05ac3d3427a..4981d7fbac7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -48,7 +48,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @@ -555,7 +555,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() MSVCRT___libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() MSVCRT___libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 45d9370c86a..f799bcd4db5 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -10,7 +10,7 @@ @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler @ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @@ -64,7 +64,7 @@ @ cdecl -arch=i386 _local_unwind2(ptr long) ucrtbase._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) ucrtbase._local_unwind4 @ cdecl -arch=i386 _longjmpex(ptr long) ucrtbase._longjmpex -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) ucrtbase._local_unwind +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) ucrtbase._local_unwind @ cdecl _purecall() ucrtbase._purecall @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind -- 2.17.1

2 2

[PATCH 1/2] ole32/clipboard: Use wide string constants.
by Nikolay Sivov Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/clipboard.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index cb6770c05b3..01cfda831f5 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1743,35 +1743,19 @@ static snapshot *snapshot_construct(DWORD seq_no) */ static void register_clipboard_formats(void) { - static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0}; - static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0}; - static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0}; - static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0}; - static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0}; - static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0}; - static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ', - 'D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; - - static const WCHAR WineMarshalledDataObject[] = {'W','i','n','e',' ','M','a','r','s','h','a','l','l','e','d',' ', - 'D','a','t','a','O','b','j','e','c','t',0}; - - ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); - filename_clipboard_format = RegisterClipboardFormatW(FileName); - filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); - dataobject_clipboard_format = RegisterClipboardFormatW(DataObject); - embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject); - embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource); - custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource); - link_source_clipboard_format = RegisterClipboardFormatW(LinkSource); - object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); - link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); - ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); - - wine_marshal_clipboard_format = RegisterClipboardFormatW(WineMarshalledDataObject); + ownerlink_clipboard_format = RegisterClipboardFormatW(L"OwnerLink"); + filename_clipboard_format = RegisterClipboardFormatW(L"FileName"); + filenameW_clipboard_format = RegisterClipboardFormatW(L"FileNameW"); + dataobject_clipboard_format = RegisterClipboardFormatW(L"DataObject"); + embedded_object_clipboard_format = RegisterClipboardFormatW(L"Embedded Object"); + embed_source_clipboard_format = RegisterClipboardFormatW(L"Embed Source"); + custom_link_source_clipboard_format = RegisterClipboardFormatW(L"Custom Link Source"); + link_source_clipboard_format = RegisterClipboardFormatW(L"Link Source"); + object_descriptor_clipboard_format = RegisterClipboardFormatW(L"Object Descriptor"); + link_source_descriptor_clipboard_format = RegisterClipboardFormatW(L"Link Source Descriptor"); + ole_private_data_clipboard_format = RegisterClipboardFormatW(L"Ole Private Data"); + + wine_marshal_clipboard_format = RegisterClipboardFormatW(L"Wine Marshalled DataObject"); } /*********************************************************************** @@ -2026,9 +2010,6 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd ) { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - /* OleUninitialize() does not release the reference to the dataobject, so take an additional reference here. This reference is then leaked. */ if (clipbrd->src_data) @@ -2040,7 +2021,7 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd->window ) { DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); + UnregisterClassW( clipbrd_wndclass, GetModuleHandleW(L"ole32") ); } IStream_Release(clipbrd->marshal_data); @@ -2115,9 +2096,7 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, static HWND create_clipbrd_window(void) { WNDCLASSEXW class; - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - static const WCHAR title[] = {'C','l','i','p','b','o','a','r','d','W','i','n','d','o','w',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); + HINSTANCE hinst = GetModuleHandleW(L"ole32"); class.cbSize = sizeof(class); class.style = 0; @@ -2134,7 +2113,7 @@ static HWND create_clipbrd_window(void) RegisterClassExW(&class); - return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, + return CreateWindowW(clipbrd_wndclass, L"ClipboardWindow", WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); } -- 2.28.0

1 1

[PATCH vkd3d-shader 1/5] vkd3d-shader: Print "domain" in tessellator domains.
by Isabella Bosia Sept. 17, 2020

Sept. 17, 2020

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 68a90fd..3a17c22 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -420,6 +420,7 @@ static void shader_dump_uav_flags(struct vkd3d_string_buffer *buffer, DWORD uav_ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, enum vkd3d_tessellator_domain domain) { + shader_addline(buffer, "domain_"); switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE: -- 2.25.1

2 9