From 054930fd52e36a0ad6b5661dc17b6e014c7d7cc8 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 8 Mar 2014 01:13:52 +0100 Subject: [PATCH] Add additional patch to register user administrative tools shell folder (required for GoToMeeting). --- ...ser-administrative-tools-shell-folde.patch | 26 +++++++++++++++++++ .../8551b692-657e-4959-a7e2-7f7d70d141cb.def | 3 +++ patches/patch-list.patch | 3 ++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 patches/98-Miscellaneous/0002-shell32-Register-user-administrative-tools-shell-folde.patch create mode 100644 patches/98-Miscellaneous/8551b692-657e-4959-a7e2-7f7d70d141cb.def diff --git a/patches/98-Miscellaneous/0002-shell32-Register-user-administrative-tools-shell-folde.patch b/patches/98-Miscellaneous/0002-shell32-Register-user-administrative-tools-shell-folde.patch new file mode 100644 index 00000000..a4920a91 --- /dev/null +++ b/patches/98-Miscellaneous/0002-shell32-Register-user-administrative-tools-shell-folde.patch @@ -0,0 +1,26 @@ +From 950ff9091599bb19c702b3d679d67d3f679b7814 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Fri, 7 Mar 2014 18:31:25 +0100 +Subject: shell32: Register user administrative tools shell folder + +--- + dlls/shell32/shellpath.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c +index 947ef29..e9b6fa8 100644 +--- a/dlls/shell32/shellpath.c ++++ b/dlls/shell32/shellpath.c +@@ -2526,7 +2526,8 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) + CSIDL_COOKIES, + CSIDL_HISTORY, + CSIDL_MYPICTURES, +- CSIDL_FONTS ++ CSIDL_FONTS, ++ CSIDL_ADMINTOOLS + }; + WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; + LPCWSTR pUserShellFolderPath, pShellFolderPath; +-- +1.7.9.5 + diff --git a/patches/98-Miscellaneous/8551b692-657e-4959-a7e2-7f7d70d141cb.def b/patches/98-Miscellaneous/8551b692-657e-4959-a7e2-7f7d70d141cb.def new file mode 100644 index 00000000..b38203ea --- /dev/null +++ b/patches/98-Miscellaneous/8551b692-657e-4959-a7e2-7f7d70d141cb.def @@ -0,0 +1,3 @@ +Revision: 1 +Author: Sebastian Lackner +Title: Register user administrative tools shell folder. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index f07f3d7b..820ddd56 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -37,7 +37,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,36 @@ const char *wine_get_version(void) +@@ -478,6 +478,37 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -60,6 +60,7 @@ index a273502..5fa0cd5 100644 + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." }, + { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, ++ { "8551b692-657e-4959-a7e2-7f7d70d141cb:1", "Sebastian Lackner", "Register user administrative tools shell folder." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { "e46b26df-3c1b-419c-9579-f0d1e1c50bea:1", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." }, + { NULL, NULL, NULL }