November 2018 - Wine-devel - list.winehq.org

[PATCH 5/7] kernel32: Reimplement RemoveDirectory() by setting a delete disposition.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 17 ++++++++--------- dlls/ntdll/tests/file.c | 8 +++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34aa4..b6faa6e0bf 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1696,11 +1696,10 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nt_name; - ANSI_STRING unix_name; IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; - BOOL ret = FALSE; + FILE_DISPOSITION_INFORMATION fdi; TRACE( "%s\n", debugstr_w(path) ); @@ -1726,19 +1725,19 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) return FALSE; } - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); + + fdi.DoDeleteFile = TRUE; + status = NtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation); + + NtClose( handle ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) ); - NtClose( handle ); return FALSE; } - - if (!(ret = (rmdir( unix_name.Buffer ) != -1))) FILE_SetDosError(); - RtlFreeAnsiString( &unix_name ); - NtClose( handle ); - return ret; + return TRUE; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 67a211c803..4ad2142c51 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2935,16 +2935,18 @@ todo_wine fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; -todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); +todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle2 != INVALID_HANDLE_VALUE) + CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "Directory should have been deleted\n" ); @@ -2967,10 +2969,10 @@ todo_wine handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -- 2.17.1

1 0

[PATCH 4/7] server: Allow setting delete disposition on a read-only directory.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

This makes next patch work for RemoveDirectory() call in dlls/kernel32/tests/profile.c,test_profile_directory_readonly(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index 3184926d18..8d57892e2c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2326,8 +2326,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - /* can't unlink files we don't have permission to access */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + /* can't unlink files we don't have permission to write */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) { set_error( STATUS_CANNOT_DELETE ); return; -- 2.17.1

1 0

[PATCH 2/7] server: Map FILE_NOTIFY_CHANGE_LAST_ACCESS to IN_MODIFY.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Using IN_ACCESS leads to generating stray change notifications. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/change.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 9577f56d86..4f6251ef63 100644 --- a/server/change.c +++ b/server/change.c @@ -742,11 +742,9 @@ static unsigned int filter_from_event( struct inotify_event *ie ) if (ie->mask & (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE)) filter |= FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME; if (ie->mask & IN_MODIFY) - filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE; + filter |= FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_LAST_ACCESS; if (ie->mask & IN_ATTRIB) filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SECURITY; - if (ie->mask & IN_ACCESS) - filter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; if (ie->mask & IN_CREATE) filter |= FILE_NOTIFY_CHANGE_CREATION; @@ -980,7 +978,7 @@ static int map_flags( unsigned int filter ) if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE) mask |= IN_MODIFY; if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS) - mask |= IN_ACCESS; + mask |= IN_MODIFY; if (filter & FILE_NOTIFY_CHANGE_SECURITY) mask |= IN_ATTRIB; -- 2.17.1

1 0

[PATCH 1/7] server: Don't stop processing change notifications when name length is 0.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

It's legitimate to receive a notification with len = 0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/change.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/change.c b/server/change.c index d00a885dd2..9577f56d86 100644 --- a/server/change.c +++ b/server/change.c @@ -949,11 +949,10 @@ static void inotify_poll_event( struct fd *fd, int event ) for( ofs = 0; ofs < r - offsetof(struct inotify_event, name); ) { ie = (struct inotify_event*) &buffer[ofs]; - if (!ie->len) - break; ofs += offsetof( struct inotify_event, name[ie->len] ); if (ofs > r) break; - inotify_notify_all( ie ); + if (ie->len) + inotify_notify_all( ie ); } } -- 2.17.1

1 0

[PATCH 2/2] widl: Make MIDL_DEFINE_GUID more compatible with midl.
by Jacek Caban 06 Nov '18

06 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 1

[PATCH] user32: Allow scrollbar control to store scroll info in subclassed window.
by Jacek Caban 06 Nov '18

06 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46004 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45966 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/scroll.c | 35 +++++++++++++++++++++++++++++------ dlls/user32/tests/scroll.c | 1 - 2 files changed, 29 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/8] comctl32/listbox: Make SetCount fail if LBS_NODATA is not set
by Gabriel Ivăncescu 06 Nov '18

