- wine-devel - winehq.org

[PATCH] dwrite: Update line breaking logic with Unicode 11.0.0 changes.
by Nikolay Sivov 06 Nov '18

06 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 19214ee392..5547531b86 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -517,7 +517,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B { switch (break_class[i]) { - /* LB7 - do not break before spaces */ + /* LB7 - do not break before spaces or zero-width space */ case b_SP: set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; @@ -531,10 +531,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B if (j < count-1 && break_class[j+1] != b_ZW) set_break_condition(j, BreakConditionAfter, DWRITE_BREAK_CONDITION_CAN_BREAK, &state); break; - /* LB8a - do not break between ZWJ and an ideograph, emoji base or emoji modifier */ + /* LB8a - do not break after ZWJ */ case b_ZWJ: - if (i < count-1 && (break_class[i+1] == b_ID || break_class[i+1] == b_EB || break_class[i+1] == b_EM)) - set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); + set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; } } -- 2.19.1

1 0

[PATCH 3/3] gdiplus: Add 4bppIndexed to the list of supported formats.
by Akihiro Sagawa 06 Nov '18

06 Nov '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 1 + dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] [v2] gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded.
by Akihiro Sagawa 06 Nov '18

06 Nov '18

In v2, - Seek tRNS chunk from the stream instead of scanning a palette for better compatiblities. - Reword a commit message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44409 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 46 insertions(+), 5 deletions(-)

1 0

[PATCH 7/7] server: Fail to open a file if it has explicit delete disposition set.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/file.c | 10 ---------- server/fd.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4ad2142c51..6793011e7a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2759,16 +2759,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 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()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2967,16 +2962,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ 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" ); -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" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/server/fd.c b/server/fd.c index 3737c4d323..346e841e05 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1833,6 +1833,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, { unsigned int err; struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd ); + struct list *ptr; if (!inode) { @@ -1847,6 +1848,16 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, list_add_head( &inode->open, &fd->inode_entry ); closed_fd = NULL; + LIST_FOR_EACH( ptr, &inode->open ) + { + struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); + if (fd_ptr->closed->unlink == 1 /* only explicit disposition matters */) + { + set_error( STATUS_DELETE_PENDING ); + goto error; + } + } + /* check directory options */ if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode)) { -- 2.17.1

1 0

[PATCH 6/7] server: Track separately implicit and explicit file disposition.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

This simplifies next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/fd.c b/server/fd.c index 8d57892e2c..3737c4d323 100644 --- a/server/fd.c +++ b/server/fd.c @@ -169,7 +169,7 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - int unlink; /* whether to unlink on close */ + int unlink; /* whether to unlink on close: -1 - implicit FILE_DELETE_ON_CLOSE, 1 - explicit disposition */ char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; @@ -1872,7 +1872,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, goto error; } - fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) ? -1 : 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -2340,7 +2340,9 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); + fd->closed->unlink = unlink ? 1 : 0; + if (fd->options & FILE_DELETE_ON_CLOSE) + fd->closed->unlink = -1; } /* set new name for the fd */ -- 2.17.1

1 0

[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

[PATCH 2/3] crypt32: Add support for a particular ALG_ID to I_CryptGetDefaultCryptProv.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Based on a patch of Alexander Morozov. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/main.c | 73 ++++++++++++++++++++++++++++++---- dlls/crypt32/tests/main.c | 2 +- 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index c6e20120fc..1b390f4a92 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -149,7 +149,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, /* Returns a handle to the default crypto provider; loads it if necessary. * Returns NULL on failure. */ -HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD); +HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); HINSTANCE hInstance DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index d37bf4a712..d0643f4107 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -35,6 +35,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HCRYPTPROV hDefProv; HINSTANCE hInstance; +static CRITICAL_SECTION prov_param_cs; +static CRITICAL_SECTION_DEBUG prov_param_cs_debug = +{ + 0, 0, &prov_param_cs, + { &prov_param_cs_debug.ProcessLocksList, + &prov_param_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": prov_param_cs") } +}; +static CRITICAL_SECTION prov_param_cs = { &prov_param_cs_debug, -1, 0, 0, 0, 0 }; + BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) { switch (fdwReason) @@ -174,20 +184,69 @@ BOOL WINAPI I_CryptGetOssGlobal(DWORD x) return FALSE; } -HCRYPTPROV WINAPI DECLSPEC_HOTPATCH I_CryptGetDefaultCryptProv(DWORD reserved) +static BOOL is_supported_algid(HCRYPTPROV prov, ALG_ID algid) +{ + PROV_ENUMALGS prov_algs; + DWORD size = sizeof(prov_algs); + BOOL ret = FALSE; + + /* This enumeration is not thread safe */ + EnterCriticalSection(&prov_param_cs); + if (CryptGetProvParam(prov, PP_ENUMALGS, (BYTE *)&prov_algs, &size, CRYPT_FIRST)) + { + do + { + if (prov_algs.aiAlgid == algid) + { + ret = TRUE; + break; + } + } while (CryptGetProvParam(prov, PP_ENUMALGS, (BYTE *)&prov_algs, &size, CRYPT_NEXT)); + } + LeaveCriticalSection(&prov_param_cs); + return ret; +} + +HCRYPTPROV WINAPI DECLSPEC_HOTPATCH I_CryptGetDefaultCryptProv(ALG_ID algid) { - HCRYPTPROV ret; + HCRYPTPROV prov, defprov; + + TRACE("(%08x)\n", algid); - TRACE("(%08x)\n", reserved); + defprov = CRYPT_GetDefaultProvider(); - if (reserved) + if (algid && !is_supported_algid(defprov, algid)) { + DWORD i = 0, type, size; + + while (CryptEnumProvidersW(i, NULL, 0, &type, NULL, &size)) + { + WCHAR *name = CryptMemAlloc(size); + if (name) + { + if (CryptEnumProvidersW(i, NULL, 0, &type, name, &size)) + { + if (CryptAcquireContextW(&prov, NULL, name, type, CRYPT_VERIFYCONTEXT)) + { + if (is_supported_algid(prov, algid)) + { + CryptMemFree(name); + return prov; + } + CryptReleaseContext(prov, 0); + } + } + CryptMemFree(name); + } + i++; + } + SetLastError(E_INVALIDARG); return 0; } - ret = CRYPT_GetDefaultProvider(); - CryptContextAddRef(ret, NULL, 0); - return ret; + + CryptContextAddRef(defprov, NULL, 0); + return defprov; } BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name, diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index a490c51e3f..6a031527d8 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -357,7 +357,7 @@ static void test_getDefaultCryptProv(void) prov = pI_CryptGetDefaultCryptProv(test_prov[i].algid); if (!prov) { -todo_wine_if(!test_prov[i].optional) +todo_wine_if(test_prov[i].algid == CALG_DSS_SIGN || test_prov[i].algid == CALG_NO_SIGN) ok(test_prov[i].optional, "%u: I_CryptGetDefaultCryptProv(%#x) failed\n", i, test_prov[i].algid); continue; } -- 2.17.1

1 0

