April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mf/evr: Add IMFRateSupport stub.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 71f8e0d3284c791cbc1b3e828f43c70693ff6dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f8e0d3284c791cbc1b3e82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:34 2021 +0300 mf/evr: Add IMFRateSupport stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 3 +++ 2 files changed, 70 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index baa6665853e..2a529895237 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -80,6 +80,7 @@ struct video_renderer IMediaEventSink IMediaEventSink_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFRateSupport IMFRateSupport_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -150,6 +151,11 @@ static struct video_renderer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface return CONTAINING_RECORD(iface, struct video_renderer, IMFQualityAdvise_iface); } +static struct video_renderer *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFRateSupport_iface); +} + static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); @@ -1087,6 +1093,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &renderer->IMFRateSupport_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2028,6 +2038,10 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface if (renderer->device_manager) hr = IUnknown_QueryInterface(renderer->device_manager, riid, obj); } + else if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE) && IsEqualIID(riid, &IID_IMFRateSupport)) + { + hr = IMFVideoRenderer_QueryInterface(&renderer->IMFVideoRenderer_iface, riid, obj); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service)); @@ -2642,6 +2656,58 @@ static const IMFQualityAdviseVtbl video_renderer_quality_advise_vtbl = video_renderer_quality_advise_DropTime, }; +static HRESULT WINAPI video_renderer_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **out) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, out); +} + +static ULONG WINAPI video_renderer_rate_support_AddRef(IMFRateSupport *iface) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_supported_rate) +{ + FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return E_NOTIMPL; +} + +static const IMFRateSupportVtbl video_renderer_rate_support_vtbl = +{ + video_renderer_rate_support_QueryInterface, + video_renderer_rate_support_AddRef, + video_renderer_rate_support_Release, + video_renderer_rate_support_GetSlowestRate, + video_renderer_rate_support_GetFastestRate, + video_renderer_rate_support_IsRateSupported, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -2664,6 +2730,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; object->IMFAttributes_iface.lpVtbl = &video_renderer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_renderer_quality_advise_vtbl; + object->IMFRateSupport_iface.lpVtbl = &video_renderer_rate_support_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 39b9d64e729..89da5d0ab64 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4263,6 +4263,8 @@ static void test_evr(void) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); check_interface(sink, &IID_IMFQualityAdvise, TRUE); + check_interface(sink, &IID_IMFRateSupport, TRUE); + check_interface(sink, &IID_IMFRateControl, FALSE); check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); @@ -4270,6 +4272,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control);

1 0

Nikolay Sivov : mf/evr: Add slowest/fastest rate support methods.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 51a0cdf52d6f9796ba5e3ca8bb8abb205703f54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a0cdf52d6f9796ba5e3ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:35 2021 +0300 mf/evr: Add slowest/fastest rate support methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 17 +++++++++++++---- dlls/mf/tests/mf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 2a529895237..292e84ddd6b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2677,17 +2677,26 @@ static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + if (renderer->flags & EVR_SHUT_DOWN) + return MF_E_SHUTDOWN; + + *rate = 0.0f; + + return S_OK; } static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return renderer->flags & EVR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_INVALIDREQUEST; } static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 89da5d0ab64..c8c7e0569cc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4224,10 +4224,12 @@ static void test_evr(void) DWORD flags, count, value; IMFActivate *activate; HWND window, window2; + IMFRateSupport *rs; LONG sample_count; IMFSample *sample; IUnknown *unk; UINT64 window3; + float rate; HRESULT hr; GUID guid; @@ -4510,6 +4512,50 @@ todo_wine hr = IMFMediaSink_SetPresentationClock(sink, clock); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFPresentationClock_Release(clock); IMFActivate_Release(activate);

1 0

