- wine-devel - winehq.org

[PATCH 2/5] kernel32/tests: Fix a bunch of access denied errors by using a dedicated TEMP directory.
by Dmitry Timoshkov 14 Oct '18

14 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/file.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 58ce74b9b7..acf657f8c7 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -62,7 +62,7 @@ static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, UL static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); -static const char filename[] = "testfile.xxx"; +static char filename[MAX_PATH]; static const char sillytext[] = "en larvig liten text dx \033 gx hej 84 hej 4484 ! \001\033 bla bl\na.. bla bla." "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3" @@ -457,10 +457,15 @@ static void test__lcreat( void ) if (INVALID_HANDLE_VALUE==find) ok (0, "file \"%s\" not found\n", filename); else { + const char *name = strrchr(filename, '\\'); + + if (name) name++; + else name = filename; + ret = FindClose(find); ok ( 0 != ret, "FindClose complains (%d)\n", GetLastError ()); - ok (!strcmp (filename, search_results.cFileName), - "found unexpected name \"%s\"\n", search_results.cFileName); + ok (!strcmp (name, search_results.cFileName), + "expected \"%s\", got \"%s\"\n", name, search_results.cFileName); search_results.dwFileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; search_results.dwFileAttributes &= ~FILE_ATTRIBUTE_COMPRESSED; ok (FILE_ATTRIBUTE_ARCHIVE==search_results.dwFileAttributes, @@ -5103,8 +5108,18 @@ static void test_post_completion(void) START_TEST(file) { + char temp_path[MAX_PATH]; + DWORD ret; + InitFunctionPointers(); + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPath error %u\n", GetLastError()); + ret = GetTempFileNameA(temp_path, "tmp", 0, filename); + ok(ret != 0, "GetTempFileName error %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret != 0, "DeleteFile error %u\n", GetLastError()); + test__hread( ); test__hwrite( ); test__lclose( ); -- 2.17.1

1 0

[PATCH 1/5] kernel32/tests: Fix compilation with PSDK.
by Dmitry Timoshkov 14 Oct '18

14 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/file.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index eb27d5582a..58ce74b9b7 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,9 +38,7 @@ #include "winnls.h" #include "fileapi.h" -#ifdef WINE_NO_UNICODE_MACROS #undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ -#endif static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); @@ -61,6 +59,8 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PW static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); +static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); +static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -91,6 +91,8 @@ static void InitFunctionPointers(void) pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pRtlInitAnsiString = (void *)GetProcAddress(hntdll, "RtlInitAnsiString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); @@ -270,7 +272,8 @@ static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) ANSI_STRING str; NTSTATUS status; BOOLEAN ret; - RtlInitAnsiString( &str, name ); + + pRtlInitAnsiString( &str, name ); status = pRtlAnsiStringToUnicodeString( &strW, &str, TRUE ); ok( !status, "RtlAnsiStringToUnicodeString failed with %08x\n", status ); @@ -278,7 +281,7 @@ static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) ret = pRtlDosPathNameToNtPathName_U( strW.Buffer, nameW, NULL, NULL ); ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); - RtlFreeUnicodeString( &strW ); + pRtlFreeUnicodeString( &strW ); } static void test__lcreat( void ) @@ -354,30 +357,30 @@ static void test__lcreat( void ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %08x\n", status ); ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN_IF, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); todo_wine ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); if (!status) CloseHandle( file ); - RtlFreeUnicodeString( &filenameW ); + pRtlFreeUnicodeString( &filenameW ); todo_wine ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); @@ -4907,7 +4910,7 @@ static void test_SetFileInformationByHandle(void) { FILE_ATTRIBUTE_TAG_INFO fileattrinfo = { 0 }; FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; - FILE_STANDARD_INFO stdinfo = { }; + FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE }; FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; char tempFileName[MAX_PATH]; -- 2.17.1

1 0

Wine staging 3.18 release
by Alistair Leslie-Hughes 14 Oct '18

14 Oct '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.18 (880 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * advapi32: SDDL assigns the "AC" abbreviation to WinBuiltinAnyPackageSid * advapi32/tests: Add a test that compares a well-known SID to a SID created from a SDDL abbreviation. * d3d10core/tests: Add test for depth bias clamp * ntdll: Add RtlSetUnhandledExceptionFilter stub. * opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences. * tools/wrc: Fix generation of custom dialog control data. * user32: Fix the pointer to custom dialog control data * user32/tests: Add a test for custom dialog control data * wined3d: Add support for depth bias clamping. Added * 45879 - setupapi: Added CM_Request_Device_EjectA/W stub * 17205 - user32: Support WM_COPY in MessageBox dialogs. * 45765 - user32: Added GetPointerType stub * 45968 - user32: Implement CascadeWindows * 45901 - wined3d: Use glReadPixels for RT texture download * 45948 - kernel32: Disable export GetQueuedCompletionStatusEx to allow Steam to login * 45975 - wined3d: Awllow DirectX 10 to work with legacy nVidia driver Updated * Compiler_Warnings patchset. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH resend] x11drv: handle missing thread data in X11DRV_get_ic
by Enrico Horn 12 Oct '18

12 Oct '18

Hi, This patch fixes a crash in x11drv when loading IME. This happens in Final Fantasy XI when using Ashita or Windower 3rd party applications. There has been no bug reported I just fixed the bug for myself. Here is the crash record: Unhandled exception: page fault on write access to 0x00000014 in 32-bit code (0x7d85a94b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7d85a94b ESP:0836fd10 EBP:0836fd38 EFLAGS:00010212( R- -- I -A- - ) EAX:00000000 EBX:0015abe8 ECX:00010050 EDX:00000000 ESI:00000000 EDI:7d894000 Stack dump: 0x0836fd10: 001e60c8 00000158 0836fdb8 00010050 0x0836fd20: 00000000 7d894000 7d85a90b 7d894000 0x0836fd30: 001e60cc 001e60c8 0836fd58 7d86560b 0x0836fd40: 00010050 00000035 7d827a09 7d8655fa 0x0836fd50: 7d894000 001e60cc 0836fd98 7d83c0ef 0x0836fd60: 00010050 7d894000 0836fd98 7d83bfb0 Backtrace: =>0 0x7d85a94b X11DRV_get_ic+0x4b(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11 (0x0836fd38) 1 0x7d86560b X11DRV_ForceXIMReset+0x1a(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/xim.c:255] in winex11 (0x0836fd58) 2 0x7d83c0ef NotifyIME+0x17e(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/winex11.drv/ime.c:764] in winex11 (0x0836fd98) 3 0x7dc80793 ImmNotifyIME+0x62(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/imm32/imm.c:2189] in imm32 (0x0836fde8) 0x7d85a94b X11DRV_get_ic+0x4b [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11: movl %ecx,0x14(%eax) 2040 x11drv_thread_data()->last_xic_hwnd = hwnd; Signed-off-by: Enrico Horn <farmboy0+winehq(a)googlemail.com> --- dlls/winex11.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19a..7dce6816ad7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2034,6 +2034,11 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; XIC ret = 0; + if (!x11drv_thread_data()) + { + release_win_data( data ); + return NULL; + } if (data) { x11drv_thread_data()->last_xic_hwnd = hwnd; -- 2.19.1

1 0

[PATCH] xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface()
by Roger Zoellner 12 Oct '18

12 Oct '18

Fixes bug https://bugs.winehq.org/show_bug.cgi?id=43660 (DOS2 classic client is affected as well) In this specific case, the bug is caused by a call to QueryInterface inside bink2w64.dll, which then will treat a precreated XAudio27 object as XAudio28. This leads to a crash. This fix may affect other games, that use BINK2, too. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 28cf98565b..461ac56ffe 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1262,7 +1262,9 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || +#if XAUDIO2_VER == 8 IsEqualGUID(riid, &IID_IXAudio28) || +#endif IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){ -- 2.19.0

2 2

[PATCH] ddraw: Get rid of a redundant assignment in ddraw7_GetDisplayMode().
by Henri Verbeet 12 Oct '18

12 Oct '18

From: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee486f..43bc36b80ca 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; -- 2.11.0

1 0

[PATCH] wbemdisp: Implement ISWbemPropertySet::get_Count.
by Hans Leidekker 12 Oct '18

12 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40534 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 15 +++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 78b81d8551..c307e347cf 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -438,8 +438,19 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) { - FIXME( "\n" ); - return E_NOTIMPL; + static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT val; + + TRACE( "%p, %p\n", propertyset, count ); + + hr = IWbemClassObject_Get( propertyset->object, propcountW, 0, &val, NULL, NULL ); + if (SUCCEEDED(hr)) + { + *count = V_I4( &val ); + } + return hr; } static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 68c0e3b589..57baf848cc 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -302,6 +302,7 @@ static void test_locator(void) ISWbemProperty *prop; ISWbemSecurity *security; VARIANT var; + LONG count; WbemImpersonationLevelEnum imp_level; WbemAuthenticationLevelEnum auth_level; @@ -379,6 +380,11 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); + count = 0; + hr = ISWbemPropertySet_get_Count( prop_set, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count > 0, "got %d\n", count ); + hr = ISWbemProperty_get_Value( prop, &var ); ok( hr == S_OK, "got %x\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Dump buffer descriptor in wined3d_buffer_create().
by Matteo Bruni 12 Oct '18

12 Oct '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 +++++-- dlls/wined3d/utils.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e20d66cc88..e7b05157cc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1445,8 +1445,11 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", - device, desc, data, parent, parent_ops, buffer); + TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " + "parent_ops %p, buffer %p.\n", + device, desc->byte_width, debug_d3dusage(desc->usage), + wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), + data, parent, parent_ops, buffer); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e3df24ade4..d62578bf9f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4447,6 +4447,27 @@ const char *wined3d_debug_resource_access(DWORD access) return wine_dbg_sprintf("%s", buffer.str); } +const char *wined3d_debug_bind_flags(DWORD bind_flags) +{ + struct debug_buffer buffer; + + init_debug_buffer(&buffer, "0"); +#define BIND_FLAG_TO_STR(x) if (bind_flags & x) { debug_append(&buffer, #x, " | "); bind_flags &= ~x; } + BIND_FLAG_TO_STR(WINED3D_BIND_VERTEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_INDEX_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_CONSTANT_BUFFER); + BIND_FLAG_TO_STR(WINED3D_BIND_SHADER_RESOURCE); + BIND_FLAG_TO_STR(WINED3D_BIND_STREAM_OUTPUT); + BIND_FLAG_TO_STR(WINED3D_BIND_RENDER_TARGET); + BIND_FLAG_TO_STR(WINED3D_BIND_DEPTH_STENCIL); + BIND_FLAG_TO_STR(WINED3D_BIND_UNORDERED_ACCESS); +#undef BIND_FLAG_TO_STR + if (bind_flags) + FIXME("Unrecognised bind flag(s) %#x.\n", bind_flags); + + return wine_dbg_sprintf("%s", buffer.str); +} + const char *debug_d3dusage(DWORD usage) { struct debug_buffer buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 19945cf30e..dbab1aaf76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3064,6 +3064,7 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta } const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; +const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { -- 2.18.1

2 9

[PATCH] ntdll/tests: Use FILE_INFORMATION_CLASS values instead of hardcoded numbers.
by Jacek Caban 12 Oct '18

12 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)

1 0

[PATCH 2/2] msi: Fix the remote case for MsiViewModify(MSIMODIFY_UPDATE).
by Hans Leidekker 12 Oct '18

12 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45972 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 ++-- dlls/msi/record.c | 11 ++++++----- dlls/msi/winemsi.idl | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 76f532f34c..4e61fdb929 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -141,8 +141,8 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; - MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ + UINT64 cookie; MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 544bfc9e9a..701a347a8c 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -379,7 +379,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - (*prec)->query = query; + (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } @@ -693,7 +693,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && rec->query != query ) + if ( mode == MSIMODIFY_UPDATE && rec->cookie != (UINT64)(ULONG_PTR)query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index a7d55888a9..cca63083d1 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1064,6 +1064,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE; + rec->cookie = in->cookie; for (i = 0; i <= in->count; i++) { switch (in->fields[i].type) @@ -1114,17 +1115,17 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) struct wire_record *marshal_record(MSIHANDLE handle) { struct wire_record *ret; - unsigned int i, count; + unsigned int i; MSIRECORD *rec; if (!(rec = msihandle2msiinfo(handle, MSIHANDLETYPE_RECORD))) return NULL; - count = MSI_RecordGetFieldCount(rec); - ret = midl_user_allocate(sizeof(*ret) + count * sizeof(ret->fields[0])); - ret->count = count; + ret = midl_user_allocate(sizeof(*ret) + rec->count * sizeof(ret->fields[0])); + ret->count = rec->count; + ret->cookie = rec->cookie; - for (i = 0; i <= count; i++) + for (i = 0; i <= rec->count; i++) { switch (rec->fields[i].type) { diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index ebbca82a16..1658603694 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -51,8 +51,10 @@ struct wire_field { int len; }; +/* compatible with MSIRECORD minus header */ struct wire_record { unsigned int count; + UINT64 cookie; [size_is(count+1)] struct wire_field fields[]; }; -- 2.11.0

1 0

[PATCH 1/2] msi: Fix memory leaks.
by Hans Leidekker 12 Oct '18

12 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 97bde52a29..3cb0f3170a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -538,46 +538,49 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (r != ERROR_SUCCESS) return r; + hPackage = alloc_msi_remote_handle( remote_package ); + if (!hPackage) + { + ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( dll ); + midl_user_free( proc ); + return ERROR_INSTALL_FAILURE; + } + hModule = LoadLibraryW( dll ); if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( dll ); + midl_user_free( proc ); + MsiCloseHandle( hPackage ); return ERROR_SUCCESS; } fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - if (fn) + if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); + else { - hPackage = alloc_msi_remote_handle( remote_package ); - if (hPackage) + handle_msi_break(proc); + + __TRY { - TRACE("calling %s\n", debugstr_a(proc)); - handle_msi_break(proc); - - __TRY - { - r = custom_proc_wrapper(fn, hPackage); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_a(proc), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; - - MsiCloseHandle( hPackage ); + r = custom_proc_wrapper( fn, hPackage ); } - else - ERR("failed to create handle for %x\n", remote_package ); + __EXCEPT_PAGE_FAULT + { + ERR( "Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); + r = ERROR_SUCCESS; + } + __ENDTRY; } - else - ERR("GetProcAddress(%s) failed\n", debugstr_a(proc)); FreeLibrary(hModule); midl_user_free(dll); midl_user_free(proc); + MsiCloseHandle(hPackage); return r; } -- 2.11.0

1 0

[PATCH] credui: Correctly check for duplicated username entries in CredDialogFillUsernameCombo.
by Jacek Caban 12 Oct '18

12 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/credui/credui_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)

1 0

[PATCH] prntvtp: add stub for PTOpenProviderEx
by Louis Lenders 12 Oct '18

12 Oct '18

See https://bugs.winehq.org/show_bug.cgi?id=45925, the attached stub makes sure the testapp at least doesn`t crash, but instead pops up a window saying I should intall a printer Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 72b1dcf680..cdf1b6c8f0 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -55,3 +55,9 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) +{ + FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bf9a8cad6b..5581fa4c50 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,6 +1,6 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) -@ stub PTOpenProviderEx +@ stdcall PTOpenProviderEx(wstr long long ptr ptr) @ stub PTCloseProvider @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities diff --git a/include/prntvpt.h b/include/prntvpt.h index 55ecbbe659..8b873dd0aa 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -26,6 +26,7 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); #ifdef __cplusplus } -- 2.17.1

1 0

[PATCH] shell32: Improve semi-stub SHGetStockIconInfo, try find existing iconhandle
by Louis Lenders 12 Oct '18

12 Oct '18

v3: try find handle to existing icon this is the best I can come up with for now, on windows afaict all these icons mostly come from imegares.dll so the attached patch is not really how windows does it Fix for bug https://bugs.winehq.org/show_bug.cgi?id=45868 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/iconcache.c | 158 +++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelllink.c | 15 ++++ 2 files changed, 165 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c33b..da3e043d95 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -987,6 +987,119 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) return -1; } +/**************************************************************************** + * For SHGetStockIconInfo + */ +typedef struct { + SHSTOCKICONID id; + DWORD iconid; +} SI_ENTRY; + +static const SI_ENTRY si_table[] = +{ + [0] = { SIID_DOCNOASSOC, IDI_SHELL_FILE}, + [1] = { SIID_DOCASSOC, IDI_SHELL_DOCUMENT}, + [2] = { SIID_APPLICATION, IDI_SHELL_WINDOW}, + [3] = { SIID_FOLDER, IDI_SHELL_FOLDER}, + [4] = { SIID_FOLDEROPEN, IDI_SHELL_FOLDER_OPEN}, + [5] = { SIID_DRIVE525, 0}, + [6] = { SIID_DRIVE35, 0}, + [7] = { SIID_DRIVERREMOVE, 0}, + [8] = { SIID_DRIVERFIXED, IDI_SHELL_DRIVE}, + [9] = { SIID_DRIVERNET, IDI_SHELL_NETDRIVE}, + [10] = { SIID_DRIVERNETDISABLE, IDI_SHELL_NETDRIVE2}, + [11] = { SIID_DRIVERCD, IDI_SHELL_OPTICAL_DRIVE}, + [12] = { SIID_DRIVERRAM, IDI_SHELL_RAMDISK}, + [13] = { SIID_WORLD, 0}, + /* Missing: 14 */ + [15] = { SIID_SERVER, 0}, + [16] = { SIID_PRINTER, IDI_SHELL_PRINT}, + [17] = { SIID_MYNETWORK, 0}, + /* Missing: 18 - 21 */ + [22] = { SIID_FIND, 0}, + [23] = { SIID_HELP, IDI_SHELL_HELP}, + /* Missing: 24 - 27 */ + [28] = {SIID_SHARE, 0}, + [29] = {SIID_LINK, 0}, + [30] = {SIID_SLOWFILE, 0}, + [31] = {SIID_RECYCLER, IDI_SHELL_TRASH_FOLDER}, + [32] = {SIID_RECYCLERFULL, IDI_SHELL_FULL_RECYCLE_BIN}, + /* Missing: 33 - 39 */ + [40] = {SIID_MEDIACDAUDIO, 0}, + /* Missing: 41 - 46 */ + [47] = {SIID_LOCK, IDI_SHELL_PASSWORDS}, + /* Missing: 48 */ + [49] = {SIID_AUTOLIST, 0}, + [50] = {SIID_PRINTERNET, 0}, + [51] = {SIID_SERVERSHARE, 0}, + [52] = {SIID_PRINTERFAX, 0}, + [53] = {SIID_PRINTERFAXNET, 0}, + [54] = {SIID_PRINTERFILE, 0}, + [55] = {SIID_STACK, 0}, + [56] = {SIID_MEDIASVCD, 0}, + [57] = {SIID_STUFFEDFOLDER, 0}, + [58] = {SIID_DRIVEUNKNOWN, 0}, + [59] = {SIID_DRIVEDVD, 0}, + [60] = {SIID_MEDIADVD, 0}, + [61] = {SIID_MEDIADVDRAM, 0}, + [62] = {SIID_MEDIADVDRW, 0}, + [63] = {SIID_MEDIADVDR, 0}, + [64] = {SIID_MEDIADVDROM, 0}, + [65] = {SIID_MEDIACDAUDIOPLUS, 0}, + [66] = {SIID_MEDIACDRW, 0}, + [67] = {SIID_MEDIACDR, 0}, + [68] = {SIID_MEDIACDBURN, 0}, + [69] = {SIID_MEDIABLANKCD, 0}, + [70] = {SIID_MEDIACDROM, 0}, + [71] = {SIID_AUDIOFILES, IDI_SHELL_AUDIO_FILE}, + [72] = {SIID_IMAGEFILES, IDI_SHELL_IMAGE_FILE}, + [73] = {SIID_VIDEOFILES, IDI_SHELL_VIDEO_FILE}, + [74] = {SIID_MIXEDFILES, 0}, + [75] = {SIID_FOLDERBACK, 0}, + [76] = {SIID_FOLDERFRONT, 0}, + [77] = {SIID_SHIELD, 0}, + [78] = {SIID_WARNING, 0}, + [79] = {SIID_INFO, 0}, + [80] = {SIID_ERROR, 0}, + [81] = {SIID_KEY, 0}, + [82] = {SIID_SOFTWARE, 0}, + [83] = {SIID_RENAME, IDI_SHELL_RENAME}, + [84] = {SIID_DELETE, IDI_SHELL_CONFIRM_DELETE}, + [85] = {SIID_MEDIAAUDIODVD, 0}, + [86] = {SIID_MEDIAMOVIEDVD, 0}, + [87] = {SIID_MEDIAENHANCEDCD, 0}, + [88] = {SIID_MEDIAENHANCEDDVD, 0}, + [89] = {SIID_MEDIAHDDVD, 0}, + [90] = {SIID_MEDIABLUERAY, 0}, + [91] = {SIID_MEDIAVCD, 0}, + [92] = {SIID_MEDIADVDPLUSR, 0}, + [93] = {SIID_MEDIADVDPLUSRW, 0}, + [94] = {SIID_DESKTOPPC, IDI_SHELL_MY_COMPUTER}, + [95] = {SIID_MOBILEPC, 0}, + [96] = {SIID_USERS, IDI_SHELL_USERS}, + [97] = {SIID_MEDIASMARTMEDIA, 0}, + [98] = {SIID_MEDIACOMPACTFLASH, 0}, + [99] = {SIID_DEVICECELLPHONE, 0}, + [100] = {SIID_DEVICECAMERA, 0}, + [101] = {SIID_DEVICEVIDEOCAMERA, 0}, + [102] = {SIID_DEVICEAUDIOPLAYER, 0}, + [103] = {SIID_NETWORKCONNECT, 0}, + [104] = {SIID_INTERNET, IDI_SHELL_WEB_BROWSER}, + [105] = {SIID_ZIPFILE, 0}, + [106] = {SIID_SETTINGS, IDI_SHELL_SETTINGS}, + /* Missing: 107 - 131 */ + [132] = {SIID_DRIVEHDDVD, 0}, + [133] = {SIID_DRIVEBD, 0}, + [134] = {SIID_MEDIAHDDVDROM, 0}, + [135] = {SIID_MEDIAHDDVDR, 0}, + [136] = {SIID_MEDIAHDDVDRAM, 0}, + [137] = {SIID_MEDIABDROM, 0}, + [138] = {SIID_MEDIABDR, 0}, + [139] = {SIID_MEDIABDRE, 0}, + [140] = {SIID_CLUSTEREDDRIVE, 0} + /* Missing: 141 - 180 and SIID_MAX_ICONS = 181*/ + }; + /**************************************************************************** * SHGetStockIconInfo [SHELL32.@] * @@ -1004,25 +1117,54 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) */ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO *sii) { - static const WCHAR shell32dll[] = {'\\','s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR shell32dllW[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; + HMODULE hmod; - FIXME("(%d, 0x%x, %p) semi-stub\n", id, flags, sii); + TRACE("(%d, 0x%x, %p)\n", id, flags, sii); if ((id < 0) || (id >= SIID_MAX_ICONS) || !sii || (sii->cbSize != sizeof(SHSTOCKICONINFO))) { return E_INVALIDARG; } GetSystemDirectoryW(sii->szPath, MAX_PATH); + lstrcatW(sii->szPath, slashW); + lstrcatW(sii->szPath, shell32dllW); + + sii->hIcon = NULL; + sii->iSysImageIndex = -1; - /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_FILE; - lstrcatW(sii->szPath, shell32dll); + /* this is not how windows does it, on windows picked mostly from imageres.dll !*/ + if (si_table[id].iconid) + sii->iIcon = sii->iSysImageIndex - si_table[id].id; + else + { + FIXME("Couldn`t find SIID %d, returning default values (IDI_SHELL_FILE)\n", id); + sii->iIcon = sii->iSysImageIndex - IDI_SHELL_FILE; + } + + if (flags & SHGSI_ICON) + { + flags &= ~SHGSI_ICON; + + hmod = GetModuleHandleW(shell32dllW); + if (hmod) + { + if (si_table[id].iconid) + sii->hIcon = LoadIconW(hmod, MAKEINTRESOURCEW(si_table[id].iconid)); + else + sii->hIcon = LoadIconW(hmod, MAKEINTRESOURCEW(IDI_SHELL_FILE)); + } + + if (!sii->hIcon) + { + ERR("failed to get an icon handle\n"); + return E_INVALIDARG; + } + } if (flags) FIXME("flags 0x%x not implemented\n", flags); - sii->hIcon = NULL; - sii->iSysImageIndex = -1; - TRACE("%3d: returning %s (%d)\n", id, debugstr_w(sii->szPath), sii->iIcon); return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 3bfd9cbe38..e7e3dac987 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1139,6 +1139,21 @@ static void test_SHGetStockIconInfo(void) /* there is a NULL check for the struct */ hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, NULL); ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); + + for(i = 0; i < 140; i++) /* highest on wvista, i > 140 gives E_INVALIDARG, win7 can go higher */ + { + memset(buffer, 0, sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(i, SHGSI_ICON | SHGSI_SMALLICON, sii); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok(sii->hIcon != NULL, "got NULL, expected an icon handle\n"); + ok(sii->iIcon != 0, "got unexpected 0 for SIID %d\n", i); /* howto find out exact sii->iIcon value??? */ + ok(sii->iSysImageIndex == -1, "got %d (expected -1)\n", sii->iSysImageIndex); + ok(DestroyIcon(sii->hIcon), "DestroyIcon failed\n"); + if (winetest_debug > 1) + trace("%3d: got iSysImageIndex %3d, iIcon %3d and %s\n", i, sii->iSysImageIndex, + sii->iIcon, wine_dbgstr_w(sii->szPath)); + } } static void test_SHExtractIcons(void) -- 2.17.1

1 0

[PATCH 1/3] dibdrv: Refactoring the gray text rendering intensities control code.
by Byeongsik Jeon 12 Oct '18

12 Oct '18

r1 = ramp[aa] r2 = ramp[16 - aa] min = text * r1 / 0xff max = r2 + ( 0xff - r2 ) * text / 0xff dst < text: diff = text - dst range = text - min dst = text - diff * range / text = text - ( text - dst ) * ( text - min ) / text = text - ( text - dst ) * ( text - text * r1 / 0xff ) / text = text - ( text - dst ) * ( 0xff - r1 ) / 0xff = ( text * r1 + dst * ( 0xff - r1 )) / 0xff = ( text * ramp[aa] + dst * ( 0xff - ramp[aa] )) / 0xff dst > text: diff = dst - text range = max - text dst = text + diff * range / ( 0xff - text ) = text + ( dst - text ) * ( max - text ) / ( 0xff - text ) = text + ( dst - text ) * (( 0xff - text) * r2 / 0xff ) / ( 0xff - text ) = text + ( dst - text ) * r2 / 0xff = ( dst * r2 + text * ( 0xff - r2 )) / 0xff = ( dst * ramp[16 - aa] + text * ( 0xff - ramp[16 - aa] )) / 0xff Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- I focused on doing equal functions without adding new features. It is a different formula from the usual gamma correction pattern, but it takes a roughly similar graph shape because it is classified as "dst > text". 0.4315 to = 1/2.3: The gamma value is too large, so the rendering quality is bad. This value seems to be related to SPI_SETFONTSMOOTHINGENTRAST. The dibdrv gray text format is limited to GGO_GRAY4_BITMAP, which lowers the quality of text rendering. Is there a special reason? dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 57 ++---------------------------- dlls/gdi32/dibdrv/primitives.c | 64 ++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 86 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..5697645229 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -190,7 +190,7 @@ typedef struct primitive_funcs void (* mask_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2); void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); + const POINT *origin, DWORD text_pixel); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel ); DWORD (* get_pixel)(const dib_info *dib, int x, int y); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..4387eaa10a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -474,52 +474,6 @@ done: return ret; } -/* Intensities of the 17 glyph levels when drawn with text component of 0xff on a - black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ -static const BYTE ramp[17] = -{ - 0, 0x4d, 0x68, 0x7c, - 0x8c, 0x9a, 0xa7, 0xb2, - 0xbd, 0xc7, 0xd0, 0xd9, - 0xe1, 0xe9, 0xf0, 0xf8, - 0xff -}; - -/* For a give text-color component and a glyph level, calculate the - range of dst intensities, the min/max corresponding to 0/0xff bkgnd - components respectively. - - The minimum is a linear interpolation between 0 and the value in - the ramp table. - - The maximum is a linear interpolation between the value from the - ramp table read in reverse and 0xff. - - To find the resulting pixel intensity, we note that if the text and - bkgnd intensities are the same then the result must be that - intensity. Otherwise we linearly interpolate between either the - min or the max value and this intermediate value depending on which - side of the inequality we lie. -*/ - -static inline void get_range( BYTE aa, DWORD text_comp, BYTE *min_comp, BYTE *max_comp ) -{ - *min_comp = (ramp[aa] * text_comp) / 0xff; - *max_comp = ramp[16 - aa] + ((0xff - ramp[16 - aa]) * text_comp) / 0xff; -} - -static inline void get_aa_ranges( COLORREF col, struct intensity_range intensities[17] ) -{ - int i; - - for (i = 0; i < 17; i++) - { - get_range( i, GetRValue(col), &intensities[i].r_min, &intensities[i].r_max ); - get_range( i, GetGValue(col), &intensities[i].g_min, &intensities[i].g_max ); - get_range( i, GetBValue(col), &intensities[i].b_min, &intensities[i].b_max ); - } -} - static DWORD font_cache_hash( struct cached_font *font ) { DWORD hash = 0, *ptr, two_chars; @@ -683,8 +637,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, - RECT *bounds ) + const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; @@ -708,7 +661,7 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics text_color ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color ); } } } @@ -816,7 +769,6 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT struct cached_glyph *glyph; dib_info glyph_dib; DWORD text_color; - struct intensity_range ranges[17]; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,9 +778,6 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) - get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); - for (i = 0; i < count; i++) { if (!(glyph = get_cached_glyph( font, str[i], flags )) && @@ -841,7 +790,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..caf2d890b5 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6039,35 +6039,36 @@ static void mask_rect_null( const dib_info *dst, const RECT *rc, { } -static inline BYTE aa_color( BYTE dst, BYTE text, BYTE min_comp, BYTE max_comp ) +/* Intensities of the 17 glyph levels when drawn with text component of 0xff on a + black bkgnd. [A log-log plot of these data gives: y = 77.05 * x^0.4315]. */ +static const BYTE ramp[17] = +{ + 0, 0x4d, 0x68, 0x7c, + 0x8c, 0x9a, 0xa7, 0xb2, + 0xbd, 0xc7, 0xd0, 0xd9, + 0xe1, 0xe9, 0xf0, 0xf8, + 0xff +}; + +static inline BYTE aa_color( BYTE dst, BYTE text, BYTE alpha ) { if (dst == text) return dst; if (dst > text) - { - DWORD diff = dst - text; - DWORD range = max_comp - text; - dst = text + (diff * range ) / (0xff - text); - return dst; - } + return ( text * ( 0xff - ramp[16 - alpha] ) + dst * ramp[16 - alpha] ) / 0xff; else - { - DWORD diff = text - dst; - DWORD range = text - min_comp; - dst = text - (diff * range) / text; - return dst; - } + return ( text * ramp[alpha] + dst * ( 0xff - ramp[alpha] ) ) / 0xff; } -static inline DWORD aa_rgb( BYTE r_dst, BYTE g_dst, BYTE b_dst, DWORD text, const struct intensity_range *range ) +static inline DWORD aa_rgb( BYTE r_dst, BYTE g_dst, BYTE b_dst, DWORD text, BYTE alpha ) { - return (aa_color( b_dst, text, range->b_min, range->b_max ) | - aa_color( g_dst, text >> 8, range->g_min, range->g_max ) << 8 | - aa_color( r_dst, text >> 16, range->r_min, range->r_max ) << 16); + return (aa_color( b_dst, text, alpha ) | + aa_color( g_dst, text >> 8, alpha ) << 8 | + aa_color( r_dst, text >> 16, alpha ) << 16); } static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6079,7 +6080,8 @@ static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_in { if (glyph_ptr[x] <= 1) continue; if (glyph_ptr[x] >= 16) { dst_ptr[x] = text_pixel; continue; } - dst_ptr[x] = aa_rgb( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, ranges + glyph_ptr[x] ); + dst_ptr[x] = aa_rgb( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x] ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride; @@ -6087,7 +6089,7 @@ static void draw_glyph_8888( const dib_info *dib, const RECT *rect, const dib_in } static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6107,7 +6109,7 @@ static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info val = aa_rgb( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6116,7 +6118,7 @@ static void draw_glyph_32( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6132,7 +6134,7 @@ static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info val = text_pixel; else val = aa_rgb( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, ranges + glyph_ptr[x] ); + text_pixel, glyph_ptr[x] ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6143,7 +6145,7 @@ static void draw_glyph_24( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6163,7 +6165,7 @@ static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_inf val = aa_rgb( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6172,7 +6174,7 @@ static void draw_glyph_555( const dib_info *dib, const RECT *rect, const dib_inf } static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6192,7 +6194,7 @@ static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info val = aa_rgb( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, ranges + glyph_ptr[x] ); + text, glyph_ptr[x] ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6201,7 +6203,7 @@ static void draw_glyph_16( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_8( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_8( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6221,7 +6223,7 @@ static void draw_glyph_8( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_4( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_4( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6246,7 +6248,7 @@ static void draw_glyph_4( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_1( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { BYTE *dst_ptr = get_pixel_ptr_1( dib, rect->left, rect->top ); const BYTE *glyph_ptr = get_pixel_ptr_8( glyph, origin->x, origin->y ); @@ -6268,7 +6270,7 @@ static void draw_glyph_1( const dib_info *dib, const RECT *rect, const dib_info } static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges ) + const POINT *origin, DWORD text_pixel ) { return; } -- 2.19.1

2 7

[PATCH 1/3] rpcrt4: Handle non-ref pointers in calc_arg_size().
by Zebediah Figura 12 Oct '18

12 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index a645a24..9e434a5 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -216,6 +216,9 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ + case FC_UP: + case FC_OP: + case FC_FP: case FC_IP: size = sizeof(void *); break; -- 2.7.4

2 5

[PATCH 1/4] gdi32: Use the helper function to order the points of a rectangle.
by Akihiro Sagawa 12 Oct '18

12 Oct '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/bitblt.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0f2128390c..c8d67cbada 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -40,13 +40,6 @@ static inline BOOL rop_uses_src( DWORD rop ) return ((rop >> 2) & 0x330000) != (rop & 0x330000); } -static inline void swap_ints( int *i, int *j ) -{ - int tmp = *i; - *i = *j; - *j = tmp; -} - BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) { RECT rect; @@ -70,8 +63,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * rect.top = dst->y + rect.top * dst->height / abs(src->height); rect.right = dst->x + rect.right * dst->width / abs(src->width); rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + order_rect( &rect ); /* avoid rounding errors */ rect.left--; @@ -88,8 +80,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * rect.top = src->y + rect.top * src->height / abs(dst->height); rect.right = src->x + rect.right * src->width / abs(dst->width); rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + order_rect( &rect ); /* avoid rounding errors */ rect.left--; -- 2.17.1

2 1

[PATCH v2] dibdrv: Fix the wrong lookup table number.
by Byeongsik Jeon 12 Oct '18

12 Oct '18

for ( x = 1; x < 17; x++ ) printf("0x%02x ", (int)( 77.05 * pow( x, 0.4315 ) + .5 )); 0x4d 0x68 0x7c 0x8c 0x9a 0xa7 0xb2 0xbd 0xc7 0xd0 0xd9 0xe1 0xe9 0xf1 0xf8 0xff Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Discard the previous patch 1, 3. dlls/gdi32/dibdrv/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..f520424b25 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -481,7 +481,7 @@ static const BYTE ramp[17] = 0, 0x4d, 0x68, 0x7c, 0x8c, 0x9a, 0xa7, 0xb2, 0xbd, 0xc7, 0xd0, 0xd9, - 0xe1, 0xe9, 0xf0, 0xf8, + 0xe1, 0xe9, 0xf1, 0xf8, 0xff }; -- 2.19.1

1 0

[PATCH] ddraw: Improve setting DDSD->dwFlags a bit.
by Serge Gautherie 12 Oct '18

12 Oct '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ddraw/ddraw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee..e08499f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,11 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = /* DDSD_CAPS | */ DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; + /* DDSD->ddsCaps.dwCaps = 0; */ DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; -- 2.10.0.windows.1

2 3

[PATCH v2] ddraw: Optimize ddraw7_GetDisplayMode() a bit.
by Serge Gautherie 12 Oct '18

12 Oct '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ddraw/ddraw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9e06ee..43bc36b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1648,11 +1648,10 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 memset(DDSD, 0, DDSD->dwSize); DDSD->dwSize = sizeof(*DDSD); - DDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; DDSD->u2.dwRefreshRate = 60; - DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; -- 2.10.0.windows.1

1 0

[PATCH] x11drv: handle missing thread data in X11DRV_get_ic
by Farmboy0 11 Oct '18

11 Oct '18

Hi, This patch fixes a crash in x11drv when loading theIME. This happens in Final Fantasy XI when using Ashita or Windower 3rd party applications. Here is the crash record: Unhandled exception: page fault on write access to 0x00000014 in 32-bit code (0x7d85a94b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7d85a94b ESP:0836fd10 EBP:0836fd38 EFLAGS:00010212( R- -- I -A- - ) EAX:00000000 EBX:0015abe8 ECX:00010050 EDX:00000000 ESI:00000000 EDI:7d894000 Stack dump: 0x0836fd10: 001e60c8 00000158 0836fdb8 00010050 0x0836fd20: 00000000 7d894000 7d85a90b 7d894000 0x0836fd30: 001e60cc 001e60c8 0836fd58 7d86560b 0x0836fd40: 00010050 00000035 7d827a09 7d8655fa 0x0836fd50: 7d894000 001e60cc 0836fd98 7d83c0ef 0x0836fd60: 00010050 7d894000 0836fd98 7d83bfb0 Backtrace: =>0 0x7d85a94b X11DRV_get_ic+0x4b(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11 (0x0836fd38) 1 0x7d86560b X11DRV_ForceXIMReset+0x1a(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/xim.c:255] in winex11 (0x0836fd58) 2 0x7d83c0ef NotifyIME+0x17e(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/winex11.drv/ime.c:764] in winex11 (0x0836fd98) 3 0x7dc80793 ImmNotifyIME+0x62(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/imm32/imm.c:2189] in imm32 (0x0836fde8) 0x7d85a94b X11DRV_get_ic+0x4b [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11: movl %ecx,0x14(%eax) 2040 x11drv_thread_data()->last_xic_hwnd = hwnd;

2 1

[PATCH 4/4] gdi32: Adjust destination coordinates in some special cases.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

When the source rectangle needs to flip and it doesn't fit in the source device area, the destination image is flipped but the destination area isn't flipped. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++++++++++---- dlls/gdi32/tests/bitmap.c | 4 ++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 6f5af649c6..abca82245a 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -60,12 +60,30 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * offset_rect( &rect, -src->x - (src->width < 0 ? 1 : 0), -src->y - (src->height < 0 ? 1 : 0)); - rect.left = dst->x + rect.left * dst->width / src->width; - rect.top = dst->y + rect.top * dst->height / src->height; - rect.right = dst->x + rect.right * dst->width / src->width; - rect.bottom = dst->y + rect.bottom * dst->height / src->height; + rect.left = rect.left * dst->width / src->width; + rect.top = rect.top * dst->height / src->height; + rect.right = rect.right * dst->width / src->width; + rect.bottom = rect.bottom * dst->height / src->height; order_rect( &rect ); + /* when the source rectangle needs to flip and it doesn't fit in the source device + area, the destination area isn't flipped. So, adjust destination coordinates */ + if (src->width < 0 && dst->width > 0 && + (src->x + src->width + 1 < src->visrect.left || src->x > src->visrect.right)) + dst->x += (dst->width - rect.right) - rect.left; + else if (src->width > 0 && dst->width < 0 && + (src->x < src->visrect.left || src->x + src->width > src->visrect.right)) + dst->x -= rect.right - (dst->width - rect.left); + + if (src->height < 0 && dst->height > 0 && + (src->y + src->height + 1 < src->visrect.top || src->y > src->visrect.bottom)) + dst->y += (dst->height - rect.bottom) - rect.top; + else if (src->height > 0 && dst->height < 0 && + (src->y < src->visrect.top || src->y + src->height > src->visrect.bottom)) + dst->y -= rect.bottom - (dst->height - rect.top); + + offset_rect( &rect, dst->x, dst->y ); + /* avoid rounding errors */ rect.left--; rect.top--; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 420a6a7ad6..df04a8b0e3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3263,13 +3263,13 @@ static void test_StretchBlt(void) memset( expected, 0, get_dib_image_size( &biDst ) ); expected[102] = 0x76543210, expected[103] = 0xfedcba98; expected[117] = 0x0000cccc, expected[118] = 0x0000f0f0, expected[119] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 8, 8, 2, 2, -8, -8, expected, __LINE__); memset( expected, 0, get_dib_image_size( &biDst ) ); expected[85] = 0x76543210, expected[86] = 0xfedcba98; expected[99] = 0x0000aaaa, expected[100] = 0x0000cccc, expected[101] = 0x0000f0f0, expected[102] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 8, 8, -18, -18, 0, 0, 18, 18, expected, __LINE__); SelectObject(hdcDst, oldDst); -- 2.17.1

2 1

[PATCH 3/4] gdi32: Fix negative width/height handling in StretchBlt.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45971 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++------------ dlls/gdi32/tests/bitmap.c | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c8d67cbada..6f5af649c6 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -57,12 +57,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * { /* map source rectangle into destination coordinates */ rect = src->visrect; - offset_rect( &rect, -min( src->x, src->x + src->width + 1), - -min( src->y, src->y + src->height + 1) ); - rect.left = dst->x + rect.left * dst->width / abs(src->width); - rect.top = dst->y + rect.top * dst->height / abs(src->height); - rect.right = dst->x + rect.right * dst->width / abs(src->width); - rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); + offset_rect( &rect, + -src->x - (src->width < 0 ? 1 : 0), + -src->y - (src->height < 0 ? 1 : 0)); + rect.left = dst->x + rect.left * dst->width / src->width; + rect.top = dst->y + rect.top * dst->height / src->height; + rect.right = dst->x + rect.right * dst->width / src->width; + rect.bottom = dst->y + rect.bottom * dst->height / src->height; order_rect( &rect ); /* avoid rounding errors */ @@ -74,12 +75,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * /* map destination rectangle back to source coordinates */ rect = dst->visrect; - offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), - -min( dst->y, dst->y + dst->height + 1) ); - rect.left = src->x + rect.left * src->width / abs(dst->width); - rect.top = src->y + rect.top * src->height / abs(dst->height); - rect.right = src->x + rect.right * src->width / abs(dst->width); - rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); + offset_rect( &rect, + -dst->x - (dst->width < 0 ? 1 : 0), + -dst->y - (dst->height < 0 ? 1 : 0)); + rect.left = src->x + rect.left * src->width / dst->width; + rect.top = src->y + rect.top * src->height / dst->height; + rect.right = src->x + rect.right * src->width / dst->width; + rect.bottom = src->y + rect.bottom * src->height / dst->height; order_rect( &rect ); /* avoid rounding errors */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ffe28a374d..420a6a7ad6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3256,7 +3256,7 @@ static void test_StretchBlt(void) memset( expected, 0, get_dib_image_size( &biDst ) ); expected[17] = 0x76543210, expected[18] = 0xfedcba98; expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); /* the source rectangle doesn't fit in the device area */ -- 2.17.1

2 1

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 108 +++++++++++++++++++-------------------------------------------- 1 file changed, 33 insertions(+), 75 deletions(-)

1 0

[PATCH 2/4] gdi32/tests: Add more StretchBlt tests.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4748691791..ffe28a374d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3252,6 +3252,26 @@ static void test_StretchBlt(void) 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); SetMapMode( hdcDst, MM_TEXT ); + /* the destination rectangle doesn't fit in the device area */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[17] = 0x76543210, expected[18] = 0xfedcba98; + expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); + + /* the source rectangle doesn't fit in the device area */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[102] = 0x76543210, expected[103] = 0xfedcba98; + expected[117] = 0x0000cccc, expected[118] = 0x0000f0f0, expected[119] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 8, 8, 2, 2, -8, -8, expected, __LINE__); + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[85] = 0x76543210, expected[86] = 0xfedcba98; + expected[99] = 0x0000aaaa, expected[100] = 0x0000cccc, expected[101] = 0x0000f0f0, expected[102] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 8, 8, -18, -18, 0, 0, 18, 18, expected, __LINE__); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); -- 2.17.1

1 0

[PATCH] winex11: Fix a compiler warning when building without vulkan support.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 063281d3d5..28ae1a9e0e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,9 +41,9 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN +WINE_DECLARE_DEBUG_CHANNEL(fps); static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = -- 2.17.1

1 0

[PATCH vkd3d 7/7] vkd3d-shader: Add OpenGL SPIR-V target environment.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> More changes are needed for full support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 10 +++++ libs/vkd3d-shader/spirv.c | 63 +++++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_main.c | 21 +++++++++ libs/vkd3d/state.c | 1 + 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 61789d63e246..121fa7557384 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -125,8 +125,18 @@ struct vkd3d_shader_interface unsigned int uav_counter_count; }; +enum vkd3d_shader_target +{ + VKD3D_SHADER_TARGET_NONE, + VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5, + VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0, /* default target */ + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET), +}; + struct vkd3d_shader_compile_arguments { + enum vkd3d_shader_target target; unsigned int *output_swizzles; unsigned int output_swizzle_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7d4a3b300a97..644c0a71d6af 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -36,7 +36,21 @@ #ifdef HAVE_SPIRV_TOOLS # include "spirv-tools/libspirv.h" -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) +static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_target target) +{ + switch (target) + { + case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + return SPV_ENV_OPENGL_4_5; + case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + return SPV_ENV_VULKAN_1_0; + default: + ERR("Invalid shader target %#x.\n", target); + return SPV_ENV_VULKAN_1_0; + } +} + +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) { const static uint32_t options = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; @@ -45,7 +59,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) spv_context context; spv_result_t ret; - context = spvContextCreate(SPV_ENV_VULKAN_1_0); + context = spvContextCreate(spv_target_env_from_vkd3d(target)); if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) @@ -68,13 +82,13 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) spvContextDestroy(context); } -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) { spv_diagnostic diagnostic = NULL; spv_context context; spv_result_t ret; - context = spvContextCreate(SPV_ENV_VULKAN_1_0); + context = spvContextCreate(spv_target_env_from_vkd3d(target)); if ((ret = spvValidateBinary(context, spirv->code, spirv->size / sizeof(uint32_t), &diagnostic))) @@ -89,8 +103,8 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) #else -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) {} -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} #endif /* HAVE_SPIRV_TOOLS */ @@ -1968,6 +1982,12 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } +static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; + return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; +} + static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { @@ -2983,9 +3003,13 @@ static const struct { enum vkd3d_shader_input_sysval_semantic sysval; struct vkd3d_spirv_builtin builtin; + enum vkd3d_shader_target target; } vkd3d_system_value_builtins[] = { + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, @@ -3020,16 +3044,20 @@ vkd3d_register_builtins[] = }; static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( - enum vkd3d_shader_input_sysval_semantic sysval) + struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { + enum vkd3d_shader_target target; unsigned int i; if (!sysval) return NULL; + target = vkd3d_dxbc_compiler_get_target(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { - if (vkd3d_system_value_builtins[i].sysval == sysval) + if (vkd3d_system_value_builtins[i].sysval == sysval + && (!vkd3d_system_value_builtins[i].target + || vkd3d_system_value_builtins[i].target == target)) return &vkd3d_system_value_builtins[i].builtin; } @@ -3052,12 +3080,12 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_register( return NULL; } -static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(enum vkd3d_shader_register_type reg_type, - enum vkd3d_shader_input_sysval_semantic sysval) +static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_input_sysval_semantic sysval) { const struct vkd3d_spirv_builtin *builtin; - if ((builtin = get_spirv_builtin_for_sysval(sysval))) + if ((builtin = get_spirv_builtin_for_sysval(compiler, sysval))) return builtin; if ((builtin = get_spirv_builtin_for_register(reg_type))) return builtin; @@ -3124,7 +3152,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } - builtin = get_spirv_builtin_for_sysval(sysval); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); @@ -3321,7 +3349,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ if (clip_distance_mask) { count = vkd3d_popcount(clip_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CLIP_DISTANCE); clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); @@ -3331,7 +3359,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ if (cull_distance_mask) { count = vkd3d_popcount(cull_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CULL_DISTANCE); + builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CULL_DISTANCE); cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); @@ -3383,7 +3411,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler return; } - builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval); + builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); @@ -6631,8 +6659,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (TRACE_ON()) { - vkd3d_spirv_dump(spirv); - vkd3d_spirv_validate(spirv); + enum vkd3d_shader_target target = vkd3d_dxbc_compiler_get_target(compiler); + vkd3d_spirv_dump(spirv, target); + vkd3d_spirv_validate(spirv, target); } return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f6bb96455771..5b269bd6a343 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -56,6 +56,24 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } +static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_arguments *compile_args) +{ + if (!compile_args) + return VKD3D_OK; + + switch (compile_args->target) + { + case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + break; + default: + WARN("Invalid shader target %#x.\n", compile_args->target); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + return VKD3D_OK; +} + int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -70,6 +88,9 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) + return ret; + if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) return ret; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1d18c31a053f..82721f27b448 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1994,6 +1994,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d: Avoid using VkCopyDescriptorSet.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> VkCopyDescriptorSet may result in the CPU reading GPU memory then writing GPU memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 101 ++++--------------------------------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 10 insertions(+), 92 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d77d6d41da5b..437c29f3b229 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1983,98 +1983,11 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return true; } -static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, - const struct vkd3d_pipeline_bindings *bindings, VkDescriptorSet src_set) -{ - const struct d3d12_root_signature *root_signature = bindings->root_signature; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct d3d12_root_descriptor_table *descriptor_table; - const struct d3d12_root_descriptor_table_range *range; - VkDevice vk_device = list->device->vk_device; - VkCopyDescriptorSet *descriptor_copies; - unsigned int copy_descriptor_count; - unsigned int i, j, k, count; - unsigned int idx; - - count = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - switch (range->descriptor_magic) - { - case VKD3D_DESCRIPTOR_MAGIC_SRV: - case VKD3D_DESCRIPTOR_MAGIC_UAV: - count += 2 * range->descriptor_count; - break; - default: - ++count; - break; - } - } - } - - if (!count) - return; - - if (!(descriptor_copies = vkd3d_calloc(count, sizeof(*descriptor_copies)))) - return; - - idx = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - copy_descriptor_count = 2 * range->descriptor_count; - else - copy_descriptor_count = 1; - for (k = 0; k < copy_descriptor_count; ++k) - { - descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - descriptor_copies[idx].pNext = NULL; - descriptor_copies[idx].srcSet = src_set; - descriptor_copies[idx].srcBinding = range->binding + k; - descriptor_copies[idx].srcArrayElement = 0; - descriptor_copies[idx].dstSet = bindings->descriptor_set; - descriptor_copies[idx].dstBinding = range->binding + k; - descriptor_copies[idx].dstArrayElement = 0; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - descriptor_copies[idx].descriptorCount = 1; - else - descriptor_copies[idx].descriptorCount = range->descriptor_count; - ++idx; - } - } - } - assert(count == idx); - VK_CALL(vkUpdateDescriptorSets(vk_device, 0, NULL, count, descriptor_copies)); - - vkd3d_free(descriptor_copies); -} - static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - VkDescriptorSet previous_descriptor_set = bindings->descriptor_set; if (bindings->descriptor_set && !bindings->in_use) return; @@ -2095,10 +2008,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; + bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask; bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; - - if (previous_descriptor_set) - d3d12_command_list_copy_descriptors(list, bindings, previous_descriptor_set); } static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, @@ -2193,6 +2104,12 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (!descriptor_count) return; + if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) + { + WARN("Descriptor table %u is not set.\n", index); + return; + } + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) return; if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) @@ -2201,8 +2118,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -3329,6 +3244,7 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_table_active_mask = 0; bindings->push_descriptor_active_mask = 0; } @@ -3365,6 +3281,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index; + bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bbd88aeca805..cb3d597a18a1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -661,6 +661,7 @@ struct vkd3d_pipeline_bindings D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; + uint64_t descriptor_table_active_mask; VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d: Simplify d3d12_command_list_set_root_descriptor().
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1ed92ca1d6a6..3f3ed05b3b0c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3465,12 +3465,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li return; } - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3481,11 +3477,14 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { + d3d12_command_list_prepare_descriptors(list, bind_point); + descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } } -- 2.18.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Recognize enableMinimumPrecision global flag.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 34 +++++++++++++----------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++--- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63a1a0e0b7c2..7d4a3b300a97 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3468,7 +3468,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler const struct vkd3d_shader_instruction *instruction) { if (instruction->flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unrecognized global flags %#x.\n", instruction->flags); + FIXME("Unhandled global flags %#x.\n", instruction->flags); else WARN("Unhandled global flags %#x.\n", instruction->flags); } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 420ccea37f94..e0cb5bab6aea 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -398,26 +398,30 @@ static unsigned int shader_get_float_offset(enum vkd3d_shader_register_type regi static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD global_flags) { - if (global_flags & VKD3DSGF_REFACTORING_ALLOWED) - { - shader_addline(buffer, "refactoringAllowed"); - global_flags &= ~VKD3DSGF_REFACTORING_ALLOWED; - if (global_flags) - shader_addline(buffer, " | "); - } + unsigned int i; - if (global_flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) + static const struct { - shader_addline(buffer, "forceEarlyDepthStencil"); - global_flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; - if (global_flags) - shader_addline(buffer, " | "); + unsigned int flag; + const char *name; } + global_flag_info[] = + { + {VKD3DSGF_REFACTORING_ALLOWED, "refactoringAllowed"}, + {VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL, "forceEarlyDepthStencil"}, + {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, + {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, + }; - if (global_flags & VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS) + for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i) { - shader_addline(buffer, "enableRawAndStructuredBuffers"); - global_flags &= ~VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS; + if (global_flags & global_flag_info[i].flag) + { + shader_addline(buffer, global_flag_info[i].name); + global_flags &= ~global_flag_info[i].flag; + if (global_flags) + shader_addline(buffer, " | "); + } } if (global_flags) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b1eadde08017..a2747acd09b2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -439,9 +439,10 @@ enum vkd3d_shader_interpolation_mode enum vkd3d_shader_global_flags { - VKD3DSGF_REFACTORING_ALLOWED = 0x1, - VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x4, - VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, + VKD3DSGF_REFACTORING_ALLOWED = 0x01, + VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, + VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, + VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 }; enum vkd3d_shader_sync_flags -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d: Prepare descriptors once for all descriptor tables.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3f3ed05b3b0c..2830a038c887 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2220,8 +2220,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2329,6 +2327,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->pool_size_count || !rs->vk_set_layout) return; + if (bindings->descriptor_table_dirty_mask) + d3d12_command_list_prepare_descriptors(list, bind_point); + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d: Avoid copying root descriptors.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 138 +++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 18 +++++ 2 files changed, 136 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2830a038c887..d77d6d41da5b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1988,7 +1988,6 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, { const struct d3d12_root_signature *root_signature = bindings->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; @@ -1998,8 +1997,6 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, unsigned int idx; count = 0; - if (!vk_info->KHR_push_descriptor) - count += root_signature->root_descriptor_count; for (i = 0; i < root_signature->parameter_count; ++i) { if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) @@ -2031,22 +2028,6 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, return; idx = 0; - if (!vk_info->KHR_push_descriptor) - { - for (i = 0; i < root_signature->root_descriptor_count; ++i) - { - descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - descriptor_copies[idx].pNext = NULL; - descriptor_copies[idx].srcSet = src_set; - descriptor_copies[idx].srcBinding = i; - descriptor_copies[idx].srcArrayElement = 0; - descriptor_copies[idx].dstSet = bindings->descriptor_set; - descriptor_copies[idx].dstBinding = i; - descriptor_copies[idx].dstArrayElement = 0; - descriptor_copies[idx].descriptorCount = 1; - ++idx; - } - } for (i = 0; i < root_signature->parameter_count; ++i) { if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) @@ -2114,6 +2095,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; + bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; + if (previous_descriptor_set) d3d12_command_list_copy_descriptors(list, bindings, previous_descriptor_set); } @@ -2264,6 +2247,109 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list vkd3d_free(image_infos); } +static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, + const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set, + VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info) +{ + const struct d3d12_root_descriptor *root_descriptor; + + switch (root_parameter->parameter_type) + { + case D3D12_ROOT_PARAMETER_TYPE_CBV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + break; + case D3D12_ROOT_PARAMETER_TYPE_SRV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + break; + case D3D12_ROOT_PARAMETER_TYPE_UAV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + break; + default: + ERR("Invalid root descriptor.\n"); + return false; + } + + root_descriptor = &root_parameter->u.descriptor; + + vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + vk_descriptor_write->pNext = NULL; + vk_descriptor_write->dstSet = vk_descriptor_set; + vk_descriptor_write->dstBinding = root_descriptor->binding; + vk_descriptor_write->dstArrayElement = 0; + vk_descriptor_write->descriptorCount = 1; + vk_descriptor_write->pImageInfo = NULL; + vk_descriptor_write->pBufferInfo = vk_buffer_info; + vk_descriptor_write->pTexelBufferView = vk_buffer_view; + + return true; +} + +static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point) +{ + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + VkWriteDescriptorSet *descriptor_writes = NULL, *current_descriptor_write; + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + VkDescriptorBufferInfo *buffer_infos = NULL, *current_buffer_info; + struct vkd3d_push_descriptor *push_descriptor; + struct d3d12_device *device = list->device; + VkDescriptorBufferInfo *vk_buffer_info; + unsigned int i, descriptor_count; + VkBufferView *vk_buffer_view; + + if (!bindings->push_descriptor_dirty_mask) + return; + + descriptor_count = vkd3d_popcount(bindings->push_descriptor_dirty_mask); + + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) + return; + if (!(buffer_infos = vkd3d_calloc(descriptor_count, sizeof(*buffer_infos)))) + goto done; + + descriptor_count = 0; + current_buffer_info = buffer_infos; + current_descriptor_write = descriptor_writes; + for (i = 0; i < ARRAY_SIZE(bindings->push_descriptors); ++i) + { + if (!(bindings->push_descriptor_dirty_mask & (1u << i))) + continue; + + push_descriptor = &bindings->push_descriptors[i]; + + if (root_signature->parameters[i].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) + { + vk_buffer_view = NULL; + vk_buffer_info = current_buffer_info; + vk_buffer_info->buffer = push_descriptor->u.cbv.vk_buffer; + vk_buffer_info->offset = push_descriptor->u.cbv.offset; + vk_buffer_info->range = VK_WHOLE_SIZE; + } + else + { + vk_buffer_view = &push_descriptor->u.vk_buffer_view; + vk_buffer_info = NULL; + } + + if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write, + &root_signature->parameters[i], bindings->descriptor_set, + vk_buffer_view, vk_buffer_info)) + continue; + + ++descriptor_count; + ++current_descriptor_write; + ++current_buffer_info; + } + + VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); + bindings->push_descriptor_dirty_mask = 0; + +done: + vkd3d_free(descriptor_writes); + vkd3d_free(buffer_infos); +} + static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { @@ -2327,7 +2413,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->pool_size_count || !rs->vk_set_layout) return; - if (bindings->descriptor_table_dirty_mask) + if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) d3d12_command_list_prepare_descriptors(list, bind_point); for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) @@ -2337,6 +2423,8 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis } bindings->descriptor_table_dirty_mask = 0; + d3d12_command_list_update_push_descriptors(list, bind_point); + if (bindings->descriptor_set) { VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, @@ -3241,6 +3329,7 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->push_descriptor_active_mask = 0; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList *iface, @@ -3405,6 +3494,11 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, d3d12_command_list_prepare_descriptors(list, bind_point); descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + + bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer; + bindings->push_descriptors[index].u.cbv.offset = buffer_info.offset; + bindings->push_descriptor_dirty_mask |= 1u << index; + bindings->push_descriptor_active_mask |= 1u << index; } } @@ -3487,6 +3581,10 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li d3d12_command_list_prepare_descriptors(list, bind_point); descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + + bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view; + bindings->push_descriptor_dirty_mask |= 1u << index; + bindings->push_descriptor_active_mask |= 1u << index; } } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d744af5a5bac..bbd88aeca805 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -639,6 +639,19 @@ struct d3d12_command_allocator HRESULT d3d12_command_allocator_create(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN; +struct vkd3d_push_descriptor +{ + union + { + VkBufferView vk_buffer_view; + struct + { + VkBuffer vk_buffer; + VkDeviceSize offset; + } cbv; + } u; +}; + struct vkd3d_pipeline_bindings { const struct d3d12_root_signature *root_signature; @@ -651,6 +664,11 @@ struct vkd3d_pipeline_bindings VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; + + /* Needed when VK_KHR_push_descriptor is not available. */ + struct vkd3d_push_descriptor push_descriptors[D3D12_MAX_ROOT_COST / 2]; + uint32_t push_descriptor_dirty_mask; + uint32_t push_descriptor_active_mask; }; /* ID3D12CommandList */ -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d: Simplify d3d12_command_list_set_root_cbv().
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55fa93347808..1ed92ca1d6a6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3383,12 +3383,8 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, buffer_info.offset = gpu_address - resource->gpu_address; buffer_info.range = VK_WHOLE_SIZE; - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3399,11 +3395,14 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { + d3d12_command_list_prepare_descriptors(list, bind_point); + descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } } -- 2.18.1

2 1

[PATCH] wined3d: Refactor blend factor from DWORD to wined3d_color
by Daniel Ansorregui 11 Oct '18

11 Oct '18

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d3d11/device.c | 15 ++++++++------- dlls/d3d9/device.c | 9 ++++++++- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/device.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/state.c | 11 ++++++----- dlls/wined3d/stateblock.c | 7 +++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d.spec | 3 +++ dlls/wined3d/wined3d_private.h | 7 ++++++- include/wine/wined3d.h | 4 +++- 10 files changed, 98 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 157ff0341a..9964568acb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -700,6 +700,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct wined3d_color blend_color; struct d3d_blend_state *blend_state_impl; const D3D11_BLEND_DESC *desc; @@ -709,6 +710,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi if (!blend_factor) blend_factor = default_blend_factor; + /* Assign the blend factor (given, or default) to wine color */ + blend_color.r = blend_factor[0]; + blend_color.g = blend_factor[1]; + blend_color.b = blend_factor[2]; + blend_color.a = blend_factor[3]; + wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); @@ -743,13 +750,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); - - if (memcmp(blend_factor, default_blend_factor, sizeof(default_blend_factor)) - && (d->SrcBlend == D3D11_BLEND_BLEND_FACTOR || d->SrcBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlend == D3D11_BLEND_BLEND_FACTOR || d->DestBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->SrcBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->SrcBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->DestBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR)) - FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); + wined3d_device_set_blendfactor(device->wined3d_device, &blend_color); } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a31360886b..c43e4971ff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2221,7 +2221,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - wined3d_device_set_render_state(device->wined3d_device, state, value); + switch (state) + { + case D3DRS_BLENDFACTOR: + wined3d_device_set_blendfactor_integer(device->wined3d_device, value); + break; + default: + wined3d_device_set_render_state(device->wined3d_device, state, value); + } wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af1dbef84c..9cfa0b107b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SAMPLER, WINED3D_CS_OP_SET_SHADER, WINED3D_CS_OP_SET_BLEND_STATE, + WINED3D_CS_OP_SET_BLENDFACTOR, WINED3D_CS_OP_SET_RASTERIZER_STATE, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, @@ -266,6 +267,12 @@ struct wined3d_cs_set_blend_state struct wined3d_blend_state *state; }; +struct wined3d_cs_set_blendfactor +{ + enum wined3d_cs_op opcode; + struct wined3d_color factor; +}; + struct wined3d_cs_set_rasterizer_state { enum wined3d_cs_op opcode; @@ -471,6 +478,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER); WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER); WINED3D_TO_STR(WINED3D_CS_OP_SET_BLEND_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_BLENDFACTOR); WINED3D_TO_STR(WINED3D_CS_OP_SET_RASTERIZER_STATE); WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE); @@ -1555,6 +1563,25 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_exec_set_blendfactor(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_blendfactor *op = data; + + cs->state.blend_factor = op->factor; + device_invalidate_state(cs->device, STATE_BLENDFACTOR); +} + +void wined3d_cs_emit_set_blendfactor(struct wined3d_cs *cs, struct wined3d_color *factor) +{ + struct wined3d_cs_set_blendfactor *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_BLENDFACTOR; + op->factor = *factor; + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rasterizer_state *op = data; @@ -2505,6 +2532,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SAMPLER */ wined3d_cs_exec_set_sampler, /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, /* WINED3D_CS_OP_SET_BLEND_STATE */ wined3d_cs_exec_set_blend_state, + /* WINED3D_CS_OP_SET_BLENDFACTOR */ wined3d_cs_exec_set_blendfactor, /* WINED3D_CS_OP_SET_RASTERIZER_STATE */ wined3d_cs_exec_set_rasterizer_state, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index abb2a89363..3b966d7eed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1993,6 +1993,35 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w return device->state.blend_state; } +void CDECL wined3d_device_set_blendfactor_integer(struct wined3d_device *device, DWORD factori) +{ + struct wined3d_color factor; + + wined3d_color_from_d3dcolor(&factor, factori); + wined3d_device_set_blendfactor(device, &factor); +} + +void CDECL wined3d_device_set_blendfactor(struct wined3d_device *device, struct wined3d_color *factor) +{ + struct wined3d_color *prev; + + TRACE("device %p, blendfactor %s.\n", device, debug_color(factor)); + + prev = &device->update_state->blend_factor; + if (!memcmp(prev, factor, sizeof(*factor))) + return; + + device->update_state->blend_factor = *factor; + wined3d_cs_emit_set_blendfactor(device->cs, factor); +} + +struct wined3d_color * CDECL wined3d_device_get_blendfactor(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return &device->state.blend_factor; +} + void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 375bc6562a..0c2e340ee7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -605,11 +605,10 @@ static void state_blendfactor_w(struct wined3d_context *context, const struct wi static void state_blendfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_color color; + struct wined3d_color color = state->blend_factor; - TRACE("Setting blend factor to %#x.\n", state->render_states[WINED3D_RS_BLENDFACTOR]); + TRACE("Setting blend factor to %s\n", debug_color(&color)); - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_BLENDFACTOR]); GL_EXTCALL(glBlendColor(color.r, color.g, color.b, color.a)); checkGLcall("glBlendColor"); } @@ -4689,8 +4688,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor_w }, WINED3D_GL_EXT_NONE }, + { STATE_BLENDFACTOR, { STATE_BLENDFACTOR, state_blendfactor }, EXT_BLEND_COLOR }, + { STATE_BLENDFACTOR, { STATE_BLENDFACTOR, state_blendfactor_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ @@ -5453,6 +5452,7 @@ static void validate_state_table(struct StateEntry *state_table) {149, 150}, {169, 169}, {177, 177}, + {193, 193}, {196, 197}, { 0, 0}, }; @@ -5488,6 +5488,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_POINT_ENABLE, STATE_COLOR_KEY, STATE_BLEND, + STATE_BLENDFACTOR, }; unsigned int i, current; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 45a4008ac4..da3e59eb5a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -35,7 +35,6 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ALPHAREF, WINED3D_RS_ALPHATESTENABLE, WINED3D_RS_ANTIALIASEDLINEENABLE, - WINED3D_RS_BLENDFACTOR, WINED3D_RS_BLENDOP, WINED3D_RS_BLENDOPALPHA, WINED3D_RS_BACK_STENCILFAIL, @@ -1255,7 +1254,6 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; - state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_WRAP8] = 0; @@ -1271,6 +1269,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_DESTBLENDALPHA] = WINED3D_BLEND_ZERO; state->render_states[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; + state->blend_factor.r = 1.0f; + state->blend_factor.g = 1.0f; + state->blend_factor.b = 1.0f; + state->blend_factor.a = 1.0f; + /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e3df24ade4..41e41a2184 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4716,7 +4716,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE1); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE2); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE3); - D3DSTATE_TO_STR(WINED3D_RS_BLENDFACTOR); D3DSTATE_TO_STR(WINED3D_RS_SRGBWRITEENABLE); D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS); D3DSTATE_TO_STR(WINED3D_RS_WRAP8); @@ -4965,6 +4964,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_STREAM_OUTPUT"; if (STATE_IS_BLEND(state)) return "STATE_BLEND"; + if (STATE_IS_BLENDFACTOR(state)) + return "STATE_BLENDFACTOR"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7944387bca..ac0a52efc9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -58,6 +58,7 @@ @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) @ cdecl wined3d_device_get_blend_state(ptr) +@ cdecl wined3d_device_get_blendfactor(ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @@ -130,6 +131,8 @@ @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr) +@ cdecl wined3d_device_set_blendfactor_integer(ptr long) +@ cdecl wined3d_device_set_blendfactor(ptr ptr) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20e626cd43..3d15fa6fcf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1645,7 +1645,10 @@ enum wined3d_pipeline #define STATE_BLEND (STATE_STREAM_OUTPUT + 1) #define STATE_IS_BLEND(a) ((a) == STATE_BLEND) -#define STATE_COMPUTE_OFFSET (STATE_BLEND + 1) +#define STATE_BLENDFACTOR (STATE_BLEND + 1) +#define STATE_IS_BLENDFACTOR(a) ((a) == STATE_BLENDFACTOR) + +#define STATE_COMPUTE_OFFSET (STATE_BLENDFACTOR + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -2934,6 +2937,7 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; + struct wined3d_color blend_factor; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -3642,6 +3646,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_blendfactor(struct wined3d_cs *cs, struct wined3d_color *factor) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c62d3640e5..bcfbcbd134 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -388,7 +388,6 @@ enum wined3d_render_state WINED3D_RS_COLORWRITEENABLE1 = 190, WINED3D_RS_COLORWRITEENABLE2 = 191, WINED3D_RS_COLORWRITEENABLE3 = 192, - WINED3D_RS_BLENDFACTOR = 193, WINED3D_RS_SRGBWRITEENABLE = 194, WINED3D_RS_DEPTHBIAS = 195, WINED3D_RS_WRAP8 = 198, @@ -2265,6 +2264,7 @@ void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *devic UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device); +struct wined3d_color * __cdecl wined3d_device_get_blendfactor(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, @@ -2380,6 +2380,8 @@ void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *dev const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state); +void __cdecl wined3d_device_set_blendfactor_integer(struct wined3d_device *device, DWORD factor); +void __cdecl wined3d_device_set_blendfactor(struct wined3d_device *device, struct wined3d_color *factor); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, -- 2.17.1