[PATCH 1/3] crypt32/tests: Add more tests for I_CryptGetDefaultCryptProv.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/main.c | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 11beff11c4..a490c51e3f 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -305,8 +305,32 @@ static void test_readTrustedPublisherDWORD(void) static void test_getDefaultCryptProv(void) { +#define ALG(id) id, #id + static const struct + { + ALG_ID algid; + const char *name; + BOOL optional; + } test_prov[] = + { + { ALG(CALG_MD2), TRUE }, + { ALG(CALG_MD4), TRUE }, + { ALG(CALG_MD5), TRUE }, + { ALG(CALG_SHA), TRUE }, + { ALG(CALG_RSA_SIGN) }, + { ALG(CALG_DSS_SIGN) }, + { ALG(CALG_NO_SIGN) }, + { ALG(CALG_ECDSA), TRUE }, + { ALG(CALG_ECDH), TRUE }, + { ALG(CALG_RSA_KEYX) }, + { ALG(CALG_RSA_KEYX) }, + }; +#undef ALG HCRYPTPROV (WINAPI *pI_CryptGetDefaultCryptProv)(DWORD w); HCRYPTPROV prov; + BOOL ret; + DWORD size, i; + LPSTR name; pI_CryptGetDefaultCryptProv = (void *)GetProcAddress(hCrypt, "I_CryptGetDefaultCryptProv"); if (!pI_CryptGetDefaultCryptProv) return; @@ -323,6 +347,34 @@ static void test_getDefaultCryptProv(void) prov = pI_CryptGetDefaultCryptProv(0); ok(prov != 0, "I_CryptGetDefaultCryptProv failed: %08x\n", GetLastError()); CryptReleaseContext(prov, 0); + + for (i = 0; i < ARRAY_SIZE(test_prov); i++) + { + if (winetest_debug > 1) + trace("%u: algid %#x (%s): class %u, type %u, sid %u\n", i, test_prov[i].algid, test_prov[i].name, + GET_ALG_CLASS(test_prov[i].algid) >> 13, GET_ALG_TYPE(test_prov[i].algid) >> 9, GET_ALG_SID(test_prov[i].algid)); + + prov = pI_CryptGetDefaultCryptProv(test_prov[i].algid); + if (!prov) + { +todo_wine_if(!test_prov[i].optional) + ok(test_prov[i].optional, "%u: I_CryptGetDefaultCryptProv(%#x) failed\n", i, test_prov[i].algid); + continue; + } + + ret = CryptGetProvParam(prov, PP_NAME, NULL, &size, 0); + if (ret) /* some provders don't support PP_NAME */ + { + name = CryptMemAlloc(size); + ret = CryptGetProvParam(prov, PP_NAME, (BYTE *)name, &size, 0); + ok(ret, "%u: CryptGetProvParam failed %#x\n", i, GetLastError()); + if (winetest_debug > 1) + trace("%u: algid %#x, name %s\n", i, test_prov[i].algid, name); + CryptMemFree(name); + } + + CryptReleaseContext(prov, 0); + } } static void test_CryptInstallOssGlobal(void) -- 2.17.1

1 0

[PATCH] include: Add _Inout_updates_opt_z_ stub definition.
by Dmitry Timoshkov 06 Nov '18

06 Nov '18

This patch allows to use Wine headers with Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c8b4491fbc..c69f7f9840 100644 --- a/include/sal.h +++ b/include/sal.h @@ -61,6 +61,7 @@ #define _Inout_updates_bytes_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) +#define _Inout_updates_opt_z_(count) #define _Inout_z_ #define _Inout_z_bytecap_(count) #define _Inout_z_cap_(count) -- 2.17.1

1 0

[PATCH 4/5] d3d8/tests: Use create_window() in more tests.
by Henri Verbeet 06 Nov '18

06 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 243 ++++++++++++++++++----------------------------- 1 file changed, 91 insertions(+), 152 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5c4e5b96659..6313d4855fd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -75,6 +75,16 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -231,8 +241,7 @@ static void test_mipmap_levels(void) ULONG refcount; HWND window; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -268,11 +277,9 @@ static void test_swapchain(void) HRESULT hr; struct device_desc device_desc; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); - window2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window2 = create_window(); ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -477,8 +484,7 @@ static void test_refcount(void) D3DVSD_END() }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -807,8 +813,7 @@ static void test_checkdevicemultisampletype(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -866,8 +871,7 @@ static void test_invalid_multisample(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -935,8 +939,7 @@ static void test_cursor(void) return; } - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); ret = SetCursorPos(50, 50); @@ -1126,8 +1129,7 @@ static void test_states(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1869,8 +1871,7 @@ static void test_scene(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1959,8 +1960,7 @@ static void test_shader(void) const DWORD simple_vs_size = sizeof(simple_vs); const DWORD simple_ps_size = sizeof(simple_ps); - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -2153,8 +2153,7 @@ static void test_limits(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -2201,8 +2200,7 @@ static void test_lights(void) BOOL enabled; D3DCAPS8 caps; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -2268,8 +2266,7 @@ static void test_render_zero_triangles(void) {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3431,8 +3428,7 @@ static void test_fpu_setup(void) IDirect3DSurface8 *surface; IUnknown dummy_object = {&dummy_object_vtbl}; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_CAPTION, 0, 0, - registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3535,8 +3531,7 @@ static void test_ApplyStateBlock(void) HRESULT hr; DWORD received, token; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3833,8 +3828,7 @@ static void test_unsupported_shaders(void) D3DVSD_END() }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -4214,8 +4208,7 @@ static void test_reset_resources(void) HRESULT hr; ULONG ref; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -4271,8 +4264,7 @@ static void test_set_rt_vp_scissor(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4447,8 +4439,7 @@ static void test_volume_get_container(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4545,8 +4536,7 @@ static void test_vb_lock_flags(void) HRESULT hr; BYTE *data; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4592,8 +4582,7 @@ static void test_texture_stage_states(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4681,8 +4670,7 @@ static void test_cube_textures(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4737,8 +4725,7 @@ static void test_get_set_texture(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -4805,8 +4792,7 @@ static void test_image_surface_pool(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4841,8 +4827,7 @@ static void test_surface_get_container(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -4953,8 +4938,7 @@ static void test_lockrect_invalid(void) {D3DRTYPE_CUBETEXTURE, D3DPOOL_SCRATCH, "scratch cube texture", TRUE, TRUE}, }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -5228,8 +5212,7 @@ static void test_private_data(void) {0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b} }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -5383,8 +5366,7 @@ static void test_surface_dimensions(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -5432,8 +5414,7 @@ static void test_surface_format_null(void) return; } - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); if (!(device = create_device(d3d, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -5514,8 +5495,7 @@ static void test_surface_double_unlock(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -5669,8 +5649,7 @@ static void test_surface_blocks(void) {60, 136, 68, 144}, /* top > surface */ }; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -5955,8 +5934,7 @@ static void test_set_palette(void) unsigned int i; D3DCAPS8 caps; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6020,8 +5998,7 @@ static void test_swvp_buffer(void) float x, y, z; } *ptr, *ptr2; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -6103,8 +6080,7 @@ static void test_managed_buffer(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6193,8 +6169,7 @@ static void test_npot_textures(void) unsigned int i, levels; BOOL tex_pow2, cube_pow2, vol_pow2; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6314,8 +6289,7 @@ static void test_volume_locking(void) { D3DPOOL_SCRATCH, D3DUSAGE_DYNAMIC, D3DERR_INVALIDCALL, D3D_OK }, }; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6421,8 +6395,7 @@ static void test_update_volumetexture(void) { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8 }, /* Different format */ }; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6525,8 +6498,7 @@ static void test_create_rt_ds_fail(void) IDirect3D8 *d3d8; IDirect3DSurface8 *surface; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6638,8 +6610,7 @@ static void test_volume_blocks(void) BOOL pow2; unsigned int offset, expected_offset; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d8, window, NULL))) @@ -6950,8 +6921,7 @@ static void test_lockbox_invalid(void) BYTE *base; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7033,36 +7003,26 @@ static void test_lockbox_invalid(void) static void test_pixel_format(void) { - HWND hwnd, hwnd2 = NULL; - HDC hdc, hdc2 = NULL; - HMODULE gl = NULL; int format, test_format; PIXELFORMATDESCRIPTOR pfd; IDirect3D8 *d3d8 = NULL; IDirect3DDevice8 *device = NULL; + HWND hwnd, hwnd2; + HDC hdc, hdc2; + HMODULE gl; HRESULT hr; - static const float point[3] = {0.0, 0.0, 0.0}; - hwnd = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 100, 100, 160, 160, NULL, NULL, NULL, NULL); - if (!hwnd) - { - skip("Failed to create window\n"); - return; - } + static const float point[] = {0.0f, 0.0f, 0.0f}; - hwnd2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 100, 100, 160, 160, NULL, NULL, NULL, NULL); + hwnd = create_window(); + ok(!!hwnd, "Failed to create window.\n"); + hwnd2 = create_window(); + ok(!!hwnd2, "Failed to create window.\n"); hdc = GetDC(hwnd); - if (!hdc) - { - skip("Failed to get DC\n"); - goto cleanup; - } - - if (hwnd2) - hdc2 = GetDC(hwnd2); + ok(!!hdc, "Failed to get DC.\n"); + hdc2 = GetDC(hwnd2); + ok(!!hdc2, "Failed to get DC.\n"); gl = LoadLibraryA("opengl32.dll"); ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); @@ -7089,14 +7049,10 @@ static void test_pixel_format(void) goto cleanup; } - if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + if (!SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) { skip("failed to set pixel format on second window\n"); - if (hdc2) - { - ReleaseDC(hwnd2, hdc2); - hdc2 = NULL; - } + goto cleanup; } d3d8 = Direct3DCreate8(D3D_SDK_VERSION); @@ -7144,17 +7100,14 @@ static void test_pixel_format(void) test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); - if (hdc2) - { - hr = IDirect3DDevice8_Present(device, NULL, NULL, hwnd2, NULL); - ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); - test_format = GetPixelFormat(hdc); - ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); - test_format = GetPixelFormat(hdc2); - ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); - } + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); cleanup: if (device) @@ -7162,12 +7115,13 @@ cleanup: UINT refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } - if (d3d8) IDirect3D8_Release(d3d8); - if (gl) FreeLibrary(gl); - if (hdc) ReleaseDC(hwnd, hdc); - if (hdc2) ReleaseDC(hwnd2, hdc2); - if (hwnd) DestroyWindow(hwnd); - if (hwnd2) DestroyWindow(hwnd2); + if (d3d8) + IDirect3D8_Release(d3d8); + FreeLibrary(gl); + ReleaseDC(hwnd2, hdc2); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd2); + DestroyWindow(hwnd); } static void test_begin_end_state_block(void) @@ -7179,8 +7133,7 @@ static void test_begin_end_state_block(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7235,8 +7188,7 @@ static void test_shader_constant_apply(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7395,8 +7347,7 @@ static void test_resource_type(void) HRESULT hr; D3DCAPS8 caps; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7548,8 +7499,7 @@ static void test_mipmap_lock(void) HRESULT hr; D3DLOCKED_RECT locked_rect; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7630,8 +7580,7 @@ static void test_writeonly_resource(void) {{ 1.0f, 1.0f, 0.0f}} }; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7693,8 +7642,7 @@ static void test_lost_device(void) HRESULT hr; BOOL ret; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); device_desc.device_window = window; @@ -7816,8 +7764,7 @@ static void test_resource_priority(void) unsigned int i; DWORD priority; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7940,8 +7887,7 @@ static void test_swapchain_parameters(void) {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, }; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8159,8 +8105,7 @@ static void test_miptree_layout(void) {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH"}, }; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8276,8 +8221,7 @@ static void test_render_target_device_mismatch(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8334,8 +8278,7 @@ static void test_format_unknown(void) void *iface; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8477,8 +8420,7 @@ static void test_clip_planes_limits(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -8557,8 +8499,7 @@ static void test_swapchain_multisample_reset(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create D3D object.\n"); @@ -8612,8 +8553,7 @@ static void test_device_caps(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8728,8 +8668,7 @@ static void test_get_info(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) -- 2.11.0

2 1

[PATCH 3/5] d3d9/tests: Use create_window() in more tests.
by Henri Verbeet 06 Nov '18

06 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 324 +++++++++++++++++------------------------------ 1 file changed, 118 insertions(+), 206 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7bf06307646..52a3ee795fa 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -117,6 +117,16 @@ static BOOL compare_elements(IDirect3DVertexDeclaration9 *declaration, const D3D return equal; } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -276,8 +286,7 @@ static void test_get_set_vertex_declaration(void) D3DDECL_END() }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -331,8 +340,7 @@ static void test_get_declaration(void) D3DDECL_END() }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -650,8 +658,7 @@ static void test_fvf_decl_conversion(void) }, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -748,8 +755,7 @@ static void test_fvf_decl_management(void) static const D3DVERTEXELEMENT9 test_elements2[] = {{0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_NORMAL, 0}, D3DDECL_END()}; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -866,8 +872,7 @@ static void test_vertex_declaration_alignment(void) }, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -940,8 +945,7 @@ static void test_unused_declaration_type(void) }, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -985,8 +989,7 @@ static void test_mipmap_levels(void) ULONG refcount; HWND window; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1015,8 +1018,7 @@ static void test_checkdevicemultisampletype(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1102,8 +1104,7 @@ static void test_invalid_multisample(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1179,11 +1180,9 @@ static void test_swapchain(void) HRESULT hr; struct device_desc device_desc; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); - window2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window2 = create_window(); ok(!!window2, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1410,8 +1409,7 @@ static void test_refcount(void) D3DDECL_END() }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -1744,8 +1742,7 @@ static void test_cursor(void) HRESULT hr; BOOL ret; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); ret = SetCursorPos(50, 50); @@ -2462,8 +2459,7 @@ static void test_scene(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -2586,8 +2582,7 @@ static void test_limits(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -2804,8 +2799,7 @@ static void test_get_rt(void) ULONG ref; UINT i; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 128, 128, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); device = create_device(d3d9, window, NULL); @@ -2872,8 +2866,7 @@ static void test_draw_primitive(void) HRESULT hr; void *ptr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -3031,8 +3024,7 @@ static void test_null_stream(void) D3DDECL_END() }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -3104,8 +3096,7 @@ static void test_lights(void) BOOL enabled; D3DCAPS9 caps; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -3157,8 +3148,7 @@ static void test_set_stream_source(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -3383,8 +3373,7 @@ static void test_multi_device(void) IDirect3D9 *d3d9; ULONG refcount; - window1 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window1 = create_window(); ok(!!window1, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -3397,8 +3386,7 @@ static void test_multi_device(void) } IDirect3D9_Release(d3d9); - window2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window2 = create_window(); ok(!!window2, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -4600,8 +4588,7 @@ static void test_fpu_setup(void) IDirect3D9 *d3d9; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, - registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -5223,8 +5210,7 @@ static void test_reset_resources(void) HRESULT hr; ULONG ref; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -5294,8 +5280,7 @@ static void test_set_rt_vp_scissor(void) HRESULT hr; RECT rect; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5399,8 +5384,7 @@ static void test_volume_get_container(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5481,8 +5465,7 @@ static void test_volume_resource(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5549,8 +5532,7 @@ static void test_vb_lock_flags(void) HRESULT hr; void *data; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5619,8 +5601,7 @@ static void test_vertex_buffer_alignment(void) HRESULT hr; void *data; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5689,8 +5670,7 @@ static void test_query_support(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -5772,8 +5752,7 @@ static void test_occlusion_query(void) BOOL broken_occlusion = FALSE; expected.uint = registry_mode.dmPelsWidth * registry_mode.dmPelsHeight; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); device_desc.device_window = window; @@ -6022,8 +6001,7 @@ static void test_timestamp_query(void) DWORD timestamp[2], freq[2]; WORD disjoint[2]; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -6213,8 +6191,7 @@ static void test_get_set_vertex_shader(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -6287,8 +6264,7 @@ static void test_vertex_shader_constant(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -6415,8 +6391,7 @@ static void test_get_set_pixel_shader(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -6487,8 +6462,7 @@ static void test_pixel_shader_constant(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -6759,8 +6733,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -6907,8 +6880,7 @@ static void test_texture_stage_states(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7069,8 +7041,7 @@ static void test_cube_textures(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7175,8 +7146,7 @@ static void test_mipmap_gen(void) return; } - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); if (!(device = create_device(d3d, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -7370,8 +7340,7 @@ static void test_filter(void) return; } - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); if (!(device = create_device(d3d, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -7440,8 +7409,7 @@ static void test_get_set_texture(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7492,8 +7460,7 @@ static void test_lod(void) HRESULT hr; DWORD ret; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7538,8 +7505,7 @@ static void test_surface_get_container(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7608,8 +7574,7 @@ static void test_surface_alignment(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7710,8 +7675,7 @@ static void test_lockrect_offset(void) BYTE *base; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -7820,8 +7784,7 @@ static void test_lockrect_invalid(void) {D3DRTYPE_CUBETEXTURE, D3DPOOL_SCRATCH, "scratch cube texture"}, }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8073,8 +8036,7 @@ static void test_private_data(void) {0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b} }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8268,8 +8230,7 @@ static void test_getdc(void) HDC dc, dc2; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8578,8 +8539,7 @@ static void test_surface_dimensions(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8629,8 +8589,7 @@ static void test_surface_format_null(void) return; } - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); if (!(device = create_device(d3d, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -8721,8 +8680,7 @@ static void test_surface_double_unlock(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -8853,8 +8811,7 @@ static void test_surface_blocks(void) {60, 136, 68, 144}, /* top > surface */ }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -9175,8 +9132,7 @@ static void test_set_palette(void) unsigned int i; D3DCAPS9 caps; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9239,8 +9195,7 @@ static void test_swvp_buffer(void) float x, y, z; } *ptr, *ptr2; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -9322,8 +9277,7 @@ static void test_managed_buffer(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9413,8 +9367,7 @@ static void test_npot_textures(void) unsigned int i, levels; BOOL tex_pow2, cube_pow2, vol_pow2; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9516,8 +9469,7 @@ static void test_vidmem_accounting(void) unsigned int i; UINT vidmem_start, vidmem_end, diff; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9587,8 +9539,7 @@ static void test_volume_locking(void) { D3DPOOL_SCRATCH, D3DUSAGE_DYNAMIC, D3DERR_INVALIDCALL, D3D_OK }, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9694,8 +9645,7 @@ static void test_update_volumetexture(void) { 8, 8, 4, 4, D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8 }, /* Different format */ }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9798,8 +9748,7 @@ static void test_create_rt_ds_fail(void) IDirect3D9 *d3d9; IDirect3DSurface9 *surface; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -9911,8 +9860,7 @@ static void test_volume_blocks(void) BOOL pow2; unsigned int offset, expected_offset; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d9, window, NULL))) @@ -10223,8 +10171,7 @@ static void test_lockbox_invalid(void) BYTE *base; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -10321,8 +10268,7 @@ static void test_shared_handle(void) void *mem; D3DCAPS9 caps; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -10406,36 +10352,26 @@ static void test_shared_handle(void) static void test_pixel_format(void) { - HWND hwnd, hwnd2 = NULL; - HDC hdc, hdc2 = NULL; - HMODULE gl = NULL; int format, test_format; PIXELFORMATDESCRIPTOR pfd; IDirect3D9 *d3d9 = NULL; IDirect3DDevice9 *device = NULL; + HWND hwnd, hwnd2; + HDC hdc, hdc2; + HMODULE gl; HRESULT hr; - static const float point[3] = {0.0, 0.0, 0.0}; - hwnd = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 100, 100, 160, 160, NULL, NULL, NULL, NULL); - if (!hwnd) - { - skip("Failed to create window\n"); - return; - } + static const float point[] = {0.0f, 0.0f, 0.0f}; - hwnd2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 100, 100, 160, 160, NULL, NULL, NULL, NULL); + hwnd = create_window(); + ok(!!hwnd, "Failed to create window.\n"); + hwnd2 = create_window(); + ok(!!hwnd2, "Failed to create window.\n"); hdc = GetDC(hwnd); - if (!hdc) - { - skip("Failed to get DC\n"); - goto cleanup; - } - - if (hwnd2) - hdc2 = GetDC(hwnd2); + ok(!!hdc, "Failed to get DC.\n"); + hdc2 = GetDC(hwnd2); + ok(!!hdc2, "Failed to get DC.\n"); gl = LoadLibraryA("opengl32.dll"); ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); @@ -10462,14 +10398,10 @@ static void test_pixel_format(void) goto cleanup; } - if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + if (!SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) { skip("failed to set pixel format on second window\n"); - if (hdc2) - { - ReleaseDC(hwnd2, hdc2); - hdc2 = NULL; - } + goto cleanup; } d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -10517,17 +10449,14 @@ static void test_pixel_format(void) test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); - if (hdc2) - { - hr = IDirect3DDevice9_Present(device, NULL, NULL, hwnd2, NULL); - ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); - test_format = GetPixelFormat(hdc); - ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); - test_format = GetPixelFormat(hdc2); - ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); - } + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); cleanup: if (device) @@ -10535,12 +10464,13 @@ cleanup: UINT refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } - if (d3d9) IDirect3D9_Release(d3d9); - if (gl) FreeLibrary(gl); - if (hdc) ReleaseDC(hwnd, hdc); - if (hdc2) ReleaseDC(hwnd2, hdc2); - if (hwnd) DestroyWindow(hwnd); - if (hwnd2) DestroyWindow(hwnd2); + if (d3d9) + IDirect3D9_Release(d3d9); + FreeLibrary(gl); + ReleaseDC(hwnd2, hdc2); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd2); + DestroyWindow(hwnd); } static void test_begin_end_state_block(void) @@ -10552,8 +10482,7 @@ static void test_begin_end_state_block(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -10610,8 +10539,7 @@ static void test_shader_constant_apply(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -10778,8 +10706,7 @@ static void test_vdecl_apply(void) D3DDECL_END(), }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -10957,8 +10884,7 @@ static void test_resource_type(void) HRESULT hr; D3DCAPS9 caps; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11126,8 +11052,7 @@ static void test_mipmap_lock(void) HRESULT hr; D3DLOCKED_RECT locked_rect; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11208,8 +11133,7 @@ static void test_writeonly_resource(void) {{ 1.0f, 1.0f, 0.0f}} }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11271,8 +11195,7 @@ static void test_lost_device(void) HRESULT hr; BOOL ret; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); device_desc.device_window = window; @@ -11389,8 +11312,7 @@ static void test_resource_priority(void) unsigned int i; DWORD priority; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11551,8 +11473,7 @@ static void test_swapchain_parameters(void) {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11836,8 +11757,7 @@ static void test_miptree_layout(void) {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH"}, }; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -11953,8 +11873,7 @@ static void test_get_render_target_data(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -12002,8 +11921,7 @@ static void test_render_target_device_mismatch(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -12060,8 +11978,7 @@ static void test_format_unknown(void) void *iface; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -12164,8 +12081,7 @@ static void test_lockable_backbuffer(void) HRESULT hr; HDC dc; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -12255,8 +12171,7 @@ static void test_clip_planes_limits(void) HWND window; HRESULT hr; - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -12338,8 +12253,7 @@ static void test_swapchain_multisample_reset(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -12411,8 +12325,7 @@ static void test_stretch_rect(void) D3DFMT_R5G6B5, }; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); + window = create_window(); ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -12567,8 +12480,7 @@ static void test_device_caps(void) HWND window; HRESULT hr; - window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); -- 2.11.0

2 1

[PATCH 2/5] wined3d: Get rid of WINED3DUSAGE_TEXTURE.
by Henri Verbeet 06 Nov '18

06 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/texture.c | 6 +++--- dlls/d3d11/utils.c | 10 +--------- dlls/d3d8/texture.c | 4 +--- dlls/d3d9/texture.c | 4 +--- dlls/ddraw/surface.c | 3 --- dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 ---- dlls/wined3d/resource.c | 1 - dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 7 +++---- 13 files changed, 11 insertions(+), 37 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index fb5b8177516..f2d32ed0a9a 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -450,7 +450,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; - wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(buffer->desc.Usage); wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(buffer->desc.BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(buffer->desc.Usage, buffer->desc.CPUAccessFlags); wined3d_desc.misc_flags = buffer->desc.MiscFlags; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e3261a57c94..580f520aae9 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -65,7 +65,7 @@ void d3d11_primitive_topology_from_wined3d_primitive_type(enum wined3d_primitive void wined3d_primitive_type_from_d3d11_primitive_topology(D3D11_PRIMITIVE_TOPOLOGY topology, enum wined3d_primitive_type *type, unsigned int *patch_vertex_count) DECLSPEC_HIDDEN; unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; -DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; +DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 9df8bae00c8..78821955604 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -456,7 +456,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); @@ -1010,7 +1010,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = desc->SampleDesc.Quality; - wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); @@ -1469,7 +1469,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; - wined3d_desc.usage = wined3d_usage_from_d3d11(desc->BindFlags, desc->Usage); + wined3d_desc.usage = wined3d_usage_from_d3d11(desc->Usage); wined3d_desc.bind_flags = wined3d_bind_flags_from_d3d11(desc->BindFlags); wined3d_desc.access = wined3d_access_from_d3d11(desc->Usage, desc->Usage == D3D11_USAGE_DEFAULT ? 0 : desc->CPUAccessFlags); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 1a619717587..cf40cc47eff 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -441,18 +441,10 @@ unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d return WINED3DGETDATA_FLUSH; } -DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) +DWORD wined3d_usage_from_d3d11(enum D3D11_USAGE usage) { - static const DWORD handled = D3D11_BIND_SHADER_RESOURCE - | D3D11_BIND_RENDER_TARGET - | D3D11_BIND_DEPTH_STENCIL; DWORD wined3d_usage = 0; - if (bind_flags & D3D11_BIND_SHADER_RESOURCE) - wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & ~handled) - FIXME("Unhandled bind flags %#x.\n", bind_flags & ~handled); - if (usage == D3D11_USAGE_DYNAMIC) wined3d_usage |= WINED3DUSAGE_DYNAMIC; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c952579ce61..1c144a14dae 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1107,7 +1107,6 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; - desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; @@ -1156,7 +1155,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; - desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; + desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; @@ -1204,7 +1203,6 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = usage & WINED3DUSAGE_MASK; - desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 70d35fc50c1..5cb0b3967df 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1311,7 +1311,6 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = wined3dusage_from_d3dusage(usage); - desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; @@ -1398,7 +1397,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = wined3dusage_from_d3dusage(usage); - desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; + desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; @@ -1470,7 +1469,6 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; desc.usage = wined3dusage_from_d3dusage(usage); - desc.usage |= WINED3DUSAGE_TEXTURE; if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fb0cc85e7b0..7c13cbfa39c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6170,10 +6170,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (!(ddraw->flags & DDRAW_NO3D)) { if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; wined3d_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - } if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) wined3d_desc.bind_flags |= WINED3D_BIND_DEPTH_STENCIL; else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9b57b46d1c7..c7481c6b6ef 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -188,8 +188,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac &surface_desc.multisample_quality, &desc->SampleDesc); surface_desc.bind_flags = wined3d_bind_flags_from_dxgi_usage(usage); surface_desc.usage = 0; - if (surface_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) - surface_desc.usage |= WINED3DUSAGE_TEXTURE; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dab10cbf116..4a135860dcf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,10 +1541,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_TEXTURE) - bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~WINED3DUSAGE_TEXTURE; - switch (resource_type) { case WINED3D_RTYPE_NONE: diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 61143556e73..05fbafbfb35 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -37,7 +37,6 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP - | WINED3DUSAGE_TEXTURE | ~WINED3DUSAGE_MASK; /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ba7c817adf5..f6963c4aba2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -921,8 +921,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; - if (texture_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) - texture_desc.usage |= WINED3DUSAGE_TEXTURE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4e5d36c7bd6..1fd3f321283 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4524,7 +4524,6 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); - WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d98dfae890..70b27bb3d3a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -928,10 +928,9 @@ enum wined3d_shader_type #define WINED3DUSAGE_TEXTAPI 0x10000000 #define WINED3DUSAGE_MASK 0x10007bf8 -#define WINED3DUSAGE_SCRATCH 0x00200000 -#define WINED3DUSAGE_PRIVATE 0x00400000 -#define WINED3DUSAGE_LEGACY_CUBEMAP 0x00800000 -#define WINED3DUSAGE_TEXTURE 0x01000000 +#define WINED3DUSAGE_SCRATCH 0x00400000 +#define WINED3DUSAGE_PRIVATE 0x00800000 +#define WINED3DUSAGE_LEGACY_CUBEMAP 0x01000000 #define WINED3DUSAGE_OWNDC 0x02000000 #define WINED3DUSAGE_STATICDECL 0x04000000 #define WINED3DUSAGE_OVERLAY 0x08000000 -- 2.11.0

