June 2022 - Wine-commits - list.winehq.org

Paul Gofman : opengl32/tests: Add more tests for ChoosePixelFormat().
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: 83cbcdefa3f55afc449b6be51e215c4f646869f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cbcdefa3f55afc449b6be5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 21 10:29:18 2022 -0500 opengl32/tests: Add more tests for ChoosePixelFormat(). Test extended by Matteo Bruni. --- dlls/opengl32/tests/opengl.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b0e70ccf9c..f05bb09d4b6 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -342,6 +342,61 @@ static void test_choosepixelformat(void) pfd.cDepthBits = 0; pfd.cStencilBits = 0; pfd.dwFlags &= ~PFD_DEPTH_DONTCARE; + + pfd.cDepthBits = 16; + ok( test_pfd(&pfd, &ret_fmt), "depth 16 failed.\n" ); + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + pfd.cDepthBits = 0; + + pfd.cDepthBits = 16; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 16, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 8; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 8, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 8, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 24; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 24, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 32; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 32; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( !ret_fmt.cStencilBits, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cStencilBits = 0; + + pfd.cDepthBits = 1; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cStencilBits = 0; + pfd.cDepthBits = 0; } static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity,

1 0

Biswapriyo Nath : include: Add IDXGIInfoQueue declaration in dxgidebug.idl.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: 21df12f1ac0cd1ab97cebd7e03f6a4a142cf82c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21df12f1ac0cd1ab97cebd7e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 18 02:11:19 2022 +0530 include: Add IDXGIInfoQueue declaration in dxgidebug.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/dxgidebug.idl | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 2daeb674f97..7806e0be013 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -18,6 +18,10 @@ import "oaidl.idl"; +const UINT DXGI_DEBUG_BINARY_VERSION = 1; + +typedef GUID DXGI_DEBUG_ID; + cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") @@ -30,6 +34,205 @@ typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_ALL = 0x0007 } DXGI_DEBUG_RLO_FLAGS; +typedef enum DXGI_INFO_QUEUE_MESSAGE_CATEGORY { + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_UNKNOWN, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_MISCELLANEOUS, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_INITIALIZATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_CLEANUP, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_COMPILATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_CREATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_SETTING, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_GETTING, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_RESOURCE_MANIPULATION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_EXECUTION, + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_SHADER, +} DXGI_INFO_QUEUE_MESSAGE_CATEGORY; + +typedef enum DXGI_INFO_QUEUE_MESSAGE_SEVERITY { + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_CORRUPTION, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_ERROR, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_WARNING, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_INFO, + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_MESSAGE +} DXGI_INFO_QUEUE_MESSAGE_SEVERITY; + +typedef int DXGI_INFO_QUEUE_MESSAGE_ID; +cpp_quote("#define DXGI_INFO_QUEUE_MESSAGE_ID_STRING_FROM_APPLICATION 0") + +typedef struct DXGI_INFO_QUEUE_MESSAGE { + DXGI_DEBUG_ID Producer; + DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category; + DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity; + DXGI_INFO_QUEUE_MESSAGE_ID ID; + const char *pDescription; + SIZE_T DescriptionByteLength; +} DXGI_INFO_QUEUE_MESSAGE; + +typedef struct DXGI_INFO_QUEUE_FILTER_DESC { + UINT NumCategories; + DXGI_INFO_QUEUE_MESSAGE_CATEGORY *pCategoryList; + UINT NumSeverities; + DXGI_INFO_QUEUE_MESSAGE_SEVERITY *pSeverityList; + UINT NumIDs; + DXGI_INFO_QUEUE_MESSAGE_ID *pIDList; +} DXGI_INFO_QUEUE_FILTER_DESC; + +typedef struct DXGI_INFO_QUEUE_FILTER { + DXGI_INFO_QUEUE_FILTER_DESC AllowList; + DXGI_INFO_QUEUE_FILTER_DESC DenyList; +} DXGI_INFO_QUEUE_FILTER; + +cpp_quote("#define DXGI_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT 1024") + +cpp_quote("HRESULT WINAPI DXGIGetDebugInterface(REFIID riid, void **ppDebug);") + +[ + uuid(d67441c7-672a-476f-9e82-cd55b44949ce), + object, + local, + pointer_default(unique) +] +interface IDXGIInfoQueue : IUnknown +{ + HRESULT SetMessageCountLimit( + [in] DXGI_DEBUG_ID producer, + [in] UINT64 limit); + + void ClearStoredMessages( + [in] DXGI_DEBUG_ID producer); + + HRESULT GetMessage( + [in] DXGI_DEBUG_ID producer, + [in] UINT64 index, + [out] DXGI_INFO_QUEUE_MESSAGE *message, + [in, out] SIZE_T *length); + + UINT64 GetNumStoredMessagesAllowedByRetrievalFilters( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumStoredMessages( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesDiscardedByMessageCountLimit( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetMessageCountLimit( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesAllowedByStorageFilter( + [in] DXGI_DEBUG_ID producer); + + UINT64 GetNumMessagesDeniedByStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddStorageFilterEntries( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + HRESULT GetStorageFilter( + [in] DXGI_DEBUG_ID producer, + [out] DXGI_INFO_QUEUE_FILTER *filter, + [in, out] SIZE_T *length); + + void ClearStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushEmptyStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushDenyAllStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushCopyOfStorageFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushStorageFilter( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + void PopStorageFilter( + [in] DXGI_DEBUG_ID producer); + + UINT GetStorageFilterStackSize( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddRetrievalFilterEntries( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + HRESULT GetRetrievalFilter( + [in] DXGI_DEBUG_ID producer, + [out] DXGI_INFO_QUEUE_FILTER *filter, + [in, out] SIZE_T *length); + + void ClearRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushEmptyRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushDenyAllRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushCopyOfRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + HRESULT PushRetrievalFilter( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_FILTER *filter); + + void PopRetrievalFilter( + [in] DXGI_DEBUG_ID producer); + + UINT GetRetrievalFilterStackSize( + [in] DXGI_DEBUG_ID producer); + + HRESULT AddMessage( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id, + [in] LPCSTR description); + + HRESULT AddApplicationMessage( + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] LPCSTR description); + + HRESULT SetBreakOnCategory( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category, + [in] BOOL enable); + + HRESULT SetBreakOnSeverity( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity, + [in] BOOL enable); + + HRESULT SetBreakOnID( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id, + [in] BOOL enable); + + BOOL GetBreakOnCategory( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_CATEGORY category); + + BOOL GetBreakOnSeverity( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_SEVERITY severity); + + BOOL GetBreakOnID( + [in] DXGI_DEBUG_ID producer, + [in] DXGI_INFO_QUEUE_MESSAGE_ID id); + + void SetMuteDebugOutput( + [in] DXGI_DEBUG_ID producer, + [in] BOOL mute); + + BOOL GetMuteDebugOutput( + [in] DXGI_DEBUG_ID producer); +} + [ object, local,

