May 2021 - Wine-devel - list.winehq.org

[PATCH 3/5] winepulse: Use native memory allocators where possible.
by Jacek Caban 27 May '21

27 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

2 1

[PATCH 2/5] winepulse: Use a critical section for PE-side locking.
by Jacek Caban 27 May '21

27 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 63 ++++++++++++++++++++--------------- dlls/winepulse.drv/pulse.c | 33 ++++++++++++------ dlls/winepulse.drv/unixlib.h | 2 -- 3 files changed, 58 insertions(+), 40 deletions(-)

2 1

[PATCH 1/5] winepulse: Use event handle to signal main loop readyness.
by Jacek Caban 27 May '21

27 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 12 ++++++++---- dlls/winepulse.drv/pulse.c | 7 +++---- dlls/winepulse.drv/unixlib.h | 3 +-- 3 files changed, 12 insertions(+), 10 deletions(-)

2 1

[PATCH 2/4] shell32: Use winvista+ AppData paths
by Andrew Eikum 27 May '21

27 May '21

Katamari Damacy Reroll makes an assumption that the LocalAppData folder is a sibling of the LocalAppDataLow folder. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- For existing prefixes, which already store the known folder paths in the registry, we are basically using the "redirected known folder" functionality in order to keep compatibility with the old prefix paths. This does mean the "default" paths will no longer match the "current" paths, which I can imagine causing a regression. We could try moving directories around to match the new layout, but that seems difficult. dlls/shell32/shell32.rc | 8 ++--- dlls/shell32/shellpath.c | 69 +++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ff859381593..2b3fe3e5438 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -200,12 +200,12 @@ the folder?" /* shell folder path default values */ /* FIXME: Some will be unused until desktop.ini support is implemented */ IDS_PROGRAMS "Programs" - IDS_PERSONAL "My Documents" + IDS_PERSONAL "Documents" IDS_FAVORITES "Favorites" IDS_STARTUP "StartUp" IDS_STARTMENU "Start Menu" - IDS_MYMUSIC "My Music" - IDS_MYVIDEOS "My Videos" + IDS_MYMUSIC "Music" + IDS_MYVIDEOS "Videos" IDS_DESKTOPDIRECTORY "#msgctxt#directory#Desktop" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -213,7 +213,7 @@ the folder?" IDS_HISTORY "History" IDS_PROGRAM_FILES "Program Files" IDS_PROGRAM_FILESX86 "Program Files (x86)" - IDS_MYPICTURES "My Pictures" + IDS_MYPICTURES "Pictures" IDS_COMMON_FILES "Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Administrative Tools" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c78fd1af80a..b6af8f6f45a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -832,9 +832,21 @@ static const WCHAR AppUpdatesFolderW[] = {'A','p','p','U','p','d','a','t','e','s static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; static const WCHAR AppDataW[] = {'A','p','p','D','a','t','a','\0'}; static const WCHAR AppData_RoamingW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\0'}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Network_ShortcutsW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','N','e','t','w','o','r','k',' ','S','h','o','r','t','c','u','t','s',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Printer_ShortcutsW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','P','r','i','n','t','e','r',' ','S','h','o','r','t','c','u','t','s',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_RecentW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','e','c','e','n','t',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_SendToW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','e','n','d','T','o',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Start_MenuW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Start_Menu_ProgramsW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Start_Menu_Programs_StartupW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','u','p',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_Start_Menu_Programs_Administrative_ToolsW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s',0}; +static const WCHAR AppData_Roaming_Microsoft_Windows_TemplatesW[] = {'A','p','p','D','a','t','a','\\','R','o','a','m','i','n','g','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','l','a','t','e','s',0}; static const WCHAR AppData_LocalLowW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','L','o','w','\0'}; static const WCHAR AppData_LocalW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','\0'}; -static const WCHAR Application_DataW[] = {'A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'}; +static const WCHAR AppData_Local_Microsoft_Windows_Burn_BurnW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','B','u','r','n','\\','B','u','r','n',0}; +static const WCHAR AppData_Local_Microsoft_Windows_HistoryW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','H','i','s','t','o','r','y',0}; +static const WCHAR AppData_Local_Microsoft_Windows_INetCacheW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','I','N','e','t','C','a','c','h','e',0}; +static const WCHAR AppData_Local_Microsoft_Windows_INetCookiesW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','I','N','e','t','C','o','o','k','i','e','s',0}; static const WCHAR CacheW[] = {'C','a','c','h','e','\0'}; static const WCHAR CD_BurningW[] = {'C','D',' ','B','u','r','n','i','n','g','\0'}; static const WCHAR ChangeRemoveProgramsFolderW[] = {'C','h','a','n','g','e','R','e','m','o','v','e','P','r','o','g','r','a','m','s','F','o','l','d','e','r',0}; @@ -881,19 +893,16 @@ static const WCHAR InternetFolderW[] = {'I','n','t','e','r','n','e','t','F','o', static const WCHAR LibrariesW[] = {'L','i','b','r','a','r','i','e','s',0}; static const WCHAR LinksW[] = {'L','i','n','k','s','\0'}; static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; -static const WCHAR Local_Settings_Application_DataW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'}; -static const WCHAR Local_Settings_CD_BurningW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\\','M','i','c','r','o','s','o','f','t','\\','C','D',' ','B','u','r','n','i','n','g','\0'}; -static const WCHAR Local_Settings_HistoryW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','H','i','s','t','o','r','y','\0'}; -static const WCHAR Local_Settings_Temporary_Internet_FilesW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s','\0'}; static const WCHAR LocalAppDataLowW[] = {'L','o','c','a','l','A','p','p','D','a','t','a','L','o','w',0}; static const WCHAR LocalizedResourcesDirW[] = {'L','o','c','a','l','i','z','e','d','R','e','s','o','u','r','c','e','s','D','i','r',0}; static const WCHAR MAPIFolderW[] = {'M','A','P','I','F','o','l','d','e','r',0}; static const WCHAR Microsoft_Internet_Explorer_Quick_LaunchW[] = {'M','i','c','r','o','s','o','f','t','\\','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\','Q','u','i','c','k',' ','L','a','u','n','c','h',0}; static const WCHAR Microsoft_Windows_Burn_BurnW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','B','u','r','n','\\','B','u','r','n',0}; -static const WCHAR Microsoft_Windows_CookiesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','o','o','k','i','e','s',0}; static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p','l','o','r','e','r','\0'}; static const WCHAR Microsoft_Windows_DeviceMetadataStoreW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','D','e','v','i','c','e','M','e','t','a','d','a','t','a','S','t','o','r','e',0}; static const WCHAR Microsoft_Windows_HistoryW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','H','i','s','t','o','r','y',0}; +static const WCHAR Microsoft_Windows_INetCacheW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','I','N','e','t','C','a','c','h','e',0}; +static const WCHAR Microsoft_Windows_INetCookiesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','I','N','e','t','C','o','o','k','i','e','s',0}; static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'}; static const WCHAR Microsoft_Windows_Network_ShortcutsW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','N','e','t','w','o','r','k',' ','S','h','o','r','t','c','u','t','s',0}; static const WCHAR Microsoft_Windows_Photo_Gallery_Original_ImagesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','P','h','o','t','o',' ','G','a','l','l','e','r','y','\\','O','r','i','g','i','n','a','l',' ','I','m','a','g','e','s',0}; @@ -907,7 +916,6 @@ static const WCHAR Microsoft_Windows_Start_Menu_ProgramsW[] = {'M','i','c','r',' static const WCHAR Microsoft_Windows_Start_Menu_Admin_ToolsW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; static const WCHAR Microsoft_Windows_Start_Menu_StartupW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'}; static const WCHAR Microsoft_Windows_TemplatesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','l','a','t','e','s',0}; -static const WCHAR Microsoft_Windows_Temporary_Internet_FilesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s',0}; static const WCHAR Microsoft_Windows_ThemesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','h','e','m','e','s',0}; static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'}; static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; @@ -978,9 +986,6 @@ static const WCHAR Slide_ShowsW[] = {'S','l','i','d','e',' ','S','h','o','w','s' static const WCHAR StartUpW[] = {'S','t','a','r','t','U','p','\0'}; static const WCHAR StartupW[] = {'S','t','a','r','t','u','p','\0'}; static const WCHAR Start_MenuW[] = {'S','t','a','r','t',' ','M','e','n','u','\0'}; -static const WCHAR Start_Menu_ProgramsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\0'}; -static const WCHAR Start_Menu_Admin_ToolsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; -static const WCHAR Start_Menu_StartupW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'}; static const WCHAR SyncCenterFolderW[] = {'S','y','n','c','C','e','n','t','e','r','F','o','l','d','e','r',0}; static const WCHAR SyncResultsFolderW[] = {'S','y','n','c','R','e','s','u','l','t','s','F','o','l','d','e','r',0}; static const WCHAR SyncSetupFolderW[] = {'S','y','n','c','S','e','t','u','p','F','o','l','d','e','r',0}; @@ -1264,12 +1269,12 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Programs, CSIDL_Type_User, ProgramsW, - Start_Menu_ProgramsW, + AppData_Roaming_Microsoft_Windows_Start_Menu_ProgramsW, KF_CATEGORY_PERUSER, /* category */ ProgramsW, /* name */ NULL, /* description */ - &GUID_NULL, /* parent */ + &FOLDERID_StartMenu, /* parent */ ProgramsW, /* relative path */ NULL, /* parsing */ NULL, /* tooltip */ @@ -1329,7 +1334,7 @@ static const CSIDL_DATA CSIDL_Data[] = KF_CATEGORY_PERUSER, /* category */ PersonalW, /* name */ NULL, /* description */ - &GUID_NULL, /* parent */ + &FOLDERID_Profile, /* parent */ DocumentsW, /* relative path */ DocumentsParsingNameW, /* parsing */ NULL, /* tooltip */ @@ -1364,12 +1369,12 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Startup, CSIDL_Type_User, StartUpW, - Start_Menu_StartupW, + AppData_Roaming_Microsoft_Windows_Start_Menu_Programs_StartupW, KF_CATEGORY_PERUSER, /* category */ StartupW, /* name */ NULL, /* description */ - &GUID_NULL, /* parent */ + &FOLDERID_Programs, /* parent */ StartUpW, /* relative path */ NULL, /* parsing */ NULL, /* tooltip */ @@ -1384,7 +1389,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Recent, CSIDL_Type_User, RecentW, - RecentW, + AppData_Roaming_Microsoft_Windows_RecentW, KF_CATEGORY_PERUSER, /* category */ RecentW, /* name */ @@ -1404,7 +1409,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_SendTo, CSIDL_Type_User, SendToW, - SendToW, + AppData_Roaming_Microsoft_Windows_SendToW, KF_CATEGORY_PERUSER, /* category */ SendToW, /* name */ @@ -1444,7 +1449,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_StartMenu, CSIDL_Type_User, Start_MenuW, - Start_MenuW, + AppData_Roaming_Microsoft_Windows_Start_MenuW, KF_CATEGORY_PERUSER, /* category */ Start_MenuW, /* name */ @@ -1576,7 +1581,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_NetHood, CSIDL_Type_User, NetHoodW, - NetHoodW, + AppData_Roaming_Microsoft_Windows_Network_ShortcutsW, KF_CATEGORY_PERUSER, /* category */ NetHoodW, /* name */ @@ -1601,7 +1606,7 @@ static const CSIDL_DATA CSIDL_Data[] = KF_CATEGORY_FIXED, /* category */ FontsW, /* name */ NULL, /* description */ - &GUID_NULL, /* parent */ + &FOLDERID_Windows, /* parent */ NULL, /* relative path */ NULL, /* parsing */ NULL, /* tooltip */ @@ -1616,7 +1621,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Templates, CSIDL_Type_User, TemplatesW, - TemplatesW, + AppData_Roaming_Microsoft_Windows_TemplatesW, KF_CATEGORY_PERUSER, /* category */ TemplatesW, /* name */ @@ -1716,7 +1721,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_RoamingAppData, CSIDL_Type_User, AppDataW, - Application_DataW, + AppData_RoamingW, KF_CATEGORY_PERUSER, /* category */ AppDataW, /* name */ @@ -1736,7 +1741,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PrintHood, CSIDL_Type_User, PrintHoodW, - PrintHoodW, + AppData_Roaming_Microsoft_Windows_Printer_ShortcutsW, KF_CATEGORY_PERUSER, /* category */ PrintHoodW, /* name */ @@ -1756,7 +1761,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_LocalAppData, CSIDL_Type_User, Local_AppDataW, - Local_Settings_Application_DataW, + AppData_LocalW, KF_CATEGORY_PERUSER, /* category */ Local_AppDataW, /* name */ @@ -1808,13 +1813,13 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_InternetCache, CSIDL_Type_User, CacheW, - Local_Settings_Temporary_Internet_FilesW, + AppData_Local_Microsoft_Windows_INetCacheW, KF_CATEGORY_PERUSER, /* category */ CacheW, /* name */ NULL, /* description */ &FOLDERID_LocalAppData, /* parent */ - Microsoft_Windows_Temporary_Internet_FilesW, /* relative path */ + Microsoft_Windows_INetCacheW, /* relative path */ NULL, /* parsing */ NULL, /* tooltip */ NULL, /* localized */ @@ -1828,13 +1833,13 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Cookies, CSIDL_Type_User, CookiesW, - CookiesW, + AppData_Local_Microsoft_Windows_INetCookiesW, KF_CATEGORY_PERUSER, /* category */ CookiesW, /* name */ NULL, /* description */ - &FOLDERID_RoamingAppData, /* parent */ - Microsoft_Windows_CookiesW, /* relative path */ + &FOLDERID_LocalAppData, /* parent */ + Microsoft_Windows_INetCookiesW, /* relative path */ NULL, /* parsing */ NULL, /* tooltip */ NULL, /* localized */ @@ -1848,7 +1853,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_History, CSIDL_Type_User, HistoryW, - Local_Settings_HistoryW, + AppData_Local_Microsoft_Windows_HistoryW, KF_CATEGORY_PERUSER, /* category */ HistoryW, /* name */ @@ -2128,7 +2133,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_AdminTools, CSIDL_Type_User, Administrative_ToolsW, - Start_Menu_Admin_ToolsW, + AppData_Roaming_Microsoft_Windows_Start_Menu_Programs_Administrative_ToolsW, KF_CATEGORY_PERUSER, /* category */ Administrative_ToolsW, /* name */ @@ -2306,7 +2311,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_CDBurning, CSIDL_Type_User, CD_BurningW, - Local_Settings_CD_BurningW, + AppData_Local_Microsoft_Windows_Burn_BurnW, KF_CATEGORY_PERUSER, /* category */ CD_BurningW, /* name */ -- 2.31.1