1 0

[PATCH 1/5] wined3d: Get rid of WINED3DUSAGE_DEPTHSTENCIL.
by Henri Verbeet 06 Nov '18

06 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 2 -- dlls/ddraw/surface.c | 5 ----- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/resource.c | 3 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 2a1a8c699e5..1a619717587 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -450,8 +450,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_SHADER_RESOURCE) wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & D3D11_BIND_DEPTH_STENCIL) - wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) FIXME("Unhandled bind flags %#x.\n", bind_flags & ~handled); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6bb92d5d399..fb0cc85e7b0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6175,14 +6175,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.bind_flags |= WINED3D_BIND_SHADER_RESOURCE; } if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - wined3d_desc.usage |= WINED3DUSAGE_DEPTHSTENCIL; wined3d_desc.bind_flags |= WINED3D_BIND_DEPTH_STENCIL; - } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) - { wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; - } } if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1af76f235c8..893ce55c9aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4898,7 +4898,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, texture_desc.format = swapchain->desc.auto_depth_stencil_format; texture_desc.multisample_type = swapchain->desc.multisample_type; texture_desc.multisample_quality = swapchain->desc.multisample_quality; - texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; texture_desc.width = swapchain->desc.backbuffer_width; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a79e9247267..dab10cbf116 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,11 +1541,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_DEPTHSTENCIL) - bind_flags |= WINED3D_BIND_DEPTH_STENCIL; if (usage & WINED3DUSAGE_TEXTURE) bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + usage &= ~WINED3DUSAGE_TEXTURE; switch (resource_type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58caccc7305..61143556e73 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_WRITEONLY + static const DWORD handled = WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 36e7b2e8318..ba7c817adf5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -947,7 +947,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 struct wined3d_texture *ds; texture_desc.format = swapchain->desc.auto_depth_stencil_format; - texture_desc.usage = WINED3DUSAGE_DEPTHSTENCIL; + texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a7b1b10f9ac..4e5d36c7bd6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4511,7 +4511,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DONOTCLIP); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd907578c2d..0d98dfae890 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 #define WINED3DUSAGE_DONOTCLIP 0x00000020 @@ -927,7 +926,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bfa +#define WINED3DUSAGE_MASK 0x10007bf8 #define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000 -- 2.11.0