1 0

Biswapriyo Nath : include: Add IDXGIDebug1 declaration in dxgidebug.idl.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: 827839a6162360b8e4de8a058a64e939bdbd2126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=827839a6162360b8e4de8a05… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 18 02:11:40 2022 +0530 include: Add IDXGIDebug1 declaration in dxgidebug.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/dxgidebug.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 7806e0be013..686637321f0 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -244,3 +244,16 @@ interface IDXGIDebug : IUnknown [in] GUID apiid, [in] DXGI_DEBUG_RLO_FLAGS flags); } + +[ + uuid(c5a05f0c-16f2-4adf-9f4d-a8c4d58ac550), + object, + local, + pointer_default(unique) +] +interface IDXGIDebug1 : IDXGIDebug +{ + void EnableLeakTrackingForThread(); + void DisableLeakTrackingForThread(); + BOOL IsLeakTrackingEnabledForThread(); +}

1 0

Zhiyi Zhang : uxtheme: Support parsing more listview parts and states.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: 49d658cdc12973360ad239c85816e1092a0466ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=49d658cdc12973360ad239c8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 12:13:49 2022 +0800 uxtheme: Support parsing more listview parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 17fae04968b..146df4f254a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -617,6 +617,49 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, {LVP_EMPTYTEXT, 0, L"EMPTYTEXT"}, + {LVP_GROUPHEADER, 0, L"GROUPHEADER"}, + {LVP_GROUPHEADER, LVGH_OPEN, L"OPEN"}, + {LVP_GROUPHEADER, LVGH_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADER, LVGH_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADER, LVGH_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADER, LVGH_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, 0, L"GROUPHEADERLINE"}, + {LVP_GROUPHEADERLINE, LVGHL_OPEN, L"OPEN"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENHOT, L"OPENHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTED, L"OPENSELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDHOT, L"OPENSELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSED, L"OPENSELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENSELECTEDNOTFOCUSEDHOT, L"OPENSELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTION, L"OPENMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_OPENMIXEDSELECTIONHOT, L"OPENMIXEDSELECTIONHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSE, L"CLOSE"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEHOT, L"CLOSEHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTED, L"CLOSESELECTED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDHOT, L"CLOSESELECTEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSED, L"CLOSESELECTEDNOTFOCUSED"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSESELECTEDNOTFOCUSEDHOT, L"CLOSESELECTEDNOTFOCUSEDHOT"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTION, L"CLOSEMIXEDSELECTION"}, + {LVP_GROUPHEADERLINE, LVGHL_CLOSEMIXEDSELECTIONHOT, L"CLOSEMIXEDSELECTIONHOT"}, + {LVP_EXPANDBUTTON, 0, L"EXPANDBUTTON"}, + {LVP_EXPANDBUTTON, LVEB_NORMAL, L"NORMAL"}, + {LVP_EXPANDBUTTON, LVEB_HOVER, L"HOVER"}, + {LVP_EXPANDBUTTON, LVEB_PUSHED, L"PUSHED"}, + {LVP_COLLAPSEBUTTON, 0, L"COLLAPSEBUTTON"}, + {LVP_COLLAPSEBUTTON, LVCB_NORMAL, L"NORMAL"}, + {LVP_COLLAPSEBUTTON, LVCB_HOVER, L"HOVER"}, + {LVP_COLLAPSEBUTTON, LVCB_PUSHED, L"PUSHED"}, + {LVP_COLUMNDETAIL, 0, L"COLUMNDETAIL"}, {0, 0, L""} };

