May 2018 - Wine-Devel - list.winehq.org

[v2 PATCH] shell32: Add general tab in file property dialog.
by Alistair Leslie-Hughes May 8, 2018

May 8, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shell32.rc | 66 +++++++++ dlls/shell32/shlview_cmenu.c | 345 +++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/shresdef.h | 28 ++++ 3 files changed, 425 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6585416..f132d851 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -342,6 +342,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 9baaa27..06391bd 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -25,7 +25,6 @@ #define NONAMELESSUNION #include "winerror.h" -#include "wine/debug.h" #include "windef.h" #include "wingdi.h" @@ -39,6 +38,10 @@ #include "shellfolder.h" #include "shresdef.h" +#include "shlwapi.h" + +#include "wine/heap.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -300,6 +303,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 = heap_alloc(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: + heap_free(data); + return ret; +} + +struct file_properties_info +{ + 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); + DestroyIcon(shinfo.hIcon); + } + if (shinfo.szTypeName[0]) + SetDlgItemTextW(hwndDlg, IDC_FPROP_TYPE, shinfo.szTypeName); + } + + if (!GetFileAttributesExW(props->path, GetFileExInfoStandard, &exinfo)) + return; + + if (format_date(&exinfo.ftCreationTime, buffer, ARRAY_SIZE(buffer))) + 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, ARRAY_SIZE(buffer)); + SetDlgItemTextW(hwndDlg, IDC_FPROP_SIZE, buffer); + + if (format_date(&exinfo.ftLastWriteTime, buffer, ARRAY_SIZE(buffer))) + SetDlgItemTextW(hwndDlg, IDC_FPROP_MODIFIED, buffer); + if (format_date(&exinfo.ftLastAccessTime, buffer, ARRAY_SIZE(buffer))) + 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, ARRAY_SIZE(buffer2))) + 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 page = (LPPROPSHEETPAGEW)lParam; + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)page->lParam); + init_file_properties_dlg(hwndDlg, (struct file_properties_info *)page->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 notify = (LPPSHNOTIFY)lParam; + if (notify->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, ARRAY_SIZE(newname)) && + strcmpW(props->filename, newname) && + strlenW(props->dir) + strlenW(newname) + 2 < ARRAY_SIZE(newpath)) + { + 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 page) +{ + struct file_properties_info *props = (struct file_properties_info *)page->lParam; + if (uMsg == PSPCB_RELEASE) + { + heap_free(props); + } + return 1; +} + +static void init_file_properties_pages(IDataObject *dataobject, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) +{ + struct file_properties_info *props; + HPROPSHEETPAGE general_page; + PROPSHEETPAGEW propsheet; + FORMATETC format; + STGMEDIUM stgm; + HRESULT hr; + WCHAR *p; + + props = heap_alloc(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(dataobject, &format, &stgm); + if (FAILED(hr)) goto error; + + if (!DragQueryFileW((HDROP)stgm.u.hGlobal, 0, props->path, ARRAY_SIZE(props->path))) + { + ReleaseStgMedium(&stgm); + goto error; + } + + ReleaseStgMedium(&stgm); + + 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_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; + + general_page = CreatePropertySheetPageW(&propsheet); + if (general_page) + lpfnAddPage(general_page, lParam); + return; + +error: + heap_free(props); +} + #define MAX_PROP_PAGES 99 static void DoOpenProperties(ContextMenu *This, HWND hwnd) @@ -381,19 +696,21 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd) 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); + 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) 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 -- 1.9.1

1 0

An Apology ("I Shot the Mail-List...")
by Kyle Auble May 8, 2018

May 8, 2018

So Jeremy was very gracious not to point fingers, but anyone that saw the patch queue this morning probably figured I had something to do with the mail-list failing. I honestly don't know what happened beyond what I wrote in my bug report from around lunch today: https://bugs.winehq.org/show_bug.cgi?id=45151 Just to be safe, I plan to switch over to my Gmail account for submitting any patches here. Between this and the side-effects from my one CSS patch though, I'm starting to feel a bit like a bull in a china-shop. There were a few last changes I planned to make, but then I think I should step back from Wine for a little while, if only not to tempt the Fates. I know for many of you, Wine is your bread-and-butter so I really hope a day with the list gone pear-shaped hasn't set you back. If there are any lingering problems I can help with, or you want me to do any tests to get to the bottom of what happened, just let me know. Enjoy your evening, everyone, Kyle