1 0

[PATCH] advapi32: Return error from RegCreateKeyEx[AW] if the key name is null
by Alex Henrie 06 Nov '18

06 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes Coverity #731771 --- dlls/advapi32/registry.c | 4 +++- dlls/advapi32/tests/registry.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9989097ff4..0601e43d3c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -371,6 +371,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR UNICODE_STRING nameW, classW; if (reserved) return ERROR_INVALID_PARAMETER; + if (!name) return ERROR_BADKEY; if (!(hkey = get_special_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; attr.Length = sizeof(attr); @@ -420,10 +421,11 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl NTSTATUS status; if (reserved) return ERROR_INVALID_PARAMETER; + if (!name) return ERROR_BADKEY; if (!is_version_nt()) { access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ - if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ + if (name[0] == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ } if (!(hkey = get_special_root_hkey( hkey, access ))) return ERROR_INVALID_HANDLE; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6043cab184..21698220aa 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1297,6 +1297,15 @@ static void test_reg_create_key(void) PACL key_acl; SECURITY_DESCRIPTOR *sd; + ret = RegCreateKeyExA(INVALID_HANDLE_VALUE, NULL, 1, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "RegCreateKeyExA returned %d\n", ret); + + ret = RegCreateKeyExA(INVALID_HANDLE_VALUE, NULL, 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_BADKEY, "RegCreateKeyExA returned %d\n", ret); + + ret = RegCreateKeyExA(INVALID_HANDLE_VALUE, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + ok(ret == ERROR_INVALID_HANDLE, "RegCreateKeyExA returned %d\n", ret); + ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); ok(!ret, "RegCreateKeyExA failed with error %d\n", ret); /* should succeed: all versions of Windows ignore the access rights -- 2.19.1

2 2

[PATCH 1/2] ntoskrnl.exe: add PsGetProcessWow64Process stub
by Austin English 06 Nov '18

06 Nov '18

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9fbf22d71f..00d93a21bd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3991,13 +3991,28 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG FIXME("stub: %p %p %u\n", lock, tag, size); } +/********************************************************************* + * DbgQueryDebugFilterState (NTOSKRNL.@) + */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) { FIXME("stub: %d %d\n", component, level); return STATUS_NOT_IMPLEMENTED; } +/********************************************************************* + * ExReleaseResourceLite (NTOSKRNL.@) + */ void WINAPI ExReleaseResourceLite(PERESOURCE resource) { FIXME("stub: %p\n", resource); } + +/********************************************************************* + * PsGetProcessWow64Process (NTOSKRNL.@) + */ +PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 422d575926..18b76c2c84 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -886,6 +886,7 @@ @ stub PsGetProcessSessionId @ stub PsGetProcessWin32Process @ stub PsGetProcessWin32WindowStation +@ stdcall -arch=x86_64 PsGetProcessWow64Process(ptr) @ stub PsGetThreadFreezeCount @ stub PsGetThreadHardErrorsAreDisabled @ stub PsGetThreadId -- 2.16.4