1 0

Zhiyi Zhang : uxtheme: Support parsing navigation class.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: e0eb7eb006ba227dafa7c5a3ab7152242ec59cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0eb7eb006ba227dafa7c5a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 21 16:47:50 2022 +0800 uxtheme: Support parsing navigation class. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 146df4f254a..fa79c9d8840 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -728,6 +728,25 @@ static const MSSTYLES_CLASS_MAP classMenuband[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classNavigation[] = { + {NAV_BACKBUTTON, 0, L"BACKBUTTON"}, + {NAV_BACKBUTTON, NAV_BB_NORMAL, L"NORMAL"}, + {NAV_BACKBUTTON, NAV_BB_HOT, L"HOT"}, + {NAV_BACKBUTTON, NAV_BB_PRESSED, L"PRESSED"}, + {NAV_BACKBUTTON, NAV_BB_DISABLED, L"DISABLED"}, + {NAV_FORWARDBUTTON, 0, L"FORWARDBUTTON"}, + {NAV_FORWARDBUTTON, NAV_FB_NORMAL, L"NORMAL"}, + {NAV_FORWARDBUTTON, NAV_FB_HOT, L"HOT"}, + {NAV_FORWARDBUTTON, NAV_FB_PRESSED, L"PRESSED"}, + {NAV_FORWARDBUTTON, NAV_FB_DISABLED, L"DISABLED"}, + {NAV_MENUBUTTON, 0, L"MENUBUTTON"}, + {NAV_MENUBUTTON, NAV_MB_NORMAL, L"NORMAL"}, + {NAV_MENUBUTTON, NAV_MB_HOT, L"HOT"}, + {NAV_MENUBUTTON, NAV_MB_PRESSED, L"PRESSED"}, + {NAV_MENUBUTTON, NAV_MB_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classPage[] = { {PGRP_UP, 0, L"UP"}, {PGRP_UP, UPS_NORMAL, L"NORMAL"}, @@ -1253,6 +1272,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classListview, L"LISTVIEW"}, {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, + {classNavigation, L"NAVIGATION"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, {classRebar, L"REBAR"},

1 0

Henri Verbeet : wined3d: Restore the vkd3d-shader version TRACE.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: d4da8e313f53b969e3b56057739f0aaab49e97d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4da8e313f53b969e3b56057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:17:10 2022 +0200 wined3d: Restore the vkd3d-shader version TRACE. This was lost in commit 24432a24d5e922cbd824b0af8f7b0c66ff2b66e8, but is useful, particularly when using external vkd3d-shader. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index cf07b81711e..14665dee0f2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1089,6 +1089,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + return &spirv_shader_backend_vk; }

1 0

Alexandre Julliard : vkd3d release 1.4
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: website Branch: master Commit: 00ea33b6f4fd5832c869590d0ad94fb82c7b94bb URL: https://source.winehq.org/git/website.git/?a=commit;h=00ea33b6f4fd5832c8695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 21:21:24 2022 +0200 vkd3d release 1.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022062201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022062201.xml b/news/en/2022062201.xml new file mode 100644 index 00000000..168cf06a --- /dev/null +++ b/news/en/2022062201.xml @@ -0,0 +1,17 @@ +<news> +<date>June 22, 2022</date> +<title>Vkd3d 1.4 Released</title> +<body> +The Wine team is proud to announce that release 1.4 of vkd3d, the +Direct3D to Vulkan translation library, is now available. + +This release contains improvements that are listed in the <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.4:/ANNOUNCE">release notes</a>. +The main highlights are: +<ul> + <li>Many improvements to the HLSL compiler.</li> + <li>A new descriptor heap implementation using the VK_EXT_descriptor_indexing extension.</li> + <li>A new fence implementation using the VK_KHR_timeline_semaphore extension.</li> +</ul> + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz">available here</a>. +</body></news>

1 0

Henri Verbeet : vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: vkd3d Branch: master Commit: 4093fe49bfcd201a4f62b02c73b81bfcf5055e99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4093fe49bfcd201a4f62b02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:09:01 2022 +0200 vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t. For example, when the input is an empty file. Leaving the source type as VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent get_source_type_info() calls to return NULL, resulting in a segmentation fault. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ab475617..9cb90cd5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -663,11 +663,11 @@ int main(int argc, char **argv) { uint32_t token; - if (options.preprocess_only) + if (options.preprocess_only || info.source.size < sizeof(token)) { options.source_type = VKD3D_SHADER_SOURCE_HLSL; } - else if (info.source.size >= sizeof(token)) + else { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC)

1 0

Henri Verbeet : build: Add the d3d9 and d3d11 shader runners to the distribution.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: vkd3d Branch: master Commit: 780da51b65d9eee473b9430a8c2bdcac893d28cb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=780da51b65d9eee473b9430… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:09:02 2022 +0200 build: Add the d3d9 and d3d11 shader runners to the distribution. We don't want to add these to tests_shader_runner_SOURCES, because they're only supposed to get built for the "crosstest" target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index bdbf8e40..0f10a56f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -404,6 +404,7 @@ cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) +EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c shader_runner_cross_sources = \ $(srcdir)/tests/shader_runner.c \

1 0

Henri Verbeet : build: Add tests/vulkan_procs.h to the distribution.
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: vkd3d Branch: master Commit: 2cad32d7fa87a277fa6cbcc6d1a54a747bae9caf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2cad32d7fa87a277fa6cbcc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:09:03 2022 +0200 build: Add tests/vulkan_procs.h to the distribution. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0f10a56f..fe8133a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,8 @@ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h \ tests/shader_runner.h \ - tests/utils.h + tests/utils.h \ + tests/vulkan_procs.h vkd3d_demos = \ demos/vkd3d-gears \

1 0