wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

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

23 Jun '22

Module: wine Branch: master Commit: 84c83af00b4c666d913d0a1b8eed179835125cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=84c83af00b4c666d913d0a1b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:11:52 2022 +0800 uxtheme: Support parsing more tooltip parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 11 +++++++++++ include/vsstyle.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d1363a0dee..f69be5f5fd4 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1179,6 +1179,17 @@ static const MSSTYLES_CLASS_MAP classTooltip[] = { {TTP_CLOSE, TTCS_NORMAL, L"NORMAL"}, {TTP_CLOSE, TTCS_HOT, L"HOT"}, {TTP_CLOSE, TTCS_PRESSED, L"PRESSED"}, + {TTP_BALLOONSTEM, 0, L"BALLOONSTEM"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPLEFTWALL, L"POINTINGUPLEFTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPCENTERED, L"POINTINGUPCENTERED"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGUPRIGHTWALL, L"POINTINGUPRIGHTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNRIGHTWALL, L"POINTINGDOWNRIGHTWALL"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNCENTERED, L"POINTINGDOWNCENTERED"}, + {TTP_BALLOONSTEM, TTBSS_POINTINGDOWNLEFTWALL, L"POINTINGDOWNLEFTWALL"}, + {TTP_WRENCH, 0, L"WRENCH"}, + {TTP_WRENCH, TTWS_NORMAL, L"NORMAL"}, + {TTP_WRENCH, TTWS_HOT, L"HOT"}, + {TTP_WRENCH, TTWS_PRESSED, L"PRESSED"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 36693ceb890..09948cf8dd5 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1376,6 +1376,7 @@ enum TOOLTIPPARTS { TTP_BALLOONTITLE = 4, TTP_CLOSE = 5, TTP_BALLOONSTEM = 6, + TTP_WRENCH = 7, }; #define TOOLTIPSTYLEPARTS TOOLTIPPARTS; @@ -1405,6 +1406,12 @@ enum BALLOONSTEMSTATES { TTBSS_POINTINGDOWNLEFTWALL = 6, }; +enum WRENCHSTATES { + TTWS_NORMAL = 1, + TTWS_HOT = 2, + TTWS_PRESSED = 3, +}; + /* TRACKBARSTYLE class */ #if defined(_MSC_VER) || defined(__MINGW32__) #define VSCLASS_TRACKBARSTYLE L"TRACKBARSTYLE"

1 0

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

23 Jun '22

Module: wine Branch: master Commit: f6f07e0c6df6bf58c5b0c48830379f558183fa1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f07e0c6df6bf58c5b0c488… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 17:01:14 2022 +0800 uxtheme: Support parsing more toolbar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 21 +++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 22 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index d6119380035..2d1363a0dee 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1103,6 +1103,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_BUTTON, TS_DISABLED, L"DISABLED"}, {TP_BUTTON, TS_CHECKED, L"CHECKED"}, {TP_BUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_BUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_BUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_DROPDOWNBUTTON, 0, L"DROPDOWNBUTTON"}, {TP_DROPDOWNBUTTON, TS_NORMAL, L"NORMAL"}, {TP_DROPDOWNBUTTON, TS_HOT, L"HOT"}, @@ -1110,6 +1112,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_DROPDOWNBUTTON, TS_DISABLED, L"DISABLED"}, {TP_DROPDOWNBUTTON, TS_CHECKED, L"CHECKED"}, {TP_DROPDOWNBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_DROPDOWNBUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_DROPDOWNBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SPLITBUTTON, 0, L"SPLITBUTTON"}, {TP_SPLITBUTTON, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTON, TS_HOT, L"HOT"}, @@ -1117,6 +1121,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SPLITBUTTON, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTON, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTON, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SPLITBUTTON, TS_NEARHOT, L"NEARHOT"}, + {TP_SPLITBUTTON, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SPLITBUTTONDROPDOWN, 0, L"SPLITBUTTONDROPDOWN"}, {TP_SPLITBUTTONDROPDOWN, TS_NORMAL, L"NORMAL"}, {TP_SPLITBUTTONDROPDOWN, TS_HOT, L"HOT"}, @@ -1124,6 +1130,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SPLITBUTTONDROPDOWN, TS_DISABLED, L"DISABLED"}, {TP_SPLITBUTTONDROPDOWN, TS_CHECKED, L"CHECKED"}, {TP_SPLITBUTTONDROPDOWN, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SPLITBUTTONDROPDOWN, TS_NEARHOT, L"NEARHOT"}, + {TP_SPLITBUTTONDROPDOWN, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SEPARATOR, 0, L"SEPARATOR"}, {TP_SEPARATOR, TS_NORMAL, L"NORMAL"}, {TP_SEPARATOR, TS_HOT, L"HOT"}, @@ -1131,6 +1139,8 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SEPARATOR, TS_DISABLED, L"DISABLED"}, {TP_SEPARATOR, TS_CHECKED, L"CHECKED"}, {TP_SEPARATOR, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SEPARATOR, TS_NEARHOT, L"NEARHOT"}, + {TP_SEPARATOR, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {TP_SEPARATORVERT, 0, L"SEPARATORVERT"}, {TP_SEPARATORVERT, TS_NORMAL, L"NORMAL"}, {TP_SEPARATORVERT, TS_HOT, L"HOT"}, @@ -1138,6 +1148,17 @@ static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_SEPARATORVERT, TS_DISABLED, L"DISABLED"}, {TP_SEPARATORVERT, TS_CHECKED, L"CHECKED"}, {TP_SEPARATORVERT, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_SEPARATORVERT, TS_NEARHOT, L"NEARHOT"}, + {TP_SEPARATORVERT, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, + {TP_DROPDOWNBUTTONGLYPH, 0, L"DROPDOWNBUTTONGLYPH"}, + {TP_DROPDOWNBUTTONGLYPH, TS_NORMAL, L"NORMAL"}, + {TP_DROPDOWNBUTTONGLYPH, TS_HOT, L"HOT"}, + {TP_DROPDOWNBUTTONGLYPH, TS_PRESSED, L"PRESSED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_DISABLED, L"DISABLED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_CHECKED, L"CHECKED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_HOTCHECKED, L"HOTCHECKED"}, + {TP_DROPDOWNBUTTONGLYPH, TS_NEARHOT, L"NEARHOT"}, + {TP_DROPDOWNBUTTONGLYPH, TS_OTHERSIDEHOT, L"OTHERSIDEHOT"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index a81f621ef0f..36693ceb890 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1344,6 +1344,7 @@ enum TOOLBARPARTS { TP_SPLITBUTTONDROPDOWN = 4, TP_SEPARATOR = 5, TP_SEPARATORVERT = 6, + TP_DROPDOWNBUTTONGLYPH = 7, }; #define TOOLBARSTYLEPARTS TOOLBARPARTS;

1 0

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

23 Jun '22

Module: wine Branch: master Commit: c9af75ca0c738de117d93babfdaefb591503ccc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9af75ca0c738de117d93bab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 30 17:57:09 2022 +0800 uxtheme: Support parsing more treeview parts and states. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 834af6b2f74..d6119380035 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1222,10 +1222,14 @@ static const MSSTYLES_CLASS_MAP classTreeview[] = { {TVP_TREEITEM, TREIS_SELECTED, L"SELECTED"}, {TVP_TREEITEM, TREIS_DISABLED, L"DISABLED"}, {TVP_TREEITEM, TREIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {TVP_TREEITEM, TREIS_HOTSELECTED, L"HOTSELECTED"}, {TVP_GLYPH, 0, L"GLYPH"}, {TVP_GLYPH, GLPS_CLOSED, L"CLOSED"}, {TVP_GLYPH, GLPS_OPENED, L"OPENED"}, {TVP_BRANCH, 0, L"BRANCH"}, + {TVP_HOTGLYPH, 0, L"HOTGLYPH"}, + {TVP_HOTGLYPH, HGLPS_CLOSED, L"CLOSED"}, + {TVP_HOTGLYPH, HGLPS_OPENED, L"OPENED"}, {0, 0, L""} };

1 0

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

23 Jun '22

Module: wine Branch: master Commit: 4d42d20e420f5a8b1bfdd45f644ae1850fddeee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d42d20e420f5a8b1bfdd45f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 10:20:03 2022 +0800 uxtheme: Support parsing taskdialog class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 35 +++++++++++++++++++++++++++++++++++ include/vsstyle.h | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 00c80259dbb..834af6b2f74 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1061,6 +1061,40 @@ static const MSSTYLES_CLASS_MAP classTaskbar[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classTaskdialog[] = { + {TDLG_PRIMARYPANEL, 0, L"PRIMARYPANEL"}, + {TDLG_MAININSTRUCTIONPANE, 0, L"MAININSTRUCTIONPANE"}, + {TDLG_MAINICON, 0, L"MAINICON"}, + {TDLG_CONTENTPANE, 0, L"CONTENTPANE"}, + {TDLG_CONTENTICON, 0, L"CONTENTICON"}, + {TDLG_EXPANDEDCONTENT, 0, L"EXPANDEDCONTENT"}, + {TDLG_COMMANDLINKPANE, 0, L"COMMANDLINKPANE"}, + {TDLG_SECONDARYPANEL, 0, L"SECONDARYPANEL"}, + {TDLG_CONTROLPANE, 0, L"CONTROLPANE"}, + {TDLG_CONTROLPANE, TDLGCPS_STANDALONE, L"STANDALONE"}, + {TDLG_BUTTONSECTION, 0, L"BUTTONSECTION"}, + {TDLG_BUTTONWRAPPER, 0, L"BUTTONWRAPPER"}, + {TDLG_EXPANDOTEXT, 0, L"EXPANDOTEXT"}, + {TDLG_EXPANDOBUTTON, 0, L"EXPANDOBUTTON"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_NORMAL, L"NORMAL"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_HOVER, L"HOVER"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_PRESSED, L"PRESSED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDNORMAL, L"EXPANDEDNORMAL"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDHOVER, L"EXPANDEDHOVER"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDPRESSED, L"EXPANDEDPRESSED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_NORMALDISABLED, L"NORMALDISABLED"}, + {TDLG_EXPANDOBUTTON, TDLGEBS_EXPANDEDDISABLED, L"EXPANDEDDISABLED"}, + {TDLG_VERIFICATIONTEXT, 0, L"VERIFICATIONTEXT"}, + {TDLG_FOOTNOTEPANE, 0, L"FOOTNOTEPANE"}, + {TDLG_FOOTNOTEAREA, 0, L"FOOTNOTEAREA"}, + {TDLG_FOOTNOTESEPARATOR, 0, L"FOOTNOTESEPARATOR"}, + {TDLG_EXPANDEDFOOTERAREA, 0, L"EXPANDEDFOOTERAREA"}, + {TDLG_PROGRESSBAR, 0, L"PROGRESSBAR"}, + {TDLG_IMAGEALIGNMENT, 0, L"IMAGEALIGNMENT"}, + {TDLG_RADIOBUTTONPANE, 0, L"RADIOBUTTONPANE"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classToolbar[] = { {TP_BUTTON, 0, L"BUTTON"}, {TP_BUTTON, TS_NORMAL, L"NORMAL"}, @@ -1352,6 +1386,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classTab, L"TAB"}, {classTaskband, L"TASKBAND"}, {classTaskbar, L"TASKBAR"}, + {classTaskdialog, L"TASKDIALOG"}, {classToolbar, L"TOOLBAR"}, {classTooltip, L"TOOLTIP"}, {classTrackbar, L"TRACKBAR"}, diff --git a/include/vsstyle.h b/include/vsstyle.h index b527c15a29a..a81f621ef0f 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1293,6 +1293,8 @@ enum EXPANDOBUTTONSTATES { TDLGEBS_EXPANDEDNORMAL = 4, TDLGEBS_EXPANDEDHOVER = 5, TDLGEBS_EXPANDEDPRESSED = 6, + TDLGEBS_NORMALDISABLED = 7, + TDLGEBS_EXPANDEDDISABLED = 8, }; /* TEXTSTYLE class */

1 0

Zhiyi Zhang : uxtheme: Support parsing more tab parts.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: wine Branch: master Commit: c75b46045b2ca2711ce685ae6ed0eab8da9f1e1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75b46045b2ca2711ce685ae… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 16:37:58 2022 +0800 uxtheme: Support parsing more tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 8da93ef321d..00c80259dbb 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -1038,6 +1038,7 @@ static const MSSTYLES_CLASS_MAP classTab[] = { {TABP_TOPTABITEMBOTHEDGE, TTIBES_FOCUSED, L"FOCUSED"}, {TABP_PANE, 0, L"PANE"}, {TABP_BODY, 0, L"BODY"}, + {TABP_AEROWIZARDBODY, 0, L"AEROWIZARDBODY"}, {0, 0, L""} };

1 0

Cressida Silver : WWN 421.
by Alexandre Julliard 23 Jun '22

23 Jun '22

Module: website Branch: master Commit: 83d228a6fd9fcff6d5cf130d1d3f38e58f2ec36d URL: https://source.winehq.org/git/website.git/?a=commit;h=83d228a6fd9fcff6d5cf1… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Wed Jun 22 12:47:49 2022 -0500 WWN 421. --- news/en/2022062402.xml | 13 ++ wwn/en/wn20220624_421.xml | 433 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 446 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=83d228a6fd9fcff6d…

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

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

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

Paul Gofman : opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat().
by Alexandre Julliard 22 Jun '22

22 Jun '22

Module: wine Branch: master Commit: cc8d8b5ee33561e984d4abe4112ddd6324f77115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8d8b5ee33561e984d4abe4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 25 18:58:21 2022 -0500 opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat(). Patch by Matteo Bruni. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/opengl32/wgl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index bd7f7d22e98..49f1e4700b4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -564,27 +564,27 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) + if (ppfd->cStencilBits) { - if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || - ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) + if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || + ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) goto found; - if (best.cDepthBits != format.cDepthBits) + if (best.cStencilBits != format.cStencilBits) { - TRACE( "depth mismatch for iPixelFormat=%d\n", i ); + TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); continue; } } - if (ppfd->cStencilBits) + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { - if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || - ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) + if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || + ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) goto found; - if (best.cStencilBits != format.cStencilBits) + if (best.cDepthBits != format.cDepthBits) { - TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); + TRACE( "depth mismatch for iPixelFormat=%d\n", i ); continue; } }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
80
Older →

Jump to page:

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-commits June 2022