1 1

[PATCH] dbghelp: search for debugfiles in modulepath too.
by Andreas Maier 05 Nov '18

05 Nov '18

Debug symbols (like PDB, ...) could not be found if the direcory of the module and application differs. Applying this patch they will be found. Dbghelp searches the module path too. (See MS docs). Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> --- dlls/dbghelp/dbghelp_private.h | 6 +++--- dlls/dbghelp/msc.c | 4 ++-- dlls/dbghelp/path.c | 34 +++++++++++++++++++++++++++++++--- dlls/dbghelp/pe_module.c | 2 +- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f689db8919..1308d63f7a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -657,9 +657,9 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, union ctx *context, struct pdb_cmd_pair *cpair) DECLSPEC_HIDDEN; /* path.c */ -extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) DECLSPEC_HIDDEN; +extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0508e120bd..6003bc3401 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2450,11 +2450,11 @@ static HANDLE map_pdb_file(const struct process* pcs, switch (lookup->kind) { case PDB_JG: - ret = path_find_symbol_file(pcs, lookup->filename, NULL, lookup->timestamp, + ret = path_find_symbol_file(pcs, module, lookup->filename, NULL, lookup->timestamp, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; case PDB_DS: - ret = path_find_symbol_file(pcs, lookup->filename, &lookup->guid, 0, + ret = path_find_symbol_file(pcs, module, lookup->filename, &lookup->guid, 0, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; } diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 8c74426eec..2e4d98233f 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -49,6 +49,17 @@ static inline const WCHAR* file_nameW(const WCHAR* str) return p + 1; } +static inline void file_pathW(const WCHAR* srcFileNameW, + WCHAR* dstFilePathW) +{ + int len; + + for (len = strlenW(srcFileNameW) - 1; (len > 0) && (!is_sepW(srcFileNameW[len])); len--); + + lstrcpynW(dstFilePathW, srcFileNameW, len); + dstFilePathW[len] = L'\0'; +} + /****************************************************************** * FindDebugInfoFile (DBGHELP.@) * @@ -612,9 +623,9 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) return mf->matched == 2; } -BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) +BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) { struct module_find mf; WCHAR full_pathW[MAX_PATH]; @@ -643,6 +654,23 @@ BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, return TRUE; } + /* FIXME: Use Environment-Variables (see MS docs) + _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH + FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) + do a search for (every?) path-element like this ... + <path> + <path>\dll + <path>\symbols\dll + (dll may be exe, or sys depending on the file extension) */ + + /* 2. check module-path */ + file_pathW(module->module.LoadedImageName, tmp); + if (do_searchW(filename, tmp, FALSE, module_find_cb, &mf)) + { + WideCharToMultiByte(CP_ACP, 0, tmp, -1, buffer, MAX_PATH, NULL, NULL); + return TRUE; + } + while (searchPath) { ptr = strchrW(searchPath, ';'); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index e7255f89ba..ea2a8262d2 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -531,7 +531,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && + if (path_find_symbol_file(pcs, module, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) && -- 2.11.0

1 0

[PATCH] winegstreamer: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 05 Nov '18

05 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/winegstreamer/main.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 833464b49e..0d9ab8ded7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -794,12 +794,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); - MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); + MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, ARRAY_SIZE(piOutput.achName) - 1); TRACE("Name: %s\n", name); strcpy(my_name, "qz_sink_"); strcat(my_name, name); g_free(name); - piOutput.achName[sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1] = 0; + piOutput.achName[ARRAY_SIZE(piOutput.achName) - 1] = 0; caps = gst_pad_query_caps(pad, NULL); caps = gst_caps_make_writable(caps); @@ -1259,7 +1259,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = &This->filter.IBaseFilter_iface; - lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); + lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index dc988cf8f4..b9cddcbc3e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -223,7 +223,7 @@ FactoryTemplate const g_Templates[] = { }, }; -const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]); +const int g_cTemplates = ARRAY_SIZE(g_Templates); BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -323,7 +323,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_ID(MEDIATYPE_Stream); INF_SET_ID(WINESUBTYPE_Gstreamer); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { + for(i = 0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = HeapAlloc(GetProcessHeap(),0,39); sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], @@ -331,7 +331,7 @@ static HRESULT register_server(BOOL do_register) clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); } - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); @@ -339,7 +339,7 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + for(i = 0; i < ARRAY_SIZE(pse); i++) HeapFree(GetProcessHeap(),0,pse[i].pszValue); if(FAILED(hres)) { -- 2.14.5

1 0

[PATCH] cryptui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 05 Nov '18

05 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cryptui/main.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index bb14fe6cd6..b62ce9ef68 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7013,32 +7013,32 @@ static void init_columns(HWND lv, DWORD flags) column.pszText = buf; if (!(flags & CRYPTUI_SELECT_ISSUEDTO_COLUMN)) { - LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_ISSUEDBY_COLUMN)) { - LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_INTENDEDUSE_COLUMN)) { - LoadStringW(hInstance, IDS_INTENDED_USE_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_INTENDED_USE_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_FRIENDLYNAME_COLUMN)) { - LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_EXPIRATION_COLUMN)) { - LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } if (!(flags & CRYPTUI_SELECT_LOCATION_COLUMN)) { - LoadStringW(hInstance, IDS_LOCATION_COLUMN, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_LOCATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, i++, (LPARAM)&column); } } @@ -7149,11 +7149,9 @@ static void add_cert_to_list(HWND lv, PCCERT_CONTEXT cert, DWORD flags, DWORD *a } if (!(flags & CRYPTUI_SELECT_EXPIRATION_COLUMN)) { - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(&cert->pCertInfo->NotAfter, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, buf, - sizeof(buf) / sizeof(buf[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, buf, ARRAY_SIZE(buf)); item.pszText = buf; if (!item.iSubItem) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); @@ -7167,7 +7165,7 @@ static void add_cert_to_list(HWND lv, PCCERT_CONTEXT cert, DWORD flags, DWORD *a static int show_fixme; if (!show_fixme++) FIXME("showing location is not implemented\n"); - LoadStringW(hInstance, IDS_NO_IMPL, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_NO_IMPL, buf, ARRAY_SIZE(buf)); if (!item.iSubItem) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); else @@ -7373,10 +7371,9 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA { WCHAR buf[40], title[40]; - LoadStringW(hInstance, IDS_SELECT_CERT, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SELECT_CERT, buf, ARRAY_SIZE(buf)); if (!data->title) - LoadStringW(hInstance, IDS_SELECT_CERT_TITLE, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_SELECT_CERT_TITLE, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, buf, data->title ? data->title : title, MB_OK | MB_ICONWARNING); break; } -- 2.14.5

1 0

[PATCH v2] msvcp140: Add _Winerror_map implementation.
by Piotr Caban 05 Nov '18

05 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix test failures on testbot dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 58 ++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 65 ++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 05 Nov '18

05 Nov '18

Addresses the Alexandre's review. Doesn't prevent the 2 other patches from applying afterwards. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 2/4] windowscodecs: Fix buffer overflow when generating a palette.
by Akihiro Sagawa 05 Nov '18

05 Nov '18

This typically happens when loading 16-bpp color-keyed grayscale PNG image via GDIPlus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-)

2 1

[PATCH 1/4] windowscodecs/tests: Introduce PNG_COLOR_TYPE constants.
by Akihiro Sagawa 05 Nov '18

05 Nov '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/windowscodecs/tests/pngformat.c | 74 +++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 26 deletions(-)

2 1

[PATCH] msvcp140: Add _Winerror_map implementation.
by Piotr Caban 05 Nov '18

05 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 56 +++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 65 ++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletion(-)

2 1

Re: [PATCH] dbghelp: search for debugfiles in modulepath too.
by Marvin 05 Nov '18

05 Nov '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=43930 Your paranoid android. === debian9 (build log) === error: patch failed: dlls/dbghelp/dbghelp_private.h:649 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/dbghelp/dbghelp_private.h:649 Task: Patch failed to apply

1 0

[PATCH v2 1/3] gdi32: Fix the truetype interpreter version problem.
by Byeongsik Jeon 05 Nov '18