4 5

[PATCH] winevulkan: cleanup make_vulkan
by Michał Janiszewski 11 Oct '18

11 Oct '18

-- Michal Janiszewski

2 1

[PATCH] fonts: Add Hebrew glyphs to Tahoma font.
by katahiromz 11 Oct '18

11 Oct '18

Add Hebrew characters to Tahoma font (fonts/tahoma.sdf and fonts/tahoma.ttf). I traced "Tahoma" outline by FontForge. Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> --- https://jira.reactos.org/browse/CORE-14880

1 0

[PATCH] fonts: Add Hebrew glyphs to Tahoma font.
by katahiromz 11 Oct '18

11 Oct '18

Add Hebrew characters to Tahoma font (fonts/tahoma.sfd and fonts/tahoma.ttf). Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> --- https://jira.reactos.org/browse/CORE-14880

1 0

[PATCH] user32: Implement user32!CascadeWindows.
by katahiromz 11 Oct '18

11 Oct '18

There's no user32!CascadeWindows implementation. I add it. Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> --- https://jira.reactos.org/browse/CORE-14807

1 0

[PATCH] user32: Implement user32!CascadeWindows.
by katahiromz 11 Oct '18

11 Oct '18

There's no user32!CascadeWindows implementation. I add it.

1 0

[PATCH] widl: Fix -Oicf marshalling of pointers to arrays.
by Zebediah Figura 10 Oct '18

