wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to implement general tab for file property dialog.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-06-27 23:46:40 +02:00
parent 53b570f698
commit 135024f481
5 changed files with 529 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -39,9 +39,10 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [3]:**
**Bug fixes and features included in the next upcoming release [4]:**
* Globally invalidate key state on changes in other threads ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
* Implement general tab for file property dialog
* SecuROM 5.x media validation fails ([Wine Bug #21448](https://bugs.winehq.org/show_bug.cgi?id=21448))
* msvcrt.strtod should initialize *end with NULL on failure

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ wine-staging (1.7.46) UNRELEASED; urgency=low
before client (fixes Wine Staging Bug #393).
* Added patches to improve crosscompiling Wine for other platforms.
* Added patch to improve output of '--check-libs' on OSX.
* Added patch to implement general tab for file property dialog.
* Improved nvcuda-CUDA_Support patchset to search for dylib on OSX.
* Updated kernel32-GetVolumePathName to fix several test failures.
* Updated ntoskrnl-Emulator patchset to implement emulation of MOVZX

16
patches/patchinstall.sh
View File

@ -216,6 +216,7 @@ patch_enable_all ()
enable_setupapi_SetupPromptForDisk="$1"
enable_shdocvw_ParseURLFromOutsideSource_Tests="$1"
enable_shell32_Default_Path="$1"
enable_shell32_File_Property_Dialog="$1"
enable_shell32_Icons="$1"
enable_shell32_Placeholder_Icons="$1"
enable_shell32_Progress_Dialog="$1"
@ -722,6 +723,9 @@ patch_enable ()
shell32-Default_Path)
enable_shell32_Default_Path="$2"
;;
shell32-File_Property_Dialog)
enable_shell32_File_Property_Dialog="$2"
;;
shell32-Icons)
enable_shell32_Icons="$2"
;;
@ -4392,6 +4396,18 @@ if test "$enable_shell32_Default_Path" -eq 1; then
) >> "$patchlist"
fi
# Patchset shell32-File_Property_Dialog
# |
# | Modified files:
# | * dlls/shell32/shell32.rc, dlls/shell32/shlview_cmenu.c, dlls/shell32/shresdef.h
# |
if test "$enable_shell32_File_Property_Dialog" -eq 1; then
patch_apply shell32-File_Property_Dialog/0001-shell32-Add-general-tab-in-file-property-dialog.patch
(
echo '+ { "Michael Müller", "shell32: Add general tab in file property dialog.", 1 },';
) >> "$patchlist"
fi
# Patchset shell32-Icons
# |
# | This patchset fixes the following Wine bugs:

509
patches/shell32-File_Property_Dialog/0001-shell32-Add-general-tab-in-file-property-dialog.patch Normal file
View File