1 0

[PATCH 1/2] dmoguids: Add library.
by Zebediah Figura May 8, 2018

May 8, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/dmoguids/Makefile.in | 4 ++++ dlls/dmoguids/dmoguids.c | 27 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 dlls/dmoguids/Makefile.in create mode 100644 dlls/dmoguids/dmoguids.c diff --git a/configure b/configure index e2a88d3..8280acc 100755 --- a/configure +++ b/configure @@ -1213,6 +1213,7 @@ enable_dmband enable_dmcompos enable_dmime enable_dmloader +enable_dmoguids enable_dmscript enable_dmstyle enable_dmsynth @@ -18574,6 +18575,7 @@ wine_fn_config_makefile dlls/dmime enable_dmime wine_fn_config_makefile dlls/dmime/tests enable_tests wine_fn_config_makefile dlls/dmloader enable_dmloader wine_fn_config_makefile dlls/dmloader/tests enable_tests +wine_fn_config_makefile dlls/dmoguids enable_dmoguids wine_fn_config_makefile dlls/dmscript enable_dmscript wine_fn_config_makefile dlls/dmscript/tests enable_tests wine_fn_config_makefile dlls/dmstyle enable_dmstyle diff --git a/configure.ac b/configure.ac index 9dbac25..d491a51 100644 --- a/configure.ac +++ b/configure.ac @@ -3194,6 +3194,7 @@ WINE_CONFIG_MAKEFILE(dlls/dmime) WINE_CONFIG_MAKEFILE(dlls/dmime/tests) WINE_CONFIG_MAKEFILE(dlls/dmloader) WINE_CONFIG_MAKEFILE(dlls/dmloader/tests) +WINE_CONFIG_MAKEFILE(dlls/dmoguids) WINE_CONFIG_MAKEFILE(dlls/dmscript) WINE_CONFIG_MAKEFILE(dlls/dmscript/tests) WINE_CONFIG_MAKEFILE(dlls/dmstyle) diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in new file mode 100644 index 0000000..db38e57 --- /dev/null +++ b/dlls/dmoguids/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libdmoguids.a + +C_SRCS = \ + dmoguids.c diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c new file mode 100644 index 0000000..b764c1f --- /dev/null +++ b/dlls/dmoguids/dmoguids.c @@ -0,0 +1,27 @@ +/* + * GUID definitions + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Don't define those GUIDs here */ +#include "strmif.h" + +#include "initguid.h" + +#include "mediaobj.h" +#include "dmoreg.h" -- 2.7.4

1 1

[PATCH] reg: Stop exporting REG_SZ data at the first NUL character (resend)
by Hugh McMaster May 7, 2018

May 7, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 11 ++++++----- programs/reg/tests/reg.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 622e7ca8d9..8b08da1299 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -39,7 +39,10 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) for (i = 0, escape_count = 0; i < str_len; i++) { WCHAR c = str[i]; - if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + + if (!c) break; + + if (c == '\r' || c == '\n' || c == '\\' || c == '"') escape_count++; } @@ -49,6 +52,8 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) { WCHAR c = str[i]; + if (!c) break; + switch (c) { case '\r': @@ -67,10 +72,6 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) buf[pos++] = '\\'; buf[pos] = '"'; break; - case '\0': - buf[pos++] = '\\'; - buf[pos] = '0'; - break; default: buf[pos] = c; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index aba71b7b87..ea4e128da5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4679,7 +4679,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); } -- 2.17.0

1 0

[PATCH] regedit: Stop exporting REG_SZ data at the first NUL character (resend)
by Hugh McMaster May 7, 2018

May 7, 2018