10 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5b498bf..0301024 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1057,13 +1057,13 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: + case TGT_ARRAY: *flags |= IsSimpleRef | MustFree; *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_STRING: case TGT_POINTER: - case TGT_ARRAY: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: *flags |= MustFree; -- 2.7.4

1 0

[PATCH] wined3d: Set texture swizzle for texture views.
by Józef Kucia 10 Oct '18

10 Oct '18

Fixes A8_UNORM views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/texture.c | 44 ++++++++++++++++++---------------- dlls/wined3d/view.c | 11 ++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 400d3671d3e3..2244db5cb6f6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -925,6 +925,24 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined wined3d_resource_update_draw_binding(&texture->resource); } +void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) +{ + static const GLenum swizzle_source[] = + { + GL_ZERO, /* CHANNEL_SOURCE_ZERO */ + GL_ONE, /* CHANNEL_SOURCE_ONE */ + GL_RED, /* CHANNEL_SOURCE_X */ + GL_GREEN, /* CHANNEL_SOURCE_Y */ + GL_BLUE, /* CHANNEL_SOURCE_Z */ + GL_ALPHA, /* CHANNEL_SOURCE_W */ + }; + + swizzle[0] = swizzle_source[fixup.x_source]; + swizzle[1] = swizzle_source[fixup.y_source]; + swizzle[2] = swizzle_source[fixup.z_source]; + swizzle[3] = swizzle_source[fixup.w_source]; +} + /* Context activation is done by the caller. */ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) @@ -1040,27 +1058,11 @@ void wined3d_texture_bind(struct wined3d_texture *texture, if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) { - static const GLenum swizzle_source[] = - { - GL_ZERO, /* CHANNEL_SOURCE_ZERO */ - GL_ONE, /* CHANNEL_SOURCE_ONE */ - GL_RED, /* CHANNEL_SOURCE_X */ - GL_GREEN, /* CHANNEL_SOURCE_Y */ - GL_BLUE, /* CHANNEL_SOURCE_Z */ - GL_ALPHA, /* CHANNEL_SOURCE_W */ - }; - struct - { - GLint x, y, z, w; - } - swizzle; - - swizzle.x = swizzle_source[fixup.x_source]; - swizzle.y = swizzle_source[fixup.y_source]; - swizzle.z = swizzle_source[fixup.z_source]; - swizzle.w = swizzle_source[fixup.w_source]; - gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, &swizzle.x); - checkGLcall("glTexParameteriv(GL_TEXTURE_SWIZZLE_RGBA)"); + GLint swizzle[4]; + + wined3d_gl_texture_swizzle_from_color_fixup(swizzle, fixup); + gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + checkGLcall("set format swizzle"); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ff2846840892..b8a3568d7efe 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -207,7 +207,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target level_idx, desc->u.texture.level_count, layer_idx, layer_count)); checkGLcall("create texture view"); - if (is_stencil_view_format(&view_format_gl->f)) + if (is_stencil_view_format(view_format)) { static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; @@ -226,6 +226,15 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); } + else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(gl_info, view_format)) + { + GLint swizzle[4]; + + context_bind_texture(context, view->target, view->name); + wined3d_gl_texture_swizzle_from_color_fixup(swizzle, view_format->color_fixup); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + checkGLcall("set format swizzle"); + } context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20e626cd433a..19945cf30e88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3390,6 +3390,8 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; +void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_fixup_desc fixup) DECLSPEC_HIDDEN; + #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004 -- 2.18.1