1 0

[PATCH 1/4] shell32: Use stored registry path for known folder symlinks
by Andrew Eikum 27 May '21

27 May '21

This allows us to keep the same symlinks for knownfolders after the upcoming patches. A functional change is that, if a user or application has redirected one of the known folders, we will now attempt to create the symlink at the redirected path instead of the default one. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/shell32/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 71267ecf580..c78fd1af80a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4064,7 +4064,7 @@ static inline char * _SHGetFolderUnixPath(const int nFolder) HRESULT hr; hr = SHGetFolderPathW(NULL, nFolder, NULL, - SHGFP_TYPE_DEFAULT, wszTempPath); + SHGFP_TYPE_CURRENT, wszTempPath); if (FAILED(hr)) return NULL; return wine_get_unix_file_name(wszTempPath); -- 2.31.1

1 0

[PATCH] wined3d: Allow zero width/height for fullscreen swapchains as well in wined3d_swapchain_resize_buffers().
by Henri Verbeet 27 May '21

27 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 20 ++++++++++---------- dlls/wined3d/swapchain.c | 7 ++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 57547f1b540..0d3caa61783 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4716,7 +4716,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); output = NULL; @@ -4763,7 +4763,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4771,7 +4771,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* An invisible window doesn't cause the swapchain to exit fullscreen * mode. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; @@ -4795,7 +4795,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4814,7 +4814,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * IDXGISwapChain_Present() calls to work, otherwise they will return * DXGI_ERROR_INVALID_CALL */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), @@ -4830,14 +4830,14 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ShowWindow(occluding_window, SW_SHOW); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); /* hr == S_OK on vista and 2008 */ todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) { @@ -4846,12 +4846,12 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* IDXGISwapChain_Present() without flags refreshes the occlusion * state. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, 0); todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); } @@ -4867,7 +4867,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) DestroyWindow(occluding_window); flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 10e12a11482..693557448fe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2007,15 +2007,12 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha if (!width || !height) { + RECT client_rect; + /* The application is requesting that either the swapchain width or * height be set to the corresponding dimension in the window's * client rect. */ - RECT client_rect; - - if (!desc->windowed) - return WINED3DERR_INVALIDCALL; - if (!GetClientRect(swapchain->state.device_window, &client_rect)) { ERR("Failed to get client rect, last error %#x.\n", GetLastError()); -- 2.20.1

2 1

[PATCH 1/7] include: Update _XSTATE_CONFIGURATION structure definition.
by Paul Gofman 27 May '21

27 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- include/ddk/wdm.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9fcb1387012..b8bb7bd971f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1207,16 +1207,24 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE typedef struct _XSTATE_FEATURE { - ULONG Offset; - ULONG Size; + ULONG Offset; + ULONG Size; } XSTATE_FEATURE, *PXSTATE_FEATURE; typedef struct _XSTATE_CONFIGURATION { - ULONG64 EnabledFeatures; - ULONG Size; - ULONG OptimizedSave:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledFeatures; + ULONG64 EnabledVolatileFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledUserVisibleSupervisorFeatures; } XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _KUSER_SHARED_DATA { -- 2.26.2

3 16

[PATCH v4 1/8] wined3d: Store the framebuffer state inline in struct wined3d_cs_clear.
by Zebediah Figura 27 May '21

27 May '21

Avoid storing pointers to the CS data inside individual ops, so that we can reallocate the queue when appending data to a deferred context, or copy the queue contents to a command list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 14076defaa9..8702ac08631 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -107,7 +107,7 @@ struct wined3d_cs_clear enum wined3d_cs_op opcode; DWORD flags; unsigned int rt_count; - struct wined3d_fb_state *fb; + struct wined3d_fb_state fb; RECT draw_rect; struct wined3d_color color; float depth; @@ -684,19 +684,19 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_clear *op = data; unsigned int i; - device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, + device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, &op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) { for (i = 0; i < op->rt_count; ++i) { - if (op->fb->render_targets[i]) - wined3d_resource_release(op->fb->render_targets[i]->resource); + if (op->fb.render_targets[i]) + wined3d_resource_release(op->fb.render_targets[i]->resource); } } if (op->flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_release(op->fb->depth_stencil->resource); + wined3d_resource_release(op->fb.depth_stencil->resource); } void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, @@ -715,7 +715,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; - op->fb = &cs->state.fb; + op->fb = state->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->rasterizer_state && state->rasterizer_state->desc.scissor) IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); @@ -746,24 +746,23 @@ void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_c struct wined3d_cs_clear *op; size_t size; - size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); + size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]); op = wined3d_device_context_require_space(context, size, WINED3D_CS_QUEUE_DEFAULT); - op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; - op->fb->render_targets[0] = view; - op->fb->depth_stencil = NULL; + op->fb.render_targets[0] = view; + op->fb.depth_stencil = NULL; op->color = *color; } else { op->rt_count = 0; - op->fb->render_targets[0] = NULL; - op->fb->depth_stencil = view; + op->fb.render_targets[0] = NULL; + op->fb.depth_stencil = view; op->depth = depth; op->stencil = stencil; } -- 2.30.2