Alexandre Julliard : ntdll: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: f93713b157411efabfa6ceabf137364b249106f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93713b157411efabfa6ceab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:43:10 2021 +0200 ntdll: Support loading builtins from the architecture-specific PE directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++++++- dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 38dd276608b..85ae6aac15f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -51,6 +51,18 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e #define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +#else +static const WCHAR pe_dir[] = L""; +#endif + /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) @@ -2640,11 +2652,18 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } + for (i = 0; ; i++) { swprintf( dllpath, ARRAY_SIZE(dllpath), L"WINEDLLDIR%u", i ); - if (get_env_var( dllpath, 20 + wcslen(name), new_name )) break; + if (get_env_var( dllpath, wcslen(pe_dir) + wcslen(name) + 1, new_name )) break; len = new_name->Length; + RtlAppendUnicodeToString( new_name, pe_dir ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\" ); RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9947ff2f447..30e1f972ae1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -237,10 +237,27 @@ static char *build_path( const char *dir, const char *name ) memcpy( ret, dir, len ); if (len && ret[len - 1] != '/') ret[len++] = '/'; + if (name[0] == '/') name++; strcpy( ret + len, name ); return ret; } + +static const char *get_pe_dir( WORD machine ) +{ + if (!machine) machine = current_machine; + + switch(machine) + { + case IMAGE_FILE_MACHINE_I386: return "/i386-windows"; + case IMAGE_FILE_MACHINE_AMD64: return "/x86_64-windows"; + case IMAGE_FILE_MACHINE_ARMNT: return "/arm-windows"; + case IMAGE_FILE_MACHINE_ARM64: return "/aarch64-windows"; + default: return ""; + } +} + + static void set_dll_path(void) { char *p, *path = getenv( "WINEDLLPATH" ); @@ -1257,6 +1274,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T unsigned int i, pos, namepos, namelen, maxlen = 0; unsigned int len = nt_name->Length / sizeof(WCHAR); char *ptr = NULL, *file, *ext = NULL; + const char *pe_dir = get_pe_dir( machine ); OBJECT_ATTRIBUTES attr; NTSTATUS status = STATUS_DLL_NOT_FOUND; BOOL found_image = FALSE; @@ -1268,7 +1286,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T InitializeObjectAttributes( &attr, nt_name, 0, 0, NULL ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof("/aarch64-windows") + sizeof(".so"); if (!(file = malloc( maxlen ))) return STATUS_NO_MEMORY; @@ -1310,8 +1328,16 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T for (i = 0; dll_paths[i]; i++) { + ptr = file + pos; + file[pos + len + 1] = 0; + ptr = prepend( ptr, pe_dir, strlen(pe_dir) ); + ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + /* use so dir for unix lib */ + ptr = file + pos; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); + if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; @@ -1652,13 +1678,26 @@ static void load_ntdll(void) UNICODE_STRING str; void *module; SIZE_T size = 0; - char *name = build_path( dll_dir, "ntdll.dll.so" ); + char *name; + + if (!build_dir) + { + char *dir = build_path( dll_dir, get_pe_dir(current_machine) ); + name = build_path( dir, "ntdll.dll.so" ); + free( dir ); + } + else name = build_path( build_dir, "dlls/ntdll/ntdll.dll.so" ); init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ status = open_builtin_file( name, &attr, &module, &size, &info, current_machine, FALSE ); if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); + else if (status == STATUS_DLL_NOT_FOUND) + { + free( name ); + name = build_path( dll_dir, "ntdll.dll.so" ); + } else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module );

1 0