Fixes https://bugs.winehq.org/show_bug.cgi?id=27497 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.c | 11 ++++++----- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 84a16f93c4..65087c97ee 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1171,7 +1171,10 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len for (i = 0, escape_count = 0; i < str_len; i++) { WCHAR c = str[i]; - if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + + if (!c) break; + + if (c == '\r' || c == '\n' || c == '\\' || c == '"') escape_count++; } @@ -1181,6 +1184,8 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len { WCHAR c = str[i]; + if (!c) break; + switch (c) { case '\r': @@ -1199,10 +1204,6 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len buf[pos++] = '\\'; buf[pos] = '"'; break; - case '\0': - buf[pos++] = '\\'; - buf[pos] = '0'; - break; default: buf[pos] = c; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 845ab00ac9..66b9562445 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3688,7 +3688,7 @@ static void test_export(void) RegCloseKey(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); - ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); } -- 2.17.0

1 0

[PATCH] comctl32/trackbar: Fix reseting to default page size
by Nikolay Sivov May 7, 2018

May 7, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/trackbar.c | 11 +++++++++++ dlls/comctl32/trackbar.c | 31 +++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7d66df775e..7f17e9e4b6 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -613,6 +613,17 @@ static void test_page_size(void) r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); ok(r == 10, "Unexpected page size %d.\n", r); + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + ok(r == 10, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 7, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 100); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 19, "Unexpected page size %d.\n", r); + DestroyWindow(hWndTrackbar); hWndTrackbar = create_trackbar(defaultstyle, hWndParent); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 762d2e1376..d774823d60 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1196,18 +1196,30 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) return lTemp; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - if (lPageSize != -1) - infoPtr->lPageSize = lPageSize; + if (lPageSize == -1) + { + infoPtr->flags &= ~TB_USER_PAGE; + TRACKBAR_UpdatePageSize(infoPtr); + } else - infoPtr->lPageSize = TB_DEFAULTPAGESIZE; - - infoPtr->flags |= TB_USER_PAGE; + { + infoPtr->flags |= TB_USER_PAGE; + infoPtr->lPageSize = lPageSize; + } return lTemp; } @@ -1234,15 +1246,6 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } -static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) -{ - if (infoPtr->flags & TB_USER_PAGE) - return; - - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; -} - static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) { -- 2.17.0

1 0

Mailing list problems
by Jeremy Newman May 7, 2018

May 7, 2018

Our mailing list got stuck (choked) on some corrupt messages today. I cleared out the queue and it appears to be working again. If you sent any messages to wine-devel after about 10:00 CDT they were most likely lost. Check the archive and resend if that is the case. https://www.winehq.org/pipermail/wine-devel/2018-May/thread.html Sorry for the problems. -N

1 0

Testing Again
by Jeremy Newman May 7, 2018

May 7, 2018

Ignore me, just another test... -N

1 0

Testing
by Jeremy Newman May 7, 2018

May 7, 2018

Ignore me, just a test... -N

1 0

[PATCH] atmlib: add stub dll
by Louis Lenders May 7, 2018

May 7, 2018

This patch allows Adobe Premiere CS4 for me to start (with only native msdmo due to other bug) without the winetricks atmlib , see bug https://bugs.winehq.org/show_bug.cgi?id=21017 Apparently this dll is present in about all windowsversions (at least at testbot); Found atmlib functions are documented here: web.mit.edu/PS/Adobe/Documents/5073.ATM_Adv_Win.ps Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/atmlib/Makefile.in | 4 +++ dlls/atmlib/atmlib.spec | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/atmlib/main.c | 47 +++++++++++++++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 dlls/atmlib/Makefile.in create mode 100644 dlls/atmlib/atmlib.spec create mode 100644 dlls/atmlib/main.c diff --git a/configure b/configure index 119391d91b..fea3babb07 100755 --- a/configure +++ b/configure @@ -1107,6 +1107,7 @@ enable_atl100 enable_atl110 enable_atl80 enable_atl90 +enable_atmlib enable_authz enable_avicap32 enable_avifil32 @@ -18421,6 +18422,7 @@ wine_fn_config_makefile dlls/atl110 enable_atl110 wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 +wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 wine_fn_config_makefile dlls/avifil32 enable_avifil32 diff --git a/configure.ac b/configure.ac index 1bc3d13fc3..8c2dcb90b4 100644 --- a/configure.ac +++ b/configure.ac @@ -3043,6 +3043,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl110) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) +WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) WINE_CONFIG_MAKEFILE(dlls/avifil32) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in new file mode 100644 index 0000000000..904cbbb54a --- /dev/null +++ b/dlls/atmlib/Makefile.in @@ -0,0 +1,4 @@ +MODULE = atmlib.dll + +C_SRCS = \ + main.c diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec new file mode 100644 index 0000000000..387486dd4d --- /dev/null +++ b/dlls/atmlib/atmlib.spec @@ -0,0 +1,76 @@ +@ stub ATMAddFont +@ stub ATMAddFontA +@ stub ATMAddFontEx +@ stub ATMAddFontExA +@ stub ATMAddFontExW +@ stub ATMAddFontW +@ stub ATMBBoxBaseXYShowText +@ stub ATMBBoxBaseXYShowTextA +@ stub ATMBBoxBaseXYShowTextW +@ stub ATMBeginFontChange +@ stub ATMClient +@ stub ATMEndFontChange +@ stub ATMEnumFonts +@ stub ATMEnumFontsA +@ stub ATMEnumFontsW +@ stub ATMEnumMMFonts +@ stub ATMEnumMMFontsA +@ stub ATMEnumMMFontsW +@ stub ATMFinish +@ stub ATMFontAvailable +@ stub ATMFontAvailableA +@ stub ATMFontAvailableW +@ stub ATMFontSelected +@ stub ATMFontStatus +@ stub ATMFontStatusA +@ stub ATMFontStatusW +@ stub ATMForceFontChange +@ stub ATMGetBuildStr +@ stub ATMGetBuildStrA +@ stub ATMGetBuildStrW +@ stub ATMGetFontBBox +@ stub ATMGetFontInfo +@ stub ATMGetFontInfoA +@ stub ATMGetFontInfoW +@ stub ATMGetFontPaths +@ stub ATMGetFontPathsA +@ stub ATMGetFontPathsW +@ stub ATMGetGlyphList +@ stub ATMGetGlyphListA +@ stub ATMGetGlyphListW +@ stub ATMGetMenuName +@ stub ATMGetMenuNameA +@ stub ATMGetMenuNameW +@ stub ATMGetNtmFields +@ stub ATMGetNtmFieldsA +@ stub ATMGetNtmFieldsW +@ stub ATMGetOutline +@ stub ATMGetOutlineA +@ stub ATMGetOutlineW +@ stub ATMGetPostScriptName +@ stub ATMGetPostScriptNameA +@ stub ATMGetPostScriptNameW +@ stub ATMGetVersion +@ stub ATMGetVersionEx +@ stub ATMGetVersionExA +@ stub ATMGetVersionExW +@ stub ATMInstallSubstFontA +@ stub ATMInstallSubstFontW +@ stub ATMMakePFM +@ stub ATMMakePFMA +@ stub ATMMakePFMW +@ stub ATMMakePSS +@ stub ATMMakePSSA +@ stub ATMMakePSSW +@ stdcall ATMProperlyLoaded() +@ stub ATMRemoveFont +@ stub ATMRemoveFontA +@ stub ATMRemoveFontW +@ stub ATMRemoveSubstFontA +@ stub ATMRemoveSubstFontW +@ stub ATMSelectEncoding +@ stub ATMSelectObject +@ stub ATMSetFlags +@ stub ATMXYShowText +@ stub ATMXYShowTextA +@ stub ATMXYShowTextW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c new file mode 100644 index 0000000000..0baca0001e --- /dev/null +++ b/dlls/atmlib/main.c @@ -0,0 +1,47 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atmlib); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} + +BOOL WINAPI ATMProperlyLoaded(void) +{ + FIXME("stub\n"); + return FALSE; +} -- 2.17.0

1 0