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

[PATCH 4/4] msvcr110: Try SNAME when matching locale.
by Daniel Lehman May 4, 2018

May 4, 2018

3 2

Ignore Patch Series
by Kyle Auble May 4, 2018

May 4, 2018

Please ignore any patches from my 7-patch series, including these: [PATCH website 1/7] Bring in CSS for rating colors from AppDB [PATCH website 7/7] Delete the rating background images I think my SMTP service flipped out when I tried to run git send-email as a batch. The mailer daemon told me it might keep retrying to redeliver some too so they may still get through, though I think it gave up. I'll try a resend next week once my first attempt has fallen off the queue. Sorry about that, Kyle

2 2

[PATCH] shell32: Fake success in propertystore_[SetValue|Commit].
by Gijs Vermeulen May 4, 2018

May 4, 2018

From: Guillaume Gill <gillg02(a)petitchinois.net> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44866 dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac34c..07c83d151c 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.13.6

1 0

[PATCH] msi: Check return value of GetBinaryType().
by Zebediah Figura May 4, 2018

May 4, 2018

Fixes test failures on 64-bit Wine. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ca0362b..956b3e9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -585,6 +585,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) void *cookie; BOOL wow64; DWORD arch; + BOOL ret; DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -607,9 +608,9 @@ static DWORD WINAPI DllThread( LPVOID arg ) } info = find_action_by_guid(guid); - GetBinaryTypeW(info->source, &arch); + ret = GetBinaryTypeW(info->source, &arch); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); -- 2.7.4

2 1

[PATCH v2] msi: Disable WoW redirection when installing a 64-bit package.
by Zebediah Figura May 4, 2018

May 4, 2018

Fixes https://bugs.winehq.org/show_bug.cgi?id=30713 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Disable in ACTION_HandleStandardAction() instead. dlls/msi/action.c | 8 ++++ dlls/msi/tests/install.c | 101 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 67dfbe4..7197bca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7855,8 +7855,12 @@ StandardActions[] = static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { UINT rc = ERROR_FUNCTION_NOT_CALLED; + void *cookie; UINT i; + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64DisableWow64FsRedirection(&cookie); + i = 0; while (StandardActions[i].action != NULL) { @@ -7891,6 +7895,10 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) } i++; } + + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64RevertWow64FsRedirection(cookie); + return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5c83d30..ac2c837 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -1334,6 +1336,18 @@ static const char da_install_exec_seq_dat[] = "immediate\t\t800\n" "InstallFinalize\t\t1100\n"; +static const CHAR x64_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "CABOUTDIR\tMSITESTDIR\tcabout\n" + "CHANGEDDIR\tMSITESTDIR\tchanged:second\n" + "FIRSTDIR\tMSITESTDIR\tfirst\n" + "MSITESTDIR\tProgramFiles64Folder\tmsitest\n" + "NEWDIR\tCABOUTDIR\tnew\n" + "ProgramFiles64Folder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + typedef struct _msi_table { const CHAR *filename; @@ -2015,6 +2029,18 @@ static const msi_table da_tables[] = ADD_TABLE(da_custom_action), }; +static const msi_table x64_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(x64_directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(install_exec_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2145,6 +2171,8 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); + GET_PROC(hkernel32, Wow64RevertWow64FsRedirection); hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -2330,7 +2358,8 @@ static BOOL get_system_dirs(void) HKEY hkey; DWORD type, size; - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &hkey)) return FALSE; size = MAX_PATH; @@ -5693,16 +5722,16 @@ static void test_package_validation(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %u\n", r); - ok(!delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(!delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(!delete_pf("msitest", FALSE), "directory exists\n"); DeleteFileA(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(delete_pf("msitest", FALSE), "directory exists\n"); } else { @@ -6124,6 +6153,67 @@ error: DeleteFileA(msifile); } +static void test_wow64(void) +{ + void *cookie; + UINT r; + + if (!is_wow64) + { + skip("test must be run on WoW64\n"); + return; + } + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database_template(msifile, x64_tables, sizeof(x64_tables)/sizeof(msi_table), 200, "x64;0"); + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + + pWow64DisableWow64FsRedirection(&cookie); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "Directory created\n"); + + ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest", FALSE), "Directory not created\n"); + + pWow64RevertWow64FsRedirection(cookie); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6217,6 +6307,7 @@ START_TEST(install) test_remove_upgrade_code(); test_feature_tree(); test_deferred_action(); + test_wow64(); DeleteFileA(customdll); -- 2.7.4