3 21

[PATCH v3 1/4] strmbase: Don't reset EOS on renderer paused->running state transition.
by Anton Baskanov 27 May '21

27 May '21

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/strmbase/renderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ee8ff4c623f..daa407ba42e 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -246,8 +246,6 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); SetEvent(filter->run_event); - if (filter->sink.pin.peer) - filter->eos = FALSE; reset_qos(filter); if (filter->sink.pin.peer && filter->ops->renderer_start_stream) filter->ops->renderer_start_stream(filter); -- 2.25.1

3 9

WineTest failure patterns preview
by Francois Gouget 27 May '21

27 May '21

I did not get to send this patch set yet so here's a preview: * Windows test patterns http://fgouget.free.fr/tmp/winepatterns/patterns-tb-win.html * Wine test patterns http://fgouget.free.fr/tmp/winepatterns/patterns-tb-wine.html So for each test unit that had failures you have: * one line per test configuration (report tag) * one row per WineTest build (daily commit) Each cell has a one character description of the test result (with more details in the tooltip) and is color coded to help identify patterns. Each 'failure' cell also links to the corresponding report page. The main goal of these pages for me is to simplify detecting new failures in the WineTest results... and not just in cases where there was no failure before since there are so many cases with preexisting failures already. In the patterns an increase in the number of failures shows up as a color change which makes them easy to spot. A secondary goal is to allow comparing the before/after results when a test configuration (VM or otherwise) is modified. A side effect is that these can also help identify the different failure modes. For instance comctl32:monthcal fails on wednesdays, except in Korean where it's all the time: http://fgouget.free.fr/tmp/winepatterns/patterns-tb-win.html#comctl32:month… To help with these tasks the page also sorts the test units to show those that look like they have new failures first. So starting the review from the top is most likely to point to the new issues. -- Francois Gouget <fgouget(a)codeweavers.com>

2 6