3 2

[PATCH 1/2] shell32/iconcache: Prevent the imagelists from going out of sync by generating invalid icons from available icons
by Gabriel Ivăncescu 10 Oct '18

10 Oct '18

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Therefore, for icons that failed to load, create them from another icon that succeeded by resizing it, favoring icons that are the closest and larger (to reduce pixelation artefacts) and with the closest aspect ratio as the source of this operation (to be as generic as possible). For example, if the icon that needs to be created must be 16x16, an 18x18 icon would get picked over either a 32x32 (it's further from 16x16) or a 15x15 (icons larger than 16x16 are favored since they're larger than the result, so smaller icons are only picked if no other available icon is larger). This also fixes a regression, because at some point, we stopped failing if one icon failed to extract (even if PrivateExtractIconsW returned success, icon handle could still be NULL), so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync and the icons would be totally screwed up until the application is restarted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/iconcache.c | 72 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..5ffb293 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -345,13 +345,6 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons return ret; } -static BOOL get_imagelist_icon_size(int list, SIZE *size) -{ - if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE; - - return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); -} - /**************************************************************************** * SIC_LoadIcon [internal] * @@ -362,15 +355,68 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) { HICON hicons[ARRAY_SIZE(shell_imagelists)] = { 0 }; HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; + SIZE size[ARRAY_SIZE(shell_imagelists)]; unsigned int i; - SIZE size; - int ret; + INT ret = -1; + /* Keep track of the sizes in case any icon fails to get extracted */ for (i = 0; i < ARRAY_SIZE(hicons); i++) { - get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) - WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + ImageList_GetIconSize(shell_imagelists[i], &size[i].cx, &size[i].cy); + PrivateExtractIconsW(sourcefile, index, size[i].cx, size[i].cy, &hicons[i], 0, 1, 0); + } + + /* Fill any icon handles that failed to get extracted, by resizing + another icon handle that succeeded and creating the icon from it. + Use a dumb O(n^2) algorithm since ARRAY_SIZE(hicons) is small */ + for (i = 0; i < ARRAY_SIZE(hicons); i++) + { + unsigned int k, ix, iy; + BOOL failed = TRUE; + if (hicons[i]) continue; + + for (k = 0; k < ARRAY_SIZE(hicons); k++) + { + if (hicons[k]) + { + ix = iy = k; + failed = FALSE; + break; + } + } + if (failed) goto fail; + + for (k++; k < ARRAY_SIZE(hicons); k++) + { + if (!hicons[k]) continue; + + /* Find closest-sized icon, but favor larger icons to resize from */ + if (size[k].cx >= size[i].cx) + ix = (size[ix].cx < size[i].cx || size[ix].cx > size[k].cx) ? k : ix; + else + ix = (size[ix].cx < size[i].cx && size[ix].cx < size[k].cx) ? k : ix; + + if (size[k].cy >= size[i].cy) + iy = (size[iy].cy < size[i].cy || size[iy].cy > size[k].cy) ? k : iy; + else + iy = (size[iy].cy < size[i].cy && size[iy].cy < size[k].cy) ? k : iy; + } + + /* Use the closest icon in aspect ratio if ix and iy differ */ + if (ix != iy) + { + float i_ratio, ix_ratio, iy_ratio; + i_ratio = (float)size[i].cx / (float)size[i].cy; + ix_ratio = (float)size[ix].cx / (float)size[ix].cy; + iy_ratio = (float)size[iy].cx / (float)size[iy].cy; + if (fabsf(ix_ratio - i_ratio) > fabsf(iy_ratio - i_ratio)) + ix = iy; + } + + /* If this fails, we have to abort to prevent the image lists from + becoming out of sync and completely screwing the icons up */ + hicons[i] = CopyImage(hicons[ix], IMAGE_ICON, size[i].cx, size[i].cy, 0); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +449,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 1.9.1

2 5

[PATCH v2] shell32: Improve semi-stub SHGetStockIconInfo to return an iconhandle if SHGSI_ICON flag is set
by Louis Lenders 10 Oct '18

10 Oct '18

v2: -fix missing \n -return error on failure To: wine-devel <wine-devel(a)winehq.org> Fix for bug https://bugs.winehq.org/show_bug.cgi?id=45868 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/iconcache.c | 25 ++++++++++++++++++++----- dlls/shell32/tests/shelllink.c | 8 ++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c33b..fb9881cf8f 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -1004,7 +1004,9 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) */ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO *sii) { - static const WCHAR shell32dll[] = {'\\','s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR shell32dllW[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; + HMODULE hmod; FIXME("(%d, 0x%x, %p) semi-stub\n", id, flags, sii); if ((id < 0) || (id >= SIID_MAX_ICONS) || !sii || (sii->cbSize != sizeof(SHSTOCKICONINFO))) { @@ -1015,14 +1017,27 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO /* no icons defined: use default */ sii->iIcon = -IDI_SHELL_FILE; - lstrcatW(sii->szPath, shell32dll); - - if (flags) - FIXME("flags 0x%x not implemented\n", flags); + lstrcatW(sii->szPath, slashW); + lstrcatW(sii->szPath, shell32dllW); sii->hIcon = NULL; sii->iSysImageIndex = -1; + if (flags & SHGSI_ICON) + { + hmod = GetModuleHandleW(shell32dllW); + if (hmod) + sii->hIcon = LoadIconW(hmod, MAKEINTRESOURCEW(IDI_SHELL_FILE)); + + if (!sii->hIcon) + { + ERR("failed to get an icon handle\n"); + return E_FAIL; /*howto test?*/ + } + } + else + FIXME("flags 0x%x not implemented\n", flags); + TRACE("%3d: returning %s (%d)\n", id, debugstr_w(sii->szPath), sii->iIcon); return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 65e9a6dd55..547ebfd86a 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1112,6 +1112,14 @@ static void test_SHGetStockIconInfo(void) /* there is a NULL check for the struct */ hr = pSHGetStockIconInfo(SIID_FOLDER, SHGSI_ICONLOCATION, NULL); ok(hr == E_INVALIDARG, "NULL: got 0x%x\n", hr); + + memset(buffer, 0, sizeof(buffer)); + sii->cbSize = sizeof(SHSTOCKICONINFO); + hr = pSHGetStockIconInfo(SIID_SHIELD, SHGSI_ICON | SHGSI_SMALLICON, sii); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + ok(sii->hIcon != NULL, "got NULL, expected an icon handle\n"); + ok(sii->iSysImageIndex == -1, "got %d (expected -1)\n", sii->iSysImageIndex); + ok(DestroyIcon(sii->hIcon), "DestroyIcon failed\n"); } static void test_SHExtractIcons(void) -- 2.17.1

2 1

[PATCH 3/3] msi/tests: Add tests for directory properties.
by Hans Leidekker 10 Oct '18

10 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 015cd6538e..22698d8a5e 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -348,12 +348,11 @@ static const char spf_install_exec_seq_dat[] = "SetFolderProp\t\t950\n" "SetFolderProp2\t\t960\n" "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" "InstallFiles\t\t4000\n" "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; + "InstallFinalize\t\t6600\n"; static const char spf_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" @@ -364,6 +363,68 @@ static const char spf_install_ui_seq_dat[] = "CostFinalize\t\t1000\n" "ExecuteAction\t\t1100\n"; +static const char spf_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "PARENTDIR\tTARGETDIR\tparent\n" + "CHILDDIR\tPARENTDIR\tchild\n" + "MSITESTDIR\tProgramFilesFolder\tmsitest\n" + "ProgramFilesFolder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + +static const char spf_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; + +static const char spf2_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "FormatParentFolderCheck\t\t910\n" + "FormatChildFolderCheck\t\t920\n" + "CheckParentFolder\tNOT PARENTDIR=PARENTDIRCHECK\t930\n" + "CheckChildFolder\tNOT CHILDDIR=CHILDDIRCHECK\t940\n" + "FormatParentFolderCheck2\t\t945\n" + "SetParentFolder\t\t950\n" + "CheckParentFolder2\tNOT PARENTDIR=PARENTDIRCHECK\t960\n" + "CheckChildFolder2\tNOT CHILDDIR=CHILDDIRCHECK\t970\n" + "CostFinalize\t\t1000\n" + "FormatParentFolderCheck3\t\t1005\n" + "CheckParentFolder3\tNOT PARENTDIR=PARENTDIRCHECK\t1010\n" + "CheckChildFolder3\tNOT CHILDDIR=CHILDDIRCHECK\t1020\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "InstallFiles\t\t4000\n" + "CreateShortcuts\t\t4100\n" + "InstallFinalize\t\t6600\n"; + +static const char spf2_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "FormatParentFolderCheck\t51\tPARENTDIRCHECK\t[TARGETDIR]parent\\\t\n" + "FormatChildFolderCheck\t51\tCHILDDIRCHECK\t[TARGETDIR]parent\\child\\\t\n" + "CheckParentFolder\t19\tPARENTDIR\tparent prop wrong before set: [PARENTDIR]\t\n" + "CheckChildFolder\t19\tCHILDDIR\tchild prop wrong before set: [CHILDDIR]\t\n" + "FormatParentFolderCheck2\t51\tPARENTDIRCHECK\t[ProgramFilesFolder]msitest\\parent\t\n" + "SetParentFolder\t51\tPARENTDIR\t[PARENTDIRCHECK]\t\n" + "CheckParentFolder2\t19\tPARENTDIR\tparent prop wrong after set: [PARENTDIR]\t\n" + "CheckChildFolder2\t19\tCHILDDIR\tchild prop wrong after set: [CHILDDIR]\t\n" + "FormatParentFolderCheck3\t51\tPARENTDIRCHECK\t[ProgramFilesFolder]msitest\\parent\\\t\n" + "CheckParentFolder3\t19\tPARENTDIR\tparent prop wrong after CostFinalize: [PARENTDIR]\t\n" + "CheckChildFolder3\t19\tCHILDDIR\tchild prop wrong after CostFinalize: [CHILDDIR]\t\n"; + +static const char shortcut_dat[] = + "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" + "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" + "Shortcut\tShortcut\n" + "Shortcut\tCHILDDIR\tShortcut\tmaximus\t[#maximus]\t\tShortcut\t\t\t\t\tMSITESTDIR\n"; + static const char sd_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -649,6 +710,21 @@ static const msi_table spf_tables[] = ADD_TABLE(spf_install_ui_seq) }; +static const msi_table spf2_tables[] = +{ + ADD_TABLE(spf_component), + ADD_TABLE(spf_directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus0_media), + ADD_TABLE(property), + ADD_TABLE(spf2_custom_action), + ADD_TABLE(spf2_install_exec_seq), + ADD_TABLE(spf_install_ui_seq), + ADD_TABLE(shortcut) +}; + static const msi_table sd_tables[] = { ADD_TABLE(directory), @@ -14096,7 +14172,6 @@ error: static void test_setpropertyfolder(void) { UINT r; - CHAR path[MAX_PATH]; if (is_process_limited()) { @@ -14104,9 +14179,6 @@ static void test_setpropertyfolder(void) return; } - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\msitest\\added"); - CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -14126,6 +14198,26 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); + CreateDirectoryA("parent", NULL); + CreateDirectoryA("parent\\child", NULL); + create_file("parent\\child\\maximus", 500); + + create_database(msifile, spf2_tables, ARRAY_SIZE(spf2_tables)); + + r = MsiInstallProductA(msifile, "TARGETDIR=c:\\"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\maximus", TRUE), "file not installed\n"); + ok(delete_pf("msitest", FALSE), "directory not created\n"); + + ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed"); + ok(RemoveDirectoryA("c:\\parent\\child"), "directory not created\n"); + ok(RemoveDirectoryA("c:\\parent"), "directory not created\n"); + + DeleteFileA("parent\\child\\maximus"); + RemoveDirectoryA("parent\\child"); + RemoveDirectoryA("parent"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); -- 2.11.0