05 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Fix the wine-tests build error at the debian9(Freetype v2.6.3). Because the build-time check is meaningless, v2 has modified it to check the supported interpreter version at the runtime. v1: This is also a problem in Linux. It just seemed to stand out in MacOS(Tahoma builtined) XQuartz2.7.11 Freetype2.7(subpixel turned off). The truetype bytecode interpreter of the Freetype appears to have the following problems depending on the version. - v35: MS cleartype font(ex. Consolas) rendering is ugly. - v40: MS legacy font (ex. Tahoma) rendering is ugly. Some fonts return the wrong values even for the glyph metrics. Is this a Freetype bug? Basically NOT. https://docs.microsoft.com/en-us/typography/opentype/spec/tt_instructions#g… The bytecode interptreter is a stack-based virtual maching the interprets the truetype bytecode instructions. Ths bytecode program receives the interpreter version information through the GETINFO instruction. GETINFO also provided the information of the fontsmoothing, cleartype, etc. The bytecode program actually changes the location of the glyph points based on this information. So, what looks like a bug above is that the wrong version information was delivered to the bytecode program. To determine this version value, this patch use the gasp table version. This idea is inspired by the following documentation. https://www.freetype.org/freetype2/docs/reference/ft2-properties.html#TT_IN… -- Note that ‘Gray ClearType’ is essentially the same as v1.6's grayscale rendering. However, the GETINFO instruction handles it differently: v1.6 returns bit 12 (hinting for grayscale), while v2.1 returns bits 13 (hinting for ClearType), 18 (symmetrical smoothing), and 19 (Gray ClearType). Also, this mode respects bits 2 and 3 for the version 1 gasp table exclusively (like Color ClearType), while v1.6 only respects the values of version 0 (bits 0 and 1). -- I think the maximum value that can be applied to the gasp version 0 font is the interpreter version 37. The Freetype interpreter version 38 includes tweaks based on the font names. I was able to use the v38 by modifying the build option of the Freetype. #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) This allows the gasp version 0 fonts to be rendered more similar to the Windows old cleartype in the subpixel rendering mode. However, this is not applied because the build option must be modified and the Freetype document is marked as a feature to be deleted. To quickly check changes with the Freetype version up, I have added the WINE_GDI_PROPERTIES code. WINE_GDI_PROPERTIES="truetype:interpreter-version=35" winecfg dlls/gdi32/freetype.c | 104 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07de6f2f6c..dd94d22db5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -130,6 +130,10 @@ typedef struct } FT_Version_t; static FT_Version_t FT_Version; static DWORD FT_SimpleVersion; +static FT_UInt forced_interpreter_version = 0; +static BOOL interpreter_v35_supported = FALSE; +static BOOL interpreter_v38_supported = FALSE; +static BOOL interpreter_v40_supported = FALSE; static void *ft_handle = NULL; @@ -158,6 +162,8 @@ MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Get_CBox); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); +MAKE_FUNCPTR(FT_Property_Get); +MAKE_FUNCPTR(FT_Property_Set); MAKE_FUNCPTR(FT_Render_Glyph); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); @@ -399,6 +405,7 @@ struct tagGdiFont { DWORD total_kern_pairs; KERNINGPAIR *kern_pairs; struct list child_fonts; + FT_UInt interpreter_version; /* the following members can be accessed without locking, they are never modified after creation */ FT_Face ft_face; @@ -4101,6 +4108,49 @@ static void update_font_info(void) } } +static void set_forced_interpreter_version(void) +{ + static const char property_name[] = "truetype:interpreter-version="; + const char *env; + + env = getenv( "WINE_GDI_PROPERTIES" ); + if ( env && (env = strstr( env, property_name )) ) + { + forced_interpreter_version = atoi( env + sizeof(property_name) - 1 ); + + TRACE( "forced_interpreter_version = %d\n" , forced_interpreter_version ); + } +} + +static void diagnose_freetype(void) +{ + if (pFT_Property_Set && pFT_Property_Get) + { + FT_UInt set_version, get_version; + + set_version = 35; + get_version = 0; + pFT_Property_Set( library, "truetype", "interpreter-version", &set_version ); + pFT_Property_Get( library, "truetype", "interpreter-version", &get_version ); + if (get_version == set_version) + interpreter_v35_supported = TRUE; + + set_version = 38; + get_version = 0; + pFT_Property_Set( library, "truetype", "interpreter-version", &set_version ); + pFT_Property_Get( library, "truetype", "interpreter-version", &get_version ); + if (get_version == set_version) + interpreter_v38_supported = TRUE; + + set_version = 40; + get_version = 0; + pFT_Property_Set( library, "truetype", "interpreter-version", &set_version ); + pFT_Property_Get( library, "truetype", "interpreter-version", &get_version ); + if (get_version == set_version) + interpreter_v40_supported = TRUE; + } +} + static BOOL init_freetype(void) { ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); @@ -4137,6 +4187,8 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Outline_Get_CBox) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) + LOAD_FUNCPTR(FT_Property_Get) + LOAD_FUNCPTR(FT_Property_Set) LOAD_FUNCPTR(FT_Render_Glyph) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) @@ -4164,6 +4216,9 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + diagnose_freetype(); + set_forced_interpreter_version(); + font_driver = &freetype_funcs; return TRUE; @@ -5153,7 +5208,7 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) +static BOOL get_gasp_flags( GdiFont *font, WORD *flags, WORD *gasp_version ) { DWORD size; WORD buf[16]; /* Enough for seven ranges before we need to alloc */ @@ -5161,7 +5216,8 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) WORD num_recs, version; BOOL ret = FALSE; - *flags = 0; + if ( !flags && !gasp_version ) return FALSE; + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; @@ -5182,6 +5238,13 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) goto done; } + if (gasp_version) + *gasp_version = version; + + ret = TRUE; + if (!flags) goto done; + + *flags = 0; while (num_recs--) { *flags = GET_BE_WORD( *(ptr + 1) ); @@ -5189,7 +5252,6 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) ptr += 2; } TRACE( "got flags %04x for ppem %d\n", *flags, font->ft_face->size->metrics.y_ppem ); - ret = TRUE; done: HeapFree( GetProcessHeap(), 0, alloced ); @@ -5779,6 +5841,8 @@ found_face: done: if (ret) { + WORD gasp_version; + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); switch (lf.lfQuality) @@ -5810,7 +5874,7 @@ done: if ((!antialias_fakes || (!ret->fake_bold && !ret->fake_italic)) && is_hinting_enabled()) { WORD gasp_flags; - if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + if (get_gasp_flags( ret, &gasp_flags, NULL ) && !(gasp_flags & GASP_DOGRAY)) { TRACE( "font %s %d aa disabled by GASP\n", debugstr_w(lf.lfFaceName), lf.lfHeight ); @@ -5819,7 +5883,26 @@ done: } } } - TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); + + if (forced_interpreter_version == 0 && get_gasp_flags( ret, NULL, &gasp_version )) + { + ret->interpreter_version = 0; + + if (gasp_version == 1) + { + if (interpreter_v40_supported) + ret->interpreter_version = 40; + else if (interpreter_v38_supported) + ret->interpreter_version = 38; + } + else if (interpreter_v35_supported) + ret->interpreter_version = 35; + } + else + ret->interpreter_version = forced_interpreter_version; + + TRACE( "%p %s %d aa_flags %x interpreter_version %d\n", hfont, + debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags, ret->interpreter_version ); release_font( physdev->font ); physdev->font = ret; } @@ -7001,6 +7084,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; + /* FT_Property_Set and FT_Load_Glyph must be in the same locking section. */ + if (font->interpreter_version && pFT_Property_Set && pFT_Property_Get) + { + FT_UInt interpreter_version = 0; + + pFT_Property_Set( library, "truetype", "interpreter-version", &font->interpreter_version ); + pFT_Property_Get( library, "truetype", "interpreter-version", &interpreter_version ); + if ( interpreter_version != font->interpreter_version ) + FIXME( "truetype:interpreter-version: expected %d, got %d\n", + font->interpreter_version, interpreter_version ); + } err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); if(err) { -- 2.19.1

4 15

[PATCH] api-ms-win-ntuser-sysparams-l1-1-0: Add dll.
by Andrey Gusev 05 Nov '18

05 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in | 1 + .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) create mode 100644 dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec diff --git a/configure b/configure index 9787693013..7f9786f6eb 100755 --- a/configure +++ b/configure @@ -1075,6 +1075,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_ntuser_sysparams_l1_1_0 enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -19181,6 +19182,7 @@ wine_fn_config_makefile dlls/api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l wine_fn_config_makefile dlls/api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-ntuser-sysparams-l1-1-0 enable_api_ms_win_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 39a2310c9e..efec221113 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-time-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in new file mode 100644 index 0000000000..4d1a5738ac --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-ntuser-sysparams-l1-1-0.dll diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec new file mode 100644 index 0000000000..f68fdd24b2 --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW +@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo +@ stub DisplayConfigSetDeviceInfo +@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW +@ stdcall EnumDisplaySettingsW(wstr long ptr) user32.EnumDisplaySettingsW +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) user32.GetDisplayConfigBufferSizes +@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW +@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles index aa5aad6076..b05afb8189 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-3-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", + "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", -- 2.17.2

1 0

[PATCH resend 1/2] comctl32/listbox: Fix InitStorage heap extension
by Gabriel Ivăncescu 05 Nov '18

05 Nov '18