Alexandre Julliard : setupapi: Support installing both types of builtins from the same directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 95118c482995c285f4f0e96d343aa89c4dc6f844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95118c482995c285f4f0e96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:39:46 2021 +0200 setupapi: Support installing both types of builtins from the same directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 852cef3d54f..7fcc4a6fe89 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -190,14 +190,13 @@ static void extract_16bit_image( IMAGE_NT_HEADERS *nt, void **data, SIZE_T *size /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ -static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_builtin ) +static int read_file( const WCHAR *name, void **data, SIZE_T *size ) { struct stat st; int fd, ret = -1; size_t header_size; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const char *signature = expect_builtin ? builtin_signature : fakedll_signature; const size_t min_size = sizeof(*dos) + 32 + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); @@ -220,8 +219,9 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_ if (read( fd, file_buffer, header_size ) != header_size) goto done; dos = file_buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; - if (dos->e_lfanew < strlen(signature) + 1) goto done; - if (memcmp( dos + 1, signature, strlen(signature) + 1 )) goto done; + if (dos->e_lfanew < sizeof(*dos) + 32) goto done; + if (memcmp( dos + 1, builtin_signature, strlen(builtin_signature) + 1 ) && + memcmp( dos + 1, fakedll_signature, strlen(fakedll_signature) + 1 )) goto done; if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) goto done; nt = (IMAGE_NT_HEADERS *)((char *)file_buffer + dos->e_lfanew); @@ -432,9 +432,9 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -444,19 +444,19 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; for (i = 0; (path = enum_load_path( i )); i++) { ptr = prepend( file + pos, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, TRUE ))) break; + if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, L"\\fakedlls", 9 ); ptr = prepend( ptr, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, FALSE ))) break; + if ((res = read_file( ptr, &data, size ))) break; } done: @@ -881,7 +881,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, BOOL expect_builtin, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -893,7 +893,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de SIZE_T len = end - name; if (ext) lstrcpyW( end, ext ); - if (!(ret = read_file( file, &data, &size, expect_builtin ))) + if (!(ret = read_file( file, &data, &size ))) { *end = 0; return 0; @@ -936,8 +936,7 @@ static void delay_copy_files( struct list *delay_copy ) LIST_FOR_EACH_ENTRY_SAFE( copy, next, delay_copy, struct delay_copy, entry ) { list_remove( &copy->entry ); - ret = read_file( copy->src, &data, &size, TRUE ); - if (ret == -1) ret = read_file( copy->src, &data, &size, FALSE ); + ret = read_file( copy->src, &data, &size ); if (ret != 1) { HeapFree( GetProcessHeap(), 0, copy ); @@ -958,7 +957,7 @@ static void delay_copy_files( struct list *delay_copy ) /* find and install all fake dlls in a given lib directory */ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, - const WCHAR *default_ext, BOOL delete, BOOL expect_builtin ) + const WCHAR *default_ext, BOOL delete ) { WCHAR *name; intptr_t handle; @@ -983,14 +982,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, lstrcatW( name, data.name ); if (wcschr( data.name, '.' )) /* module possibly already has an extension */ { - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy ); + else install_fake_dll( dest, file, NULL, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1023,18 +1022,18 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B { lstrcpyW( file, build_dir ); lstrcatW( file, L"\\dlls" ); - install_lib_dir( dest, file, wildcard, L".dll", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".dll", delete ); lstrcpyW( file, build_dir ); lstrcatW( file, L"\\programs" ); - install_lib_dir( dest, file, wildcard, L".exe", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".exe", delete ); } for (i = 0; (path = enum_load_path( i )); i++) { lstrcpyW( file, path ); - install_lib_dir( dest, file, wildcard, NULL, delete, TRUE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, wildcard, NULL, delete, FALSE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest );

1 0

Alexandre Julliard : setupapi: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 717e394af31407e04459c25f589c5105dd126566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717e394af31407e04459c25f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:41:32 2021 +0200 setupapi: Support loading builtins from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 7fcc4a6fe89..68d0bd0bc69 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -40,6 +40,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +static const char current_arch[] = "x86"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +static const char current_arch[] = "amd64"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +static const char current_arch[] = "arm"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +static const char current_arch[] = "arm64"; +#else +static const WCHAR pe_dir[] = L""; +static const char current_arch[] = "none"; +#endif + static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; @@ -414,7 +431,7 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) len = lstrlenW( name ); if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + len + 1; while ((path = enum_load_path( i++ ))) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += ARRAY_SIZE(L"\\fakedlls") + len + ARRAY_SIZE(L".fake"); + maxlen += ARRAY_SIZE(pe_dir) + len + ARRAY_SIZE(L".fake"); if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return NULL; @@ -452,6 +469,9 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) file[pos + len + 1] = 0; for (i = 0; (path = enum_load_path( i )); i++) { + ptr = prepend( file + pos, pe_dir, lstrlenW(pe_dir) ); + ptr = prepend( ptr, path, lstrlenW(path) ); + if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, path, lstrlenW(path) ); if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, L"\\fakedlls", 9 ); @@ -709,17 +729,6 @@ struct dll_data static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR *res_name, LONG_PTR arg ) { -#ifdef __i386__ - static const char current_arch[] = "x86"; -#elif defined __x86_64__ - static const char current_arch[] = "amd64"; -#elif defined __arm__ - static const char current_arch[] = "arm"; -#elif defined __aarch64__ - static const char current_arch[] = "arm64"; -#else - static const char current_arch[] = "none"; -#endif const struct dll_data *dll_data = (const struct dll_data*)arg; WCHAR *dest = NULL; DWORD dest_len = 0; @@ -1007,7 +1016,7 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += 2 * max_dll_name_len + 2 + 10; /* ".dll.fake" */ + maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll.fake" */ if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return FALSE; if (!(dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) @@ -1029,6 +1038,8 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B } for (i = 0; (path = enum_load_path( i )); i++) { + swprintf( file, maxlen, L"%s%s", path, pe_dir ); + install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path );

1 0

Alexandre Julliard : winecfg: Get the builtins list from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: b51aab9199221d0b4c2c58c7f4a483180f749721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51aab9199221d0b4c2c58c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:14:20 2021 +0200 winecfg: Get the builtins list from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index ae66509c9d0..0c5fcc65ced 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -43,6 +43,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); +#ifdef __i386__ +static const char pe_dir[] = "\\i386-windows"; +#elif defined __x86_64__ +static const char pe_dir[] = "\\x86_64-windows"; +#elif defined __arm__ +static const char pe_dir[] = "\\arm-windows"; +#elif defined __aarch64__ +static const char pe_dir[] = "\\aarch64-windows"; +#else +static const char pe_dir[] = ""; +#endif + /* dlls that shouldn't be configured anything other than builtin; list must be sorted*/ static const char * const builtin_only[] = { @@ -332,6 +344,8 @@ static void load_library_list( HWND dialog ) sprintf( var, "WINEDLLDIR%u", i++ ); if (!GetEnvironmentVariableA( var, path, MAX_PATH )) break; load_library_list_from_dir( dialog, path, FALSE ); + strcat( path, pe_dir ); + load_library_list_from_dir( dialog, path, FALSE ); } /* get rid of duplicate entries */

1 0

Alexandre Julliard : Wine release 6.7
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: website Branch: master Commit: 005c11c7bbd4a270741af2ccd74834424163c07d URL: https://source.winehq.org/git/website.git/?a=commit;h=005c11c7bbd4a270741af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:20:30 2021 +0200 Wine release 6.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021042301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2021042301.xml b/news/en/2021042301.xml new file mode 100644 index 00000000..76091554 --- /dev/null +++ b/news/en/2021042301.xml @@ -0,0 +1,19 @@ +<news> +<date>April 23, 2021</date> +<title>Wine 6.7 Released</title> +<body> + The Wine development release 6.7 is now available. + <a href="{$root}/announce/6.7">What's new</a> in this release: +<ul> + <li>NetApi32, WLDAP32, and Kerberos libraries converted to PE.</li> + <li>More Media Foundation work.</li> + <li>ES6 JavaScript mode.</li> + <li>Improved WOW64 file system redirection.</li> + <li>More Plug & Play driver support.</li> + <li>Keyboard raw input device.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Gabriel Ivăncescu : kernel32/tests: Test renaming a file/directory to a different casing of itself or existing target.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: b3553f0e5ae34e3c9a0cecbc86dd98586dffd91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3553f0e5ae34e3c9a0cecbc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 23 18:52:26 2021 +0300 kernel32/tests: Test renaming a file/directory to a different casing of itself or existing target. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5deed96abf3..bb05188b4c7 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1954,6 +1954,7 @@ static void test_MoveFileA(void) char tempdir[MAX_PATH]; char source[MAX_PATH], dest[MAX_PATH]; static const char prefix[] = "pfx"; + WIN32_FIND_DATAA find_data; HANDLE hfile; HANDLE hmapfile; DWORD ret; @@ -2023,9 +2024,72 @@ static void test_MoveFileA(void) ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); lstrcatA(tempdir, "Remove Me"); + + /* test renaming a file "Remove Me" to itself but in lowercase "me" */ + lstrcpyA(source, tempdir); + tempdir[lstrlenA(tempdir) - 2] = 'm'; + + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %s\n", source); + CloseHandle(hfile); + + ret = MoveFileA(source, tempdir); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + + /* test renaming another file "Remove Be" to "Remove Me", which replaces the existing "Remove me" */ + tempdir[lstrlenA(tempdir) - 2] = 'B'; + + hfile = CreateFileA(tempdir, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %s\n", tempdir); + CloseHandle(hfile); + + ret = MoveFileA(tempdir, source); + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "MoveFileA: expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ret = MoveFileExA(tempdir, source, MOVEFILE_REPLACE_EXISTING); + ok(ret, "MoveFileExA: failed, error %d\n", GetLastError()); + + tempdir[lstrlenA(tempdir) - 2] = 'm'; + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + ok(!lstrcmpA(strrchr(source, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on existing target file: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + + ret = DeleteFileA(tempdir); + ok(ret, "DeleteFileA: error %d\n", GetLastError()); + + /* now test a directory from "Remove me" to uppercase "Me" */ ret = CreateDirectoryA(tempdir, NULL); ok(ret == TRUE, "CreateDirectoryA failed\n"); + lstrcpyA(source, tempdir); + tempdir[lstrlenA(tempdir) - 2] = 'M'; + ret = MoveFileA(source, tempdir); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + + hfile = FindFirstFileA(tempdir, &find_data); + ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); + } + CloseHandle(hfile); + lstrcpyA(source, dest); lstrcpyA(dest, tempdir); lstrcatA(dest, "\\wild?.*");

1 0

Gabriel Ivăncescu : kernel32/tests: Test hard linking a file to a different casing of itself.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 01283ec6a6de80babce6bb395e0c675c55a61b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01283ec6a6de80babce6bb39… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 23 18:52:27 2021 +0300 kernel32/tests: Test hard linking a file to a different casing of itself. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index bb05188b4c7..8560524683d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5790,6 +5790,11 @@ static void test_hard_link(void) ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CreateHardLinkA( "WineTest_File1", "winetest_file1", NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got error %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = CreateHardLinkA( "winetest_file3", "winetest_dir1", NULL ); ok(!ret, "expected failure\n");

1 0

Gabriel Ivăncescu : ntdll/tests: Test hard linking a file to a different casing of itself or existing target.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: ec20f767fb0b5012fe1c3d241af2175a1c5828df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec20f767fb0b5012fe1c3d24… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 23 18:52:28 2021 +0300 ntdll/tests: Test hard linking a file to a different casing of itself or existing target. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 839046a7488..d469b449a74 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2176,6 +2176,7 @@ static void test_file_link_information(void) WCHAR tmp_path[MAX_PATH], oldpath[MAX_PATH + 16], newpath[MAX_PATH + 16], *filename, *p; FILE_LINK_INFORMATION *fli; FILE_NAME_INFORMATION *fni; + WIN32_FIND_DATAW find_data; BOOL success, fileDeleted; UNICODE_STRING name_str; HANDLE handle, handle2; @@ -2283,6 +2284,46 @@ static void test_file_link_information(void) delete_object( oldpath ); delete_object( newpath ); + /* oldpath is a file, newpath is a file, ReplaceIfExists = TRUE, different casing on link */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + wcsrchr( newpath, '\\' )[1] = 'F'; + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_LINK_INFORMATION) + name_str.Length ); + fli->ReplaceIfExists = TRUE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + handle = FindFirstFileW( newpath, &find_data ); + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); + if (handle != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); + } + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); + delete_object( newpath ); + /* oldpath is a file, newpath is a file, ReplaceIfExists = FALSE, target file opened */ res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); ok( res != 0, "failed to create temp file\n" ); @@ -2826,6 +2867,46 @@ static void test_file_link_information(void) CloseHandle( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); + + /* oldpath == newpath, different casing on link */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + wcsrchr( oldpath, '\\' )[1] = 'F'; + pRtlDosPathNameToNtPathName_U( oldpath, &name_str, NULL, NULL ); + fli = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fli->ReplaceIfExists = FALSE; + fli->RootDirectory = NULL; + fli->FileNameLength = name_str.Length; + memcpy( fli->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_OBJECT_NAME_COLLISION, "got status %x\n", res ); + + fli->ReplaceIfExists = TRUE; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, FileLinkInformation ); + ok( U(io).Status == STATUS_SUCCESS, "got io status %#x\n", U(io).Status ); + ok( res == STATUS_SUCCESS, "got status %x\n", res ); + ok( GetFileAttributesW( oldpath ) != INVALID_FILE_ATTRIBUTES, "file should exist\n" ); + + CloseHandle( handle ); + handle = FindFirstFileW( oldpath, &find_data ); + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); + if (handle != INVALID_HANDLE_VALUE) + { + todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); + } + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); } static void test_file_both_information(void)

1 0