Ros-diffs June 2018

ros-diffs@reactos.org

26 participants
174 discussions

01/02: [FREETYPE] Allow a NULL style_name. CORE-14775

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae8762e15e6c2a316b06c… commit ae8762e15e6c2a316b06c1773a064354259d5529 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jun 29 21:55:54 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jun 29 21:55:54 2018 +0200 [FREETYPE] Allow a NULL style_name. CORE-14775 --- win32ss/gdi/ntgdi/freetype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5aa43e701d..4ae74fced1 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -193,7 +193,7 @@ SharedFace_Create(FT_Face Face, PSHARED_MEM Memory) SharedFaceCache_Init(&Ptr->UserLanguage); SharedMem_AddRef(Memory); - DPRINT("Creating SharedFace for %s\n", Face->family_name); + DPRINT("Creating SharedFace for %s\n", Face->family_name ? Face->family_name : "<NULL>"); } return Ptr; } @@ -294,7 +294,7 @@ SharedFace_Release(PSHARED_FACE Ptr) --Ptr->RefCount; if (Ptr->RefCount == 0) { - DPRINT("Releasing SharedFace for %s\n", Ptr->Face->family_name); + DPRINT("Releasing SharedFace for %s\n", Ptr->Face->family_name ? Ptr->Face->family_name : "<NULL>"); RemoveCacheEntries(Ptr->Face); FT_Done_Face(Ptr->Face); SharedMem_Release(Ptr->Memory); @@ -989,7 +989,9 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, } ++FaceCount; - DPRINT("Font loaded: %s (%s)\n", Face->family_name, Face->style_name); + DPRINT("Font loaded: %s (%s)\n", + Face->family_name ? Face->family_name : "<NULL>", + Face->style_name ? Face->style_name : "<NULL>"); DPRINT("Num glyphs: %d\n", Face->num_glyphs); DPRINT("CharSet: %d\n", FontGDI->CharSet); @@ -4028,7 +4030,6 @@ GetFontPenalty(const LOGFONTW * LogFont, ASSERT(Otm); ASSERT(LogFont); - ASSERT(style_name); /* FIXME: Aspect Penalty 30 */ /* FIXME: IntSizeSynth Penalty 20 */

6 years, 5 months

01/01: [NOTEPAD] Avoid a cast.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97df61edfa1a630ed48de… commit 97df61edfa1a630ed48de98998a352b6b3eb5466 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Jun 29 14:59:16 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jun 29 18:49:44 2018 +0200 [NOTEPAD] Avoid a cast. --- base/applications/notepad/dialog.c | 2 +- base/applications/notepad/main.h | 4 ++-- base/applications/notepad/text.c | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index e1c660b7ae..04e6e7b837 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -362,7 +362,7 @@ VOID DoOpenFile(LPCTSTR szFileName) goto done; } - if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, (int *)&Globals.encFile, &Globals.iEoln)) + if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, &Globals.encFile, &Globals.iEoln)) { ShowLastError(); goto done; diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h index c64ccf6e2f..a84162fbc0 100644 --- a/base/applications/notepad/main.h +++ b/base/applications/notepad/main.h @@ -91,8 +91,8 @@ extern NOTEPAD_GLOBALS Globals; VOID SetFileName(LPCTSTR szFileName); /* from text.c */ -BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int *piEoln); -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile, int iEoln); +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, int *piEoln); +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, int iEoln); /* from settings.c */ void NOTEPAD_LoadSettingsFromRegistry(void); diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index be7a76446a..2c6ee8cd07 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -48,7 +48,7 @@ static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, D } BOOL -ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int *piEoln) +ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, int *piEoln) { DWORD dwSize; LPBYTE pBytes = NULL; @@ -58,7 +58,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int * DWORD dwCharCount; BOOL bSuccess = FALSE; BYTE b = 0; - int encFile = ENCODING_ANSI; + ENCODING encFile = ENCODING_ANSI; int iCodePage = 0; WCHAR szCrlf[2] = {'\r', '\n'}; DWORD adwEolnCount[3] = {0, 0, 0}; @@ -147,6 +147,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int * pszAllocText[dwCharCount] = '\0'; pszText = pszAllocText; break; + DEFAULT_UNREACHABLE; } dwPos = 0; @@ -221,7 +222,7 @@ done: return bSuccess; } -static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile) +static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile) { LPBYTE pBytes = NULL; LPBYTE pAllocBuffer = NULL; @@ -315,7 +316,7 @@ done: return bSuccess; } -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile, int iEoln) +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, int iEoln) { WCHAR wcBom; LPCWSTR pszLF = L"\n";

6 years, 5 months

01/01: [NOTEPAD] Fix a MSVC warning about Globals.encFile (#648)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=534a309edcac565afa82f… commit 534a309edcac565afa82f4356e942ae9aaed3b2e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Jun 29 14:17:29 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 29 14:17:29 2018 +0200 [NOTEPAD] Fix a MSVC warning about Globals.encFile (#648) "...\dialog.c(365) : error C4133: 'function' : incompatible types - from 'ENCODING *' to 'int *'" CORE-7538 --- base/applications/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 04e6e7b837..e1c660b7ae 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -362,7 +362,7 @@ VOID DoOpenFile(LPCTSTR szFileName) goto done; } - if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, &Globals.encFile, &Globals.iEoln)) + if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, (int *)&Globals.encFile, &Globals.iEoln)) { ShowLastError(); goto done;

6 years, 5 months

01/01: [SHELL32] Refresh 'General' tab if the folder icon is updated (#646)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e353b48cb2e87f7a10990… commit e353b48cb2e87f7a10990154110198257c0d86cf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 29 21:13:37 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 29 14:13:37 2018 +0200 [SHELL32] Refresh 'General' tab if the folder icon is updated (#646) CORE-11407 --- dll/win32/shell32/dialogs/filedefext.cpp | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index 2065e4ef05..2b650ecf91 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -643,6 +643,7 @@ CFileDefExt::InitGeneralPage(HWND hwndDlg) INT_PTR CALLBACK CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + CFileDefExt *pFileDefExt = reinterpret_cast<CFileDefExt *>(GetWindowLongPtr(hwndDlg, DWLP_USER)); switch (uMsg) { case WM_INITDIALOG: @@ -654,7 +655,7 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n", hwndDlg, lParam, ppsp->lParam); - CFileDefExt *pFileDefExt = reinterpret_cast<CFileDefExt *>(ppsp->lParam); + pFileDefExt = reinterpret_cast<CFileDefExt *>(ppsp->lParam); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pFileDefExt); pFileDefExt->InitGeneralPage(hwndDlg); break; @@ -662,7 +663,6 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar case WM_COMMAND: if (LOWORD(wParam) == 14024) /* Opens With - Change */ { - CFileDefExt *pFileDefExt = reinterpret_cast<CFileDefExt *>(GetWindowLongPtr(hwndDlg, DWLP_USER)); OPENASINFO oainfo; oainfo.pcszFile = pFileDefExt->m_wszPath; oainfo.pcszClass = NULL; @@ -682,8 +682,6 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == PSN_APPLY) { - CFileDefExt *pFileDefExt = reinterpret_cast<CFileDefExt *>(GetWindowLongPtr(hwndDlg, DWLP_USER)); - /* Update attributes first */ DWORD dwAttr = GetFileAttributesW(pFileDefExt->m_wszPath); if (dwAttr) @@ -717,6 +715,19 @@ CFileDefExt::GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar } break; } + case PSM_QUERYSIBLINGS: + { + // reset icon + HWND hIconCtrl = GetDlgItem(hwndDlg, 14025); + HICON hIcon = (HICON)SendMessageW(hIconCtrl, STM_GETICON, 0, 0); + DestroyIcon(hIcon); + hIcon = NULL; + SendMessageW(hIconCtrl, STM_SETICON, (WPARAM)hIcon, 0); + + // refresh the page + pFileDefExt->InitGeneralPage(hwndDlg); + return FALSE; // continue + } default: break; } @@ -878,6 +889,8 @@ CFileDefExt::VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar break; case WM_DESTROY: break; + case PSM_QUERYSIBLINGS: + return FALSE; // continue default: break; } @@ -949,6 +962,9 @@ CFileDefExt::FolderCustomizePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPA break; } + case PSM_QUERYSIBLINGS: + return FALSE; // continue + case WM_DESTROY: pFileDefExt->OnFolderCustDestroy(hwndDlg); break; @@ -1116,6 +1132,9 @@ BOOL CFileDefExt::OnFolderCustApply(HWND hwndDlg) attrs |= FILE_ATTRIBUTE_READONLY; SetFileAttributesW(m_wszPath, attrs); + // notify to the siblings + PropSheet_QuerySiblings(GetParent(hwndDlg), 0, 0); + // done! m_bFolderIconIsSet = FALSE; }

6 years, 5 months

02/02: [SERVICES] Minor additions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fafcd50a35a77f1dd1f46… commit fafcd50a35a77f1dd1f4606a30dd4f5b6fe520bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 28 22:32:28 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 23:34:08 2018 +0200 [SERVICES] Minor additions. - Remove a redundant ScmWaitForLsa() call. - Remove the LSA_RPC_SERVER_ACTIVE macro (just use directly the string). - Improve output of DPRINTs. --- base/system/services/services.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/base/system/services/services.c b/base/system/services/services.c index 3b3342f350..bd7f24ccc0 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -24,7 +24,6 @@ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId); /* Defined in include/reactos/services/services.h */ // #define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" #define SCM_AUTOSTARTCOMPLETE_EVENT L"SC_AutoStartComplete" -#define LSA_RPC_SERVER_ACTIVE L"LSA_RPC_SERVER_ACTIVE" BOOL ScmInitialize = FALSE; BOOL ScmShutdown = FALSE; @@ -85,10 +84,10 @@ ScmLogEvent(DWORD dwEventId, VOID ScmWaitForLsa(VOID) { - HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, LSA_RPC_SERVER_ACTIVE); + HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, L"LSA_RPC_SERVER_ACTIVE"); if (hEvent == NULL) { - DPRINT1("Failed to create the notification event (Error %lu)\n", GetLastError()); + DPRINT1("Failed to create or open the notification event (Error %lu)\n", GetLastError()); } else { @@ -194,9 +193,6 @@ wWinMain(HINSTANCE hInstance, goto done; } - /* Wait for the LSA server */ - ScmWaitForLsa(); - /* Update the services database */ ScmGetBootAndSystemDriverState();

6 years, 5 months

01/02: [SERVICES] Remove the "Special service accounts initialization" hack, and enable per-service account logging.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75dc03108037e491947e6… commit 75dc03108037e491947e6e21d120fc6a155c70e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 23 01:36:22 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 23:34:02 2018 +0200 [SERVICES] Remove the "Special service accounts initialization" hack, and enable per-service account logging. This effectively removes the temporary hacks introduced in r73486 (a35a785b) and in r73487 (0ce031f7) for the LocalService and NetworkService accounts. Now these accounts (and their corresponding user profiles) are created on the fly, the first time a service that needs these is started. The code introduced in r73501 (ade0d2cd) is now re-enabled: this has been made possible thanks to commit f42b4bbe (thanks Eric!). Dedicated to Joachim Henze ;-) CORE-12541, CORE-12279 --- base/system/services/database.c | 25 ++---- base/system/services/services.c | 178 ---------------------------------------- 2 files changed, 9 insertions(+), 194 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 580dc0fd69..0a710659bb 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -184,37 +184,30 @@ ScmLogonService( IN PSERVICE pService, IN PSERVICE_IMAGE pImage) { -#if 0 + DWORD dwError = ERROR_SUCCESS; PROFILEINFOW ProfileInfo; PWSTR pszUserName = NULL; PWSTR pszDomainName = NULL; PWSTR pszPassword = NULL; PWSTR ptr; - DWORD dwError = ERROR_SUCCESS; -#endif DPRINT("ScmLogonService(%p %p)\n", pService, pImage); - DPRINT("Service %S\n", pService->lpServiceName); if (ScmIsLocalSystemAccount(pImage->pszAccountName)) return ERROR_SUCCESS; - // FIXME: Always assume LocalSystem - return ERROR_SUCCESS; - -#if 0 /* Get the user and domain names */ ptr = wcschr(pImage->pszAccountName, L'\\'); if (ptr != NULL) { *ptr = L'\0'; - pszUserName = ptr + 1; pszDomainName = pImage->pszAccountName; } else { + // ERROR_INVALID_SERVICE_ACCOUNT pszUserName = pImage->pszAccountName; pszDomainName = NULL; } @@ -234,7 +227,7 @@ ScmLogonService( DPRINT("Domain: %S User: %S Password: %S\n", pszDomainName, pszUserName, pszPassword); - /* Service logon */ + /* Do the service logon */ if (!LogonUserW(pszUserName, pszDomainName, pszPassword, @@ -244,14 +237,13 @@ ScmLogonService( { dwError = GetLastError(); DPRINT1("LogonUserW() failed (Error %lu)\n", dwError); + + /* Normalize the returned error */ + dwError = ERROR_SERVICE_LOGON_FAILED; goto done; } - // FIXME: Call LoadUserProfileW to be able to initialize a per-user - // environment block, with user-specific environment variables as - // %USERNAME%, %USERPROFILE%, and %ALLUSERSPROFILE% correctly initialized!! - - /* Load the user profile, so that the per-user environment variables can be initialized */ + /* Load the user profile; the per-user environment variables are thus correctly initialized */ ZeroMemory(&ProfileInfo, sizeof(ProfileInfo)); ProfileInfo.dwSize = sizeof(ProfileInfo); ProfileInfo.dwFlags = PI_NOUI; @@ -279,7 +271,6 @@ done: *ptr = L'\\'; return dwError; -#endif } @@ -1682,7 +1673,9 @@ ScmStartUserModeService(PSERVICE Service, /* Use the interactive desktop if the service is interactive */ if ((NoInteractiveServices == 0) && (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS)) + { StartupInfo.lpDesktop = L"WinSta0\\Default"; + } if (Service->lpImage->hToken) { diff --git a/base/system/services/services.c b/base/system/services/services.c index 58a6256efe..3b3342f350 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -123,178 +123,6 @@ ShutdownHandlerRoutine(DWORD dwCtrlType) } -/*** HACK CORE-12541: Special service accounts initialization HACK ************/ - -#include <ndk/setypes.h> -#include <sddl.h> -#include <userenv.h> -#include <strsafe.h> - -/* Inspired from userenv.dll's CreateUserProfileExW and LoadUserProfileW APIs */ -static -BOOL -ScmLogAccountHack(IN LPCWSTR pszAccountName, - IN LPCWSTR pszSid, - OUT PHKEY phProfile) -{ - BOOL Success = FALSE; - LONG Error; - NTSTATUS Status; - BOOLEAN WasPriv1Set = FALSE, WasPriv2Set = FALSE; - PSID pSid; - DWORD dwLength; - WCHAR szUserHivePath[MAX_PATH]; - - DPRINT1("ScmLogAccountsHack(%S, %S)\n", pszAccountName, pszSid); - if (!pszAccountName || !pszSid || !phProfile) - return ERROR_INVALID_PARAMETER; - - /* Convert the SID string into a SID. NOTE: No RTL equivalent. */ - if (!ConvertStringSidToSidW(pszSid, &pSid)) - { - DPRINT1("ConvertStringSidToSidW() failed (error %lu)\n", GetLastError()); - return FALSE; - } - - /* Determine a suitable profile path */ - dwLength = ARRAYSIZE(szUserHivePath); - if (!GetProfilesDirectoryW(szUserHivePath, &dwLength)) - { - DPRINT1("GetProfilesDirectoryW() failed (error %lu)\n", GetLastError()); - goto Quit; - } - - /* Create user hive name */ - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\"); - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), pszAccountName); - StringCbCatW(szUserHivePath, sizeof(szUserHivePath), L"\\ntuser.dat"); - DPRINT("szUserHivePath: %S\n", szUserHivePath); - - /* Magic #1: Create the special user profile if needed */ - if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) - { - if (!CreateUserProfileW(pSid, pszAccountName)) - { - DPRINT1("CreateUserProfileW() failed (error %lu)\n", GetLastError()); - goto Quit; - } - } - - /* - * Now Da Magiks #2: Manually mount the user profile registry hive - * aka. manually do what LoadUserProfile does!! But we don't require - * a security token! - */ - - /* Acquire restore privilege */ - Status = RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, TRUE, FALSE, &WasPriv1Set); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE) failed (Error 0x%08lx)\n", Status); - goto Quit; - } - - /* Acquire backup privilege */ - Status = RtlAdjustPrivilege(SE_BACKUP_PRIVILEGE, TRUE, FALSE, &WasPriv2Set); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlAdjustPrivilege(SE_BACKUP_PRIVILEGE) failed (Error 0x%08lx)\n", Status); - RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, WasPriv1Set, FALSE, &WasPriv1Set); - goto Quit; - } - - /* Load user registry hive */ - Error = RegLoadKeyW(HKEY_USERS, pszSid, szUserHivePath); - - /* Remove restore and backup privileges */ - RtlAdjustPrivilege(SE_BACKUP_PRIVILEGE, WasPriv2Set, FALSE, &WasPriv2Set); - RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, WasPriv1Set, FALSE, &WasPriv1Set); - - /* HACK: Do not fail if the profile has already been loaded! */ - if (Error == ERROR_SHARING_VIOLATION) - Error = ERROR_SUCCESS; - - if (Error != ERROR_SUCCESS) - { - DPRINT1("RegLoadKeyW() failed (Error %ld)\n", Error); - goto Quit; - } - - /* Open future HKEY_CURRENT_USER */ - Error = RegOpenKeyExW(HKEY_USERS, - pszSid, - 0, - MAXIMUM_ALLOWED, - phProfile); - if (Error != ERROR_SUCCESS) - { - DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); - goto Quit; - } - - Success = TRUE; - -Quit: - LocalFree(pSid); - - DPRINT1("ScmLogAccountsHack(%S) returned %s\n", - pszAccountName, Success ? "success" : "failure"); - - return Success; -} - -static struct -{ - LPCWSTR pszAccountName; - LPCWSTR pszSid; - HKEY hProfile; -} AccountHandles[] = { -// {L"LocalSystem" , L"S-1-5-18", NULL}, - {L"LocalService" , L"S-1-5-19", NULL}, // L"NT AUTHORITY\\LocalService" - {L"NetworkService", L"S-1-5-20", NULL}, // L"NT AUTHORITY\\NetworkService" -}; - -static VOID -ScmCleanupServiceAccountsHack(VOID) -{ - UINT i; - - DPRINT1("ScmCleanupServiceAccountsHack()\n"); - - for (i = 0; i < ARRAYSIZE(AccountHandles); ++i) - { - if (AccountHandles[i].hProfile) - { - RegCloseKey(AccountHandles[i].hProfile); - AccountHandles[i].hProfile = NULL; - } - } -} - -static BOOL -ScmApplyServiceAccountsHack(VOID) -{ - UINT i; - - DPRINT1("ScmApplyServiceAccountsHack()\n"); - - for (i = 0; i < ARRAYSIZE(AccountHandles); ++i) - { - if (!ScmLogAccountHack( AccountHandles[i].pszAccountName, - AccountHandles[i].pszSid, - &AccountHandles[i].hProfile)) - { - ScmCleanupServiceAccountsHack(); - return FALSE; - } - } - - return TRUE; -} - -/*************************** END OF HACK CORE-12541 ***************************/ - - int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -407,9 +235,6 @@ wWinMain(HINSTANCE hInstance, */ SetProcessShutdownParameters(480, SHUTDOWN_NORETRY); - /*** HACK CORE-12541: Apply service accounts HACK ***/ - ScmApplyServiceAccountsHack(); - /* Start auto-start services */ ScmAutoStartServices(); @@ -429,9 +254,6 @@ wWinMain(HINSTANCE hInstance, /* Wait until the shutdown event gets signaled */ WaitForSingleObject(hScmShutdownEvent, INFINITE); - /*** HACK CORE-12541: Cleanup service accounts HACK ***/ - ScmCleanupServiceAccountsHack(); - done: ScmShutdownSecurity();

6 years, 5 months

01/01: [FONT][FREETYPE] Refactor global variable names and locking (#591)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1345cb77b3a460950a7f7… commit 1345cb77b3a460950a7f767dca7e40d26c7814b1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 29 05:00:55 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 22:00:55 2018 +0200 [FONT][FREETYPE] Refactor global variable names and locking (#591) Refactor the font engine code in "win32ss/gdi/ntgdi/freetype.c". - Add "g_" prefix to global variables. - Make the locking macros function-like. CORE-13065 --- win32ss/gdi/ntgdi/freetype.c | 298 +++++++++++++++++++++---------------------- 1 file changed, 149 insertions(+), 149 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 6417012381..5aa43e701d 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -47,51 +47,51 @@ extern const MATRIX gmxWorldToPageDefault; /* HACK!! Fix XFORMOBJ then use 1:16 / 16:1 */ #define gmxWorldToDeviceDefault gmxWorldToPageDefault -FT_Library library; +FT_Library g_FreeTypeLibrary; /* special font names */ -static const UNICODE_STRING MarlettW = RTL_CONSTANT_STRING(L"Marlett"); +static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett"); /* registry */ -static UNICODE_STRING FontRegPath = +static UNICODE_STRING g_FontRegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); /* The FreeType library is not thread safe, so we have to serialize access to it */ -static PFAST_MUTEX FreeTypeLock; +static PFAST_MUTEX g_FreeTypeLock; -static LIST_ENTRY FontListHead; -static PFAST_MUTEX FontListLock; -static BOOL RenderingEnabled = TRUE; +static LIST_ENTRY g_FontListHead; +static PFAST_MUTEX g_FontListLock; +static BOOL g_RenderingEnabled = TRUE; -#define IntLockGlobalFonts \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FontListLock) +#define IntLockGlobalFonts() \ + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(g_FontListLock) -#define IntUnLockGlobalFonts \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FontListLock) +#define IntUnLockGlobalFonts() \ + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(g_FontListLock) #define ASSERT_GLOBALFONTS_LOCK_HELD() \ - ASSERT(FontListLock->Owner == KeGetCurrentThread()) + ASSERT(g_FontListLock->Owner == KeGetCurrentThread()) -#define IntLockFreeType \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(FreeTypeLock) +#define IntLockFreeType() \ + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(g_FreeTypeLock) -#define IntUnLockFreeType \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(FreeTypeLock) +#define IntUnLockFreeType() \ + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(g_FreeTypeLock) #define ASSERT_FREETYPE_LOCK_HELD() \ - ASSERT(FreeTypeLock->Owner == KeGetCurrentThread()) + ASSERT(g_FreeTypeLock->Owner == KeGetCurrentThread()) #define ASSERT_FREETYPE_LOCK_NOT_HELD() \ - ASSERT(FreeTypeLock->Owner != KeGetCurrentThread()) + ASSERT(g_FreeTypeLock->Owner != KeGetCurrentThread()) #define MAX_FONT_CACHE 256 -static LIST_ENTRY FontCacheListHead; -static UINT FontCacheNumEntries; +static LIST_ENTRY g_FontCacheListHead; +static UINT g_FontCacheNumEntries; -static PWCHAR ElfScripts[32] = /* These are in the order of the fsCsb[0] bits */ +static PWCHAR g_ElfScripts[32] = /* These are in the order of the fsCsb[0] bits */ { L"Western", /* 00 */ L"Central_European", @@ -119,7 +119,7 @@ static PWCHAR ElfScripts[32] = /* These are in the order of the fsCsb[0] bits */ #define CP_SYMBOL 42 #define MAXTCIINDEX 32 -static const CHARSETINFO FontTci[MAXTCIINDEX] = +static const CHARSETINFO g_FontTci[MAXTCIINDEX] = { /* ANSI */ { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, @@ -161,7 +161,7 @@ static const CHARSETINFO FontTci[MAXTCIINDEX] = }; /* list head */ -static RTL_STATIC_LIST_HEAD(FontSubstListHead); +static RTL_STATIC_LIST_HEAD(g_FontSubstListHead); static void SharedMem_AddRef(PSHARED_MEM Ptr) @@ -230,8 +230,8 @@ RemoveCachedEntry(PFONT_CACHE_ENTRY Entry) FT_Done_Glyph((FT_Glyph)Entry->BitmapGlyph); RemoveEntryList(&Entry->ListEntry); ExFreePoolWithTag(Entry, TAG_FONT); - FontCacheNumEntries--; - ASSERT(FontCacheNumEntries <= MAX_FONT_CACHE); + g_FontCacheNumEntries--; + ASSERT(g_FontCacheNumEntries <= MAX_FONT_CACHE); } static void @@ -242,8 +242,8 @@ RemoveCacheEntries(FT_Face Face) ASSERT_FREETYPE_LOCK_HELD(); - CurrentEntry = FontCacheListHead.Flink; - while (CurrentEntry != &FontCacheListHead) + CurrentEntry = g_FontCacheListHead.Flink; + while (CurrentEntry != &g_FontCacheListHead) { FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry); CurrentEntry = CurrentEntry->Flink; @@ -285,7 +285,7 @@ SharedFaceCache_Release(PSHARED_FACE_CACHE Cache) static void SharedFace_Release(PSHARED_FACE Ptr) { - IntLockFreeType; + IntLockFreeType(); ASSERT(Ptr->RefCount > 0); if (Ptr->RefCount <= 0) @@ -302,7 +302,7 @@ SharedFace_Release(PSHARED_FACE Ptr) SharedFaceCache_Release(&Ptr->UserLanguage); ExFreePoolWithTag(Ptr, TAG_FONT); } - IntUnLockFreeType; + IntUnLockFreeType(); } @@ -455,25 +455,25 @@ InitFontSupport(VOID) { ULONG ulError; - InitializeListHead(&FontListHead); - InitializeListHead(&FontCacheListHead); - FontCacheNumEntries = 0; + InitializeListHead(&g_FontListHead); + InitializeListHead(&g_FontCacheListHead); + g_FontCacheNumEntries = 0; /* Fast Mutexes must be allocated from non paged pool */ - FontListLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), TAG_INTERNAL_SYNC); - if (FontListLock == NULL) + g_FontListLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), TAG_INTERNAL_SYNC); + if (g_FontListLock == NULL) { return FALSE; } - ExInitializeFastMutex(FontListLock); - FreeTypeLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), TAG_INTERNAL_SYNC); - if (FreeTypeLock == NULL) + ExInitializeFastMutex(g_FontListLock); + g_FreeTypeLock = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_MUTEX), TAG_INTERNAL_SYNC); + if (g_FreeTypeLock == NULL) { return FALSE; } - ExInitializeFastMutex(FreeTypeLock); + ExInitializeFastMutex(g_FreeTypeLock); - ulError = FT_Init_FreeType(&library); + ulError = FT_Init_FreeType(&g_FreeTypeLibrary); if (ulError) { DPRINT1("FT_Init_FreeType failed with error code 0x%x\n", ulError); @@ -481,7 +481,7 @@ InitFontSupport(VOID) } IntLoadSystemFonts(); - IntLoadFontSubstList(&FontSubstListHead); + IntLoadFontSubstList(&g_FontSubstListHead); return TRUE; } @@ -593,7 +593,7 @@ SubstituteFontRecurse(LOGFONTW* pLogFont) while (RecurseCount-- > 0) { - Found = SubstituteFontByList(&FontSubstListHead, + Found = SubstituteFontByList(&g_FontSubstListHead, &OutputNameW, &InputNameW, pLogFont->lfCharSet, CharSetMap); if (!Found) @@ -801,9 +801,9 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, if (SharedFace == NULL && CharSetIndex == -1) { /* load a face from memory */ - IntLockFreeType; + IntLockFreeType(); Error = FT_New_Memory_Face( - library, + g_FreeTypeLibrary, pLoadFont->Memory->Buffer, pLoadFont->Memory->BufferSize, ((FontIndex != -1) ? FontIndex : 0), @@ -812,7 +812,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, if (!Error) SharedFace = SharedFace_Create(Face, pLoadFont->Memory); - IntUnLockFreeType; + IntUnLockFreeType(); if (!Error && FT_IS_SFNT(Face)) pLoadFont->IsTrueType = TRUE; @@ -832,9 +832,9 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, else { Face = SharedFace->Face; - IntLockFreeType; + IntLockFreeType(); SharedFace_AddRef(SharedFace); - IntUnLockFreeType; + IntUnLockFreeType(); } /* allocate a FONT_ENTRY */ @@ -933,7 +933,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, } os2_version = 0; - IntLockFreeType; + IntLockFreeType(); pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(Face, FT_SFNT_OS2); if (pOS2) { @@ -941,7 +941,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, os2_ulCodePageRange1 = pOS2->ulCodePageRange1; os2_usWeightClass = pOS2->usWeightClass; } - IntUnLockFreeType; + IntUnLockFreeType(); if (pOS2 && os2_version >= 1) { @@ -954,13 +954,13 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, { if (os2_ulCodePageRange1 & (1 << BitIndex)) { - if (FontTci[BitIndex].ciCharset == DEFAULT_CHARSET) + if (g_FontTci[BitIndex].ciCharset == DEFAULT_CHARSET) continue; if ((CharSetIndex == -1 && CharSetCount == 0) || CharSetIndex == CharSetCount) { - FontGDI->CharSet = FontTci[BitIndex].ciCharset; + FontGDI->CharSet = g_FontTci[BitIndex].ciCharset; } ++CharSetCount; @@ -973,17 +973,17 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, else { /* get charset from WinFNT header */ - IntLockFreeType; + IntLockFreeType(); Error = FT_Get_WinFNT_Header(Face, &WinFNT); if (!Error) { FontGDI->CharSet = WinFNT.charset; } - IntUnLockFreeType; + IntUnLockFreeType(); } /* FIXME: CharSet is invalid on Marlett */ - if (RtlEqualUnicodeString(&Entry->FaceName, &MarlettW, TRUE)) + if (RtlEqualUnicodeString(&Entry->FaceName, &g_MarlettW, TRUE)) { FontGDI->CharSet = SYMBOL_CHARSET; } @@ -1008,9 +1008,9 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, else { /* global font */ - IntLockGlobalFonts; - InsertTailList(&FontListHead, &Entry->ListEntry); - IntUnLockGlobalFonts; + IntLockGlobalFonts(); + InsertTailList(&g_FontListHead, &Entry->ListEntry); + IntUnLockGlobalFonts(); } if (FontIndex == -1) @@ -1135,9 +1135,9 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) ObDereferenceObject(SectionObject); /* Release our copy */ - IntLockFreeType; + IntLockFreeType(); SharedMem_Release(LoadFont.Memory); - IntUnLockFreeType; + IntUnLockFreeType(); if (FontCount > 0) { @@ -1162,7 +1162,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) } /* registry */ - InitializeObjectAttributes(&ObjectAttributes, &FontRegPath, + InitializeObjectAttributes(&ObjectAttributes, &g_FontRegPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); @@ -1213,9 +1213,9 @@ IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) RtlFreeUnicodeString(&LoadFont.RegValueName); /* Release our copy */ - IntLockFreeType; + IntLockFreeType(); SharedMem_Release(LoadFont.Memory); - IntUnLockFreeType; + IntUnLockFreeType(); if (FaceCount > 0) { @@ -1372,12 +1372,12 @@ IntGdiCleanupPrivateFontsForProcess(VOID) BOOL FASTCALL IntIsFontRenderingEnabled(VOID) { - BOOL Ret = RenderingEnabled; + BOOL Ret = g_RenderingEnabled; HDC hDC; hDC = IntGetScreenDC(); if (hDC) - Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && RenderingEnabled; + Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && g_RenderingEnabled; return Ret; } @@ -1385,7 +1385,7 @@ IntIsFontRenderingEnabled(VOID) VOID FASTCALL IntEnableFontRendering(BOOL Enable) { - RenderingEnabled = Enable; + g_RenderingEnabled = Enable; } FT_Render_Mode FASTCALL @@ -1466,13 +1466,13 @@ IntTranslateCharsetInfo(PDWORD Src, /* [in] } break; case TCI_SRCCODEPAGE: - while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciACP) + while (Index < MAXTCIINDEX && *Src != g_FontTci[Index].ciACP) { Index++; } break; case TCI_SRCCHARSET: - while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciCharset) + while (Index < MAXTCIINDEX && *Src != g_FontTci[Index].ciCharset) { Index++; } @@ -1481,12 +1481,12 @@ IntTranslateCharsetInfo(PDWORD Src, /* [in] return FALSE; } - if (Index >= MAXTCIINDEX || DEFAULT_CHARSET == FontTci[Index].ciCharset) + if (Index >= MAXTCIINDEX || DEFAULT_CHARSET == g_FontTci[Index].ciCharset) { return FALSE; } - RtlCopyMemory(Cs, &FontTci[Index], sizeof(CHARSETINFO)); + RtlCopyMemory(Cs, &g_FontTci[Index], sizeof(CHARSETINFO)); return TRUE; } @@ -1825,11 +1825,11 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; - IntLockFreeType; + IntLockFreeType(); pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); if (NULL == pOS2) { - IntUnLockFreeType; + IntUnLockFreeType(); DPRINT1("Can't find OS/2 table - not TT font?\n"); RtlFreeUnicodeString(&FamilyNameW); RtlFreeUnicodeString(&FaceNameW); @@ -1841,7 +1841,7 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, pHori = FT_Get_Sfnt_Table(Face, ft_sfnt_hhea); if (NULL == pHori) { - IntUnLockFreeType; + IntUnLockFreeType(); DPRINT1("Can't find HHEA table - not TT font?\n"); RtlFreeUnicodeString(&FamilyNameW); RtlFreeUnicodeString(&FaceNameW); @@ -1900,7 +1900,7 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, Otm->otmsUnderscorePosition = (FT_MulFix(pPost->underlinePosition, YScale) + 32) >> 6; } - IntUnLockFreeType; + IntUnLockFreeType(); Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW); @@ -1996,9 +1996,9 @@ FindFaceNameInLists(PUNICODE_STRING FaceName) } /* Search the global list */ - IntLockGlobalFonts; - Font = FindFaceNameInList(FaceName, &FontListHead); - IntUnLockGlobalFonts; + IntLockGlobalFonts(); + Font = FindFaceNameInList(FaceName, &g_FontListHead); + IntUnLockGlobalFonts(); return Font; } @@ -2227,18 +2227,18 @@ IntGetFontLocalizedName(PUNICODE_STRING pNameW, PSHARED_FACE SharedFace, if (NameID == TT_NAME_ID_FONT_FAMILY) { ASSERT_FREETYPE_LOCK_NOT_HELD(); - IntLockFreeType; + IntLockFreeType(); if (!Cache->FontFamily.Buffer) DuplicateUnicodeString(pNameW, &Cache->FontFamily); - IntUnLockFreeType; + IntUnLockFreeType(); } else if (NameID == TT_NAME_ID_FULL_NAME) { ASSERT_FREETYPE_LOCK_NOT_HELD(); - IntLockFreeType; + IntLockFreeType(); if (!Cache->FullName.Buffer) DuplicateUnicodeString(pNameW, &Cache->FullName); - IntUnLockFreeType; + IntUnLockFreeType(); } } @@ -2357,12 +2357,12 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, } Info->EnumLogFontEx.elfScript[0] = UNICODE_NULL; - IntLockFreeType; + IntLockFreeType(); pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); if (!pOS2) { - IntUnLockFreeType; + IntUnLockFreeType(); return; } @@ -2382,7 +2382,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, else fs.fsCsb[0] |= FS_SYMBOL; } - IntUnLockFreeType; + IntUnLockFreeType(); if (fs.fsCsb[0] == 0) { @@ -2415,8 +2415,8 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, } if (DEFAULT_CHARSET != CharSetInfo.ciCharset) { - if (ElfScripts[i]) - wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); + if (g_ElfScripts[i]) + wcscpy(Info->EnumLogFontEx.elfScript, g_ElfScripts[i]); else { DPRINT1("Unknown elfscript for bit %u\n", i); @@ -2549,7 +2549,7 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, DWORD *pCount, DWORD MaxCount) { - PLIST_ENTRY pEntry, pHead = &FontSubstListHead; + PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; PFONTSUBST_ENTRY pCurrentEntry; PUNICODE_STRING pFromW; FONTGDI *FontGDI; @@ -2627,8 +2627,8 @@ ftGdiGlyphCacheGet( ASSERT_FREETYPE_LOCK_HELD(); - CurrentEntry = FontCacheListHead.Flink; - while (CurrentEntry != &FontCacheListHead) + CurrentEntry = g_FontCacheListHead.Flink; + while (CurrentEntry != &g_FontCacheListHead) { FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry); if ((FontEntry->Face == Face) && @@ -2640,13 +2640,13 @@ ftGdiGlyphCacheGet( CurrentEntry = CurrentEntry->Flink; } - if (CurrentEntry == &FontCacheListHead) + if (CurrentEntry == &g_FontCacheListHead) { return NULL; } RemoveEntryList(CurrentEntry); - InsertHeadList(&FontCacheListHead, CurrentEntry); + InsertHeadList(&g_FontCacheListHead, CurrentEntry); return FontEntry->BitmapGlyph; } @@ -2753,10 +2753,10 @@ ftGdiGlyphCacheSet( NewEntry->RenderMode = RenderMode; NewEntry->mxWorldToDevice = *pmx; - InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); - if (++FontCacheNumEntries > MAX_FONT_CACHE) + InsertHeadList(&g_FontCacheListHead, &NewEntry->ListEntry); + if (++g_FontCacheNumEntries > MAX_FONT_CACHE) { - NewEntry = CONTAINING_RECORD(FontCacheListHead.Blink, FONT_CACHE_ENTRY, ListEntry); + NewEntry = CONTAINING_RECORD(g_FontCacheListHead.Blink, FONT_CACHE_ENTRY, ListEntry); RemoveCachedEntry(NewEntry); } @@ -3042,7 +3042,7 @@ TextIntUpdateSize(PDC dc, LOGFONTW *plf; if (bDoLock) - IntLockFreeType; + IntLockFreeType(); face = FontGDI->SharedFace->Face; if (face->charmap == NULL) @@ -3080,7 +3080,7 @@ TextIntUpdateSize(PDC dc, error = IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); if (bDoLock) - IntUnLockFreeType; + IntUnLockFreeType(); if (error) { @@ -3173,7 +3173,7 @@ ftGdiGetGlyphOutline( return GDI_ERROR; } - IntLockFreeType; + IntLockFreeType(); TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); FtSetCoordinateTransform(ft_face, DC_pmxWorldToDevice(dc)); @@ -3199,11 +3199,11 @@ ftGdiGetGlyphOutline( if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; + IntUnLockFreeType(); if (potm) ExFreePoolWithTag(potm, GDITAG_TEXT); return GDI_ERROR; } - IntUnLockFreeType; + IntUnLockFreeType(); if (aveWidth && potm) { @@ -3221,7 +3221,7 @@ ftGdiGetGlyphOutline( DPRINT("Advance = %d, lsb = %d, bbx = %d\n",adv, lsb, bbx); - IntLockFreeType; + IntLockFreeType(); /* Scaling transform */ /*if (aveWidth)*/ @@ -3343,7 +3343,7 @@ ftGdiGetGlyphOutline( gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); - IntUnLockFreeType; + IntUnLockFreeType(); if (iFormat == GGO_METRICS) @@ -3395,7 +3395,7 @@ ftGdiGetGlyphOutline( ft_bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ft_bitmap.buffer = pvBuf; - IntLockFreeType; + IntLockFreeType(); if (needsTransform) { FT_Outline_Transform(&ft_face->glyph->outline, &transMat); @@ -3403,8 +3403,8 @@ ftGdiGetGlyphOutline( FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); /* Note: FreeType will only set 'black' bits for us. */ RtlZeroMemory(pvBuf, needed); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; + FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType(); break; default: @@ -3459,15 +3459,15 @@ ftGdiGetGlyphOutline( ft_bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ft_bitmap.buffer = pvBuf; - IntLockFreeType; + IntLockFreeType(); if (needsTransform) { FT_Outline_Transform(&ft_face->glyph->outline, &transMat); } FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); RtlZeroMemory(ft_bitmap.buffer, cjBuf); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; + FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType(); if (iFormat == GGO_GRAY2_BITMAP) mult = 4; @@ -3505,23 +3505,23 @@ ftGdiGetGlyphOutline( if (cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ - IntLockFreeType; + IntLockFreeType(); if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); needed = get_native_glyph_outline(outline, cjBuf, NULL); if (!pvBuf || !cjBuf) { - IntUnLockFreeType; + IntUnLockFreeType(); break; } if (needed > cjBuf) { - IntUnLockFreeType; + IntUnLockFreeType(); return GDI_ERROR; } get_native_glyph_outline(outline, cjBuf, pvBuf); - IntUnLockFreeType; + IntUnLockFreeType(); break; } case GGO_BEZIER: @@ -3531,9 +3531,9 @@ ftGdiGetGlyphOutline( if (needsTransform && pvBuf) { - IntLockFreeType; + IntLockFreeType(); FT_Outline_Transform(outline, &transMat); - IntUnLockFreeType; + IntUnLockFreeType(); } needed = get_bezier_glyph_outline(outline, cjBuf, NULL); @@ -3590,7 +3590,7 @@ TextIntGetTextExtentPoint(PDC dc, *Fit = 0; } - IntLockFreeType; + IntLockFreeType(); TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); @@ -3689,7 +3689,7 @@ TextIntGetTextExtentPoint(PDC dc, } ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */ descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */ - IntUnLockFreeType; + IntUnLockFreeType(); Size->cx = (TotalWidth + 32) >> 6; Size->cy = ascender + descender; @@ -3731,9 +3731,9 @@ ftGdiGetTextCharsetInfo( Face = FontGdi->SharedFace->Face; TEXTOBJ_UnlockText(TextObj); - IntLockFreeType; + IntLockFreeType(); pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); - IntUnLockFreeType; + IntUnLockFreeType(); memset(&fs, 0, sizeof(FONTSIGNATURE)); if (NULL != pOS2) { @@ -3915,10 +3915,10 @@ ftGdiGetTextMetricsW( FontGDI = ObjToGDI(TextObj->Font, FONT); Face = FontGDI->SharedFace->Face; - IntLockFreeType; + IntLockFreeType(); Error = IntRequestFontSize(dc, Face, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc)); - IntUnLockFreeType; + IntUnLockFreeType(); if (0 != Error) { DPRINT1("Error in setting pixel sizes: %u\n", Error); @@ -3929,7 +3929,7 @@ ftGdiGetTextMetricsW( FT_Face Face = FontGDI->SharedFace->Face; Status = STATUS_SUCCESS; - IntLockFreeType; + IntLockFreeType(); pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); if (NULL == pOS2) { @@ -3946,7 +3946,7 @@ ftGdiGetTextMetricsW( Error = FT_Get_WinFNT_Header(Face, &Win); - IntUnLockFreeType; + IntUnLockFreeType(); if (NT_SUCCESS(Status)) { @@ -3984,7 +3984,7 @@ ftGdiGetFontData( DWORD Result = GDI_ERROR; FT_Face Face = FontGdi->SharedFace->Face; - IntLockFreeType; + IntLockFreeType(); if (FT_IS_SFNT(Face)) { @@ -4007,7 +4007,7 @@ ftGdiGetFontData( Result = Size; } - IntUnLockFreeType; + IntUnLockFreeType(); return Result; } @@ -4502,10 +4502,10 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) IntUnLockProcessPrivateFonts(Win32Process); /* Search system fonts */ - IntLockGlobalFonts; + IntLockGlobalFonts(); FindBestFontFromList(&TextObj->Font, &MatchPenalty, &SubstitutedLogFont, - &FontListHead); - IntUnLockGlobalFonts; + &g_FontListHead); + IntUnLockGlobalFonts(); if (NULL == TextObj->Font) { @@ -4684,8 +4684,8 @@ IntGdiGetFontResourceInfo( } /* Try to find the pathname in the global font list */ Count = 0; - IntLockGlobalFonts; - for (ListEntry = FontListHead.Flink; ListEntry != &FontListHead; + IntLockGlobalFonts(); + for (ListEntry = g_FontListHead.Flink; ListEntry != &g_FontListHead; ListEntry = ListEntry->Flink) { FontEntry = CONTAINING_RECORD(ListEntry, FONT_ENTRY, ListEntry); @@ -4718,7 +4718,7 @@ IntGdiGetFontResourceInfo( break; } } - IntUnLockGlobalFonts; + IntUnLockGlobalFonts(); /* Free the buffers */ ExFreePoolWithTag(NameInfo1, TAG_FINF); @@ -4937,7 +4937,7 @@ ftGdiGetKerningPairs( PFONTGDI Font, char_previous = char_code = FT_Get_First_Char(face, &glyph_index); - IntLockFreeType; + IntLockFreeType(); while (glyph_index) { @@ -4959,7 +4959,7 @@ ftGdiGetKerningPairs( PFONTGDI Font, char_previous = char_code; char_code = FT_Get_Next_Char(face, char_code, &glyph_index); } - IntUnLockFreeType; + IntUnLockFreeType(); } return Count; } @@ -4999,15 +4999,15 @@ NtGdiGetFontFamilyInfo(HDC Dc, } /* Enumerate font families in the global list */ - IntLockGlobalFonts; + IntLockGlobalFonts(); Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &FontListHead) ) + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) ) { - IntUnLockGlobalFonts; + IntUnLockGlobalFonts(); ExFreePoolWithTag(Info, GDITAG_TEXT); return -1; } - IntUnLockGlobalFonts; + IntUnLockGlobalFonts(); /* Enumerate font families in the process local list */ Win32Process = PsGetCurrentProcessWin32Process(); @@ -5248,7 +5248,7 @@ GreExtTextOutW( FontGDI = ObjToGDI(FontObj, FONT); ASSERT(FontGDI); - IntLockFreeType; + IntLockFreeType(); face = FontGDI->SharedFace->Face; plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; @@ -5262,7 +5262,7 @@ GreExtTextOutW( if (!TextIntUpdateSize(dc, TextObj, FontGDI, FALSE)) { - IntUnLockFreeType; + IntUnLockFreeType(); bResult = FALSE; goto Cleanup; } @@ -5364,7 +5364,7 @@ GreExtTextOutW( if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; + IntUnLockFreeType(); goto Cleanup; } @@ -5439,7 +5439,7 @@ GreExtTextOutW( if (error) { DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; + IntUnLockFreeType(); goto Cleanup; } @@ -5452,7 +5452,7 @@ GreExtTextOutW( if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); - IntUnLockFreeType; + IntUnLockFreeType(); goto Cleanup; } @@ -5801,7 +5801,7 @@ GreExtTextOutW( pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; } - IntUnLockFreeType; + IntUnLockFreeType(); EXLATEOBJ_vCleanup(&exloRGB2Dst); EXLATEOBJ_vCleanup(&exloDst2RGB); @@ -6077,13 +6077,13 @@ NtGdiGetCharABCWidthsW( return FALSE; } - IntLockFreeType; + IntLockFreeType(); FT_Set_Charmap(face, found); - IntUnLockFreeType; + IntUnLockFreeType(); } plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - IntLockFreeType; + IntLockFreeType(); IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(face, pmxWorldToDevice); @@ -6132,7 +6132,7 @@ NtGdiGetCharABCWidthsW( SafeBuff[i - FirstChar].abcC = adv - lsb - bbx; } } - IntUnLockFreeType; + IntUnLockFreeType(); TEXTOBJ_UnlockText(TextObj); Status = MmCopyToCaller(Buffer, SafeBuff, BufferSize); @@ -6273,13 +6273,13 @@ NtGdiGetCharWidthW( return FALSE; } - IntLockFreeType; + IntLockFreeType(); FT_Set_Charmap(face, found); - IntUnLockFreeType; + IntUnLockFreeType(); } plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - IntLockFreeType; + IntLockFreeType(); IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight); FtSetCoordinateTransform(face, pmxWorldToDevice); @@ -6305,7 +6305,7 @@ NtGdiGetCharWidthW( else SafeBuff[i - FirstChar] = (face->glyph->advance.x + 32) >> 6; } - IntUnLockFreeType; + IntUnLockFreeType(); TEXTOBJ_UnlockText(TextObj); MmCopyToCaller(Buffer, SafeBuff, BufferSize); @@ -6449,7 +6449,7 @@ NtGdiGetGlyphIndicesW( if (!NT_SUCCESS(Status)) goto ErrorRet; - IntLockFreeType; + IntLockFreeType(); for (i = 0; i < cwc; i++) { @@ -6460,7 +6460,7 @@ NtGdiGetGlyphIndicesW( } } - IntUnLockFreeType; + IntUnLockFreeType(); _SEH2_TRY {

6 years, 5 months

01/01: [SHELL32] Initial implementation of Folder Customization (#642)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb1912b15f9a7342c61b1… commit eb1912b15f9a7342c61b19d5ed9d226712f76fed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 29 04:51:37 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 21:51:37 2018 +0200 [SHELL32] Initial implementation of Folder Customization (#642) - Add property sheet; - Implement changing the folder icon. CORE-11407 --- dll/win32/shell32/dialogs/filedefext.cpp | 255 +++++++++++++++++++++++++++++++ dll/win32/shell32/dialogs/filedefext.h | 14 ++ dll/win32/shell32/lang/bg-BG.rc | 21 +++ dll/win32/shell32/lang/ca-ES.rc | 21 +++ dll/win32/shell32/lang/cs-CZ.rc | 21 +++ dll/win32/shell32/lang/da-DK.rc | 21 +++ dll/win32/shell32/lang/de-DE.rc | 21 +++ dll/win32/shell32/lang/el-GR.rc | 21 +++ dll/win32/shell32/lang/en-GB.rc | 21 +++ dll/win32/shell32/lang/en-US.rc | 21 +++ dll/win32/shell32/lang/es-ES.rc | 21 +++ dll/win32/shell32/lang/et-EE.rc | 21 +++ dll/win32/shell32/lang/fi-FI.rc | 21 +++ dll/win32/shell32/lang/fr-FR.rc | 21 +++ dll/win32/shell32/lang/he-IL.rc | 21 +++ dll/win32/shell32/lang/hu-HU.rc | 21 +++ dll/win32/shell32/lang/it-IT.rc | 21 +++ dll/win32/shell32/lang/ja-JP.rc | 21 +++ dll/win32/shell32/lang/ko-KR.rc | 21 +++ dll/win32/shell32/lang/nl-NL.rc | 21 +++ dll/win32/shell32/lang/no-NO.rc | 21 +++ dll/win32/shell32/lang/pl-PL.rc | 21 +++ dll/win32/shell32/lang/pt-BR.rc | 21 +++ dll/win32/shell32/lang/pt-PT.rc | 21 +++ dll/win32/shell32/lang/ro-RO.rc | 21 +++ dll/win32/shell32/lang/ru-RU.rc | 21 +++ dll/win32/shell32/lang/sk-SK.rc | 21 +++ dll/win32/shell32/lang/sl-SI.rc | 21 +++ dll/win32/shell32/lang/sq-AL.rc | 21 +++ dll/win32/shell32/lang/sv-SE.rc | 21 +++ dll/win32/shell32/lang/tr-TR.rc | 21 +++ dll/win32/shell32/lang/uk-UA.rc | 21 +++ dll/win32/shell32/lang/zh-CN.rc | 21 +++ dll/win32/shell32/lang/zh-TW.rc | 21 +++ dll/win32/shell32/shresdef.h | 10 ++ 35 files changed, 951 insertions(+) diff --git a/dll/win32/shell32/dialogs/filedefext.cpp b/dll/win32/shell32/dialogs/filedefext.cpp index 8ac8c62998..2065e4ef05 100644 --- a/dll/win32/shell32/dialogs/filedefext.cpp +++ b/dll/win32/shell32/dialogs/filedefext.cpp @@ -885,11 +885,256 @@ CFileDefExt::VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar return FALSE; } +/*************************************************************************/ +/* Folder Customize */ + +static const WCHAR s_szShellClassInfo[] = L".ShellClassInfo"; +static const WCHAR s_szIconIndex[] = L"IconIndex"; +static const WCHAR s_szIconFile[] = L"IconFile"; +static const WCHAR s_szIconResource[] = L"IconResource"; + +// IDD_FOLDER_CUSTOMIZE +INT_PTR CALLBACK +CFileDefExt::FolderCustomizePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CFileDefExt *pFileDefExt = reinterpret_cast<CFileDefExt *>(GetWindowLongPtr(hwndDlg, DWLP_USER)); + switch (uMsg) + { + case WM_INITDIALOG: + { + LPPROPSHEETPAGE ppsp = (LPPROPSHEETPAGE)lParam; + + if (ppsp == NULL || !ppsp->lParam) + break; + + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %x\n", hwndDlg, lParam, ppsp->lParam); + + pFileDefExt = reinterpret_cast<CFileDefExt *>(ppsp->lParam); + return pFileDefExt->InitFolderCustomizePage(hwndDlg); + } + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_FOLDERCUST_CHANGE_ICON: + pFileDefExt->OnFolderCustChangeIcon(hwndDlg); + break; + + case IDC_FOLDERCUST_CHOOSE_PIC: + // TODO: + break; + + case IDC_FOLDERCUST_RESTORE_DEFAULTS: + // TODO: + break; + } + break; + + case WM_NOTIFY: + { + LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; + if (lppsn->hdr.code == PSN_APPLY) + { + // apply or not + if (pFileDefExt->OnFolderCustApply(hwndDlg)) + { + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR); + } + else + { + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + } + return TRUE; + } + break; + } + + case WM_DESTROY: + pFileDefExt->OnFolderCustDestroy(hwndDlg); + break; + + default: + break; + } + + return FALSE; +} + +// IDD_FOLDER_CUSTOMIZE WM_DESTROY +void CFileDefExt::OnFolderCustDestroy(HWND hwndDlg) +{ + ::DestroyIcon(m_hFolderIcon); + m_hFolderIcon = NULL; + + /* Detach the object from dialog window */ + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)0); +} + +void CFileDefExt::UpdateFolderIcon(HWND hwndDlg) +{ + // destroy icon if any + if (m_hFolderIcon) + { + ::DestroyIcon(m_hFolderIcon); + m_hFolderIcon = NULL; + } + + // create the icon + if (m_szFolderIconPath[0] == 0 && m_nFolderIconIndex == 0) + { + m_hFolderIcon = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER)); + } + else + { + ExtractIconExW(m_szFolderIconPath, m_nFolderIconIndex, &m_hFolderIcon, NULL, 1); + } + + // set icon + SendDlgItemMessageW(hwndDlg, IDC_FOLDERCUST_ICON, STM_SETICON, (WPARAM)m_hFolderIcon, 0); +} + +// IDD_FOLDER_CUSTOMIZE WM_INITDIALOG +BOOL CFileDefExt::InitFolderCustomizePage(HWND hwndDlg) +{ + /* Attach the object to dialog window */ + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)this); + + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDERCUST_COMBOBOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDERCUST_CHECKBOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDERCUST_CHOOSE_PIC), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDERCUST_RESTORE_DEFAULTS), FALSE); + + // build the desktop.ini file path + WCHAR szIniFile[MAX_PATH]; + StringCchCopyW(szIniFile, _countof(szIniFile), m_wszPath); + PathAppendW(szIniFile, L"desktop.ini"); + + // desktop.ini --> m_szFolderIconPath, m_nFolderIconIndex + m_szFolderIconPath[0] = 0; + m_nFolderIconIndex = 0; + if (GetPrivateProfileStringW(s_szShellClassInfo, s_szIconFile, NULL, + m_szFolderIconPath, _countof(m_szFolderIconPath), szIniFile)) + { + m_nFolderIconIndex = GetPrivateProfileIntW(s_szShellClassInfo, s_szIconIndex, 0, szIniFile); + } + else if (GetPrivateProfileStringW(s_szShellClassInfo, s_szIconResource, NULL, + m_szFolderIconPath, _countof(m_szFolderIconPath), szIniFile)) + { + m_nFolderIconIndex = PathParseIconLocationW(m_szFolderIconPath); + } + + // update icon + UpdateFolderIcon(hwndDlg); + + return TRUE; +} + +// IDD_FOLDER_CUSTOMIZE IDC_FOLDERCUST_CHANGE_ICON +void CFileDefExt::OnFolderCustChangeIcon(HWND hwndDlg) +{ + WCHAR szPath[MAX_PATH]; + INT nIconIndex; + + // m_szFolderIconPath, m_nFolderIconIndex --> szPath, nIconIndex + if (m_szFolderIconPath[0]) + { + StringCchCopyW(szPath, _countof(szPath), m_szFolderIconPath); + nIconIndex = m_nFolderIconIndex; + } + else + { + szPath[0] = 0; + nIconIndex = 0; + } + + // let the user choose the icon + if (PickIconDlg(hwndDlg, szPath, _countof(szPath), &nIconIndex)) + { + // changed + m_bFolderIconIsSet = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + // update + StringCchCopyW(m_szFolderIconPath, _countof(m_szFolderIconPath), szPath); + m_nFolderIconIndex = nIconIndex; + UpdateFolderIcon(hwndDlg); + } +} + +// IDD_FOLDER_CUSTOMIZE PSN_APPLY +BOOL CFileDefExt::OnFolderCustApply(HWND hwndDlg) +{ + // build the desktop.ini file path + WCHAR szIniFile[MAX_PATH]; + StringCchCopyW(szIniFile, _countof(szIniFile), m_wszPath); + PathAppendW(szIniFile, L"desktop.ini"); + + if (m_bFolderIconIsSet) // it is set! + { + DWORD attrs; + + // change folder attributes (-S -R) + attrs = GetFileAttributesW(m_wszPath); + attrs &= ~(FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY); + SetFileAttributesW(m_wszPath, attrs); + + // change desktop.ini attributes (-S -H -R) + attrs = GetFileAttributesW(szIniFile); + attrs &= ~(FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_READONLY); + SetFileAttributesW(szIniFile, attrs); + + if (m_szFolderIconPath[0]) + { + // write IconFile and IconIndex + WritePrivateProfileStringW(s_szShellClassInfo, s_szIconFile, m_szFolderIconPath, szIniFile); + + WCHAR szInt[32]; + StringCchPrintfW(szInt, _countof(szInt), L"%d", m_nFolderIconIndex); + WritePrivateProfileStringW(s_szShellClassInfo, s_szIconIndex, szInt, szIniFile); + + // flush! + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + } + else + { + // erase three values + WritePrivateProfileStringW(s_szShellClassInfo, s_szIconFile, NULL, szIniFile); + WritePrivateProfileStringW(s_szShellClassInfo, s_szIconIndex, NULL, szIniFile); + WritePrivateProfileStringW(s_szShellClassInfo, s_szIconResource, NULL, szIniFile); + + // flush! + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + } + + // change desktop.ini attributes (+S +H) + attrs = GetFileAttributesW(szIniFile); + attrs |= FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + SetFileAttributesW(szIniFile, attrs); + + // change folder attributes (+R) + attrs = GetFileAttributesW(m_wszPath); + attrs |= FILE_ATTRIBUTE_READONLY; + SetFileAttributesW(m_wszPath, attrs); + + // done! + m_bFolderIconIsSet = FALSE; + } + + return TRUE; +} + +/*****************************************************************************/ + CFileDefExt::CFileDefExt(): m_bDir(FALSE), m_cFiles(0), m_cFolders(0) { m_wszPath[0] = L'\0'; m_DirSize.QuadPart = 0ull; + + m_szFolderIconPath[0] = 0; + m_nFolderIconIndex = 0; + m_hFolderIcon = NULL; + m_bFolderIconIsSet = FALSE; } CFileDefExt::~CFileDefExt() @@ -980,6 +1225,16 @@ CFileDefExt::AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) pfnAddPage(hPage, lParam); } + if (m_bDir) + { + hPage = SH_CreatePropertySheetPage(IDD_FOLDER_CUSTOMIZE, + FolderCustomizePageProc, + (LPARAM)this, + NULL); + if (hPage) + pfnAddPage(hPage, lParam); + } + return S_OK; } diff --git a/dll/win32/shell32/dialogs/filedefext.h b/dll/win32/shell32/dialogs/filedefext.h index 4a1c710065..31a513e2ee 100644 --- a/dll/win32/shell32/dialogs/filedefext.h +++ b/dll/win32/shell32/dialogs/filedefext.h @@ -71,8 +71,10 @@ private: BOOL SetVersionLabel(HWND hwndDlg, DWORD idCtrl, LPCWSTR pwszName); BOOL AddVersionString(HWND hwndDlg, LPCWSTR pwszName); BOOL InitVersionPage(HWND hwndDlg); + BOOL InitFolderCustomizePage(HWND hwndDlg); static INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK VersionPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK FolderCustomizePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); BOOL CountFolderAndFiles(HWND hwndDlg, LPWSTR pwszBuf, UINT cchBufMax, LPDWORD ticks); WCHAR m_wszPath[MAX_PATH]; @@ -85,10 +87,22 @@ private: static DWORD WINAPI _CountFolderAndFilesThreadProc(LPVOID lpParameter); + // FolderCustomize + WCHAR m_szFolderIconPath[MAX_PATH]; + INT m_nFolderIconIndex; + HICON m_hFolderIcon; + BOOL m_bFolderIconIsSet; + public: CFileDefExt(); ~CFileDefExt(); + // FolderCustomize + BOOL OnFolderCustApply(HWND hwndDlg); + void OnFolderCustChangeIcon(HWND hwndDlg); + void OnFolderCustDestroy(HWND hwndDlg); + void UpdateFolderIcon(HWND hwndDlg); + // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index a0b68c49c4..7ba087f495 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -692,6 +692,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 95f9cc776e..87d75b207c 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index eaf95dd9b3..8886b98159 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -697,6 +697,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index e119183090..0eb0780f69 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -697,6 +697,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 186b4daeed..2244de12db 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -692,6 +692,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 7160496c3f..6e04f6af6f 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 28364b60cd..55093b2be2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 8b3277d356..a2dd042363 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -692,6 +692,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index be37170990..bc1f9ea1af 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -693,6 +693,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index da98d936c7..422863cfcf 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -699,6 +699,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index ca9a0eda15..d60d367e18 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 58f991f1be..7f5aef691e 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 2d40a8f1e4..3d8d1a6246 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index edeaea40d2..583dc6d883 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index ad7d311521..4ab9e804fc 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index a9368a78c6..c58f52181b 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -688,6 +688,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index ca1ae4f008..0ab6955762 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 9, "굴림" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index daf6033a27..550d927d0c 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 72cf948cf8..b748c18512 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 1dbc90695b..46a9649a95 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -696,6 +696,27 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index c1cc8ebcd6..73c1d34bf8 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 0b5331b475..9dd6b0c7b0 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 692ad17b66..28bb92004f 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -693,6 +693,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index a14c15af4e..6c4e7a91c5 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -693,6 +693,27 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 82c3fff2dd..5c1033d23a 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 194984c2d0..a8d4843d16 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index d30e49facc..de4d8dcef9 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -695,6 +695,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 16cfbea80f..79ccef9cc1 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index de2688eb51..0bd46bbc88 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -693,6 +693,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index f7c390b2b4..1ae5fa95de 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -691,6 +691,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index a0ac5f220c..7a91360d76 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -699,6 +699,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 9, "宋体" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 5dc86e8fa3..58fdc657ff 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -699,6 +699,27 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 END +IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 +CAPTION "Customize" +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +FONT 9, "新細明體" +BEGIN + GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 + GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + ICON 0, IDC_FOLDERCUST_ICON, 175, 210, 32, 30 + PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15, BS_MULTILINE +END + STRINGTABLE BEGIN /* columns in the shellview */ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 483c9c88de..037d1fc0be 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -434,6 +434,16 @@ #define IDD_NEWEXTENSION 28 #define IDD_EDITTYPE 36 #define IDD_ACTION 37 +#define IDD_FOLDER_CUSTOMIZE 38 + +/* Control IDs for IDD_FOLDER_CUSTOMIZE dialog */ +#define IDC_FOLDERCUST_COMBOBOX 14001 +#define IDC_FOLDERCUST_CHECKBOX 14002 +#define IDC_FOLDERCUST_CHOOSE_PIC 14003 +#define IDC_FOLDERCUST_RESTORE_DEFAULTS 14004 +#define IDC_FOLDERCUST_PREVIEW_BITMAP 14005 +#define IDC_FOLDERCUST_ICON 14006 +#define IDC_FOLDERCUST_CHANGE_ICON 14007 /* Not used dialogs */ #define IDD_SHUTDOWN 29

6 years, 5 months

01/01: [WIN32SS] Fix IntSynthesizeDib to synthesize CF_DIB with CF_BITMAP (#644)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a685446b671b70c2cefd… commit 8a685446b671b70c2cefdede37c6403cb020acf0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 29 02:27:40 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 19:27:40 2018 +0200 [WIN32SS] Fix IntSynthesizeDib to synthesize CF_DIB with CF_BITMAP (#644) CORE-14770 --- win32ss/user/ntuser/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/clipboard.c b/win32ss/user/ntuser/clipboard.c index 9790b86746..92109953cc 100644 --- a/win32ss/user/ntuser/clipboard.c +++ b/win32ss/user/ntuser/clipboard.c @@ -160,6 +160,7 @@ IntSynthesizeDib( } /* Get information about the bitmap format */ + memset(&bmiBuffer, 0, sizeof(bmiBuffer)); pbmi->bmiHeader.biSize = sizeof(bmiBuffer.bmih); iResult = GreGetDIBitsInternal(hdc, hbm,

6 years, 5 months

01/01: [DBGHELP] Fix 3 MSVC warnings about MiniDumpWriteDump() (#643)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3766d836c701d59cedb2d… commit 3766d836c701d59cedb2d014bde572a7e8b40e59 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 28 17:44:49 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 28 17:44:49 2018 +0200 [DBGHELP] Fix 3 MSVC warnings about MiniDumpWriteDump() (#643) - Fixes MSVC errors: "...\dll\win32\dbghelp\minidump.c(857) : error C4028: formal parameter 5 different from declaration", for parameters 5, 6 and 7. - Fix spec file too. CORE-7538 --- dll/win32/dbghelp/dbghelp.spec | 2 +- sdk/include/psdk/dbghelp.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp.spec b/dll/win32/dbghelp/dbghelp.spec index 2a572512e4..95cebca63d 100644 --- a/dll/win32/dbghelp/dbghelp.spec +++ b/dll/win32/dbghelp/dbghelp.spec @@ -30,7 +30,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) -@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) +@ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 28eec9a10a..a8fdf38e0a 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -901,9 +901,9 @@ MiniDumpWriteDump( _In_ DWORD, _In_ HANDLE, _In_ MINIDUMP_TYPE, - _In_opt_ const PMINIDUMP_EXCEPTION_INFORMATION, - _In_opt_ const PMINIDUMP_USER_STREAM_INFORMATION, - _In_opt_ const PMINIDUMP_CALLBACK_INFORMATION); + _In_opt_ PMINIDUMP_EXCEPTION_INFORMATION, + _In_opt_ PMINIDUMP_USER_STREAM_INFORMATION, + _In_opt_ PMINIDUMP_CALLBACK_INFORMATION); BOOL WINAPI

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2018