2 1

[PATCH 2/3] msi: Remove unused fields from MSIFOLDER.
by Hans Leidekker 10 Oct '18

10 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msipriv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1710850ebe..76f532f34c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -565,8 +565,6 @@ typedef struct tagMSIFOLDER LPWSTR ResolvedSource; enum folder_state State; BOOL persistent; - INT Cost; - INT Space; } MSIFOLDER; typedef struct tagFolderList -- 2.11.0

1 0

[PATCH 1/3] msi: Rename msi_reset_folders to msi_reset_source_folders.
by Hans Leidekker 10 Oct '18

10 Oct '18

It was always called with source parameter set to TRUE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 4 ++-- dlls/msi/appsearch.c | 2 +- dlls/msi/custom.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 16 ++++------------ dlls/msi/upgrade.c | 2 +- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f2a038bc41..8ae9dce57a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -368,7 +368,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, r = msi_set_property( package->db, prop, val, -1 ); if (r == ERROR_SUCCESS && !strcmpW( prop, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free( val ); msi_free( prop ); @@ -486,7 +486,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { UINT r = msi_set_property( package->db, szSourceDir, source, -1 ); if (r == ERROR_SUCCESS) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } msi_free( check ); diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index fbed073bd4..806365191d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1107,7 +1107,7 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { r = msi_set_property( package->db, propName, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( propName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(value); } diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a0fc3dd350..97bde52a29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1408,7 +1408,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) len = deformat_string( package, target, &deformated ); rc = msi_set_property( package->db, source, deformated, len ); if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msi_free(deformated); break; case 37: /* JScript/VBScript text stored in target column. */ diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b01374f5e1..6184da84f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -577,7 +577,7 @@ static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCW { UINT r = msi_set_property( package->db, property, value, -1 ); if (r == ERROR_SUCCESS && !strcmpW( property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); } static MSIFEATURE *msi_seltree_feature_from_item( HWND hwnd, HTREEITEM hItem ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10031d61de..1710850ebe 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1025,7 +1025,7 @@ extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BO extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; -extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; +extern void msi_reset_source_folders( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 39a0a939b7..6ac73a3a3f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2154,22 +2154,14 @@ end: return r; } -void msi_reset_folders( MSIPACKAGE *package, BOOL source ) +void msi_reset_source_folders( MSIPACKAGE *package ) { MSIFOLDER *folder; LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) { - if ( source ) - { - msi_free( folder->ResolvedSource ); - folder->ResolvedSource = NULL; - } - else - { - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = NULL; - } + msi_free( folder->ResolvedSource ); + folder->ResolvedSource = NULL; } } @@ -2263,7 +2255,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue ret = msi_set_property( package->db, szName, szValue, -1 ); if (ret == ERROR_SUCCESS && !strcmpW( szName, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index bbc7df6eec..36d65be8fe 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -90,7 +90,7 @@ static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, r = msi_set_property( package->db, action_property, newprop, -1 ); if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) - msi_reset_folders( package, TRUE ); + msi_reset_source_folders( package ); TRACE("Found Related Product... %s now %s\n", debugstr_w(action_property), debugstr_w(newprop)); -- 2.11.0

1 0

[PATCH v2 1/2] gdi32: Remove unnecessary operations.
by Byeongsik Jeon 10 Oct '18

10 Oct '18

The rgb part works from text rendering to alpha value. The '24' part is an unnecessary operation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Separated into two patches by Huw Davies's comment. dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b95d223138..4a65a9f6c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7422,15 +7422,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0); } else { dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | - ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | - ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0); } } src += src_pitch * vmul; -- 2.19.1

2 3

Unable to compile MFC application with libwine
by Jelle De Loecker 10 Oct '18

10 Oct '18

Greetings, I've been following the Winelib User Guide (https://wiki.winehq.org/Winelib_User%27s_Guide) in order to compile an old Visual Studio C++ game. The code is from about 1999, fyi. I'm using winemaker to create my Makefile, like so: winemaker --lower-uppercase --mfc "Kipdola.dsp" This seems to work fine, but when I try to `make` it I get this error: stdafx.h:14:10: fatal error: afxwin.h: No such file or directory #include <afxwin.h> `stdafx.h` is a file in my project's folder, and it then tries to include `afxwin.h` (which I assume is an MFC file), but fails. The guide isn't entirely clear on where these files should come from, but after some googling I came to realize I had to supply these myself in some way. So I installed Vistual Studio 6 in my main `.wine` prefix. This didn't really help, though. I still get the same error. I see the Makefile has this declaration in the "Common settings" section: INCLUDE_PATH = $(MFC_INCLUDE_PATH) I don't think this `MFC_INCLUDE_PATH` has been defined anywhere, so I tried to compile it like this: MFC_INCLUDE_PATH=/home/skerit/VC98/MFC/INCLUDE/ make But I still got the same error. (And yes, I also ran `winemaker` in THAT include folder, as all files were uppercased) I also tried to change the include statement to `#include "afxwin.h"`, but that also did nothing. So does anyone know where it's going wrong and what I can do to fix it? Greetings, Jelle De Loecker

1 0

[PATCH 1/2] widl: Fix detection of SAFEARRAY pointers when writing array pointers.
by Zebediah Figura 09 Oct '18

09 Oct '18

This code was introduced in 7d1e3691, but that commit did not account for pointers to normal C arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typelib.c | 4 ++-- tools/widl/write_msft.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e8dfcb1..2ebb50e 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -200,10 +200,10 @@ unsigned short get_type_vt(type_t *t) { if (match(type_array_get_element(t)->name, "SAFEARRAY")) return VT_SAFEARRAY; + return VT_PTR; } else - error("get_type_vt: array types not supported\n"); - return VT_PTR; + return VT_CARRAY; case TYPE_INTERFACE: if(match(t->name, "IUnknown")) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 913e1a6..9357fd8 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1113,7 +1113,7 @@ static int encode_var( if (target_type & 0x80000000) { mix_field = ((target_type >> 16) & 0x3fff) | VT_BYREF; - } else if (is_array(ref)) { + } else if (get_type_vt(ref) == VT_SAFEARRAY) { type_t *element_type = type_alias_get_aliasee(type_array_get_element(ref)); mix_field = get_type_vt(element_type) | VT_ARRAY | VT_BYREF; } else { -- 2.7.4

1 1

[PATCH 4/7] wined3d: Implement depth bias clamp.
by Henri Verbeet 09 Oct '18

09 Oct '18

From: Zebediah Figura <z.figura12(a)gmail.com> Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_gl.c | 8 +++++++- dlls/wined3d/state.c | 18 ++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c36b87fbbd3..6de35029556 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1081,6 +1081,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; + wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b62c86a8d0c..16a26b88ba6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -103,6 +103,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT }, {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, + {"GL_ARB_polygon_offset_clamp", ARB_POLYGON_OFFSET_CLAMP }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, @@ -1254,7 +1255,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g shader_model = min(shader_model, max(shader_caps->hs_version, 4)); shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] + && gl_info->supported[ARB_SAMPLER_OBJECTS]) { if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] @@ -2172,6 +2175,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_point_parameters */ USE_GL_FUNC(glPointParameterfARB) USE_GL_FUNC(glPointParameterfvARB) + /* GL_ARB_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClamp) /* GL_ARB_provoking_vertex */ USE_GL_FUNC(glProvokingVertex) /* GL_ARB_sample_shading */ @@ -3316,6 +3321,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, + {ARB_POLYGON_OFFSET_CLAMP, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3b2f84538db..375bc6562ab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1775,7 +1775,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; - float factor, units, scale; + float factor, units, scale, clamp; union { @@ -1783,6 +1783,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 float f; } scale_bias, const_bias; + clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; @@ -1811,7 +1812,16 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 } gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); - gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + if (gl_info->supported[ARB_POLYGON_OFFSET_CLAMP]) + { + gl_info->gl_ops.ext.p_glPolygonOffsetClamp(factor, units, clamp); + } + else + { + if (clamp != 0.0f) + WARN("Ignoring depth bias clamp %.8e.\n", clamp); + gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + } } else { @@ -4345,6 +4355,8 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } @@ -4357,6 +4369,8 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a985da9faf..a02073c28af 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_PIXEL_BUFFER_OBJECT, ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, + ARB_POLYGON_OFFSET_CLAMP, ARB_PROVOKING_VERTEX, ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8197a8682ae..c62d3640e58 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2012,6 +2012,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + float depth_bias_clamp; BOOL depth_clip; }; -- 2.11.0

3 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