3 2

[PATCH] include: Add lldiv and lldiv_t
by Alex Henrie May 4, 2018

May 4, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For https://stackoverflow.com/questions/49397035/trying-to-use-winelib-with-sta… include/msvcrt/stdlib.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3c9c4a7fbc..2db48c592a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -60,6 +60,11 @@ typedef struct _ldiv_t { __msvcrt_long rem; } ldiv_t; +typedef struct _lldiv_t { + __int64 quot; + __int64 rem; +} lldiv_t; + #define _countof(x) (sizeof(x)/sizeof((x)[0])) @@ -194,6 +199,7 @@ void* __cdecl calloc(size_t,size_t); div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif +lldiv_t __cdecl lldiv(__int64,__int64); void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*); -- 2.17.0

2 1

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

May 4, 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 | 351 ++++++++++++++++++++++++++++++++++++++++--- dlls/shell32/shresdef.h | 28 ++++ 3 files changed, 428 insertions(+), 17 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..a7e718a 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 +{ + 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)) + heap_free(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 = 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(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: + heap_free(props); +} + #define MAX_PROP_PAGES 99 static void DoOpenProperties(ContextMenu *This, HWND hwnd) @@ -379,22 +694,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 -- 1.9.1

3 2

[PATCH 5/5] combase: Add stub for CleanupTlsOleState.
by Alistair Leslie-Hughes May 4, 2018

May 4, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 72a7eb5..c8a8dee 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -66,7 +66,7 @@ @ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID @ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString @ stub CleanupOleStateInAllTls -@ stub CleanupTlsOleState +@ stdcall CleanupTlsOleState(ptr) @ stub ClearCleanupFlag @ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess @ stub CoAllowUnmarshalerCLSID diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ee03bd3..63e218d 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -274,3 +274,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } + +/*********************************************************************** + * CleanupTlsOleState (combase.@) + */ +void WINAPI CleanupTlsOleState(void *unknown) +{ + FIXME("(%p): stub\n", unknown); +} -- 1.9.1

1 0

[PATCH 4/5] combase: Add stub for RoRegisterActivationFactories.
by Alistair Leslie-Hughes May 4, 2018

May 4, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index d27130c..32b9474 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) combase.RoRegisterActivationFactories @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c721f43..72a7eb5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -262,7 +262,7 @@ @ stub RoOriginateErrorW @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 96165e4..ee03bd3 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -263,3 +263,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW *count = 0; return S_OK; } + +/*********************************************************************** + * RoRegisterActivationFactories (combase.@) + */ +HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks, + UINT32 count, RO_REGISTRATION_COOKIE *cookie) +{ + FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie); + + return S_OK; +} -- 1.9.1

1 0

[PATCH 3/5] combase: Add stub for RoGetServerActivatableClasses.
by Alistair Leslie-Hughes May 4, 2018

May 4, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec index 350ac04..20c8d9c 100644 --- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec @@ -1,2 +1,2 @@ @ stub RoGetActivatableClassRegistration -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ec4a6cd..c721f43 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -254,7 +254,7 @@ @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ffcb0e9..96165e4 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -251,3 +251,15 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, *cookie = (void *)0xcafecafe; return S_OK; } + +/*********************************************************************** + * RoGetServerActivatableClasses (combase.@) + */ +HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count) +{ + FIXME("(%p, %p, %p): stub\n", name, classes, count); + + if (count) + *count = 0; + return S_OK; +} -- 1.9.1

1 0