Only increase the item array if we actually have to. Previously, sending for example just 1 to nb_items repeatedly would always increase the array by LB_ARRAY_GRANULARITY, even if there was plenty of space. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Assume LB_ARRAY_GRANULARITY is a power of 2 and note it in the comments. This simplifies the code (and it's already the case anyway). dlls/comctl32/listbox.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..5c171ab 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity; must be a power of 2 */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -673,16 +673,18 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, n * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapAlloc(GetProcessHeap(), 0, n * sizeof(*item)); } if (!item) -- 2.19.1

2 3

[PATCH] ntdll: Add WinSqmIncrementDWORD stub.
by Andrey Gusev 05 Nov '18

05 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45828 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/misc.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f2c0e1494d..bb75d9cc70 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -341,6 +341,14 @@ NTSTATUS WINAPI WinSqmEndSession(HANDLE session) return STATUS_NOT_IMPLEMENTED; } +/********************************************************************* + * WinSqmIncrementDWORD (NTDLL.@) + */ +void WINAPI WinSqmIncrementDWORD(DWORD unk1, DWORD unk2, DWORD unk3) +{ + FIXME("(%d, %d, %d): stub\n", unk1, unk2, unk3); +} + /********************************************************************* * WinSqmIsOptedIn (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87b5d7078f..3486a78fe3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,6 +1039,7 @@ @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmEndSession(long) +@ stdcall WinSqmIncrementDWORD(long long long) @ stdcall WinSqmIsOptedIn() @ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long) -- 2.17.2

1 0

[PATCH 1/2] dwrite/tests: Add a test for text format with unknown font family name.
by Nikolay Sivov 05 Nov '18

05 Nov '18

From: Lucian Poston <lucianposton(a)pm.me> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 188 ++++++++++++++++++++++--------------- 1 file changed, 111 insertions(+), 77 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77a0ea51b..e6ed3c13c4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2677,83 +2677,6 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteFactory_Release(factory); } -static void test_fallback(void) -{ - static const WCHAR strW[] = {'a','b','c','d',0}; - IDWriteFontFallback *fallback, *fallback2; - IDWriteTextLayout2 *layout2; - IDWriteTextFormat1 *format1; - IDWriteTextFormat *format; - IDWriteTextLayout *layout; - IDWriteFactory2 *factory2; - IDWriteFactory *factory; - HRESULT hr; - - factory = create_factory(); - - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteTextFormat_Release(format); - - hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); - IDWriteTextLayout_Release(layout); - - if (hr != S_OK) { - win_skip("GetFontFallback() is not supported.\n"); - IDWriteFactory_Release(factory); - return; - } - - if (0) /* crashes on native */ - hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = NULL; - hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback != NULL, "got %p\n", fallback); - - hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == fallback, "got %p\n", fallback2); - - hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == NULL, "got %p\n", fallback2); - - IDWriteFontFallback_Release(fallback); - IDWriteTextFormat1_Release(format1); - IDWriteTextLayout2_Release(layout2); - IDWriteFactory_Release(factory); -} - static void test_DetermineMinWidth(void) { struct minwidth_test { @@ -4939,6 +4862,117 @@ todo_wine { ok(ref == 0, "Factory is not released, ref %u.\n", ref); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback, *fallback2; + DWRITE_CLUSTER_METRICS clusters[4]; + DWRITE_TEXT_METRICS metrics; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + UINT32 count, i; + FLOAT width; + HRESULT hr; + + factory = create_factory(); + + /* Font does not exist in system collection. */ + hr = IDWriteFactory_CreateTextFormat(factory, g_blahfontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine { + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 4, "Unexpected count %u.\n", count); +} + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); +todo_wine { + ok(metrics.width > 0.0 && metrics.width == width, "Unexpected width %.2f, expected %.2f.\n", metrics.width, width); + ok(metrics.height > 0.0, "Unexpected height %.2f.\n", metrics.height); + ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); +} + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Existing font. */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + IDWriteFactory_Release(factory); + return; + } + + if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = NULL; + hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback != NULL, "got %p\n", fallback); + + hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == fallback, "got %p\n", fallback2); + + hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == NULL, "got %p\n", fallback2); + + IDWriteFontFallback_Release(fallback); + IDWriteTextFormat1_Release(format1); + IDWriteTextLayout2_Release(layout2); + IDWriteFactory_Release(factory); +} + + static void test_SetTypography(void) { static const WCHAR strW[] = {'a','f','i','b',0}; -- 2.19.1

1 1

[PATCH v2] api-ms-win-core-processthreads-l1-1-3: Add dll.
by Andrey Gusev 05 Nov '18

05 Nov '18

v2: Sort functions alphabetically. Spotted by Gijs Vermeulen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46086 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-3.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in create mode 100644 dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec diff --git a/configure b/configure index 5bf21e4ef7..9787693013 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 +enable_api_ms_win_core_processthreads_l1_1_3 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 @@ -19084,6 +19085,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-processenvironment-l1-2-0 enable_ap wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-3 enable_api_ms_win_core_processthreads_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-processtopology-obsolete-l1-1-0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 878fa4c0fd..39a2310c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -2935,6 +2935,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in new file mode 100644 index 0000000000..520db5c2f8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-3.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec new file mode 100644 index 0000000000..3b57e1c898 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -0,0 +1,10 @@ +@ stub GetProcessDefaultCpuSets +@ stub GetProcessInformation +@ stub GetSystemCpuSetInformation +@ stub GetThreadDescription +@ stub GetThreadSelectedCpuSets +@ stub SetProcessDefaultCpuSets +@ stub SetProcessInformation +@ stub SetThreadDescription +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stub SetThreadSelectedCpuSets diff --git a/tools/make_specfiles b/tools/make_specfiles index 545d436308..aa5aad6076 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -302,6 +302,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-processthreads-l1-1-3", ], [ "kernel32", -- 2.17.2

1 0

[PATCH 5/5] wined3d: Get rid of WINED3DUSAGE_RENDERTARGET.
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/utils.c | 2 -- dlls/ddraw/surface.c | 1 - dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/resource.c | 3 +-- dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c7c682ba6c8..2a1a8c699e5 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -450,8 +450,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_SHADER_RESOURCE) wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & D3D11_BIND_RENDER_TARGET) - wined3d_usage |= WINED3DUSAGE_RENDERTARGET; if (bind_flags & D3D11_BIND_DEPTH_STENCIL) wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5ce1d85b3ed..6bb92d5d399 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6181,7 +6181,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) { - wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; } } diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 26f248800fa..9b57b46d1c7 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -190,8 +190,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac surface_desc.usage = 0; if (surface_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) surface_desc.usage |= WINED3DUSAGE_TEXTURE; - if (surface_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a03465f8077..a79e9247267 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,13 +1541,11 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_RENDERTARGET) - bind_flags |= WINED3D_BIND_RENDER_TARGET; if (usage & WINED3DUSAGE_DEPTHSTENCIL) bind_flags |= WINED3D_BIND_DEPTH_STENCIL; if (usage & WINED3DUSAGE_TEXTURE) bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~(WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); switch (resource_type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ff584567975..58caccc7305 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_RENDERTARGET - | WINED3DUSAGE_DEPTHSTENCIL + static const DWORD handled = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ab1594f063..36e7b2e8318 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -921,8 +921,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; - if (texture_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - texture_desc.usage |= WINED3DUSAGE_RENDERTARGET; if (texture_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) texture_desc.usage |= WINED3DUSAGE_TEXTURE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 73e8cf25f78..a7b1b10f9ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4511,7 +4511,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3575f7e02ca..fd907578c2d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_RENDERTARGET 0x00000001 #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 @@ -928,7 +927,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bff +#define WINED3DUSAGE_MASK 0x10007bfa #define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000 -- 2.11.0

1 0

[PATCH 4/5] d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e5135496453..1e7c0ea0f45 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } - if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + if ((desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_SHADER_RESOURCE)) == WINED3D_BIND_SHADER_RESOURCE) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } - if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n"); -- 2.11.0

1 0