06 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Here's the patch series with all of the relevant tests for LBS_NODATA implementation. To avoid having to use todo_wine for no reason which then gets replaced, the tests are simply placed after the given patch that requires them to prove its correct behavior. For example, the second patch tests SetCount and the third one tests the creation styles so that the first patch is proven to be Windows' behavior. The later patches also have their own tests at the end of the series, which should conclude all relevant tests for LBS_NODATA. Please note that the final implementation of LBS_NODATA that comes after this won't affect the tests; it is purely for performance and memory usage (as that is the whole point of the style to begin with). So these patches can be committed by themselves and still be completely correct in regards to Windows behavior. For example if you simply run the tests without the other patches, they will fail on Wine (rightfully). dlls/comctl32/listbox.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..0a7c341 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1752,7 +1752,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { LRESULT ret; - if (HAS_STRINGS(descr)) + if (!(descr->style & LBS_NODATA)) { SetLastError(ERROR_SETCOUNT_ON_BAD_LB); return LB_ERR; @@ -2518,6 +2518,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; descr->item_height = LISTBOX_SetFont( descr, 0 ); + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; + if (descr->style & LBS_OWNERDRAWFIXED) { if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) -- 2.19.1

2 12

[PATCH] ntoskrnl.exe: add stub for KeSetTargetProcessorDpc
by Louis Lenders 06 Nov '18

06 Nov '18

For https://bugs.winehq.org/show_bug.cgi?id=46040 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9fbf22d..0c85b23 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2845,6 +2845,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI } /*********************************************************************** + * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetTargetProcessorDpc(PRKDPC dpc, CCHAR number) +{ + FIXME("%p, %d stub\n", dpc, number); +} + +/*********************************************************************** * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) */ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c10fa2f..c19f739 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -620,7 +620,7 @@ @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stdcall KeSetSystemAffinityThread(long) -@ stub KeSetTargetProcessorDpc +@ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement @ stub KeSetTimer @ stdcall KeSetTimerEx(ptr int64 long ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e76ccc9..fdf035d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); -- 2.7.4

1 0

[PATCH 3/3] crypt32: Look for the provider that supports the specified content OID in CryptMsgOpenToEncode(CMSG_HASHED).
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/msg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f37c462aa9..26f2616fdd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,7 +567,12 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, prov = info->hCryptProv; else { - prov = I_CryptGetDefaultCryptProv(0); + prov = I_CryptGetDefaultCryptProv(algID); + if (!prov) + { + SetLastError(E_INVALIDARG); + return NULL; + } dwFlags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } msg = CryptMemAlloc(sizeof(CHashEncodeMsg)); -- 2.17.1

1 0

[PATCH 5/5] d3d8/tests: Port test_lockable_backbuffer() from d3d9.
by Henri Verbeet 06 Nov '18

06 Nov '18

Note that we use D3DLOCK_READONLY instead of D3DLOCK_DISCARD. The latter doesn't appear to be valid for d3d8 backbuffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6313d4855fd..aec35ce22f0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -33,9 +33,10 @@ struct vec3 float x, y, z; }; -#define CREATE_DEVICE_FULLSCREEN 0x01 -#define CREATE_DEVICE_FPU_PRESERVE 0x02 -#define CREATE_DEVICE_SWVP_ONLY 0x04 +#define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_FPU_PRESERVE 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 +#define CREATE_DEVICE_LOCKABLE_BACKBUFFER 0x08 struct device_desc { @@ -122,6 +123,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_LOCKABLE_BACKBUFFER) + present_parameters.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; if (desc->flags & CREATE_DEVICE_SWVP_ONLY) behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) @@ -8406,6 +8409,89 @@ static void test_destroyed_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_lockable_backbuffer(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; + IDirect3DSurface8 *surface; + IDirect3DDevice8 *device; + D3DLOCKED_RECT lockrect; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &lockrect, NULL, D3DLOCK_READONLY); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + /* Reset with D3DPRESENTFLAG_LOCKABLE_BACKBUFFER. */ + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &lockrect, NULL, D3DLOCK_READONLY); +todo_wine + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + device_desc.width = 640; + device_desc.height = 480; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_LOCKABLE_BACKBUFFER; + + device = create_device(d3d, window, &device_desc); + ok(!!device, "Failed to create device.\n"); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &surface); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock rect, hr %#x.\n", hr); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock rect, hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + static void test_clip_planes_limits(void) { static const DWORD device_flags[] = {0, CREATE_DEVICE_SWVP_ONLY}; @@ -8805,6 +8891,7 @@ START_TEST(device) test_render_target_device_mismatch(); test_format_unknown(); test_destroyed_window(); + test_lockable_backbuffer(); test_clip_planes_limits(); test_swapchain_multisample_reset(); test_device_caps(); -- 2.11.0

2 1