@ -0,0 +1,509 @@
From 85a66b44d805d0a24a05903d54d716ba0f8595a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 21 Jun 2015 01:10:54 +0200
Subject: shell32: Add general tab in file property dialog.
---
dlls/shell32/shell32.rc | 66 ++++++++
dlls/shell32/shlview_cmenu.c | 347 +++++++++++++++++++++++++++++++++++++++++--
dlls/shell32/shresdef.h | 28 ++++
3 files changed, 425 insertions(+), 16 deletions(-)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 847d2ce..2641bc6 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -341,6 +341,72 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON "&Browse...", IDC_RUNDLG_BROWSE, 180, 63, 50, 14, WS_TABSTOP
}
+IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 155
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON "", IDC_FPROP_ICON, 10, 5, 32, 32, WS_VISIBLE
+ EDITTEXT IDC_FPROP_PATH, 70, 10, 160, 14, WS_TABSTOP
+
+ LTEXT "", -1, 5, 30, 230, 1, SS_ETCHEDHORZ
+ LTEXT "File type:", IDC_FPROP_TYPE_LABEL, 10, 35, 60, 10
+ EDITTEXT IDC_FPROP_TYPE, 70, 35, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+
+ LTEXT "", -1, 5, 50, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Location:", IDC_FPROP_LOCATION_LABEL, 10, 55, 60, 10
+ EDITTEXT IDC_FPROP_LOCATION, 70, 55, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ LTEXT "Size:", IDC_FPROP_SIZE_LABEL, 10, 70, 60, 10
+ EDITTEXT IDC_FPROP_SIZE, 70, 70, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+
+ LTEXT "", -1, 5, 85, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Creation date:", IDC_FPROP_CREATED_LABEL, 10, 90, 60, 10
+ EDITTEXT IDC_FPROP_CREATED, 70, 90, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+
+ LTEXT "", -1, 5, 105, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Attributes:", IDC_FPROP_ATTRIB_LABEL, 10, 110, 60, 10
+ AUTOCHECKBOX "&Read-only", IDC_FPROP_READONLY, 70, 110, 70, 10
+ AUTOCHECKBOX "&Hidden", IDC_FPROP_HIDDEN, 70, 125, 70, 10
+ AUTOCHECKBOX "&Archive", IDC_FPROP_ARCHIVE, 70, 140, 70, 10
+END
+
+IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 200
+STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION
+CAPTION "General"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON "", IDC_FPROP_ICON, 10, 5, 32, 32, WS_VISIBLE
+ EDITTEXT IDC_FPROP_PATH, 70, 10, 160, 14, WS_TABSTOP
+
+ LTEXT "", -1, 5, 30, 230, 1, SS_ETCHEDHORZ
+ LTEXT "File type:", IDC_FPROP_TYPE_LABEL, 10, 35, 60, 10
+ EDITTEXT IDC_FPROP_TYPE, 70, 35, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ LTEXT "Open with:", IDC_FPROP_OPENWITH_LABEL, 10, 50, 60, 10
+ ICON "", IDC_FPROP_PROG_ICON, 70, 50, 16, 16, WS_VISIBLE
+ EDITTEXT IDC_FPROP_PROG_NAME, 85, 50, 80, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ PUSHBUTTON "&Change...", IDC_FPROP_PROG_CHANGE, 170, 48, 60, 14, WS_CHILD | WS_TABSTOP
+
+ LTEXT "", -1, 5, 65, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Location:", IDC_FPROP_LOCATION_LABEL, 10, 70, 60, 10
+ EDITTEXT IDC_FPROP_LOCATION, 70, 70, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ LTEXT "Size:", IDC_FPROP_SIZE_LABEL, 10, 85, 60, 10
+ EDITTEXT IDC_FPROP_SIZE, 70, 85, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+
+ LTEXT "", -1, 5, 100, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Creation date:", IDC_FPROP_CREATED_LABEL, 10, 105, 60, 10
+ EDITTEXT IDC_FPROP_CREATED, 70, 105, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ LTEXT "Last modified:", IDC_FPROP_MODIFIED_LABEL, 10, 120, 60, 10
+ EDITTEXT IDC_FPROP_MODIFIED, 70, 120, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+ LTEXT "Last accessed:", IDC_FPROP_ACCESSED_LABEL, 10, 135, 60, 10
+ EDITTEXT IDC_FPROP_ACCESSED, 70, 135, 160, 10, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+
+ LTEXT "", -1, 5, 150, 230, 1, SS_ETCHEDHORZ
+ LTEXT "Attributes:", IDC_FPROP_ATTRIB_LABEL, 10, 155, 60, 10
+ AUTOCHECKBOX "&Read-only", IDC_FPROP_READONLY, 70, 155, 70, 10
+ AUTOCHECKBOX "&Hidden", IDC_FPROP_HIDDEN, 70, 170, 70, 10
+ AUTOCHECKBOX "&Archive", IDC_FPROP_ARCHIVE, 70, 185, 70, 10
+END
+
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* @makedep: shell32.rgs */
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
index 099f5bc..aa7a7de 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -39,6 +39,7 @@
#include "shellfolder.h"
#include "shresdef.h"
+#include "shlwapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
@@ -284,6 +285,318 @@ static BOOL CALLBACK Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARA
return TRUE;
}
+static BOOL format_date(FILETIME *time, WCHAR *buffer, DWORD size)
+{
+ FILETIME ft;
+ SYSTEMTIME st;
+ int ret;
+
+ if (!FileTimeToLocalFileTime(time, &ft))
+ return FALSE;
+
+ if (!FileTimeToSystemTime(&ft, &st))
+ return FALSE;
+
+ ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, buffer, size);
+ if (ret)
+ {
+ buffer[ret - 1] = ' ';
+ ret = GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, buffer + ret , size - ret);
+ }
+ return ret != 0;
+}
+
+static BOOL get_program_description(WCHAR *path, WCHAR *buffer, DWORD size)
+{
+ static const WCHAR translationW[] = {
+ '\\','V','a','r','F','i','l','e','I','n','f','o',
+ '\\','T','r','a','n','s','l','a','t','i','o','n',0
+ };
+ static const WCHAR fileDescFmtW[] = {
+ '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o',
+ '\\','%','0','4','x','%','0','4','x',
+ '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0
+ };
+ WCHAR fileDescW[41], *desc;
+ DWORD versize, *lang;
+ UINT dlen, llen, i;
+ BOOL ret = FALSE;
+ PVOID data;
+
+ versize = GetFileVersionInfoSizeW(path, NULL);
+ if (!versize) return FALSE;
+
+ data = HeapAlloc(GetProcessHeap(), 0, versize);
+ if (!data) return FALSE;
+
+ if (!GetFileVersionInfoW(path, 0, versize, data))
+ goto out;
+
+ if (!VerQueryValueW(data, translationW, (LPVOID *)&lang, &llen))
+ goto out;
+
+ for (i = 0; i < llen / sizeof(DWORD); i++)
+ {
+ sprintfW(fileDescW, fileDescFmtW, LOWORD(lang[i]), HIWORD(lang[i]));
+ if (VerQueryValueW(data, fileDescW, (LPVOID *)&desc, &dlen))
+ {
+ if (dlen > size - 1) dlen = size - 1;
+ memcpy(buffer, desc, dlen * sizeof(WCHAR));
+ buffer[dlen] = 0;
+ ret = TRUE;
+ break;
+ }
+ }
+
+out:
+ HeapFree(GetProcessHeap(), 0, data);
+ return ret;
+}
+
+struct file_properties_info
+{
+ LONG refcount;
+ WCHAR path[MAX_PATH];
+ WCHAR dir[MAX_PATH];
+ WCHAR *filename;
+ DWORD attrib;
+};
+
+static void init_file_properties_dlg(HWND hwndDlg, struct file_properties_info *props)
+{
+ WCHAR buffer[MAX_PATH], buffer2[MAX_PATH];
+ WIN32_FILE_ATTRIBUTE_DATA exinfo;
+ SHFILEINFOW shinfo;
+
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, props->filename);
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_LOCATION, props->dir);
+
+ if (SHGetFileInfoW(props->path, 0, &shinfo, sizeof(shinfo), SHGFI_TYPENAME|SHGFI_ICON))
+ {
+ if (shinfo.hIcon) SendDlgItemMessageW(hwndDlg, IDC_FPROP_ICON, STM_SETICON, (WPARAM)shinfo.hIcon, 0);
+ if (shinfo.szTypeName[0]) SetDlgItemTextW(hwndDlg, IDC_FPROP_TYPE, shinfo.szTypeName);
+ }
+
+ if (!GetFileAttributesExW(props->path, GetFileExInfoStandard, &exinfo))
+ return;
+
+ if (format_date(&exinfo.ftCreationTime, buffer, sizeof(buffer) / sizeof(buffer[0])))
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_CREATED, buffer);
+
+ if (exinfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
+ SendDlgItemMessageW(hwndDlg, IDC_FPROP_READONLY, BM_SETCHECK, BST_CHECKED, 0);
+ if (exinfo.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
+ SendDlgItemMessageW(hwndDlg, IDC_FPROP_HIDDEN, BM_SETCHECK, BST_CHECKED, 0);
+ if (exinfo.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+ SendDlgItemMessageW(hwndDlg, IDC_FPROP_ARCHIVE, BM_SETCHECK, BST_CHECKED, 0);
+
+ if (exinfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ {
+ static const WCHAR unknownW[] = {'(','u','n','k','n','o','w','n',')',0};
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_SIZE, unknownW);
+
+ /* TODO: Implement counting for directories */
+ return;
+ }
+
+ /* Information about files only */
+ StrFormatByteSizeW(((LONGLONG)exinfo.nFileSizeHigh << 32) | exinfo.nFileSizeLow,
+ buffer, sizeof(buffer) / sizeof(buffer[0]));
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_SIZE, buffer);
+
+ if (format_date(&exinfo.ftLastWriteTime, buffer, sizeof(buffer) / sizeof(buffer[0])))
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_MODIFIED, buffer);
+ if (format_date(&exinfo.ftLastAccessTime, buffer, sizeof(buffer) / sizeof(buffer[0])))
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_ACCESSED, buffer);
+
+ if (FindExecutableW(props->path, NULL, buffer) <= (HINSTANCE)32)
+ return;
+
+ /* Information about executables */
+ if (SHGetFileInfoW(buffer, 0, &shinfo, sizeof(shinfo), SHGFI_ICON | SHGFI_SMALLICON) && shinfo.hIcon)
+ SendDlgItemMessageW(hwndDlg, IDC_FPROP_PROG_ICON, STM_SETICON, (WPARAM)shinfo.hIcon, 0);
+
+ if (get_program_description(buffer, buffer2, sizeof(buffer2) / sizeof(buffer2[0])))
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_PROG_NAME, buffer2);
+ else
+ {
+ WCHAR *p = strrchrW(buffer, '\\');
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_PROG_NAME, p ? ++p : buffer);
+ }
+}
+
+static INT_PTR CALLBACK file_properties_proc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ LPPROPSHEETPAGEW ppsp = (LPPROPSHEETPAGEW)lParam;
+ SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)ppsp->lParam);
+ init_file_properties_dlg(hwndDlg, (struct file_properties_info *)ppsp->lParam);
+ break;
+ }
+
+ case WM_COMMAND:
+ if (LOWORD(wParam) == IDC_FPROP_PROG_CHANGE)
+ {
+ /* TODO: Implement file association dialog */
+ MessageBoxA(hwndDlg, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION);
+ }
+ else if (LOWORD(wParam) == IDC_FPROP_READONLY ||
+ LOWORD(wParam) == IDC_FPROP_HIDDEN ||
+ LOWORD(wParam) == IDC_FPROP_ARCHIVE)
+ {
+ SendMessageW(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+ }
+ else if (LOWORD(wParam) == IDC_FPROP_PATH && HIWORD(wParam) == EN_CHANGE)
+ {
+ SendMessageW(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0);
+ }
+ break;
+
+ case WM_NOTIFY:
+ {
+ LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
+ if (lppsn->hdr.code == PSN_APPLY)
+ {
+ struct file_properties_info *props = (struct file_properties_info *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
+ WCHAR newname[MAX_PATH], newpath[MAX_PATH];
+ DWORD attributes;
+
+ attributes = GetFileAttributesW(props->path);
+ if (attributes != INVALID_FILE_ATTRIBUTES)
+ {
+ attributes &= ~(FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_ARCHIVE);
+
+ if (SendDlgItemMessageW(hwndDlg, IDC_FPROP_READONLY, BM_GETCHECK, 0, 0) == BST_CHECKED)
+ attributes |= FILE_ATTRIBUTE_READONLY;
+ if (SendDlgItemMessageW(hwndDlg, IDC_FPROP_HIDDEN, BM_GETCHECK, 0, 0) == BST_CHECKED)
+ attributes |= FILE_ATTRIBUTE_HIDDEN;
+ if (SendDlgItemMessageW(hwndDlg, IDC_FPROP_ARCHIVE, BM_GETCHECK, 0, 0) == BST_CHECKED)
+ attributes |= FILE_ATTRIBUTE_ARCHIVE;
+
+ if (!SetFileAttributesW(props->path, attributes))
+ ERR("failed to update file attributes of %s\n", debugstr_w(props->path));
+ }
+
+ /* Update filename it it was changed */
+ if (GetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, newname, sizeof(newname)/sizeof(newname[0])) &&
+ strcmpW(props->filename, newname) &&
+ strlenW(props->dir) + strlenW(newname) + 2 < sizeof(newpath) / sizeof(newpath[0]))
+ {
+ static const WCHAR slash[] = {'\\', 0};
+ strcpyW(newpath, props->dir);
+ strcatW(newpath, slash);
+ strcatW(newpath, newname);
+
+ if (!MoveFileW(props->path, newpath))
+ ERR("failed to move file %s to %s\n", debugstr_w(props->path), debugstr_w(newpath));
+ else
+ {
+ WCHAR *p;
+ strcpyW(props->path, newpath);
+ strcpyW(props->dir, newpath);
+ if ((p = strrchrW(props->dir, '\\')))
+ {
+ *p = 0;
+ props->filename = p + 1;
+ }
+ else
+ props->filename = props->dir;
+ SetDlgItemTextW(hwndDlg, IDC_FPROP_LOCATION, props->dir);
+ }
+ }
+
+ return TRUE;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+ return FALSE;
+}
+
+static UINT CALLBACK file_properties_callback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGEW ppsp)
+{
+ struct file_properties_info *props = (struct file_properties_info *)ppsp->lParam;
+ if (uMsg == PSPCB_RELEASE)
+ {
+ if (!InterlockedDecrement(&props->refcount))
+ HeapFree(GetProcessHeap(), 0, props);
+ }
+ return 1;
+}
+
+static void init_file_properties_pages(IDataObject *pDo, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
+{
+ static WCHAR title[] = {'G','e','n','e','r','a','l',0};
+ struct file_properties_info *props;
+ HPROPSHEETPAGE general_page;
+ PROPSHEETPAGEW propsheet;
+ FORMATETC format;
+ STGMEDIUM stgm;
+ HRESULT hr;
+ WCHAR *p;
+
+ props = HeapAlloc(GetProcessHeap(), 0, sizeof(*props));
+ if (!props) return;
+
+ format.cfFormat = CF_HDROP;
+ format.ptd = NULL;
+ format.dwAspect = DVASPECT_CONTENT;
+ format.lindex = -1;
+ format.tymed = TYMED_HGLOBAL;
+
+ hr = IDataObject_GetData(pDo, &format, &stgm);
+ if (FAILED(hr)) goto error;
+
+ if (!DragQueryFileW((HDROP)stgm.DUMMYUNIONNAME.hGlobal, 0,
+ props->path, sizeof(props->path) / sizeof(props->path[0])))
+ {
+ ReleaseStgMedium(&stgm);
+ goto error;
+ }
+
+ ReleaseStgMedium(&stgm);
+
+ props->refcount = 1;
+ props->attrib = GetFileAttributesW(props->path);
+ if (props->attrib == INVALID_FILE_ATTRIBUTES)
+ goto error;
+
+ strcpyW(props->dir, props->path);
+ if ((p = strrchrW(props->dir, '\\')))
+ {
+ *p = 0;
+ props->filename = p + 1;
+ }
+ else
+ props->filename = props->dir;
+
+ memset(&propsheet, 0, sizeof(propsheet));
+ propsheet.dwSize = sizeof(propsheet);
+ propsheet.dwFlags = PSP_DEFAULT | PSP_USETITLE | PSP_USECALLBACK;
+ propsheet.hInstance = shell32_hInstance;
+ if (props->attrib & FILE_ATTRIBUTE_DIRECTORY)
+ propsheet.u.pszTemplate = (LPWSTR)MAKEINTRESOURCE(IDD_FOLDER_PROPERTIES);
+ else
+ propsheet.u.pszTemplate = (LPWSTR)MAKEINTRESOURCE(IDD_FILE_PROPERTIES);
+ propsheet.pfnDlgProc = file_properties_proc;
+ propsheet.pfnCallback = file_properties_callback;
+ propsheet.lParam = (LPARAM)props;
+ propsheet.pszTitle = title;
+
+ general_page = CreatePropertySheetPageW(&propsheet);
+ if (general_page) lpfnAddPage(general_page, lParam);
+ return;
+
+error:
+ HeapFree(GetProcessHeap(), 0, props);
+}
+
#define MAX_PROP_PAGES 99
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
@@ -363,22 +676,24 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
IShellFolder_Release(lpDesktopSF);
}
- if (SUCCEEDED(ret))
- {
- hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
- if (hpsxa != NULL)
- {
- SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh);
- SHDestroyPropSheetExtArray(hpsxa);
- }
- hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo);
- if (hpsxa != NULL)
- {
- SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh);
- SHDestroyPropSheetExtArray(hpsxa);
- }
- IDataObject_Release(lpDo);
- }
+ if (SUCCEEDED(ret))
+ {
+ init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
+
+ hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
+ if (hpsxa != NULL)
+ {
+ SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh);
+ SHDestroyPropSheetExtArray(hpsxa);
+ }
+ hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo);
+ if (hpsxa != NULL)
+ {
+ SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh);
+ SHDestroyPropSheetExtArray(hpsxa);
+ }
+ IDataObject_Release(lpDo);
+ }
if (psh.nPages)
PropertySheetW(&psh);
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 183a75e..1518de5 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -152,6 +152,10 @@
/* Note: this string is referenced from the registry*/
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
+/* Properties dialog */
+#define IDD_FILE_PROPERTIES 8
+#define IDD_FOLDER_PROPERTIES 9
+
#define IDD_ICON 0x4300
#define IDD_MESSAGE 0x4301
@@ -232,6 +236,30 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi
#define IDC_RUNDLG_EDITPATH 12298
#define IDC_RUNDLG_LABEL 12305
+/* file property dialog */
+#define IDC_FPROP_ICON 13000
+#define IDC_FPROP_PATH 13001
+#define IDC_FPROP_TYPE_LABEL 13002
+#define IDC_FPROP_TYPE 13003
+#define IDC_FPROP_OPENWITH_LABEL 13004
+#define IDC_FPROP_PROG_ICON 13005
+#define IDC_FPROP_PROG_NAME 13006
+#define IDC_FPROP_PROG_CHANGE 13007
+#define IDC_FPROP_LOCATION_LABEL 13008
+#define IDC_FPROP_LOCATION 13009
+#define IDC_FPROP_SIZE_LABEL 13010
+#define IDC_FPROP_SIZE 13011
+#define IDC_FPROP_CREATED_LABEL 13012
+#define IDC_FPROP_CREATED 13013
+#define IDC_FPROP_MODIFIED_LABEL 13014
+#define IDC_FPROP_MODIFIED 13015
+#define IDC_FPROP_ACCESSED_LABEL 13016
+#define IDC_FPROP_ACCESSED 13017
+#define IDC_FPROP_ATTRIB_LABEL 13018
+#define IDC_FPROP_READONLY 13019
+#define IDC_FPROP_HIDDEN 13020
+#define IDC_FPROP_ARCHIVE 13021
+
/* bitmaps */
/* explorer toolbar icons
* FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now
--
2.4.3

1
patches/shell32-File_Property_Dialog/definition Normal file
View File

@ -0,0 +1 @@
Fixes: Implement general tab for file property dialog