[PATCH 3/5] d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f5a4352ce..e5135496453 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1668,13 +1668,13 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (dst->texture && !(dst_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) { WARN("Destination is a regular texture.\n"); goto done; } - if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (src_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { if (device->in_scene) { -- 2.11.0

1 0

[PATCH 2/5] d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 27b32faa445..b05df7e2914 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); wined3d_mutex_unlock(); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_h = wined3d_desc.height; wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface); wined3d_mutex_unlock(); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view().
by Henri Verbeet 05 Nov '18

05 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5515b27b069..1af76f235c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4461,9 +4461,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (view && !(view->resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (view && !(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { - WARN("View resource %p doesn't have render target usage.\n", view->resource); + WARN("View resource %p doesn't have render target bind flags.\n", view->resource); return WINED3DERR_INVALIDCALL; } -- 2.11.0

1 0

[PATCH] kernel32/tests: Add more directory change notification tests.
by Dmitry Timoshkov 05 Nov '18

05 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/change.c | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index f4abad48c5..3c8084de64 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -254,11 +254,12 @@ static void test_FindFirstChangeNotification(void) static void test_ffcn(void) { DWORD filter; - HANDLE handle; + HANDLE handle, file; LONG r; - WCHAR path[MAX_PATH], subdir[MAX_PATH]; + WCHAR path[MAX_PATH], subdir[MAX_PATH], filename[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + static const WCHAR szZoo[] = { '\\','z','o','o',0 }; SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); @@ -275,6 +276,9 @@ static void test_ffcn(void) lstrcpyW( subdir, path ); lstrcatW( subdir, szHoo ); + lstrcpyW( filename, path ); + lstrcatW( filename, szZoo ); + RemoveDirectoryW( subdir ); RemoveDirectoryW( path ); @@ -290,6 +294,38 @@ static void test_ffcn(void) r = WaitForSingleObject( handle, 0 ); ok( r == STATUS_TIMEOUT, "should time out\n"); + file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + CloseHandle(file); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = DeleteFileW( filename ); + ok( r == TRUE, "failed to remove file\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n"); -- 2.17.1

2 1

[PATCH 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 05 Nov '18

05 Nov '18

Hi, Please find attached a patch that implements enumerating remembered (aka persistent) connections from registry. Note that this leads to the removal of the null enumerator code which is no longer used. The next patches implement the creation and the deletion of persistent connections. As usual, this patch series got tested on ReactOS and its purpose is to reduce the diff between Wine's MPR and ReactOS' one. The initial implementation was too broken to get into Wine. This one is correct. Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 1

[PATCH v6 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior
by Gabriel Ivăncescu 05 Nov '18

05 Nov '18

Windows doesn't reset and re-enumerate it everytime autocompletion happens, and it also sorts the strings. This matches it more closely and makes it more useable on large lists as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 206 +++++++++++++++++++++++++++++++------------- 1 file changed, 146 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b3f86f3..69d9cc8 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -25,7 +25,6 @@ - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - implement ResetEnumerator - - string compares should be case-insensitive, the content of the list should be sorted */ #include "config.h" @@ -62,6 +61,8 @@ typedef struct LONG ref; BOOL initialized; BOOL enabled; + UINT enum_strs_num; + WCHAR **enum_strs; HWND hwndEdit; HWND hwndListBox; WNDPROC wpOrigEditProc; @@ -103,10 +104,94 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } -static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) +static int enumerate_strings_cmpfn(const void *a, const void *b) +{ + return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); +} + +/* + Enumerate all of the strings and sort them in the internal list. + + We don't free the enumerated strings (except on error) to avoid needless + copies, until the next reset (or the object itself is destroyed) +*/ +static void enumerate_strings(IAutoCompleteImpl *ac) +{ + UINT cur = 0, array_size = 1024; + LPOLESTR *strs = NULL, *tmp; + ULONG read; + + do + { + if ((tmp = heap_realloc(strs, array_size * sizeof(*strs))) == NULL) + goto fail; + strs = tmp; + + do + { + if (FAILED(IEnumString_Next(ac->enumstr, array_size - cur, &strs[cur], &read))) + read = 0; + } while (read != 0 && (cur += read) < array_size); + + array_size *= 2; + } while (read != 0); + + /* Allocate even if there were zero strings enumerated, to mark it non-NULL */ + if ((tmp = heap_realloc(strs, cur * sizeof(*strs)))) + { + strs = tmp; + if (cur > 0) + qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); + + ac->enum_strs = strs; + ac->enum_strs_num = cur; + return; + } + +fail: + while (cur--) + CoTaskMemFree(strs[cur]); + heap_free(strs); +} + +static UINT find_matching_enum_str(IAutoCompleteImpl *ac, UINT start, WCHAR *text, + UINT len, int direction) +{ + WCHAR **strs = ac->enum_strs; + UINT index = ~0, a = start, b = ac->enum_strs_num; + while (a < b) + { + UINT i = (a + b - 1) / 2; + int cmp = strncmpiW(text, strs[i], len); + if (cmp == 0) + { + index = i; + cmp = direction; + } + if (cmp <= 0) b = i; + else a = i + 1; + } + return index; +} + +static void free_enum_strs(IAutoCompleteImpl *ac) +{ + WCHAR **strs = ac->enum_strs; + if (strs) + { + UINT i = ac->enum_strs_num; + ac->enum_strs = NULL; + while (i--) + CoTaskMemFree(strs[i]); + heap_free(strs); + } +} + +static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) { ShowWindow(hwnd, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); + if (reset) free_enum_strs(ac); } static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) @@ -167,14 +252,14 @@ static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) { len = SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)text); set_text_and_selection(ac, hwnd, text, 0, len); - hide_listbox(ac, hwndListBox); + hide_listbox(ac, hwndListBox, TRUE); ac->no_fwd_char = '\r'; /* RETURN char */ heap_free(text); return TRUE; } } } - hide_listbox(ac, hwndListBox); + hide_listbox(ac, hwndListBox, TRUE); return FALSE; } @@ -241,6 +326,10 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) { WCHAR c = last_delim[1]; + + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + last_delim[1] = '\0'; IACList_Expand(ac->aclist, txt); last_delim[1] = c; @@ -276,6 +365,9 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) while (i--) if (strchrW(delims, txt[i])) return do_aclist_expand(ac, txt, &txt[i]); + + /* Windows doesn't expand without a delim, but it does reset */ + free_enum_strs(ac); } return FALSE; @@ -312,66 +404,57 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, HWND hwnd, enum autoappend_flag flag) { /* Return FALSE if we need to hide the listbox */ - UINT cpt; + WCHAR **str = ac->enum_strs; + UINT cnt, start, end; + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; - if (ac->options & ACO_AUTOSUGGEST) + if (len) { - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + start = find_matching_enum_str(ac, 0, text, len, -1); + if (start == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[start], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the index beyond the last string that matches */ + end = find_matching_enum_str(ac, start + 1, text, len, 1); + end = (end == ~0 ? start : end) + 1; } - for (cpt = 0;;) - { - HRESULT hr; - LPOLESTR strs = NULL; - ULONG fetched; - - hr = IEnumString_Next(ac->enumstr, 1, &strs, &fetched); - if (hr != S_OK) - break; - - if (!strncmpiW(text, strs, len)) - { - if (cpt == 0 && flag == autoappend_flag_yes) - { - autoappend_str(ac, text, len, strs, hwnd); - if (!(ac->options & ACO_AUTOSUGGEST)) - { - CoTaskMemFree(strs); - break; - } - } - - if (ac->options & ACO_AUTOSUGGEST) - SendMessageW(ac->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - - cpt++; - } - - CoTaskMemFree(strs); - } - - if (ac->options & ACO_AUTOSUGGEST) + else { - if (cpt) - { - show_listbox(ac, cpt); - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); - } - else + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + start = 0; + end = ac->enum_strs_num; + if (end == 0) return FALSE; } + cnt = end - start; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + for (; start < end; start++) + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); + + show_listbox(ac, cnt); + SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; } static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { WCHAR *text; + BOOL expanded = FALSE; UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); if (flag != autoappend_flag_displayempty && len == 0) { if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, TRUE); return; } @@ -382,28 +465,31 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - /* Reset it here to simplify the logic in aclist_expand for - empty strings, since it tracks changes using txtbackup, - and Reset needs to be called before IACList::Expand */ - IEnumString_Reset(ac->enumstr); if (ac->aclist) { - aclist_expand(ac, text); if (text[len - 1] == '\\' || text[len - 1] == '/') flag = autoappend_flag_no; + expanded = aclist_expand(ac, text); + } + if (expanded || !ac->enum_strs) + { + if (!expanded) IEnumString_Reset(ac->enumstr); + enumerate_strings(ac); } - /* Set txtbackup to point to text itself (which must not be released) */ + /* Set txtbackup to point to text itself (which must not be released), + and it must be done here since aclist_expand uses it to track changes */ heap_free(ac->txtbackup); ac->txtbackup = text; if (!display_matching_strs(ac, text, len, hwnd, flag)) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, FALSE); } static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; + free_enum_strs(ac); if (ac->hwndListBox) DestroyWindow(ac->hwndListBox); IAutoComplete2_Release(&ac->IAutoComplete2_iface); @@ -421,7 +507,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT /* When pressing ESC, Windows hides the auto-suggest listbox, if visible */ if ((ac->options & ACO_AUTOSUGGEST) && IsWindowVisible(ac->hwndListBox)) { - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, FALSE); ac->no_fwd_char = 0x1B; /* ESC char */ return 0; } @@ -448,7 +534,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT } if (ac->options & ACO_AUTOSUGGEST) - hide_listbox(ac, ac->hwndListBox); + hide_listbox(ac, ac->hwndListBox, TRUE); heap_free(text); return 0; } @@ -512,12 +598,12 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { case CB_SHOWDROPDOWN: if (This->options & ACO_AUTOSUGGEST) - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, TRUE); return 0; case WM_KILLFOCUS: if ((This->options & ACO_AUTOSUGGEST) && ((HWND)wParam != This->hwndListBox)) { - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, FALSE); } break; case WM_KEYDOWN: @@ -583,7 +669,7 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, break; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); - hide_listbox(This, hwnd); + hide_listbox(This, hwnd, TRUE); heap_free(msg); break; default: @@ -861,7 +947,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( if ((This->options & ACO_AUTOSUGGEST) && This->hwndEdit && !This->hwndListBox) create_listbox(This); else if (!(This->options & ACO_AUTOSUGGEST) && This->hwndListBox) - hide_listbox(This, This->hwndListBox); + hide_listbox(This, This->hwndListBox, TRUE); return hr; } -- 1.9.1

2 7

[PATCH v2] msi: Don't consider read-only drives when enumerating volumes.
by Pierre Schweitzer 05 Nov '18

05 Nov '18

Just fixing a stupid typo. As both Fabian & my patch do basically the same thing with different coding style, feel free to pick whichever you like ;-). -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 1

[PATCH] msi: In dialogs show show titlebar buttons
by Fabian Maurer 05 Nov '18

05 Nov '18

Implemented according to my tests on windows with a bunch of msi files: -All dialogs have a close box, which acts like cancel -Main Dialogs can have a minimize box -When clicking cancel, that new dialog must never have a minimize box Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6184da84f1..a3797c2c04 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3858,6 +3858,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_COMMAND: return msi_dialog_oncommand( dialog, wParam, (HWND)lParam ); + case WM_CLOSE: + /* Simulate escape press */ + return msi_dialog_oncommand(dialog, 2, NULL); + case WM_ACTIVATE: if( LOWORD(wParam) == WA_INACTIVE ) dialog->hWndFocus = GetFocus(); @@ -3903,10 +3907,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - style = WS_OVERLAPPED; + style = WS_OVERLAPPED | WS_SYSMENU; if( dialog->attributes & msidbDialogAttributesVisible ) style |= WS_VISIBLE; + if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) + style |= WS_MINIMIZEBOX; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog ); -- 2.19.1

2 1

[PATCH] wshom: Split the command line before passing it to ShellExecuteEx.
by Hans Leidekker 05 Nov '18

05 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 34 ++++++++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1aa353a17a..ca4f7ff899 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1218,12 +1218,37 @@ static inline BOOL is_optional_argument(const VARIANT *arg) return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } +static WCHAR *split_command( BSTR cmd, WCHAR **params ) +{ + WCHAR *ret, *ptr; + BOOL in_quotes = FALSE; + + if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + strcpyW( ret, cmd ); + + *params = NULL; + for (ptr = ret; *ptr; ptr++) + { + if (*ptr == '"') in_quotes = !in_quotes; + else if (*ptr == ' ' && !in_quotes) + { + *ptr = 0; + *params = ptr + 1; + break; + } + } + + return ret; +} + static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; + WCHAR *file, *params; VARIANT s; HRESULT hr; + BOOL ret; TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); @@ -1251,13 +1276,18 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, waitforprocess = V_I4(&w); } + if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; - info.lpFile = cmd; + info.lpFile = file; + info.lpParameters = params; info.nShow = V_I4(&s); - if (!ShellExecuteExW(&info)) + ret = ShellExecuteExW(&info); + heap_free( file ); + if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 18ff4d6228..c1f9519ff8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -66,6 +66,17 @@ static void test_wshshell(void) static const WCHAR path2W[] = {'P','A','T','H',0}; static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; + static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; + static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; + static const WCHAR paramsW[] = + {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmdW[] = + {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmd2W[] = + {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; IWshShell3 *sh3; @@ -82,7 +93,7 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval; + DWORD retval, attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -238,9 +249,53 @@ static void test_wshshell(void) hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(retval == 10, "got %u\n", retval); + SysFreeString(str); + + V_VT(&arg2) = VT_BOOL; + V_BOOL(&arg2) = VARIANT_TRUE; + retval = 0xdeadbeef; + str = SysAllocString(cmdW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); + retval = 0xdeadbeef; + str = SysAllocString(cmd2W); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, cmdexeW); + attrs = GetFileAttributesW(path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "cmd.exe not found\n"); + + /* copy cmd.exe to a path with spaces */ + GetTempPathW(ARRAY_SIZE(path2), path2); + lstrcatW(path2, testdirW); + CreateDirectoryW(path2, NULL); + lstrcatW(path2, cmdexeW); + CopyFileW(path, path2, FALSE); + + buf[0] = '"'; + lstrcpyW(buf + 1, path2); + buf[lstrlenW(buf)] = '"'; + lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + + retval = 0xdeadbeef; + str = SysAllocString(buf); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + DeleteFileW(path2); + path2[lstrlenW(path2) - lstrlenW(cmdexeW)] = 0; + RemoveDirectoryW(path2); + /* current directory */ if (0) /* crashes on native */ hr = IWshShell3_get_CurrentDirectory(sh3, NULL); -- 2.11.0

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel