Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [NDK] Replace the SYSTEMTIME fields StandardDate and DaylightDate in RTL_TIME_ZONE_INFORMATION by TIME_FIELDs and fix resulting errors

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=491138291348dbc72f0be… commit 491138291348dbc72f0be52cecb1459d0281d332 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 17:48:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 17:48:29 2018 +0200 [NDK] Replace the SYSTEMTIME fields StandardDate and DaylightDate in RTL_TIME_ZONE_INFORMATION by TIME_FIELDs and fix resulting errors Patch will be sent upstream. CORE-14658 --- dll/win32/kernel32/wine/timezone.c | 64 ++++++++++++++++++++++++++++++++++--- ntoskrnl/ex/sysinfo.c | 10 +++--- ntoskrnl/ex/time.c | 8 ++--- ntoskrnl/include/internal/ex.h | 4 +-- sdk/include/ndk/rtltypes.h | 29 +++-------------- sdk/include/reactos/wine/winternl.h | 32 ++++++++++--------- win32ss/user/ntuser/kbdlayout.c | 5 ++- 7 files changed, 96 insertions(+), 56 deletions(-) diff --git a/dll/win32/kernel32/wine/timezone.c b/dll/win32/kernel32/wine/timezone.c index 23c0c47302..8869848d49 100644 --- a/dll/win32/kernel32/wine/timezone.c +++ b/dll/win32/kernel32/wine/timezone.c @@ -261,13 +261,14 @@ DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) { + RTL_TIME_ZONE_INFORMATION TimeZoneInformation; NTSTATUS Status; DPRINT("GetTimeZoneInformation()\n"); Status = NtQuerySystemInformation(SystemCurrentTimeZoneInformation, - lpTimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION), + &TimeZoneInformation, + sizeof(RTL_TIME_ZONE_INFORMATION), NULL); if (!NT_SUCCESS(Status)) { @@ -275,6 +276,32 @@ GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation) return TIME_ZONE_ID_INVALID; } + lpTimeZoneInformation->Bias = TimeZoneInformation.Bias; + + wcsncpy(lpTimeZoneInformation->StandardName, + TimeZoneInformation.StandardName, + ARRAYSIZE(lpTimeZoneInformation->StandardName)); + lpTimeZoneInformation->StandardDate.wYear = TimeZoneInformation.StandardDate.Year; + lpTimeZoneInformation->StandardDate.wMonth = TimeZoneInformation.StandardDate.Month; + lpTimeZoneInformation->StandardDate.wDay = TimeZoneInformation.StandardDate.Day; + lpTimeZoneInformation->StandardDate.wHour = TimeZoneInformation.StandardDate.Hour; + lpTimeZoneInformation->StandardDate.wMinute = TimeZoneInformation.StandardDate.Minute; + lpTimeZoneInformation->StandardDate.wSecond = TimeZoneInformation.StandardDate.Second; + lpTimeZoneInformation->StandardDate.wDayOfWeek = TimeZoneInformation.StandardDate.Weekday; + lpTimeZoneInformation->StandardBias = TimeZoneInformation.StandardBias; + + wcsncpy(lpTimeZoneInformation->DaylightName, + TimeZoneInformation.DaylightName, + ARRAYSIZE(lpTimeZoneInformation->DaylightName)); + lpTimeZoneInformation->DaylightDate.wYear = TimeZoneInformation.DaylightDate.Year; + lpTimeZoneInformation->DaylightDate.wMonth = TimeZoneInformation.DaylightDate.Month; + lpTimeZoneInformation->DaylightDate.wDay = TimeZoneInformation.DaylightDate.Day; + lpTimeZoneInformation->DaylightDate.wHour = TimeZoneInformation.DaylightDate.Hour; + lpTimeZoneInformation->DaylightDate.wMinute = TimeZoneInformation.DaylightDate.Minute; + lpTimeZoneInformation->DaylightDate.wSecond = TimeZoneInformation.DaylightDate.Second; + lpTimeZoneInformation->DaylightDate.wDayOfWeek = TimeZoneInformation.DaylightDate.Weekday; + lpTimeZoneInformation->DaylightBias = TimeZoneInformation.DaylightBias; + return TIME_ZoneID(lpTimeZoneInformation); } @@ -286,11 +313,38 @@ BOOL WINAPI SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) { + RTL_TIME_ZONE_INFORMATION TimeZoneInformation; NTSTATUS Status; DPRINT("SetTimeZoneInformation()\n"); - Status = RtlSetTimeZoneInformation((LPTIME_ZONE_INFORMATION)lpTimeZoneInformation); + TimeZoneInformation.Bias = lpTimeZoneInformation->Bias; + + wcsncpy(TimeZoneInformation.StandardName, + lpTimeZoneInformation->StandardName, + ARRAYSIZE(TimeZoneInformation.StandardName)); + TimeZoneInformation.StandardDate.Year = lpTimeZoneInformation->StandardDate.wYear; + TimeZoneInformation.StandardDate.Month = lpTimeZoneInformation->StandardDate.wMonth; + TimeZoneInformation.StandardDate.Day = lpTimeZoneInformation->StandardDate.wDay; + TimeZoneInformation.StandardDate.Hour = lpTimeZoneInformation->StandardDate.wHour; + TimeZoneInformation.StandardDate.Minute = lpTimeZoneInformation->StandardDate.wMinute; + TimeZoneInformation.StandardDate.Second = lpTimeZoneInformation->StandardDate.wSecond; + TimeZoneInformation.StandardDate.Weekday = lpTimeZoneInformation->StandardDate.wDayOfWeek; + TimeZoneInformation.StandardBias = lpTimeZoneInformation->StandardBias; + + wcsncpy(TimeZoneInformation.DaylightName, + lpTimeZoneInformation->DaylightName, + ARRAYSIZE(TimeZoneInformation.DaylightName)); + TimeZoneInformation.DaylightDate.Year = lpTimeZoneInformation->DaylightDate.wYear; + TimeZoneInformation.DaylightDate.Month = lpTimeZoneInformation->DaylightDate.wMonth; + TimeZoneInformation.DaylightDate.Day = lpTimeZoneInformation->DaylightDate.wDay; + TimeZoneInformation.DaylightDate.Hour = lpTimeZoneInformation->DaylightDate.wHour; + TimeZoneInformation.DaylightDate.Minute = lpTimeZoneInformation->DaylightDate.wMinute; + TimeZoneInformation.DaylightDate.Second = lpTimeZoneInformation->DaylightDate.wSecond; + TimeZoneInformation.DaylightDate.Weekday = lpTimeZoneInformation->DaylightDate.wDayOfWeek; + TimeZoneInformation.DaylightBias = lpTimeZoneInformation->DaylightBias; + + Status = RtlSetTimeZoneInformation(&TimeZoneInformation); if (!NT_SUCCESS(Status)) { DPRINT1("RtlSetTimeZoneInformation() failed (Status %lx)\n", Status); @@ -299,8 +353,8 @@ SetTimeZoneInformation(CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation) } Status = NtSetSystemInformation(SystemCurrentTimeZoneInformation, - (PVOID)lpTimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION)); + (PVOID)&TimeZoneInformation, + sizeof(RTL_TIME_ZONE_INFORMATION)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetSystemInformation() failed (Status %lx)\n", Status); diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index ceb1d22842..016ac5b1d9 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -1939,9 +1939,9 @@ QSI_DEF(SystemLegacyDriverInformation) /* Class 44 - Current Time Zone Information */ QSI_DEF(SystemCurrentTimeZoneInformation) { - *ReqSize = sizeof(TIME_ZONE_INFORMATION); + *ReqSize = sizeof(RTL_TIME_ZONE_INFORMATION); - if (sizeof(TIME_ZONE_INFORMATION) != Size) + if (sizeof(RTL_TIME_ZONE_INFORMATION) != Size) { return STATUS_INFO_LENGTH_MISMATCH; } @@ -1949,7 +1949,7 @@ QSI_DEF(SystemCurrentTimeZoneInformation) /* Copy the time zone information struct */ memcpy(Buffer, &ExpTimeZoneInfo, - sizeof(TIME_ZONE_INFORMATION)); + sizeof(RTL_TIME_ZONE_INFORMATION)); return STATUS_SUCCESS; } @@ -1958,12 +1958,12 @@ QSI_DEF(SystemCurrentTimeZoneInformation) SSI_DEF(SystemCurrentTimeZoneInformation) { /* Check user buffer's size */ - if (Size < sizeof(TIME_ZONE_INFORMATION)) + if (Size < sizeof(RTL_TIME_ZONE_INFORMATION)) { return STATUS_INFO_LENGTH_MISMATCH; } - return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); + return ExpSetTimeZoneInformation((PRTL_TIME_ZONE_INFORMATION)Buffer); } static diff --git a/ntoskrnl/ex/time.c b/ntoskrnl/ex/time.c index a9ae21c1ce..44ce39d9ad 100644 --- a/ntoskrnl/ex/time.c +++ b/ntoskrnl/ex/time.c @@ -18,7 +18,7 @@ /* GLOBALS ******************************************************************/ /* Note: Bias[minutes] = UTC - local time */ -TIME_ZONE_INFORMATION ExpTimeZoneInfo; +RTL_TIME_ZONE_INFORMATION ExpTimeZoneInfo; ULONG ExpLastTimeZoneBias = -1; LARGE_INTEGER ExpTimeZoneBias; ULONG ExpAltTimeZoneBias; @@ -233,7 +233,7 @@ ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) if (!NT_SUCCESS(Status)) { /* Failed, clear all data */ - RtlZeroMemory(&ExpTimeZoneInfo, sizeof(TIME_ZONE_INFORMATION)); + RtlZeroMemory(&ExpTimeZoneInfo, sizeof(RTL_TIME_ZONE_INFORMATION)); ExpTimeZoneBias.QuadPart = (LONGLONG)0; ExpTimeZoneId = TIME_ZONE_ID_UNKNOWN; } @@ -275,7 +275,7 @@ ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) } NTSTATUS -ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) +ExpSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation) { LARGE_INTEGER LocalTime, SystemTime, OldTime; TIME_FIELDS TimeFields; @@ -303,7 +303,7 @@ ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation) /* Copy the timezone information */ RtlCopyMemory(&ExpTimeZoneInfo, TimeZoneInformation, - sizeof(TIME_ZONE_INFORMATION)); + sizeof(RTL_TIME_ZONE_INFORMATION)); /* Set the new time zone information */ SharedUserData->TimeZoneBias.High1Time = ExpTimeZoneBias.u.HighPart; diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 091b90783d..740bb96564 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -2,7 +2,7 @@ /* GLOBAL VARIABLES *********************************************************/ -extern TIME_ZONE_INFORMATION ExpTimeZoneInfo; +extern RTL_TIME_ZONE_INFORMATION ExpTimeZoneInfo; extern LARGE_INTEGER ExpTimeZoneBias; extern ULONG ExpTimeZoneId; extern ULONG ExpTickCountMultiplier; @@ -1417,7 +1417,7 @@ ExTryToAcquireResourceExclusiveLite( NTSTATUS ExpSetTimeZoneInformation( - IN PTIME_ZONE_INFORMATION TimeZoneInformation + IN PRTL_TIME_ZONE_INFORMATION TimeZoneInformation ); BOOLEAN diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 1371f4c86f..b526f9ea04 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1662,38 +1662,19 @@ typedef struct _RTL_ATOM_TABLE PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; -#ifndef _WINBASE_ // -// System Time and Timezone Structures +// Timezone Information // -typedef struct _SYSTEMTIME -{ - USHORT wYear; - USHORT wMonth; - USHORT wDayOfWeek; - USHORT wDay; - USHORT wHour; - USHORT wMinute; - USHORT wSecond; - USHORT wMilliseconds; -} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; - -typedef struct _TIME_ZONE_INFORMATION +typedef struct _RTL_TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - SYSTEMTIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - SYSTEMTIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; -} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; -#endif /* !_WINBASE_ */ - -// -// Native version of Timezone Structure -// -typedef LPTIME_ZONE_INFORMATION PRTL_TIME_ZONE_INFORMATION; +} RTL_TIME_ZONE_INFORMATION, *PRTL_TIME_ZONE_INFORMATION; // // Hotpatch Header diff --git a/sdk/include/reactos/wine/winternl.h b/sdk/include/reactos/wine/winternl.h index 999f544edb..edd79e5a6f 100644 --- a/sdk/include/reactos/wine/winternl.h +++ b/sdk/include/reactos/wine/winternl.h @@ -102,6 +102,7 @@ typedef struct _FILETIME } FILETIME, *PFILETIME, *LPFILETIME; #endif /* _FILETIME_ */ +#if 0 /* * RTL_SYSTEM_TIME and RTL_TIME_ZONE_INFORMATION are the same as * the SYSTEMTIME and TIME_ZONE_INFORMATION structures defined @@ -120,14 +121,26 @@ typedef struct _RTL_SYSTEM_TIME { WORD wSecond; WORD wMilliseconds; } RTL_SYSTEM_TIME, *PRTL_SYSTEM_TIME; +#endif + +typedef struct _TIME_FIELDS { + CSHORT Year; + CSHORT Month; + CSHORT Day; + CSHORT Hour; + CSHORT Minute; + CSHORT Second; + CSHORT Milliseconds; + CSHORT Weekday; +} TIME_FIELDS, *PTIME_FIELDS; typedef struct _RTL_TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - RTL_SYSTEM_TIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - RTL_SYSTEM_TIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; } RTL_TIME_ZONE_INFORMATION, *PRTL_TIME_ZONE_INFORMATION; @@ -135,10 +148,10 @@ typedef struct _RTL_TIME_DYNAMIC_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; - RTL_SYSTEM_TIME StandardDate; + TIME_FIELDS StandardDate; LONG StandardBias; WCHAR DaylightName[32]; - RTL_SYSTEM_TIME DaylightDate; + TIME_FIELDS DaylightDate; LONG DaylightBias; WCHAR TimeZoneKeyName[128]; BOOLEAN DynamicDaylightTimeDisabled; @@ -1647,17 +1660,6 @@ typedef struct _SYSTEM_TIME_ADJUSTMENT { BOOLEAN TimeAdjustmentDisabled; } SYSTEM_TIME_ADJUSTMENT, *PSYSTEM_TIME_ADJUSTMENT; -typedef struct _TIME_FIELDS -{ CSHORT Year; - CSHORT Month; - CSHORT Day; - CSHORT Hour; - CSHORT Minute; - CSHORT Second; - CSHORT Milliseconds; - CSHORT Weekday; -} TIME_FIELDS, *PTIME_FIELDS; - typedef struct _WINSTATIONINFORMATIONW { BYTE Reserved2[70]; ULONG LogonId; diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index cd57492d99..f47ece5cba 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -10,7 +10,10 @@ #include <win32k.h> -#include <winnls.h> +// Was included only because of CP_ACP and required the +// definition of SYSTEMTIME in ndk\rtltypes.h +//#include <winnls.h> +#define CP_ACP 0 DBG_DEFAULT_CHANNEL(UserKbdLayout);

7 years

01/01: [NTDLL_APITEST] Add missing test file for 0f8e7207.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac45758aff58d16bfbed0… commit ac45758aff58d16bfbed0a0a5e2451d5b8d34633 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 17:12:52 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 17:12:52 2018 +0200 [NTDLL_APITEST] Add missing test file for 0f8e7207. CORE-14658 --- .../rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c | 155 +++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c new file mode 100644 index 0000000000..fcbad38f5c --- /dev/null +++ b/modules/rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ntdll_apitest + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for RtlQueryTimeZoneInformation + * COPYRIGHT: Copyright 2018 Doug Lyons + */ + +#include "precomp.h" + +#if 0 +/* + * RTL_SYSTEM_TIME is almost the same as the SYSTEMTIME structure defined + * in winbase.h, however we need to define it differently here. + * This is used by RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. + * See: https://social.msdn.microsoft.com/Forums/en-US/home?forum=en-US and + * Search: Reading TimeZone binary data from registry by Patrick + * and then look at the last post showing typedef struct SYSTEMTIME_TZI. + */ +typedef struct _RTL_SYSTEM_TIME { + WORD wYear; + WORD wMonth; + WORD wDay; /* wDayOfWeek was here normally */ + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; + WORD wDayOfWeek; /* wDayOfWeek relocated to here */ +} RTL_SYSTEM_TIME; + +/* + * RTL_TIME_ZONE_INFORMATION is the same as the TIME_ZONE_INFORMATION structure + * defined in winbase.h, however we need to define RTL_TIME_ZONE_INFORMATION + * seperately here so we don't depend on winbase.h. + * This is used by RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. + */ +typedef struct _RTL_TIME_ZONE_INFORMATION { + LONG Bias; + WCHAR StandardName[32]; + RTL_SYSTEM_TIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + RTL_SYSTEM_TIME DaylightDate; + LONG DaylightBias; +} RTL_TIME_ZONE_INFORMATION; +#endif + +static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); + +static void test_RtlQueryTimeZoneInformation(void) +{ + RTL_TIME_ZONE_INFORMATION tzinfo; + NTSTATUS status; + TIME_ZONE_INFORMATION tziOld, tziNew, tziTest; + DWORD dwRet; + + // Retrieve the current time zone information + + dwRet = GetTimeZoneInformation(&tziOld); + + ok(dwRet == TIME_ZONE_ID_STANDARD || dwRet == TIME_ZONE_ID_UNKNOWN || dwRet == TIME_ZONE_ID_DAYLIGHT, + "Get Time Zone Name failed with error = %ld.\n", GetLastError()); + + // Adjust the time zone information + + ZeroMemory(&tziNew, sizeof(tziNew)); + tziNew.Bias = 360; + wcscpy(tziNew.StandardName, L"Test Standard Zone"); + tziNew.StandardDate.wMonth = 11; + tziNew.StandardDate.wDayOfWeek = 5; + tziNew.StandardDate.wDay = 3; + tziNew.StandardDate.wHour = 2; + tziNew.StandardBias = 120; + + wcscpy(tziNew.DaylightName, L"Test Daylight Zone"); + tziNew.DaylightDate.wMonth = 4; + tziNew.DaylightDate.wDayOfWeek = 6; + tziNew.DaylightDate.wDay = 2; + tziNew.DaylightDate.wHour = 2; + tziNew.DaylightBias = -60; + + // Set up SetLastError with known value for later testing + + SetLastError(0xDEADBEEF); + + ok(SetTimeZoneInformation(&tziNew) , + "Set Time Zone Information failed with error = %ld.\n", GetLastError()); + + // if we got an error the function failed, so there is not much else we can do + + if(GetLastError() != 0xDEADBEEF) + { + win_skip("SetTimeZoneInformation() is not available, so tests cannot be run.\n"); + return; + } + + // Retrieve and display the newly set time zone information + + dwRet = GetTimeZoneInformation(&tziTest); + + ok(dwRet == TIME_ZONE_ID_STANDARD || dwRet == TIME_ZONE_ID_UNKNOWN || dwRet == TIME_ZONE_ID_DAYLIGHT, + "Get Time Zone Information Returned failed with error = %ld.\n", GetLastError()); + + ok(!wcscmp(tziTest.StandardName, tziNew.StandardName), + "Standard Time Zone Name = %ls, expected %ls.\n", tziTest.StandardName, tziNew.StandardName); + + ok(!wcscmp(tziTest.DaylightName, tziNew.DaylightName), + "Standard Time Zone Name = %ls, expected %ls.\n", tziTest.DaylightName, tziNew.DaylightName); + + /* test RtlQueryTimeZoneInformation returns a TIME_ZONE_INFORMATION structure */ + + if (!pRtlQueryTimeZoneInformation) + { + win_skip("pRtlQueryTimeZoneInformation() fails, so tests cannot be run.\n"); + return; + } + + /* Clear Time Zone Info field */ + memset(&tzinfo, 0, sizeof(tzinfo)); + + /* Read Time Zone Info */ + status = pRtlQueryTimeZoneInformation(&tzinfo); + ok(status == STATUS_SUCCESS, "pRtlQueryTimeZoneInformation failed, got %08lx\n", status); + + /* Check for the Daylight Date Info */ + ok(tzinfo.DaylightDate.Month == 4, "tzinfo.DaylightDate.wMonth expected '4', got '%d'.\n", tzinfo.DaylightDate.Month); + ok(tzinfo.DaylightDate.Day == 2, "tzinfo.DaylightDate.wDay expected '2', got '%d'.\n", tzinfo.DaylightDate.Day); + ok(tzinfo.DaylightDate.Weekday == 6, "tzinfo.DaylightDate.wDayOfWeek expected '6', got '%d'.\n", tzinfo.DaylightDate.Weekday); + ok(tzinfo.DaylightDate.Year == 0, "tzinfo.DaylightDate.wYear expected '0', got '%d'.\n", tzinfo.DaylightDate.Year); + + /* Check for the Standard Data Info */ + ok(tzinfo.StandardDate.Month == 11, "tzinfo.StandardDate.wMonth expected '11', got '%d'.\n", tzinfo.StandardDate.Month); + ok(tzinfo.StandardDate.Day == 3, "tzinfo.StandardDate.wDay expected '3', got '%d'.\n", tzinfo.StandardDate.Day); + ok(tzinfo.StandardDate.Weekday == 5, "tzinfo.StandardDate.wDayOfWeek expected '5', got '%d'.\n", tzinfo.StandardDate.Weekday); + ok(tzinfo.StandardDate.Year == 0, "tzinfo.StandardDate.wYear expected '0', got '%d'.\n", tzinfo.StandardDate.Year); + + /* Check for the Bias Info */ + ok(tzinfo.Bias == 360, "tzinfo.Bias expected '360', got '%ld'.\n", tzinfo.Bias); + ok(tzinfo.DaylightBias == -60, "tzinfo.DaylightBias expected '-60', got '%ld'.\n", tzinfo.DaylightBias); + ok(tzinfo.StandardBias == 120, "tzinfo.StandardBias expected '120', got '%ld'.\n", tzinfo.StandardBias); + + // Restore the original time zone information and put things back like we found them originally + ok(SetTimeZoneInformation(&tziOld), + "Set Time Zone Information failed with error = %ld.\n", GetLastError()); + +} + + +START_TEST(RtlQueryTimeZoneInformation) +{ + /* Test modeled after reactos\modules\rostests\winetests\ntdll\time.c for Vista+ */ + HMODULE mod = GetModuleHandleA("ntdll.dll"); + pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); + + test_RtlQueryTimeZoneInformation(); +} \ No newline at end of file

7 years

01/01: [NTDLL_APITEST][LIB_RTL] Add a test for RtlQueryTimeZoneInformation and fix the bug in RtlpQueryRegistryDirect

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8e720711532d6020021… commit 0f8e720711532d60200211ab7c6dce80e023b68f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu May 31 16:47:42 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu May 31 16:47:42 2018 +0200 [NTDLL_APITEST][LIB_RTL] Add a test for RtlQueryTimeZoneInformation and fix the bug in RtlpQueryRegistryDirect In working on some problems with Time Zone adjustments in ReactOS I found that the RtlQueryTimeZoneInformation function is partially broken and wrote an apitest to capture the failures. Patch by Doug Lyons. CORE-14658 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + modules/rostests/apitests/ntdll/testlist.c | 2 ++ sdk/lib/rtl/registry.c | 26 +++++++++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 3e9756c7f3..a7fdc5a2cd 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -49,6 +49,7 @@ list(APPEND SOURCE RtlMemoryStream.c RtlNtPathNameToDosPathName.c RtlpEnsureBufferSize.c + RtlQueryTimeZoneInfo.c RtlReAllocateHeap.c RtlUnicodeStringToAnsiString.c RtlUpcaseUnicodeStringToCountedOemString.c diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index f17f87267c..c6afd1d342 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -53,6 +53,7 @@ extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); extern void func_RtlNtPathNameToDosPathName(void); extern void func_RtlpEnsureBufferSize(void); +extern void func_RtlQueryTimeZoneInformation(void); extern void func_RtlReAllocateHeap(void); extern void func_RtlUnicodeStringToAnsiString(void); extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); @@ -111,6 +112,7 @@ const struct test winetest_testlist[] = { "RtlMemoryStream", func_RtlMemoryStream }, { "RtlNtPathNameToDosPathName", func_RtlNtPathNameToDosPathName }, { "RtlpEnsureBufferSize", func_RtlpEnsureBufferSize }, + { "RtlQueryTimeZoneInformation", func_RtlQueryTimeZoneInformation }, { "RtlReAllocateHeap", func_RtlReAllocateHeap }, { "RtlUnicodeStringToAnsiString", func_RtlUnicodeStringToAnsiString }, { "RtlUpcaseUnicodeStringToCountedOemString", func_RtlUpcaseUnicodeStringToCountedOemString }, diff --git a/sdk/lib/rtl/registry.c b/sdk/lib/rtl/registry.c index 02361efc48..bc69d4d0b3 100644 --- a/sdk/lib/rtl/registry.c +++ b/sdk/lib/rtl/registry.c @@ -96,17 +96,25 @@ RtlpQueryRegistryDirect(IN ULONG ValueType, } else { - /* Check if there's space for the length and type, plus data */ - if (*Length < (2 * sizeof(ULONG) + ValueLength)) + if (ValueType != REG_BINARY) { - /* Nope, fail */ - return STATUS_BUFFER_TOO_SMALL; - } + /* Check if there's space for the length and type, plus data */ + if (*Length < (2 * sizeof(ULONG) + ValueLength)) + { + /* Nope, fail */ + return STATUS_BUFFER_TOO_SMALL; + } - /* Return the data */ - *Length++ = ValueLength; - *Length++ = ValueType; - RtlCopyMemory(Length, ValueData, ValueLength); + /* Return the data */ + *Length++ = ValueLength; + *Length++ = ValueType; + RtlCopyMemory(Length, ValueData, ValueLength); + } + else + { + /* Return the REG_BINARY data */ + RtlCopyMemory(Length, ValueData, ValueLength); + } } }

7 years

01/01: [WINLOGON] Update Italian translation (#513) (by deleted user)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=528e6339c21109b33f6a2… commit 528e6339c21109b33f6a29eddd8e4f3167b43036 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 31 15:41:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 15:41:09 2018 +0200 [WINLOGON] Update Italian translation (#513) (by deleted user) --- base/system/winlogon/lang/it-IT.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index 35d9e297f3..01af5b2d4a 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -44,11 +44,11 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Esecuzione scripts di connessione..." IDS_LOADINGYOURPERSONALSETTINGS "Caricamento delle impostazioni personali..." IDS_CLOSINGNETWORKCONNECTIONS "Chiusura connessioni di rete..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS Sta spegnendosi..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS si sta spegnendo..." IDS_PREPARETOSTANDBY "Preparazione Standby..." - IDS_PREPARETOHIBERNATE "Preparazione Hibernate..." + IDS_PREPARETOHIBERNATE "Preparazione Ibernazione..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." - IDS_REACTOSISSTARTINGUP "ReactOS sta avviandosi..." + IDS_REACTOSISSTARTINGUP "ReactOS si sta avviando..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" IDS_TIMEOUTLONGFORMAT "%d days" END

7 years

01/01: [SHELL32] Fix and improve the PickIconDlg function (#574)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=222534a5a22cf12ed6673… commit 222534a5a22cf12ed667382c7425bd77bd4242ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 31 22:33:07 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu May 31 15:33:07 2018 +0200 [SHELL32] Fix and improve the PickIconDlg function (#574) CORE-10972 --- dll/win32/shell32/CShellLink.cpp | 69 ++++++--- dll/win32/shell32/dialogs/dialogs.cpp | 266 ++++++++++++++++++++++++---------- dll/win32/shell32/lang/bg-BG.rc | 46 +++--- dll/win32/shell32/lang/ca-ES.rc | 45 +++--- dll/win32/shell32/lang/cs-CZ.rc | 45 +++--- dll/win32/shell32/lang/da-DK.rc | 45 +++--- dll/win32/shell32/lang/de-DE.rc | 45 +++--- dll/win32/shell32/lang/el-GR.rc | 45 +++--- dll/win32/shell32/lang/en-GB.rc | 45 +++--- dll/win32/shell32/lang/en-US.rc | 45 +++--- dll/win32/shell32/lang/es-ES.rc | 45 +++--- dll/win32/shell32/lang/et-EE.rc | 45 +++--- dll/win32/shell32/lang/fi-FI.rc | 45 +++--- dll/win32/shell32/lang/fr-FR.rc | 45 +++--- dll/win32/shell32/lang/he-IL.rc | 45 +++--- dll/win32/shell32/lang/hu-HU.rc | 45 +++--- dll/win32/shell32/lang/it-IT.rc | 45 +++--- dll/win32/shell32/lang/ja-JP.rc | 47 +++--- dll/win32/shell32/lang/ko-KR.rc | 45 +++--- dll/win32/shell32/lang/nl-NL.rc | 45 +++--- dll/win32/shell32/lang/no-NO.rc | 45 +++--- dll/win32/shell32/lang/pl-PL.rc | 45 +++--- dll/win32/shell32/lang/pt-BR.rc | 45 +++--- dll/win32/shell32/lang/pt-PT.rc | 45 +++--- dll/win32/shell32/lang/ro-RO.rc | 45 +++--- dll/win32/shell32/lang/ru-RU.rc | 45 +++--- dll/win32/shell32/lang/sk-SK.rc | 45 +++--- dll/win32/shell32/lang/sl-SI.rc | 45 +++--- dll/win32/shell32/lang/sq-AL.rc | 45 +++--- dll/win32/shell32/lang/sv-SE.rc | 45 +++--- dll/win32/shell32/lang/tr-TR.rc | 45 +++--- dll/win32/shell32/lang/uk-UA.rc | 45 +++--- dll/win32/shell32/lang/zh-CN.rc | 45 +++--- dll/win32/shell32/lang/zh-TW.rc | 45 +++--- dll/win32/shell32/shresdef.h | 28 ++++ 35 files changed, 1007 insertions(+), 799 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index dfbd05792f..ddabd18949 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -6,6 +6,7 @@ * Copyright 2009 Andrew Hill * Copyright 2013 Dominik Hornung * Copyright 2017 Hermes Belusca-Maito + * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1764,10 +1765,30 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon return S_OK; } -HRESULT STDMETHODCALLTYPE CShellLink::Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +HRESULT STDMETHODCALLTYPE +CShellLink::Extract(PCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { - UNIMPLEMENTED; - return E_FAIL; + SHFILEINFOW info; + + if (phiconLarge) + { + SHGetFileInfoW(pszFile, 0, &info, sizeof(info), + SHGFI_ICON | SHGFI_LARGEICON | SHGFI_LINKOVERLAY); + *phiconLarge = info.hIcon; + if (!info.hIcon) + return E_FAIL; + } + + if (phiconSmall) + { + SHGetFileInfoW(pszFile, 0, &info, sizeof(info), + SHGFI_ICON | SHGFI_SMALLICON | SHGFI_LINKOVERLAY); + *phiconSmall = info.hIcon; + if (!info.hIcon) + return E_FAIL; + } + + return S_OK; } #if 0 @@ -2658,13 +2679,13 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, case WM_INITDIALOG: if (lParam) { - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_SHORTEX_RUN_DIFFERENT); SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); } return TRUE; case WM_COMMAND: { - HWND hDlgCtrl = GetDlgItem(hwndDlg, 14000); + HWND hDlgCtrl = GetDlgItem(hwndDlg, IDC_SHORTEX_RUN_DIFFERENT); if (LOWORD(wParam) == IDOK) { if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) @@ -2676,7 +2697,7 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, { EndDialog(hwndDlg, -1); } - else if (LOWORD(wParam) == 14000) + else if (LOWORD(wParam) == IDC_SHORTEX_RUN_DIFFERENT) { if (SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED) SendMessage(hDlgCtrl, BM_SETCHECK, BST_UNCHECKED, 0); @@ -2772,13 +2793,13 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM } if (fi.hIcon) // TODO: destroy icon - SendDlgItemMessageW(hwndDlg, 14000, STM_SETICON, (WPARAM)fi.hIcon, 0); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_SETICON, (WPARAM)fi.hIcon, 0); else ERR("ExtractIconW failed %ls %u\n", pThis->m_sIcoPath, pThis->m_Header.nIconIndex); /* Target type */ if (pThis->m_sPath) - SetDlgItemTextW(hwndDlg, 14005, SH_GetTargetTypeByPath(pThis->m_sPath)); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TYPE_EDIT, SH_GetTargetTypeByPath(pThis->m_sPath)); /* Target location */ if (pThis->m_sPath) @@ -2786,7 +2807,7 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM WCHAR target[MAX_PATH]; StringCchCopyW(target, _countof(target), pThis->m_sPath); PathRemoveFileSpecW(target); - SetDlgItemTextW(hwndDlg, 14007, PathFindFileNameW(target)); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION_EDIT, PathFindFileNameW(target)); } /* Target path */ @@ -2803,16 +2824,16 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM StringCchCatW(newpath, _countof(newpath), L" "); StringCchCatW(newpath, _countof(newpath), pThis->m_sArgs); } - SetDlgItemTextW(hwndDlg, 14009, newpath); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TARGET_TEXT, newpath); } /* Working dir */ if (pThis->m_sWorkDir) - SetDlgItemTextW(hwndDlg, 14011, pThis->m_sWorkDir); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_START_IN_EDIT, pThis->m_sWorkDir); /* Description */ if (pThis->m_sDescription) - SetDlgItemTextW(hwndDlg, 14019, pThis->m_sDescription); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_COMMENT_EDIT, pThis->m_sDescription); return TRUE; } @@ -2824,10 +2845,10 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM { WCHAR wszBuf[MAX_PATH]; /* set working directory */ - GetDlgItemTextW(hwndDlg, 14011, wszBuf, _countof(wszBuf)); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_START_IN_EDIT, wszBuf, _countof(wszBuf)); pThis->SetWorkingDirectory(wszBuf); /* set link destination */ - GetDlgItemTextW(hwndDlg, 14009, wszBuf, _countof(wszBuf)); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_TARGET_TEXT, wszBuf, _countof(wszBuf)); LPWSTR lpszArgs = NULL; LPWSTR unquoted = strdupW(wszBuf); StrTrimW(unquoted, L" "); @@ -2877,7 +2898,7 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM case WM_COMMAND: switch(LOWORD(wParam)) { - case 14020: + case IDC_SHORTCUT_FIND: SHOpenFolderAndSelectItems(pThis->m_pPidl, 0, NULL, 0); /// /// FIXME @@ -2885,24 +2906,32 @@ INT_PTR CALLBACK CShellLink::SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM /// return TRUE; - case 14021: + case IDC_SHORTCUT_CHANGE_ICON: { WCHAR wszPath[MAX_PATH] = L""; if (pThis->m_sIcoPath) wcscpy(wszPath, pThis->m_sIcoPath); + else + FindExecutableW(pThis->m_sPath, NULL, wszPath); + INT IconIndex = pThis->m_Header.nIconIndex; if (PickIconDlg(hwndDlg, wszPath, _countof(wszPath), &IconIndex)) { pThis->SetIconLocation(wszPath, IconIndex); - /// - /// FIXME redraw icon - /// + + HICON hIconLarge = NULL; + if (S_OK == pThis->Extract(wszPath, IconIndex, &hIconLarge, NULL, 0)) + { + HICON hIconOld = (HICON)SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_GETICON, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_ICON, STM_SETICON, (WPARAM)hIconLarge, 0); + DestroyIcon(hIconOld); + } } return TRUE; } - case 14022: + case IDC_SHORTCUT_ADVANCED: { INT_PTR result = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_SHORTCUT_EXTENDED_PROPERTIES), hwndDlg, ExtendedShortcutProc, (LPARAM)pThis->m_bRunAs); if (result == 1 || result == 0) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index f266e79787..168b066e28 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -2,6 +2,7 @@ * common shell dialogs * * Copyright 2000 Juergen Schmied + * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,39 +47,33 @@ typedef struct { HMODULE hLibrary; HWND hDlgCtrl; - WCHAR szName[MAX_PATH]; + WCHAR szPath[MAX_PATH]; + WCHAR szExpandedPath[MAX_PATH]; INT Index; + INT nIcons; + HICON *phIcons; } PICK_ICON_CONTEXT, *PPICK_ICON_CONTEXT; BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, - LONG_PTR lParam -) + LONG_PTR lParam) { - WCHAR szName[100]; - int index; - HICON hIcon; - HWND hDlgCtrl = (HWND)lParam; + PPICK_ICON_CONTEXT pIconContext = PPICK_ICON_CONTEXT(lParam); + HWND hDlgCtrl = pIconContext->hDlgCtrl; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u", (DWORD)lpszName); + lParam = LOWORD(lpszName); else - StringCbCopyW(szName, sizeof(szName), lpszName); - - hIcon = LoadIconW(hModule, lpszName); - if (hIcon == NULL) - return TRUE; + lParam = -1; - index = SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName); - if (index != LB_ERR) - SendMessageW(hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon); + SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, lParam); return TRUE; } static void -DestroyIconList(HWND hDlgCtrl) +DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) { int count; int index; @@ -89,11 +84,94 @@ DestroyIconList(HWND hDlgCtrl) for(index = 0; index < count; index++) { - HICON hIcon = (HICON)SendMessageW(hDlgCtrl, LB_GETITEMDATA, index, 0); - DestroyIcon(hIcon); + DestroyIcon(pIconContext->phIcons[index]); + pIconContext->phIcons[index] = NULL; } } +static BOOL +DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) +{ + // destroy previous + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); + delete[] pIconContext->phIcons; + + // store paths + if (pIconContext->szPath != pszFile) + StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); + ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + + // load DLL if possible + HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (pIconContext->hLibrary) + FreeLibrary(pIconContext->hLibrary); + pIconContext->hLibrary = hLibrary; + + if (pIconContext->hLibrary) + { + // load icons from DLL + pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); + pIconContext->phIcons = new HICON[pIconContext->nIcons]; + + if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + { + EnumResourceNamesW(pIconContext->hLibrary, RT_GROUP_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); + } + else + { + pIconContext->nIcons = 0; + } + } + else + { + // *.ico + pIconContext->nIcons = 1; + pIconContext->phIcons = new HICON[1]; + + if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + { + SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, 0); + } + else + { + pIconContext->nIcons = 0; + } + } + + // set text + SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); + + if (pIconContext->nIcons == 0) + { + delete[] pIconContext->phIcons; + pIconContext->phIcons = NULL; + } + + return pIconContext->nIcons > 0; +} + +static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; + +static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) +{ + // show message + CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); + strText.Format(IDS_NO_ICONS, pIconContext->szPath); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONWARNING); + + // load default icons + DoLoadIcons(hwndDlg, pIconContext, s_pszDefaultPath); +} + +// icon size +#define CX_ICON GetSystemMetrics(SM_CXICON) +#define CY_ICON GetSystemMetrics(SM_CYICON) + +// item size +#define CX_ITEM (CX_ICON + 4) +#define CY_ITEM (CY_ICON + 12) + INT_PTR CALLBACK PickIconProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -104,8 +182,9 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, LPDRAWITEMSTRUCT lpdis; HICON hIcon; INT index, count; - WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; - OPENFILENAMEW ofn = {0}; + WCHAR szText[MAX_PATH], szFilter[100]; + CStringW strTitle; + OPENFILENAMEW ofn; PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -115,83 +194,99 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); - EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); - else - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); + + // load icons + if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) + { + NoIconsInFile(hwndDlg, pIconContext); + } + + // set selection count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); if (count != LB_ERR) { - if (count > pIconContext->Index) - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); - else - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + if (pIconContext->Index < 0) + { + // A negative value will be interpreted as a negated resource ID. + LPARAM lParam = -pIconContext->Index; + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); + } + + if (pIconContext->Index < 0 || count <= pIconContext->Index) + pIconContext->Index = 0; + + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); } return TRUE; + case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); pIconContext->Index = index; - GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName, MAX_PATH); - DestroyIconList(pIconContext->hDlgCtrl); + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, MAX_PATH); + ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; EndDialog(hwndDlg, 1); break; + case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; EndDialog(hwndDlg, 0); break; + case IDC_PICKICON_LIST: - if (HIWORD(wParam) == LBN_SELCHANGE) - InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + InvalidateRect((HWND)lParam, NULL, TRUE); + break; + + case LBN_DBLCLK: + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); + break; + } break; + case IDC_BUTTON_PATH: + // choose DLL path szText[0] = 0; - szTitle[0] = 0; szFilter[0] = 0; + ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwndDlg; ofn.lpstrFile = szText; ofn.nMaxFile = MAX_PATH; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, sizeof(szTitle) / sizeof(WCHAR)); - ofn.lpstrTitle = szTitle; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR)); + strTitle.LoadString(IDS_PICK_ICON_TITLE); + ofn.lpstrTitle = strTitle; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); ofn.lpstrFilter = szFilter; - if (GetOpenFileNameW(&ofn)) - { - HMODULE hLibrary; - - if (!wcsicmp(pIconContext->szName, szText)) - break; - - DestroyIconList(pIconContext->hDlgCtrl); + if (!GetOpenFileNameW(&ofn)) + break; - hLibrary = LoadLibraryExW(szText, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (hLibrary == NULL) - break; - FreeLibrary(pIconContext->hLibrary); - pIconContext->hLibrary = hLibrary; - wcscpy(pIconContext->szName, szText); - EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); - if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH)) - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); - else - SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); - - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + // load icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + { + NoIconsInFile(hwndDlg, pIconContext); } + + // set selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; } break; + case WM_MEASUREITEM: lpmis = (LPMEASUREITEMSTRUCT) lParam; - lpmis->itemHeight = 32; - lpmis->itemWidth = 64; + lpmis->itemHeight = CY_ITEM; return TRUE; + case WM_DRAWITEM: lpdis = (LPDRAWITEMSTRUCT) lParam; if (lpdis->itemID == (UINT)-1) @@ -202,19 +297,24 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, { case ODA_SELECT: case ODA_DRAWENTIRE: + { index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, 0); + hIcon = pIconContext->phIcons[lpdis->itemID]; if (lpdis->itemID == (UINT)index) FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); else FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1)); - DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, - 0, 0, 0, NULL, DI_NORMAL); + // centering + INT x = lpdis->rcItem.left + (CX_ITEM - CX_ICON) / 2; + INT y = lpdis->rcItem.top + (CY_ITEM - CY_ICON) / 2; + + DrawIconEx(lpdis->hDC, x, y, hIcon, 0, 0, 0, NULL, DI_NORMAL); break; + } } - break; + return TRUE; } return FALSE; @@ -226,23 +326,41 @@ BOOL WINAPI PickIconDlg( UINT nMaxFile, INT* lpdwIconIndex) { - HMODULE hLibrary; int res; - PICK_ICON_CONTEXT IconContext; - hLibrary = LoadLibraryExW(lpstrFile, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - IconContext.hLibrary = hLibrary; + // initialize + PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; - StringCchCopyNW(IconContext.szName, _countof(IconContext.szName), lpstrFile, nMaxFile); + StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); + ExpandEnvironmentStringsW(lpstrFile, IconContext.szExpandedPath, _countof(IconContext.szExpandedPath)); + + if (!IconContext.szExpandedPath[0] || + GetFileAttributesW(IconContext.szExpandedPath) == INVALID_FILE_ATTRIBUTES) + { + if (IconContext.szExpandedPath[0]) + { + // no such file + CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); + strText.Format(IDS_FILE_NOT_FOUND, lpstrFile); + MessageBoxW(hWndOwner, strText, strTitle, MB_ICONWARNING); + } + + // set default value + StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); + ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); + } + // show dialog res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hWndOwner, PickIconProc, (LPARAM)&IconContext); if (res) { - StringCchCopyNW(lpstrFile, nMaxFile, IconContext.szName, _countof(IconContext.szName)); + // store + StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); *lpdwIconIndex = IconContext.Index; } - FreeLibrary(hLibrary); + if (IconContext.hLibrary) + FreeLibrary(IconContext.hLibrary); return res; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 83c49ed60a..a4e722635a 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1,3 +1,4 @@ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT MENU_001 MENUEX @@ -180,27 +181,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Препратка" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Вид на целта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Място на целта:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Цел:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Вид на целта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Място на целта:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Цел:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Изпълняване в:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Бърз &клавиш:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Из&пълняване:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Забележка:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Намиране на целта...", 14020, 10, 115, 75, 14, ES_LEFT - PUSHBUTTON "&Смяна на значето...", 14021, 86, 115, 72, 14, ES_LEFT - PUSHBUTTON "Раз&ширени...", 14022, 160, 115, 60, 14, ES_LEFT + LTEXT "&Изпълняване в:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Бърз &клавиш:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Из&пълняване:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Забележка:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Намиране на целта...", IDC_SHORTCUT_FIND, 10, 115, 75, 14, ES_LEFT + PUSHBUTTON "&Смяна на значето...", IDC_SHORTCUT_CHANGE_ICON, 86, 115, 72, 14, ES_LEFT + PUSHBUTTON "Раз&ширени...", IDC_SHORTCUT_ADVANCED, 160, 115, 60, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 260, 150 @@ -210,9 +211,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Укажете желаните допълнителни свойства за препратката.", -1, 5, 30, 246, 10 - CHECKBOX "Изпълняване с различни правомощия", 14000, 30, 50, 150, 10 + CHECKBOX "Изпълняване с различни правомощия", IDC_SHORTEX_RUN_DIFFERENT, 30, 50, 150, 10 LTEXT "Тази възможност ви позволява да изпълните препратката като друг потребител или да продължите като себе си, като предпазвате компютъра и данните от неупълномощена дейност на приложенията.", -1, 50, 60, 200, 40 - CHECKBOX "Изпълняване в отделен дял от паметта", 14001, 30, 100, 170, 10, WS_DISABLED + CHECKBOX "Изпълняване в отделен дял от паметта", IDC_SHORTEX_RUN_SEPARATE, 30, 100, 170, 10, WS_DISABLED PUSHBUTTON "Добре", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Прекъсване", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index d0f996e04f..a345509fa6 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index adbf5db4db..2b59ae81c1 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -186,27 +186,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Zástupce" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ cíle:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Umístění cíle:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cíl:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ cíle:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Umístění cíle:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cíl:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Spustit v:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Klávesová zk&ratka:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Spusti&t:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Komentář:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Najít cíl...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Změnit ikonu...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "R&ozšířené...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Spustit v:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Klávesová zk&ratka:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Spusti&t:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Komentář:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Najít cíl...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Změnit ikonu...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "R&ozšířené...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -216,9 +216,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zvolte rozšířené vlastnosti, které požadujtete pro tohoto zástupce.", -1, 5, 30, 210, 10 - CHECKBOX "Spustit s jinými pověřeními", 14000, 25, 50, 150, 10 + CHECKBOX "Spustit s jinými pověřeními", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Tato možnost umožní spustit tohoto zástupce jako jiný uživatel nebo při spuštění se současným uživatelem chránit počítač před nepovolenou aktivitou programu.", -1, 50, 60, 175, 40 - CHECKBOX "Spustit v odděleném paměťovém prostoru", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Spustit v odděleném paměťovém prostoru", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -929,5 +929,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 50a7afd779..de55fda1f7 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -186,27 +186,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -216,9 +216,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -949,5 +949,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 8008e61627..667269fb10 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Verknüpfung" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Zieltyp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Zielpfad:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Ziel:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Zieltyp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Zielpfad:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Ziel:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Starten in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Kurztasten:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Ausfüh&ren:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Ziel finden...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "S&ymbol wechseln...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "Er&weitert...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Starten in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Kurztasten:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Ausfüh&ren:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Ziel finden...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "S&ymbol wechseln...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 210, 10 - CHECKBOX "Als anderer Benutzer ausführen", 14000, 25, 50, 150, 10 + CHECKBOX "Als anderer Benutzer ausführen", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter einem anderen oder Ihrem eigenen Benutzerkonto auszuführen während der Computer und Ihre Daten vor unautorisierten Programmaktivitäten geschützt werden können.", -1, 50, 60, 175, 40 - CHECKBOX "In getrenntem Speicherbereich ausführen", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "In getrenntem Speicherbereich ausführen", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -944,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 240e742ed2..051a9ab472 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Συντόμευση" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Τύπος προορισμού:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Θέση προορισμού:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Προορισμός:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Τύπος προορισμού:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Θέση προορισμού:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Προορισμός:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Εκκίνηση στο:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Πλήκτρο &συντόμευσης:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Εκ&τέλεση:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Σχόλια:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Εύρεση προορισμού...", 14020, 10, 115, 71, 14, ES_LEFT - PUSHBUTTON "&Αλλαγή εικονιδίου...", 14021, 83, 115, 71, 14, ES_LEFT - PUSHBUTTON "&Για προχωρημένους...", 14022, 156, 115, 71, 14, ES_LEFT + LTEXT "&Εκκίνηση στο:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Πλήκτρο &συντόμευσης:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Εκ&τέλεση:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Σχόλια:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Εύρεση προορισμού...", IDC_SHORTCUT_FIND, 10, 115, 71, 14, ES_LEFT + PUSHBUTTON "&Αλλαγή εικονιδίου...", IDC_SHORTCUT_CHANGE_ICON, 83, 115, 71, 14, ES_LEFT + PUSHBUTTON "&Για προχωρημένους...", IDC_SHORTCUT_ADVANCED, 156, 115, 71, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Επιλέξτε τις πρόσθετες ιδιότητες που θέλετε για αυτήν την συντόμευση.", -1, 5, 30, 210, 20 - CHECKBOX "Εκτέλεση με διαφορετικά πιστοποιητικά", 14000, 25, 50, 150, 10 + CHECKBOX "Εκτέλεση με διαφορετικά πιστοποιητικά", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Αυτή η επιλογή θα σας επιτρέψει να εκτελέσετε την συντόμευση ως διαφορετικός χρήστης ή ως εσείς ο ίδιος προστατεύοντας τον υπολογιστή σας από μη εξουσιοδοτημένες ενέργειες προγραμμάτων.", -1, 50, 60, 175, 40 - CHECKBOX "Εκτέλεση σε διαφορετική περιοχή μνήμης", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Εκτέλεση σε διαφορετική περιοχή μνήμης", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Άκυρο", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 77fedc3028..39b8612d2b 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 4c11b3f54e..c4e7df3afe 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -181,27 +181,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -211,9 +211,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancel", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -944,5 +944,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index a6d1bef762..971391dac4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Acceso directo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de destino:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ubicación de destino:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Destino:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de destino:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Ubicación de destino:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Destino:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "I&niciar en:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de método abreviado:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Ejecutar:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omentario:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Abrir ubicación...", 14020, 9, 172, 62, 14, ES_LEFT - PUSHBUTTON "Cambiar &icono...", 14021, 76, 172, 62, 14, ES_LEFT - PUSHBUTTON "Propiedades avan&zadas...", 14022, 144, 172, 85, 14, ES_LEFT + LTEXT "I&niciar en:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de método abreviado:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Ejecutar:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omentario:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Abrir ubicación...", IDC_SHORTCUT_FIND, 9, 172, 62, 14, ES_LEFT + PUSHBUTTON "Cambiar &icono...", IDC_SHORTCUT_CHANGE_ICON, 76, 172, 62, 14, ES_LEFT + PUSHBUTTON "Propiedades avan&zadas...", IDC_SHORTCUT_ADVANCED, 144, 172, 85, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Elija las propiedades avanzadas que desee para este acceso directo.", -1, 5, 25, 210, 14 - CHECKBOX "Ejecutar con credenciales diferentes", 14000, 25, 50, 150, 10 + CHECKBOX "Ejecutar con credenciales diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opción puede permitirle ejecutar este acceso directo como otro usuario, o continuar como usted mismo mientras protege su equipo y datos de una actividad de programa no autorizada.", -1, 50, 60, 175, 40 - CHECKBOX "Ejecutar en otro espacio de memoria", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Ejecutar en otro espacio de memoria", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Aceptar", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Cancelar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 22c71b8af7..df51f5cb63 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -188,27 +188,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Otsetee" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Sihiüksuse t&üüp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Sihtüksuse &asukoht:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Sihtüksus:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Sihiüksuse t&üüp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Sihtüksuse &asukoht:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Sihtüksus:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Käi&vituskoht:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Kiirkla&hv:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Käivita:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentaar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Otsi sihtüksus...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Muuda ikoon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Täpsemalt...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "Käi&vituskoht:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Kiirkla&hv:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Käivita:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentaar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Otsi sihtüksus...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Muuda ikoon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Täpsemalt...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -218,9 +218,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Vali selle otsetee jaoks soovitud täpsemad atribuudid.", -1, 5, 30, 210, 10 - CHECKBOX "Käivita teistsuguse mandaadiga", 14000, 25, 50, 150, 10 + CHECKBOX "Käivita teistsuguse mandaadiga", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Selle suvandi abil saad käivitada otsetee teise või enda kasutajanime all, kaitstes samal ajal oma arvutit ja andmeid volitamata programmitegevuse eest.", -1, 50, 60, 175, 40 - CHECKBOX "Käivita eraldi mäluruumis", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Käivita eraldi mäluruumis", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Loobu", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -951,5 +951,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 02949be085..5b058eda00 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 3e056ea304..800f6a5715 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Raccourci" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type de la cible :", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localisation de la cible :", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cible :", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Type de la cible :", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Localisation de la cible :", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cible :", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Démarrer dans :", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Touche de raccourci :", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Exécuter :", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommentaire :", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Changer d'icône...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancé...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Démarrer dans :", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Touche de raccourci :", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Exécuter :", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&ommentaire :", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "Trouver la cible...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Changer d'icône...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancé...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choisissez la propriété étendue que vous voulez pour ce raccourci.", -1, 5, 30, 210, 10 - CHECKBOX "Exécuter avec des droits différents", 14000, 25, 50, 150, 10 + CHECKBOX "Exécuter avec des droits différents", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-même en protégeant votre ordinateur et vos données des activés de programme non autorisées.", -1, 50, 60, 175, 40 - CHECKBOX "Lancer dans un espace mémoire séparé", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Lancer dans un espace mémoire séparé", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 1fb8a87f14..28e5f97599 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "קיצור דרך" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "סוג יעד:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "מיקום יעד:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "יעד:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "סוג יעד:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "מיקום יעד:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "יעד:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "התחל ב:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "מקש קיצור:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "הפעל:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "הערה:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "פתח מיקום קובץ", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "שינוי סמל...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "מתקדם...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "התחל ב:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "מקש קיצור:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "הפעל:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "הערה:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "פתח מיקום קובץ", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "שינוי סמל...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "מתקדם...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "הרץ בטווח זיכרון מופרד", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "הרץ בטווח זיכרון מופרד", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "אישור", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "ביטול", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ba3374f49f..fe0da3d84d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 584bd37f9f..d73eae1772 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Collegamento" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Posizione:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Nome:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Posizione:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Nome:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Eseguito in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tasto per il collegamento:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "E&secuzione:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommento:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Trova...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Cambia icona...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vanzate...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Eseguito in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tasto per il collegamento:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "E&secuzione:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&ommento:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Trova...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Cambia icona...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vanzate...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Scegliere le impostazioni avanzate per questo collegamento.", -1, 5, 30, 210, 10 - CHECKBOX "Eseguire con credenziali diverse", 14000, 25, 50, 150, 10 + CHECKBOX "Eseguire con credenziali diverse", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Questa opzione permette l'esecuzione del collegamento come se si fosse un altro utente o di proteggere il computer e i dati da attività non autorizzate del programma.", -1, 50, 60, 175, 40 - CHECKBOX "Eseguire in uno spazio di memoria separato", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Eseguire in uno spazio di memoria separato", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Annulla", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 3834c9bd9a..43c85ae4b4 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "ショートカット" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "対象の種類:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "対象の場所:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "対象 (&T):", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "対象の種類:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "対象の場所:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "対象 (&T):", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "実行元(&S):", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "ショートカットキー(&K):", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "実行状態 (&R):", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "コメント(&O):", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "対象の検索(&F)...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "アイコンの変更(&C)...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "詳細設定(&D)...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "実行元(&S):", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "ショートカットキー(&K):", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "実行状態 (&R):", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "コメント(&O):", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "対象の検索(&F)...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "アイコンの変更(&C)...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "詳細設定(&D)...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "このショートカットに使用する拡張プロパティを選択してください。", -1, 5, 30, 210, 10 - CHECKBOX "異なる人物証明情報で実行する", 14000, 25, 50, 150, 10 + CHECKBOX "異なる人物証明情報で実行する", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "このオプションを使用するとこのショートカットを別のユーザーとして実行できます。また、自分自身で実行する場合、許可されていないプログラムの活動からコンピュータとデータを保護できます。", -1, 50, 60, 175, 40 - CHECKBOX "別のメモリ領域で実行する", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "別のメモリ領域で実行する", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "中止", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -222,7 +222,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE + ICON "", IDC_SHORTCUT_ICON, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT LTEXT "ファイルの種類:", 14004, 8, 40, 55, 10 CONTROL "フォルダ", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 @@ -940,5 +940,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf7c62329e..bd1908c2a1 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 9, "굴림", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index de2b87616c..c0da495845 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 9d8e0477ec..0924770823 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Snarvei" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Plasseringstype:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Plasseringssted:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Plassering:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Plasseringstype:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Plasseringssted:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Plassering:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start i:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Snarvei nø&kkel:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Kjø&r:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Finn mål...", 14020, 10, 115, 63, 14, ES_LEFT - PUSHBUTTON "&Endre ikon...", 14021, 83, 115, 63, 14, ES_LEFT - PUSHBUTTON "A&vansert...", 14022, 156, 115, 63, 14, ES_LEFT + LTEXT "&Start i:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Snarvei nø&kkel:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Kjø&r:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Finn mål...", IDC_SHORTCUT_FIND, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "&Endre ikon...", IDC_SHORTCUT_CHANGE_ICON, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "A&vansert...", IDC_SHORTCUT_ADVANCED, 156, 115, 63, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Velg avansert egenskaper som du vil for denne snarveien.", -1, 5, 30, 210, 10 - CHECKBOX "Kjør som administrator", 14000, 25, 50, 150, 10 + CHECKBOX "Kjør som administrator", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Med dette valget kan du kjøre denne snarveien med som en administrator, mens du beskytter din datamaskin og data fra uautorisert program aktivitet.", -1, 50, 60, 175, 40 - CHECKBOX "Kjør i seperat minneplass", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Kjør i seperat minneplass", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "Avbryt", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index d22086d5b3..55e531c2e0 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -185,27 +185,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Skrót" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ docelowy:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Lokalizacja:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Element docelowy:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ docelowy:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Lokalizacja:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Element docelowy:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Uruchom w:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Skrót &klawiszowy:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "U&ruchom:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&omentarz:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Znajdź element docelowy", 14020, 8, 172, 90, 14, ES_LEFT - PUSHBUTTON "Zmień &ikonę", 14021, 104, 172, 60, 14, ES_LEFT - PUSHBUTTON "Z&aawansowane", 14022, 169, 172, 60, 14, ES_LEFT + LTEXT "&Uruchom w:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Skrót &klawiszowy:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "U&ruchom:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&omentarz:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Znajdź element docelowy", IDC_SHORTCUT_FIND, 8, 172, 90, 14, ES_LEFT + PUSHBUTTON "Zmień &ikonę", IDC_SHORTCUT_CHANGE_ICON, 104, 172, 60, 14, ES_LEFT + PUSHBUTTON "Z&aawansowane", IDC_SHORTCUT_ADVANCED, 169, 172, 60, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -215,9 +215,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Wybierz właściwości zaawansowane dla tego skrótu.", -1, 5, 30, 210, 10 - CHECKBOX "Uruchom z innym Użytkownikiem", 14000, 25, 50, 150, 10 + CHECKBOX "Uruchom z innym Użytkownikiem", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ta opcja pozwoli ci na uruchomienie skrótu jako inny użytkownik, do ochrony twoich danych przed niepowołanym dostępem.", -1, 50, 60, 175, 40 - CHECKBOX "Uruchom w osobnym przedziale pamięci", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Uruchom w osobnym przedziale pamięci", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -948,5 +948,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 33a5df82fa..4f1864b369 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Atalho" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de alvo:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Local do alvo:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Alvo:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de alvo:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Local do alvo:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Alvo:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Iniciar em:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de atalho:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Executar:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omentário:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Procurar Alvo...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Modificar Ícone...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vançado...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Iniciar em:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de atalho:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Executar:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omentário:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Procurar Alvo...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Modificar Ícone...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vançado...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avançadas para este atalho.", -1, 5, 30, 210, 10 - CHECKBOX "Executar com credenciais diferentes", 14000, 25, 50, 150, 10 + CHECKBOX "Executar com credenciais diferentes", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite você executar este atalho como outro usuário, ou continuar como si próprio enquanto protege seu computador e dados de atividades de programas não autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar em espaço de memória separado", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Executar em espaço de memória separado", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7dfbef5761..31618bb68f 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Atalho" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipo de destino:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localização do destino:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Destino:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipo de destino:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Localização do destino:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Destino:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Iniciar em:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Tecla de Atalho:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Executa&r:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omemntário:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Localizar Destino...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Trocar Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vançado...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Iniciar em:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Tecla de Atalho:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Executa&r:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omemntário:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Localizar Destino...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Trocar Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vançado...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Escolha as propriedades avançadas que quer para este atalho.", -1, 5, 30, 210, 10 - CHECKBOX "Executar com diferentes credenciais", 14000, 25, 50, 150, 10 + CHECKBOX "Executar com diferentes credenciais", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Esta opção permite executar este atalho como outro utilizador, ou continue com a sua conta enquanto protege o seu computador e dados contra actividade de programas não autorizados.", -1, 50, 60, 175, 40 - CHECKBOX "Executar num espaço de memória separada", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Executar num espaço de memória separada", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abortar", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 577ecf6495..e3fa5b04b4 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Scurtătură" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipul destinației:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Locația destinației:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "D&estinația:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipul destinației:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Locația destinației:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "D&estinația:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "C&alea de lansare:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Taste &rapide:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "E&xecuție:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Comentariu:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Locul țintei", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Pictogramă…", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vansate…", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "C&alea de lansare:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Taste &rapide:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "E&xecuție:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Comentariu:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Locul țintei", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Pictogramă…", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vansate…", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Specificați proprietăți avansate pentru această scurtătură.", -1, 5, 30, 210, 10 - CHECKBOX "Execută sub o i&dentitate explicită", 14000, 25, 50, 150, 10 + CHECKBOX "Execută sub o i&dentitate explicită", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Această opțiune vă permite execuția scurtăturii sub autoritatea unui alt utilizator sau continuarea folosirii scurtăturii în mod securizat, protejând astfel calculatorul de activități neautorizate.", -1, 50, 60, 175, 40 - CHECKBOX "Execută în sp&ațiu de memorie separat", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Execută în sp&ațiu de memorie separat", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Con&firmă", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "A&nulează", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2f6c32567f..e1b4372fd3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ярлык" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Тип объекта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Размещение:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Объект:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Тип объекта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Размещение:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Объект:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Рабочая папка:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Б&ыстрый вызов:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Ок&но:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Комментарий:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Найти объект...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "См&енить значок...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Дополнительно...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Рабочая папка:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Б&ыстрый вызов:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Ок&но:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Комментарий:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Найти объект...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "См&енить значок...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Дополнительно...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Установите нужные свойства для этого ярлыка.", -1, 5, 30, 210, 10 - CHECKBOX "Запускать с другими учетными данными", 14000, 25, 50, 150, 10 + CHECKBOX "Запускать с другими учетными данными", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Позволяет использовать этот ярлык для запуска программы от &имени администратора, в то же время продолжая работу от своего имени, что защищает компьютер от несанкционированных действий других программ.", -1, 50, 60, 175, 40 - CHECKBOX "Запус&кать в отдельной области памяти", 14001, 25, 104, 145, 10, WS_DISABLED + CHECKBOX "Запус&кать в отдельной области памяти", IDC_SHORTEX_RUN_SEPARATE, 25, 104, 145, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Отмена", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index d64d3fe0d0..1ca54231a0 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Odkaz" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Typ cieľa:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Umiestnenie cieľa:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cieľ:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Typ cieľa:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Umiestnenie cieľa:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Cieľ:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Z&ačať v priečinku:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Klávesová skratka:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "Sp&ustiť:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Pozná&mka:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Hľadať cieľ...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Zmeniť ikonu...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Spresniť...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "Z&ačať v priečinku:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Klávesová skratka:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "Sp&ustiť:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "Pozná&mka:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Hľadať cieľ...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Zmeniť ikonu...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Spresniť...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Vyberte rozšírené vlastnosti určené pre tento odkaz.", -1, 5, 30, 210, 10 - CHECKBOX "&Spustiť s inými povereniami", 14000, 25, 50, 150, 10 + CHECKBOX "&Spustiť s inými povereniami", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Táto možnosť umožňuje spustiť tento odkaz ako iný používateľ, alebo pokračovať so svojím používateľským oprávnením, ale s ochranou počítača a údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 170, 40 - CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", 14001, 25, 100, 190, 10, WS_DISABLED + CHECKBOX "Spustiť v oddelenom pa&mäťovom priestore", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 190, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Prerušiť", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 08368bad81..6caa12aa2a 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 5ef554d314..cde0bc88cf 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -184,27 +184,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ikonë" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tipi Objektivit:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Vendndodhja ObjektivitTarget location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Objektivi:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Tipi Objektivit:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Vendndodhja ObjektivitTarget location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Objektivi:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Fillo në:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Ikonë &çelës:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Ekzekuto:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&oment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Gjej Objektivin...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Ndrysho Ikonë...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancuar...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Fillo në:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Ikonë &çelës:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Ekzekuto:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&oment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Gjej Objektivin...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Ndrysho Ikonë...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancuar...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -214,9 +214,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Zgjidhni karakteristikat e avancuara që ju dëshironi për këtë ikonë.", -1, 5, 30, 210, 10 - CHECKBOX "Ekzekuto me kredenciale të ndryshme", 14000, 25, 50, 150, 10 + CHECKBOX "Ekzekuto me kredenciale të ndryshme", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Ky opsion mund të lejojë për të drejtuar këtë ikonë si një përdorues tjetër, ose të vazhdojë si veten tënde, duke mbrojtur kompjuterin tuaj dhe të dhënat nga aktiviteti i paautorizuar i programit.", -1, 50, 60, 175, 40 - CHECKBOX "Ekzekuto në hapësirë të veçantë që e kujtesës", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Ekzekuto në hapësirë të veçantë që e kujtesës", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Ndërprej", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -947,5 +947,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9838370191..6c5cdc3e0c 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Genväg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Måltyp:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Målplats:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Mål:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Måltyp:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Målplats:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Mål:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Starta i:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Kort&kommando:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Kör:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Sök mål...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Ändra ikon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&vancerat...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Starta i:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Kort&kommando:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Kör:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "K&ommentar:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Sök mål...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Ändra ikon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancerat...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Välj de avancerade egenskaper du vill ha för den här genvägen.", -1, 5, 30, 210, 10 - CHECKBOX "Kör med andra användaruppgifter", 14000, 25, 50, 150, 10 + CHECKBOX "Kör med andra användaruppgifter", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Det här alternativet tillåter dig att köra genvägen som en annan användare eller som dig själv samtidigt som din dator skyddas från otillåten programaktivitet.", -1, 50, 60, 175, 40 - CHECKBOX "Kör i seperat minnesutrymme", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Kör i seperat minnesutrymme", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Avbryt", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 6411243735..92e0d46827 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -182,27 +182,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Kısayol" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Varış Türü:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Varış Konumu:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Varış:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Varış Türü:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Varış Konumu:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Varış:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Başlama Yeri:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Kısayol Düğmesi:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Çalıştır:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Açıklama:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "Va&rış Bul...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Simge Değiştir...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Gelişmiş...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Başlama Yeri:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Kısayol Düğmesi:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Çalıştır:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Açıklama:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "Va&rış Bul...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Simge Değiştir...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Gelişmiş...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -212,9 +212,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Bu kısayol için istediğiniz gelişmiş husûsîyetleri seçiniz.", -1, 5, 30, 210, 10 - CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", 14000, 25, 50, 150, 10 + CHECKBOX "&Ayrı Kimlik Bilgileriyle Çalıştır", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Bu seçenek, bu kısayolu başka bir kullanıcı olarak çalıştırmanızı veyâ yetkilendirilmemiş izlence etkinliğinden bilgisayarınızı ve verinizi koruyarak kendiniz olarak sürdürmenizi sağlayabilir.", -1, 50, 60, 175, 40 - CHECKBOX "A&yrı Bellek Alanında Çalıştır", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "A&yrı Bellek Alanında Çalıştır", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "Tamam", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "İptal", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -945,5 +945,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 8065fd0512..5d60621327 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -180,27 +180,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ярлик" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Тип об'єкта:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Розташування:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "О&б'єкт:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Тип об'єкта:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Розташування:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "О&б'єкт:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Робоча папка:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Швидкий виклик:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Вікно:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "&Примітка:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "З&найти об'єкт...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Змінити значок...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Додатково...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Робоча папка:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "&Швидкий виклик:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Вікно:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "&Примітка:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "З&найти об'єкт...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Змінити значок...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Додатково...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -210,9 +210,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Виберіть потрібні властивості для цього ярлика.", -1, 5, 30, 210, 10 - CHECKBOX "Запускати з іншими обліковими даними", 14000, 25, 50, 150, 10 + CHECKBOX "Запускати з іншими обліковими даними", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "Цей параметр дозволяє використовувати цей ярлик від імені іншого користувача або продовжувати роботу від свого імені, що захищає комп'ютер й дані від несанкціонованих дій програми.", -1, 50, 60, 175, 40 - CHECKBOX "Запускати в окремій області пам'яті", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Запускати в окремій області пам'яті", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Скасувати", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -943,5 +943,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 78a898a1fb..983c9b57f6 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -190,27 +190,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "快捷方式" FONT 9, "宋体", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "目标类型：", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "目标位置：", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "目标(&T):", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "目标类型：", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "目标位置：", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "目标(&T):", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "起始位置(&S):", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "快捷键(&K):", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "运行(&R):", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "备注(&O):", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "查找目标...(&F)", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "更改图标...(&C)", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "高级...(&D)", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "起始位置(&S):", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "快捷键(&K):", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "运行(&R):", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "备注(&O):", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "查找目标...(&F)", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "更改图标...(&C)", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "高级...(&D)", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -220,9 +220,9 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "为这个快捷方式选择您想要的高级属性。", -1, 5, 30, 210, 10 - CHECKBOX "以其他用户身份运行", 14000, 25, 50, 150, 10 + CHECKBOX "以其他用户身份运行", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "此选项允许您以另一用户身份运行此快捷方式，或继续以您自己的身份运行以保护您的计算机和数据不受未授权程序的破坏。", -1, 50, 60, 175, 40 - CHECKBOX "在单独的内存空间中运行", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "在单独的内存空间中运行", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -953,5 +953,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index f46729673c..3288dcceee 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -188,27 +188,27 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE - EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE + EDITTEXT IDC_SHORTCUT_TEXT, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 - EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 - EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 - EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL + LTEXT "Target type:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Target location:", IDC_SHORTCUT_LOCATION, 8, 55, 68, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Target:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 - EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 - CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 - COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 - EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + LTEXT "&Start in:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL + LTEXT "Shortcut &key:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 + LTEXT "&Run:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "C&omment:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Find Target...", IDC_SHORTCUT_FIND, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Change Icon...", IDC_SHORTCUT_CHANGE_ICON, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&dvanced...", IDC_SHORTCUT_ADVANCED, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 @@ -218,9 +218,9 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 + CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 150, 10, WS_DISABLED + CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END @@ -951,5 +951,6 @@ BEGIN IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" IDS_EDITING_ACTION "Editing action for type: " - + IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." + IDS_FILE_NOT_FOUND "The file '%s' was not found." END diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 74bf189361..440fe81785 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -275,6 +275,9 @@ #define IDS_REMOVE_EXT 30522 +#define IDS_NO_ICONS 30529 +#define IDS_FILE_NOT_FOUND 30530 + /* Dialogs */ /* Run dialog */ @@ -371,6 +374,31 @@ #define IDC_NEWEXT_COMBOBOX 14003 #define IDC_NEWEXT_ASSOC 14004 +/* Control IDs for IDD_SHORTCUT_PROPERTIES dialog */ +#define IDC_SHORTCUT_ICON 14000 +#define IDC_SHORTCUT_TEXT 14001 +#define IDC_SHORTCUT_TYPE 14004 +#define IDC_SHORTCUT_TYPE_EDIT 14005 +#define IDC_SHORTCUT_LOCATION 14006 +#define IDC_SHORTCUT_LOCATION_EDIT 14007 +#define IDC_SHORTCUT_TARGET 14008 +#define IDC_SHORTCUT_TARGET_TEXT 14009 +#define IDC_SHORTCUT_START_IN 14010 +#define IDC_SHORTCUT_START_IN_EDIT 14011 +#define IDC_SHORTCUT_KEY 14014 +#define IDC_SHORTCUT_KEY_HOTKEY 14015 +#define IDC_SHORTCUT_RUN 14016 +#define IDC_SHORTCUT_RUN_COMBO 14017 +#define IDC_SHORTCUT_COMMENT 14018 +#define IDC_SHORTCUT_COMMENT_EDIT 14019 +#define IDC_SHORTCUT_FIND 14020 +#define IDC_SHORTCUT_CHANGE_ICON 14021 +#define IDC_SHORTCUT_ADVANCED 14022 + +/* Control IDs for IDD_SHORTCUT_EXTENDED_PROPERTIES dialog */ +#define IDC_SHORTEX_RUN_DIFFERENT 14000 +#define IDC_SHORTEX_RUN_SEPARATE 14001 + /* Control IDs for IDD_EDITTYPE dialog */ #define IDC_EDITTYPE_ICON 14001 #define IDC_EDITTYPE_TEXT 14002

7 years

01/01: [USERENV] LoadUserProfileW: User the user name passed in via lpProfileInfo to create the profile directory instead of the user name extracted from the token

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d8bbf72e323577b6cbfa… commit 5d8bbf72e323577b6cbfa732cb60c92b5e03ad8c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed May 30 23:28:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed May 30 23:29:14 2018 +0200 [USERENV] LoadUserProfileW: User the user name passed in via lpProfileInfo to create the profile directory instead of the user name extracted from the token --- dll/win32/userenv/profile.c | 53 ++++----------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index a7289211be..077619e5aa 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -1350,16 +1350,13 @@ LoadUserProfileW( _Inout_ LPPROFILEINFOW lpProfileInfo) { WCHAR szUserHivePath[MAX_PATH]; - LPWSTR UserName = NULL, Domain = NULL; - DWORD UserNameLength = 0, DomainLength = 0; PTOKEN_USER UserSid = NULL; - SID_NAME_USE AccountType; UNICODE_STRING SidString = { 0, 0, NULL }; LONG Error; BOOL ret = FALSE; DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); - DPRINT("LoadUserProfileW() called\n"); + DPRINT("LoadUserProfileW(%p %p)\n", hToken, lpProfileInfo); /* Check profile info */ if (!lpProfileInfo || (lpProfileInfo->dwSize != sizeof(PROFILEINFOW)) || @@ -1369,6 +1366,8 @@ LoadUserProfileW( return FALSE; } + DPRINT("UserName: %S\n", lpProfileInfo->lpUserName); + /* Don't load a profile twice */ if (CheckForLoadedProfile(hToken)) { @@ -1423,50 +1422,8 @@ LoadUserProfileW( goto cleanup; } - /* Get user name */ - do - { - if (UserNameLength > 0) - { - HeapFree(GetProcessHeap(), 0, UserName); - UserName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, UserNameLength * sizeof(WCHAR)); - if (!UserName) - { - DPRINT1("HeapAlloc() failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - } - if (DomainLength > 0) - { - HeapFree(GetProcessHeap(), 0, Domain); - Domain = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, DomainLength * sizeof(WCHAR)); - if (!Domain) - { - DPRINT1("HeapAlloc() failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - } - ret = LookupAccountSidW(NULL, - UserSid->User.Sid, - UserName, - &UserNameLength, - Domain, - &DomainLength, - &AccountType); - } while (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER); - - if (!ret) - { - DPRINT1("LookupAccountSidW() failed\n"); - goto cleanup; - } - /* Create profile */ - /* FIXME: ignore Domain? */ - DPRINT("UserName %S, Domain %S\n", UserName, Domain); - ret = CreateUserProfileW(UserSid->User.Sid, UserName); + ret = CreateUserProfileW(UserSid->User.Sid, lpProfileInfo->lpUserName); if (!ret) { DPRINT1("CreateUserProfileW() failed\n"); @@ -1524,8 +1481,6 @@ LoadUserProfileW( cleanup: HeapFree(GetProcessHeap(), 0, UserSid); - HeapFree(GetProcessHeap(), 0, UserName); - HeapFree(GetProcessHeap(), 0, Domain); RtlFreeUnicodeString(&SidString); DPRINT("LoadUserProfileW() done\n");

7 years

01/01: [SHELL32] Implement the 'Advanced' button of the 'File Types' dialog (#565)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5187ec858f9284c6ec35d… commit 5187ec858f9284c6ec35d4833d83149d34e51a49 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 31 00:22:31 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 30 17:22:31 2018 +0200 [SHELL32] Implement the 'Advanced' button of the 'File Types' dialog (#565) This allows the user to edit the File Type / extension information by clicking 'Advanced' button in the 'File Types' property sheet of Folder Options. CORE-12906, CORE-10972 --- dll/win32/shell32/dialogs/folder_options.cpp | 868 +++++++++++++++++++++++++-- dll/win32/shell32/lang/bg-BG.rc | 43 ++ dll/win32/shell32/lang/ca-ES.rc | 43 ++ dll/win32/shell32/lang/cs-CZ.rc | 43 ++ dll/win32/shell32/lang/da-DK.rc | 43 ++ dll/win32/shell32/lang/de-DE.rc | 43 ++ dll/win32/shell32/lang/el-GR.rc | 43 ++ dll/win32/shell32/lang/en-GB.rc | 43 ++ dll/win32/shell32/lang/en-US.rc | 43 ++ dll/win32/shell32/lang/es-ES.rc | 43 ++ dll/win32/shell32/lang/et-EE.rc | 43 ++ dll/win32/shell32/lang/fi-FI.rc | 43 ++ dll/win32/shell32/lang/fr-FR.rc | 43 ++ dll/win32/shell32/lang/he-IL.rc | 43 ++ dll/win32/shell32/lang/hu-HU.rc | 43 ++ dll/win32/shell32/lang/it-IT.rc | 43 ++ dll/win32/shell32/lang/ja-JP.rc | 43 ++ dll/win32/shell32/lang/ko-KR.rc | 43 ++ dll/win32/shell32/lang/nl-NL.rc | 43 ++ dll/win32/shell32/lang/no-NO.rc | 43 ++ dll/win32/shell32/lang/pl-PL.rc | 43 ++ dll/win32/shell32/lang/pt-BR.rc | 43 ++ dll/win32/shell32/lang/pt-PT.rc | 43 ++ dll/win32/shell32/lang/ro-RO.rc | 43 ++ dll/win32/shell32/lang/ru-RU.rc | 43 ++ dll/win32/shell32/lang/sk-SK.rc | 43 ++ dll/win32/shell32/lang/sl-SI.rc | 43 ++ dll/win32/shell32/lang/sq-AL.rc | 43 ++ dll/win32/shell32/lang/sv-SE.rc | 43 ++ dll/win32/shell32/lang/tr-TR.rc | 43 ++ dll/win32/shell32/lang/uk-UA.rc | 43 ++ dll/win32/shell32/lang/zh-CN.rc | 43 ++ dll/win32/shell32/lang/zh-TW.rc | 43 ++ dll/win32/shell32/precomp.h | 1 + dll/win32/shell32/shresdef.h | 30 +- 35 files changed, 2235 insertions(+), 40 deletions(-) diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index 29320702a6..0675eacf67 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -36,11 +36,14 @@ typedef struct WCHAR FileExtension[30]; WCHAR FileDescription[100]; WCHAR ClassKey[MAX_PATH]; + WCHAR ClassName[64]; DWORD EditFlags; WCHAR AppName[64]; HICON hIconLarge; HICON hIconSmall; WCHAR ProgramPath[MAX_PATH]; + WCHAR IconPath[MAX_PATH]; + INT nIconIndex; } FOLDER_FILE_TYPE_ENTRY, *PFOLDER_FILE_TYPE_ENTRY; // uniquely-defined icon entry for Advanced Settings @@ -996,6 +999,7 @@ ViewDlg_ToggleCheckItem(HWND hwndDlg, HTREEITEM hItem) case AETYPE_CHECKBOX: pEntry->bChecked = !pEntry->bChecked; break; + case AETYPE_RADIO: // reset all the entries of the same parent for (i = 0; i < s_AdvancedCount; ++i) @@ -1013,6 +1017,7 @@ ViewDlg_ToggleCheckItem(HWND hwndDlg, HTREEITEM hItem) } pEntry->bChecked = TRUE; break; + default: return FALSE; // failure } @@ -1286,6 +1291,7 @@ FolderOptionsViewDlg( { case WM_INITDIALOG: return ViewDlg_OnInitDialog(hwndDlg); + case WM_COMMAND: switch (LOWORD(wParam)) { @@ -1294,23 +1300,28 @@ FolderOptionsViewDlg( break; } break; + case WM_NOTIFY: switch (LPNMHDR(lParam)->code) { case NM_CLICK: // clicked on treeview ViewDlg_OnTreeViewClick(hwndDlg); break; + case NM_CUSTOMDRAW: // custom draw (for graying) Draw = (NMTVCUSTOMDRAW *)lParam; Result = ViewDlg_OnTreeCustomDraw(hwndDlg, Draw); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, Result); return Result; + case TVN_KEYDOWN: // key is down ViewDlg_OnTreeViewKeyDown(hwndDlg, (TV_KEYDOWN *)lParam); break; + case PSN_APPLY: // [Apply] is clicked ViewDlg_Apply(hwndDlg); break; + default: break; } @@ -1443,9 +1454,10 @@ DoFileTypeIconLocation(PFOLDER_FILE_TYPE_ENTRY Entry, LPCWSTR IconLocation) return; } - INT nIndex = PathParseIconLocationW(szLocation); - Entry->hIconLarge = DoExtractIcon(Entry, szLocation, nIndex, FALSE); - Entry->hIconSmall = DoExtractIcon(Entry, szLocation, nIndex, TRUE); + Entry->nIconIndex = PathParseIconLocationW(szLocation); + StringCchCopyW(Entry->IconPath, _countof(Entry->IconPath), szLocation); + Entry->hIconLarge = DoExtractIcon(Entry, szLocation, Entry->nIconIndex, FALSE); + Entry->hIconSmall = DoExtractIcon(Entry, szLocation, Entry->nIconIndex, TRUE); } static BOOL @@ -1460,6 +1472,8 @@ GetFileTypeIconsEx(PFOLDER_FILE_TYPE_ENTRY Entry, LPCWSTR IconLocation) Entry->hIconLarge = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_EXE)); Entry->hIconSmall = HICON(LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_EXE), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)); + StringCchCopyW(Entry->IconPath, _countof(Entry->IconPath), L"%SystemRoot%\\system32\\shell32.dll"); + Entry->nIconIndex = -IDI_SHELL_EXE; } else if (lstrcmpW(IconLocation, L"%1") == 0) { @@ -1510,6 +1524,18 @@ QueryFileDescription(LPCWSTR ProgramPath, LPWSTR pszName, INT cchName) return !!GetFileTitleW(ProgramPath, pszName, cchName); } +static void +SetFileTypeEntryDefaultIcon(PFOLDER_FILE_TYPE_ENTRY Entry) +{ + Entry->hIconLarge = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPTIONS)); + INT cxSmall = GetSystemMetrics(SM_CXSMICON); + INT cySmall = GetSystemMetrics(SM_CYSMICON); + Entry->hIconSmall = HICON(LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPTIONS), + IMAGE_ICON, cxSmall, cySmall, 0)); + StringCchCopyW(Entry->IconPath, _countof(Entry->IconPath), L"%SystemRoot%\\system32\\shell32.dll"); + Entry->nIconIndex = -IDI_SHELL_FOLDER_OPTIONS; +} + static BOOL InsertFileType(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFile) { @@ -1551,12 +1577,16 @@ InsertFileType(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFile) Entry->ClassKey[0] = 0; } + Entry->ClassName[0] = 0; if (Entry->ClassKey[0]) { HKEY hTemp; /* try open linked key */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, Entry->ClassKey, 0, KEY_READ, &hTemp) == ERROR_SUCCESS) { + DWORD dwSize = sizeof(Entry->ClassName); + RegQueryValueExW(hTemp, NULL, NULL, NULL, LPBYTE(Entry->ClassName), &dwSize); + /* use linked key */ RegCloseKey(hKey); hKey = hTemp; @@ -1590,11 +1620,7 @@ InsertFileType(HWND hListView, LPCWSTR szName, INT iItem, LPCWSTR szFile) if (!GetFileTypeIconsByKey(hKey, Entry)) { // set default icon - Entry->hIconLarge = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPTIONS)); - INT cxSmall = GetSystemMetrics(SM_CXSMICON); - INT cySmall = GetSystemMetrics(SM_CYSMICON); - Entry->hIconSmall = HICON(LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPTIONS), - IMAGE_ICON, cxSmall, cySmall, 0)); + SetFileTypeEntryDefaultIcon(Entry); } /* close key */ @@ -1759,7 +1785,6 @@ GetListViewEntry(HWND hListView, INT iItem = -1) struct NEWEXT_DIALOG { - HWND hwndDlg; HWND hwndLV; RECT rcDlg; BOOL bAdvanced; @@ -1844,7 +1869,6 @@ NewExtDlg_OnInitDialog(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) { WCHAR szText[64]; - pNewExt->hwndDlg = hwndDlg; pNewExt->bAdvanced = FALSE; GetWindowRect(hwndDlg, &pNewExt->rcDlg); @@ -1865,25 +1889,7 @@ NewExtDlg_OnInitDialog(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) return TRUE; } -static void -StringTrimW(LPWSTR pszText) -{ - LPWSTR pch = pszText; - while (iswspace(*pch)) - pch++; - - LPWSTR pchFirst, pchLast; - pchFirst = pchLast = pch; - while (*pch && !iswspace(*pch)) - { - ++pch; - pchLast = pch; - } - - INT_PTR cch = pchLast - pchFirst; - MoveMemory(pszText, pchFirst, cch * sizeof(WCHAR)); - pszText[cch] = 0; -} +static LPCWSTR s_pszSpace = L" \t\n\r\f\v"; static BOOL NewExtDlg_OnOK(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) @@ -1892,11 +1898,11 @@ NewExtDlg_OnOK(HWND hwndDlg, NEWEXT_DIALOG *pNewExt) INT iItem; GetDlgItemTextW(hwndDlg, IDC_NEWEXT_EDIT, pNewExt->szExt, _countof(pNewExt->szExt)); - StringTrimW(pNewExt->szExt); + StrTrimW(pNewExt->szExt, s_pszSpace); CharUpperW(pNewExt->szExt); GetDlgItemTextW(hwndDlg, IDC_NEWEXT_COMBOBOX, pNewExt->szFileType, _countof(pNewExt->szFileType)); - StringTrimW(pNewExt->szFileType); + StrTrimW(pNewExt->szFileType, s_pszSpace); if (pNewExt->szExt[0] == 0) { @@ -1981,15 +1987,18 @@ NewExtensionDlgProc( s_pNewExt = (NEWEXT_DIALOG *)lParam; NewExtDlg_OnInitDialog(hwndDlg, s_pNewExt); return TRUE; + case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: NewExtDlg_OnOK(hwndDlg, s_pNewExt); break; + case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); break; + case IDC_NEWEXT_ADVANCED: s_pNewExt->bAdvanced = !s_pNewExt->bAdvanced; NewExtDlg_OnAdvanced(hwndDlg, s_pNewExt); @@ -2144,6 +2153,763 @@ FileTypesDlg_OnItemChanging(HWND hwndDlg, PFOLDER_FILE_TYPE_ENTRY pEntry) EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), TRUE); } +struct EDITTYPE_DIALOG +{ + HWND hwndLV; + FOLDER_FILE_TYPE_ENTRY *pEntry; + CSimpleMap<CStringW, CStringW> CommandLineMap; + WCHAR szIconPath[MAX_PATH]; + INT nIconIndex; + WCHAR szDefaultVerb[64]; +}; + +static BOOL +EditTypeDlg_ReadClass(HWND hwndDlg, EDITTYPE_DIALOG *pEditType, LPCWSTR ClassKey) +{ + // open class key + HKEY hClassKey; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, ClassKey, 0, KEY_READ, &hClassKey) != ERROR_SUCCESS) + return FALSE; + + // open "shell" key + HKEY hShellKey; + if (RegOpenKeyExW(hClassKey, L"shell", 0, KEY_READ, &hShellKey) != ERROR_SUCCESS) + { + RegCloseKey(hClassKey); + return FALSE; + } + + WCHAR DefaultVerb[64]; + DWORD dwSize = sizeof(DefaultVerb); + if (RegQueryValueExW(hShellKey, NULL, NULL, NULL, LPBYTE(DefaultVerb), &dwSize) == ERROR_SUCCESS) + { + StringCchCopyW(pEditType->szDefaultVerb, _countof(pEditType->szDefaultVerb), DefaultVerb); + } + else + { + StringCchCopyW(pEditType->szDefaultVerb, _countof(pEditType->szDefaultVerb), L"open"); + } + + // enumerate shell verbs + WCHAR szVerbName[64]; + DWORD dwIndex = 0; + while (RegEnumKeyW(hShellKey, dwIndex, szVerbName, _countof(szVerbName)) == ERROR_SUCCESS) + { + // open verb key + HKEY hVerbKey; + LONG nResult = RegOpenKeyExW(hShellKey, szVerbName, 0, KEY_READ, &hVerbKey); + if (nResult == ERROR_SUCCESS) + { + // open command key + HKEY hCommandKey; + nResult = RegOpenKeyExW(hVerbKey, L"command", 0, KEY_READ, &hCommandKey); + if (nResult == ERROR_SUCCESS) + { + // get command line + WCHAR szValue[MAX_PATH + 32]; + dwSize = sizeof(szValue); + nResult = RegQueryValueExW(hCommandKey, NULL, NULL, NULL, LPBYTE(szValue), &dwSize); + if (nResult == ERROR_SUCCESS) + { + pEditType->CommandLineMap.SetAt(szVerbName, szValue); + } + + RegCloseKey(hCommandKey); + } + + RegCloseKey(hVerbKey); + } + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_ADDSTRING, 0, LPARAM(szVerbName)); + ++dwIndex; + } + + RegCloseKey(hShellKey); + RegCloseKey(hClassKey); + + return TRUE; +} + +static BOOL +EditTypeDlg_WriteClass(HWND hwndDlg, EDITTYPE_DIALOG *pEditType, + LPCWSTR ClassKey, LPCWSTR ClassName, INT cchName) +{ + FOLDER_FILE_TYPE_ENTRY *pEntry = pEditType->pEntry; + + if (ClassKey[0] == 0) + return FALSE; + + // create or open class key + HKEY hClassKey; + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, ClassKey, 0, NULL, 0, KEY_WRITE, NULL, &hClassKey, NULL) != ERROR_SUCCESS) + return FALSE; + + // create "DefaultIcon" key + if (pEntry->IconPath[0]) + { + HKEY hDefaultIconKey; + if (RegCreateKeyExW(hClassKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hDefaultIconKey, NULL) == ERROR_SUCCESS) + { + WCHAR szText[MAX_PATH]; + StringCchPrintfW(szText, _countof(szText), L"%s,%d", pEntry->IconPath, pEntry->nIconIndex); + + // set icon location + DWORD dwSize = (lstrlenW(szText) + 1) * sizeof(WCHAR); + RegSetValueExW(hDefaultIconKey, NULL, 0, REG_EXPAND_SZ, LPBYTE(szText), dwSize); + + RegCloseKey(hDefaultIconKey); + } + } + + // create "shell" key + HKEY hShellKey; + if (RegCreateKeyExW(hClassKey, L"shell", 0, NULL, 0, KEY_WRITE, NULL, &hShellKey, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hClassKey); + return FALSE; + } + + // delete shell commands + WCHAR szVerbName[64]; + DWORD dwIndex = 0; + while (RegEnumKeyW(hShellKey, dwIndex, szVerbName, _countof(szVerbName)) == ERROR_SUCCESS) + { + if (pEditType->CommandLineMap.FindKey(szVerbName) == -1) + { + // doesn't exist in CommandLineMap, then delete it + if (SHDeleteKeyW(hShellKey, szVerbName) == ERROR_SUCCESS) + { + --dwIndex; + } + } + ++dwIndex; + } + + // set default action + RegSetValueExW(hShellKey, NULL, 0, REG_SZ, LPBYTE(pEditType->szDefaultVerb), sizeof(pEditType->szDefaultVerb)); + + // write shell commands + const INT nCount = pEditType->CommandLineMap.GetSize(); + for (INT i = 0; i < nCount; ++i) + { + CStringW& key = pEditType->CommandLineMap.GetKeyAt(i); + CStringW& value = pEditType->CommandLineMap.GetValueAt(i); + + // create verb key + HKEY hVerbKey; + if (RegCreateKeyExW(hShellKey, key, 0, NULL, 0, KEY_WRITE, NULL, &hVerbKey, NULL) == ERROR_SUCCESS) + { + // create command key + HKEY hCommandKey; + if (RegCreateKeyExW(hVerbKey, L"command", 0, NULL, 0, KEY_WRITE, NULL, &hCommandKey, NULL) == ERROR_SUCCESS) + { + // write the default value + DWORD dwSize = (value.GetLength() + 1) * sizeof(WCHAR); + RegSetValueExW(hCommandKey, NULL, 0, REG_EXPAND_SZ, LPBYTE(LPCWSTR(value)), dwSize); + + RegCloseKey(hCommandKey); + } + + RegCloseKey(hVerbKey); + } + } + + // set class name to class key + RegSetValueExW(hClassKey, NULL, 0, REG_SZ, LPBYTE(ClassName), cchName); + + RegCloseKey(hShellKey); + RegCloseKey(hClassKey); + + return TRUE; +} + +static BOOL +EditTypeDlg_OnInitDialog(HWND hwndDlg, EDITTYPE_DIALOG *pEditType) +{ + FOLDER_FILE_TYPE_ENTRY *pEntry = pEditType->pEntry; + StringCchCopyW(pEditType->szIconPath, _countof(pEditType->szIconPath), pEntry->IconPath); + pEditType->nIconIndex = pEntry->nIconIndex; + StringCchCopyW(pEditType->szDefaultVerb, _countof(pEditType->szDefaultVerb), L"open"); + + // set info + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_ICON, STM_SETICON, (WPARAM)pEntry->hIconLarge, 0); + SetDlgItemTextW(hwndDlg, IDC_EDITTYPE_TEXT, pEntry->ClassName); + EditTypeDlg_ReadClass(hwndDlg, pEditType, pEntry->ClassKey); + InvalidateRect(GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX), NULL, TRUE); + + // is listbox empty? + if (SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_GETCOUNT, 0, 0) == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_EDIT_BUTTON), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_REMOVE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_SET_DEFAULT), FALSE); + } + else + { + // select first item + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_SETCURSEL, 0, 0); + } + + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_SAME_WINDOW), FALSE); + + return TRUE; +} + +static BOOL +EditTypeDlg_OnRemove(HWND hwndDlg, EDITTYPE_DIALOG *pEditType) +{ + // get current selection + INT iItem = SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_GETCURSEL, 0, 0); + if (iItem == LB_ERR) + return FALSE; + + // ask user for removal + CStringW strText(MAKEINTRESOURCEW(IDS_REMOVE_ACTION)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + if (MessageBoxW(hwndDlg, strText, strTitle, MB_ICONINFORMATION | MB_YESNO) == IDNO) + return FALSE; + + // get text + WCHAR szText[64]; + szText[0] = 0; + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_GETTEXT, iItem, (LPARAM)szText); + StrTrimW(szText, s_pszSpace); + + // remove it + pEditType->CommandLineMap.Remove(szText); + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_DELETESTRING, iItem, 0); + return TRUE; +} + +static BOOL +EditTypeDlg_UpdateEntryIcon(HWND hwndDlg, EDITTYPE_DIALOG *pEditType, LPCWSTR IconPath, INT IconIndex) +{ + FOLDER_FILE_TYPE_ENTRY *pEntry = pEditType->pEntry; + + BOOL bIconSet = FALSE; + if (IconPath && IconPath[0]) + { + DestroyIcon(pEntry->hIconLarge); + DestroyIcon(pEntry->hIconSmall); + pEntry->hIconLarge = DoExtractIcon(pEntry, IconPath, IconIndex, FALSE); + pEntry->hIconSmall = DoExtractIcon(pEntry, IconPath, IconIndex, TRUE); + + bIconSet = (pEntry->hIconLarge && pEntry->hIconSmall); + } + if (bIconSet) + { + StringCchCopyW(pEntry->IconPath, _countof(pEntry->IconPath), IconPath); + pEntry->nIconIndex = IconIndex; + } + else + { + SetFileTypeEntryDefaultIcon(pEntry); + } + + HWND hListView = pEditType->hwndLV; + HIMAGELIST himlLarge = ListView_GetImageList(hListView, LVSIL_NORMAL); + HIMAGELIST himlSmall = ListView_GetImageList(hListView, LVSIL_SMALL); + + INT iLargeImage = ImageList_AddIcon(himlLarge, pEntry->hIconLarge); + INT iSmallImage = ImageList_AddIcon(himlSmall, pEntry->hIconSmall); + ASSERT(iLargeImage == iSmallImage); + + INT iItem = ListView_GetNextItem(hListView, -1, LVNI_SELECTED); + if (iItem != -1) + { + LV_ITEMW Item = { LVIF_IMAGE, iItem }; + Item.iImage = iSmallImage; + ListView_SetItem(hListView, &Item); + } + return TRUE; +} + +static void +EditTypeDlg_OnOK(HWND hwndDlg, EDITTYPE_DIALOG *pEditType) +{ + FOLDER_FILE_TYPE_ENTRY *pEntry = pEditType->pEntry; + + // get class name + GetDlgItemTextW(hwndDlg, IDC_EDITTYPE_TEXT, pEntry->ClassName, _countof(pEntry->ClassName)); + StrTrimW(pEntry->ClassName, s_pszSpace); + + // update entry icon + EditTypeDlg_UpdateEntryIcon(hwndDlg, pEditType, pEditType->szIconPath, pEditType->nIconIndex); + + // write registry + EditTypeDlg_WriteClass(hwndDlg, pEditType, pEntry->ClassKey, pEntry->ClassName, _countof(pEntry->ClassName)); + + // update the icon cache + SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_FLUSHNOWAIT, NULL, NULL); + + EndDialog(hwndDlg, IDOK); +} + +struct ACTION_DIALOG +{ + HWND hwndLB; + WCHAR ClassName[64]; + WCHAR szAction[64]; + WCHAR szApp[MAX_PATH]; + BOOL bUseDDE; +}; + +static void +NewAct_OnOK(HWND hwndDlg, ACTION_DIALOG *pNewAct) +{ + GetDlgItemTextW(hwndDlg, IDC_ACTION_ACTION, pNewAct->szAction, _countof(pNewAct->szAction)); + GetDlgItemTextW(hwndDlg, IDC_ACTION_APP, pNewAct->szApp, _countof(pNewAct->szApp)); + StrTrimW(pNewAct->szAction, s_pszSpace); + StrTrimW(pNewAct->szApp, s_pszSpace); + if (pNewAct->szAction[0] == 0) + { + // action is empty, error + HWND hwndCtrl = GetDlgItem(hwndDlg, IDC_ACTION_ACTION); + SendMessageW(hwndCtrl, EM_SETSEL, 0, -1); + SetFocus(hwndCtrl); + CStringW strText(MAKEINTRESOURCEW(IDS_SPECIFY_ACTION)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONERROR); + return; + } + if (pNewAct->szApp[0] == 0 || GetFileAttributesW(pNewAct->szApp) == 0xFFFFFFFF) + { + // app is invalid + HWND hwndCtrl = GetDlgItem(hwndDlg, IDC_ACTION_APP); + SendMessageW(hwndCtrl, EM_SETSEL, 0, -1); + SetFocus(hwndCtrl); + CStringW strText(MAKEINTRESOURCEW(IDS_INVALID_PROGRAM)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONERROR); + return; + } + EndDialog(hwndDlg, IDOK); +} + +static void +Action_OnBrowse(HWND hwndDlg, ACTION_DIALOG *pNewAct, BOOL bEdit = FALSE) +{ + WCHAR szFile[MAX_PATH]; + szFile[0] = 0; + + WCHAR szFilter[MAX_PATH]; + LoadStringW(shell32_hInstance, IDS_EXE_FILTER, szFilter, _countof(szFilter)); + + CStringW strTitle(MAKEINTRESOURCEW(IDS_OPEN_WITH)); + + OPENFILENAMEW ofn; + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofn.hwndOwner = hwndDlg; + ofn.lpstrFilter = szFilter; + ofn.lpstrFile = szFile; + ofn.nMaxFile = _countof(szFile); + ofn.lpstrTitle = strTitle; + ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + ofn.lpstrDefExt = L"exe"; + if (GetOpenFileNameW(&ofn)) + { + if (bEdit) + { + CStringW str = szFile; + str += L" \"%1\""; + SetDlgItemTextW(hwndDlg, IDC_ACTION_APP, str); + } + else + { + SetDlgItemTextW(hwndDlg, IDC_ACTION_APP, szFile); + } + } +} + +INT_PTR CALLBACK +NewActionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static ACTION_DIALOG *s_pNewAct = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + s_pNewAct = (ACTION_DIALOG *)lParam; + s_pNewAct->bUseDDE = FALSE; + EnableWindow(GetDlgItem(hwndDlg, IDC_ACTION_USE_DDE), FALSE); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + NewAct_OnOK(hwndDlg, s_pNewAct); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + + case IDC_ACTION_BROWSE: + Action_OnBrowse(hwndDlg, s_pNewAct, FALSE); + break; + } + break; + } + return 0; +} + +static void +EditAct_OnOK(HWND hwndDlg, ACTION_DIALOG *pEditAct) +{ + GetDlgItemTextW(hwndDlg, IDC_ACTION_ACTION, pEditAct->szAction, _countof(pEditAct->szAction)); + GetDlgItemTextW(hwndDlg, IDC_ACTION_APP, pEditAct->szApp, _countof(pEditAct->szApp)); + StrTrimW(pEditAct->szAction, s_pszSpace); + StrTrimW(pEditAct->szApp, s_pszSpace); + if (pEditAct->szAction[0] == 0) + { + HWND hwndCtrl = GetDlgItem(hwndDlg, IDC_ACTION_ACTION); + SendMessageW(hwndCtrl, EM_SETSEL, 0, -1); + SetFocus(hwndCtrl); + CStringW strText(MAKEINTRESOURCEW(IDS_SPECIFY_ACTION)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONERROR); + } + if (pEditAct->szApp[0] == 0) + { + HWND hwndCtrl = GetDlgItem(hwndDlg, IDC_ACTION_APP); + SendMessageW(hwndCtrl, EM_SETSEL, 0, -1); + SetFocus(hwndCtrl); + CStringW strText(MAKEINTRESOURCEW(IDS_INVALID_PROGRAM)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONERROR); + } + EndDialog(hwndDlg, IDOK); +} + +INT_PTR CALLBACK +EditActionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static ACTION_DIALOG *s_pEditAct = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + s_pEditAct = (ACTION_DIALOG *)lParam; + s_pEditAct->bUseDDE = FALSE; + SetDlgItemTextW(hwndDlg, IDC_ACTION_ACTION, s_pEditAct->szAction); + SetDlgItemTextW(hwndDlg, IDC_ACTION_APP, s_pEditAct->szApp); + EnableWindow(GetDlgItem(hwndDlg, IDC_ACTION_USE_DDE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_ACTION_ACTION), FALSE); + { + // set title + CStringW str(MAKEINTRESOURCEW(IDS_EDITING_ACTION)); + str += s_pEditAct->ClassName; + SetWindowTextW(hwndDlg, str); + } + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EditAct_OnOK(hwndDlg, s_pEditAct); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + + case IDC_ACTION_BROWSE: + Action_OnBrowse(hwndDlg, s_pEditAct, TRUE); + break; + } + break; + } + return 0; +} + +static void +EditTypeDlg_OnChangeIcon(HWND hwndDlg, EDITTYPE_DIALOG *pEditType) +{ + WCHAR szPath[MAX_PATH]; + INT IconIndex; + + ExpandEnvironmentStringsW(pEditType->szIconPath, szPath, _countof(szPath)); + IconIndex = pEditType->nIconIndex; + if (PickIconDlg(hwndDlg, szPath, _countof(szPath), &IconIndex)) + { + // replace Windows directory with "%SystemRoot%" (for portability) + WCHAR szWinDir[MAX_PATH]; + GetWindowsDirectoryW(szWinDir, _countof(szWinDir)); + if (wcsstr(szPath, szWinDir) == 0) + { + CStringW str(L"%SystemRoot%"); + str += &szPath[wcslen(szWinDir)]; + StringCchCopyW(szPath, _countof(szPath), LPCWSTR(str)); + } + + // update FOLDER_FILE_TYPE_ENTRY + FOLDER_FILE_TYPE_ENTRY *pEntry = pEditType->pEntry; + DestroyIcon(pEntry->hIconLarge); + DestroyIcon(pEntry->hIconSmall); + pEntry->hIconLarge = DoExtractIcon(pEntry, szPath, IconIndex, FALSE); + pEntry->hIconSmall = DoExtractIcon(pEntry, szPath, IconIndex, TRUE); + + // update EDITTYPE_DIALOG + StringCchCopyW(pEditType->szIconPath, _countof(pEditType->szIconPath), szPath); + pEditType->nIconIndex = IconIndex; + + // set icon to dialog + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_ICON, STM_SETICON, (WPARAM)pEntry->hIconLarge, 0); + } +} + +static BOOL +EditTypeDlg_OnDrawItem(HWND hwndDlg, LPDRAWITEMSTRUCT pDraw, EDITTYPE_DIALOG *pEditType) +{ + WCHAR szText[64]; + HFONT hFont, hFont2; + + if (!pDraw) + return FALSE; + + // fill rect and set colors + if (pDraw->itemState & ODS_SELECTED) + { + FillRect(pDraw->hDC, &pDraw->rcItem, HBRUSH(COLOR_HIGHLIGHT + 1)); + SetTextColor(pDraw->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + SetBkColor(pDraw->hDC, GetSysColor(COLOR_HIGHLIGHT)); + } + else + { + FillRect(pDraw->hDC, &pDraw->rcItem, HBRUSH(COLOR_WINDOW + 1)); + SetTextColor(pDraw->hDC, GetSysColor(COLOR_WINDOWTEXT)); + SetBkColor(pDraw->hDC, GetSysColor(COLOR_WINDOW)); + } + + // get listbox text + SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, LB_GETTEXT, pDraw->itemID, (LPARAM)szText); + + // is it default? + hFont = (HFONT)SendDlgItemMessageW(hwndDlg, IDC_EDITTYPE_LISTBOX, WM_GETFONT, 0, 0); + if (lstrcmpiW(pEditType->szDefaultVerb, szText) == 0) + { + // default. set bold + LOGFONTW lf; + GetObject(hFont, sizeof(lf), &lf); + lf.lfWeight = FW_BOLD; + hFont2 = CreateFontIndirectW(&lf); + if (hFont2) + { + HGDIOBJ hFontOld = SelectObject(pDraw->hDC, hFont2); + InflateRect(&pDraw->rcItem, -2, -2); + DrawTextW(pDraw->hDC, szText, -1, &pDraw->rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_NOPREFIX); + InflateRect(&pDraw->rcItem, 2, 2); + SelectObject(pDraw->hDC, hFontOld); + DeleteObject(hFont2); + } + } + else + { + // non-default + InflateRect(&pDraw->rcItem, -2, -2); + DrawTextW(pDraw->hDC, szText, -1, &pDraw->rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_NOPREFIX); + InflateRect(&pDraw->rcItem, 2, 2); + } + + // draw focus rect + if (pDraw->itemState & ODS_FOCUS) + { + DrawFocusRect(pDraw->hDC, &pDraw->rcItem); + } + return TRUE; +} + +static BOOL +EditTypeDlg_OnMeasureItem(HWND hwndDlg, LPMEASUREITEMSTRUCT pMeasure, EDITTYPE_DIALOG *pEditType) +{ + if (!pMeasure) + return FALSE; + + HWND hwndLB = GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX); + + RECT rc; + GetClientRect(hwndLB, &rc); + + HDC hDC = GetDC(hwndLB); + if (hDC) + { + TEXTMETRICW tm; + GetTextMetricsW(hDC, &tm); + pMeasure->itemWidth = rc.right - rc.left; + pMeasure->itemHeight = tm.tmHeight + 4; + ReleaseDC(hwndLB, hDC); + return TRUE; + } + return FALSE; +} + +static void +EditTypeDlg_OnCommand(HWND hwndDlg, UINT id, UINT code, EDITTYPE_DIALOG *pEditType) +{ + INT iItem, iIndex; + ACTION_DIALOG action; + switch (id) + { + case IDOK: + EditTypeDlg_OnOK(hwndDlg, pEditType); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + + case IDC_EDITTYPE_CHANGE_ICON: + EditTypeDlg_OnChangeIcon(hwndDlg, pEditType); + break; + + case IDC_EDITTYPE_NEW: + action.bUseDDE = FALSE; + action.hwndLB = GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX); + StringCchPrintfW(action.ClassName, _countof(action.ClassName), pEditType->pEntry->ClassName); + // open 'New Action' dialog + if (IDOK == DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_ACTION), hwndDlg, + NewActionDlgProc, LPARAM(&action))) + { + if (SendMessageW(action.hwndLB, LB_FINDSTRING, -1, (LPARAM)action.szAction) != LB_ERR) + { + // already exists, error + HWND hwndCtrl = GetDlgItem(hwndDlg, IDC_ACTION_ACTION); + SendMessageW(hwndCtrl, EM_SETSEL, 0, -1); + SetFocus(hwndCtrl); + + CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + strText.Format(IDS_ACTION_EXISTS, action.szAction); + MessageBoxW(hwndDlg, strText, strTitle, MB_ICONERROR); + } + else + { + // add it + CStringW strCommandLine = action.szApp; + strCommandLine += L" \"%1\""; + pEditType->CommandLineMap.SetAt(action.szAction, strCommandLine); + SendMessageW(action.hwndLB, LB_ADDSTRING, 0, LPARAM(action.szAction)); + if (SendMessageW(action.hwndLB, LB_GETCOUNT, 0, 0) == 1) + { + // set default + StringCchCopyW(pEditType->szDefaultVerb, _countof(pEditType->szDefaultVerb), action.szAction); + InvalidateRect(action.hwndLB, NULL, TRUE); + } + } + } + break; + + case IDC_EDITTYPE_LISTBOX: + if (code == LBN_SELCHANGE) + { + action.hwndLB = GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX); + INT iItem = SendMessageW(action.hwndLB, LB_GETCURSEL, 0, 0); + SendMessageW(action.hwndLB, LB_GETTEXT, iItem, LPARAM(action.szAction)); + if (lstrcmpiW(action.szAction, pEditType->szDefaultVerb) == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_SET_DEFAULT), FALSE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_SET_DEFAULT), TRUE); + } + break; + } + else if (code != LBN_DBLCLK) + { + break; + } + // FALL THROUGH + + case IDC_EDITTYPE_EDIT_BUTTON: + action.bUseDDE = FALSE; + action.hwndLB = GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX); + StringCchPrintfW(action.ClassName, _countof(action.ClassName), pEditType->pEntry->ClassName); + iItem = SendMessageW(action.hwndLB, LB_GETCURSEL, 0, 0); + if (iItem == LB_ERR) + break; + + // get action + SendMessageW(action.hwndLB, LB_GETTEXT, iItem, LPARAM(action.szAction)); + + // get app + { + iIndex = pEditType->CommandLineMap.FindKey(action.szAction); + CStringW str = pEditType->CommandLineMap.GetValueAt(iIndex); + StringCchCopyW(action.szApp, _countof(action.szApp), LPCWSTR(str)); + } + + // open dialog + if (IDOK == DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_ACTION), hwndDlg, + EditActionDlgProc, LPARAM(&action))) + { + SendMessageW(action.hwndLB, LB_DELETESTRING, iItem, 0); + SendMessageW(action.hwndLB, LB_INSERTSTRING, iItem, LPARAM(action.szAction)); + pEditType->CommandLineMap.SetAt(action.szAction, action.szApp); + } + break; + + case IDC_EDITTYPE_REMOVE: + EditTypeDlg_OnRemove(hwndDlg, pEditType); + break; + + case IDC_EDITTYPE_SET_DEFAULT: + action.hwndLB = GetDlgItem(hwndDlg, IDC_EDITTYPE_LISTBOX); + iItem = SendMessageW(action.hwndLB, LB_GETCURSEL, 0, 0); + if (iItem == LB_ERR) + break; + + SendMessageW(action.hwndLB, LB_GETTEXT, iItem, LPARAM(action.szAction)); + + // set default + StringCchCopyW(pEditType->szDefaultVerb, _countof(pEditType->szDefaultVerb), action.szAction); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDITTYPE_SET_DEFAULT), FALSE); + InvalidateRect(action.hwndLB, NULL, TRUE); + break; + } +} + +INT_PTR CALLBACK +EditTypeDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static EDITTYPE_DIALOG *s_pEditType = NULL; + LPDRAWITEMSTRUCT pDraw; + LPMEASUREITEMSTRUCT pMeasure; + + switch (uMsg) + { + case WM_INITDIALOG: + s_pEditType = (EDITTYPE_DIALOG *)lParam; + return EditTypeDlg_OnInitDialog(hwndDlg, s_pEditType); + + case WM_DRAWITEM: + pDraw = LPDRAWITEMSTRUCT(lParam); + return EditTypeDlg_OnDrawItem(hwndDlg, pDraw, s_pEditType); + + case WM_MEASUREITEM: + pMeasure = LPMEASUREITEMSTRUCT(lParam); + return EditTypeDlg_OnMeasureItem(hwndDlg, pMeasure, s_pEditType); + + case WM_COMMAND: + EditTypeDlg_OnCommand(hwndDlg, LOWORD(wParam), HIWORD(wParam), s_pEditType); + break; + } + + return 0; +} + +static void +EditTypeDlg_OnDelete(HWND hwndDlg) +{ + CStringW strRemoveExt(MAKEINTRESOURCEW(IDS_REMOVE_EXT)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); + if (MessageBoxW(hwndDlg, strRemoveExt, strTitle, MB_ICONQUESTION | MB_YESNO) == IDYES) + { + FileTypesDlg_RemoveExt(hwndDlg); + } +} + // IDD_FOLDER_OPTIONS_FILETYPES dialog INT_PTR CALLBACK @@ -2157,6 +2923,7 @@ FolderOptionsFileTypesDlg( PFOLDER_FILE_TYPE_ENTRY pItem; OPENASINFO Info; NEWEXT_DIALOG newext; + EDITTYPE_DIALOG edittype; switch(uMsg) { @@ -2180,16 +2947,11 @@ FolderOptionsFileTypesDlg( FileTypesDlg_AddExt(hwndDlg, newext.szExt, newext.szFileType); } break; + case IDC_FILETYPES_DELETE: - { - CStringW strRemoveExt(MAKEINTRESOURCEW(IDS_REMOVE_EXT)); - CStringW strTitle(MAKEINTRESOURCEW(IDS_FILE_TYPES)); - if (MessageBoxW(hwndDlg, strRemoveExt, strTitle, MB_ICONQUESTION | MB_YESNO) == IDYES) - { - FileTypesDlg_RemoveExt(hwndDlg); - } - } + EditTypeDlg_OnDelete(hwndDlg); break; + case IDC_FILETYPES_CHANGE: pItem = GetListViewEntry(GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW)); if (pItem) @@ -2199,6 +2961,13 @@ FolderOptionsFileTypesDlg( SHOpenWithDialog(hwndDlg, &Info); } break; + + case IDC_FILETYPES_ADVANCED: + edittype.hwndLV = GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW); + edittype.pEntry = GetListViewEntry(edittype.hwndLV); + DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_EDITTYPE), + hwndDlg, EditTypeDlgProc, (LPARAM)&edittype); + break; } break; @@ -2206,6 +2975,23 @@ FolderOptionsFileTypesDlg( lppl = (LPNMLISTVIEW) lParam; switch (lppl->hdr.code) { + case LVN_KEYDOWN: + { + LV_KEYDOWN *pKeyDown = (LV_KEYDOWN *)lParam; + if (pKeyDown->wVKey == VK_DELETE) + { + EditTypeDlg_OnDelete(hwndDlg); + } + break; + } + + case NM_DBLCLK: + edittype.hwndLV = GetDlgItem(hwndDlg, IDC_FILETYPES_LISTVIEW); + edittype.pEntry = GetListViewEntry(edittype.hwndLV); + DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_EDITTYPE), + hwndDlg, EditTypeDlgProc, (LPARAM)&edittype); + break; + case LVN_DELETEALLITEMS: return FALSE; // send LVN_DELETEITEM @@ -2222,7 +3008,9 @@ FolderOptionsFileTypesDlg( case LVN_ITEMCHANGING: pItem = GetListViewEntry(lppl->hdr.hwndFrom, lppl->iItem); if (!pItem) + { return TRUE; + } if (!(lppl->uOldState & LVIS_FOCUSED) && (lppl->uNewState & LVIS_FOCUSED)) { @@ -2286,11 +3074,13 @@ Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow) case 0: ShowFolderOptionsDialog(hWnd, hInst); break; + case 1: // show taskbar options dialog FIXME("notify explorer to show taskbar options dialog"); //PostMessage(GetShellWindow(), WM_USER+22, fOptions, 0); break; + default: FIXME("unrecognized options id %d\n", fOptions); } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index d6b3d0023e..83c49ed60a 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 7b4d4defb0..d0f996e04f 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index f4d3515946..adbf5db4db 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -661,6 +661,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -887,4 +923,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 87010cbcb3..50a7afd779 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -661,6 +661,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -907,4 +943,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index ab0ff0db71..8008e61627 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -656,6 +656,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -902,4 +938,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 7e288bd377..240e742ed2 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 338628a052..77fedc3028 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 2d15ab52a0..4c11b3f54e 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -656,6 +656,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -902,4 +938,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d82117f568..a6d1bef762 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -657,6 +657,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -903,4 +939,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e8782c9a44..22c71b8af7 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -663,6 +663,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -909,4 +945,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 5f3c1d0707..02949be085 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index b819825c50..3e056ea304 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index d09efde782..1fb8a87f14 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 5c7f7c3311..ba3374f49f 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 69d937088e..584bd37f9f 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 4468fe73ad..3834c9bd9a 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -652,6 +652,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -898,4 +934,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 7d4ee74b81..bf7c62329e 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "굴림" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "굴림" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index e0968c2f9a..de2b87616c 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 2fc75b45fd..9d8e0477ec 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 82d94ab242..d22086d5b3 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -660,6 +660,42 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -906,4 +942,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Rozszerzenie jest w użyciu" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 0a14d66235..33a5df82fa 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index a7da71e7a5..7dfbef5761 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3243fc2081..577ecf6495 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -657,6 +657,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -903,4 +939,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2e7c8e5afc..2f6c32567f 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -657,6 +657,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -903,4 +939,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index c06885070c..d64d3fe0d0 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index d1c20fddbd..08368bad81 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 8c8a17b8f5..5ef554d314 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -659,6 +659,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -905,4 +941,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 1b73e3e5d1..9838370191 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index ac07ccfd68..6411243735 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -657,6 +657,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -903,4 +939,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 7e662ab1d5..8065fd0512 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -655,6 +655,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -901,4 +937,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 73759bc46e..78a898a1fb 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -663,6 +663,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -911,4 +947,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index d9c982fdc7..f46729673c 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -663,6 +663,42 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 END +IDD_EDITTYPE DIALOG 0, 0, 225, 190 +CAPTION "Edit File Type" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "新細明體" +BEGIN + ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 + EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL + PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Actions:", -1, 5, 37, 70, 10 + LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 +END + +IDD_ACTION DIALOG 0, 0, 225, 95 +CAPTION "New Action" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "新細明體" +BEGIN + LTEXT "&Action:", -1, 5, 7, 150, 10 + EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL + LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 +END + STRINGTABLE BEGIN /* columns in the shellview */ @@ -909,4 +945,11 @@ BEGIN IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" + IDS_SPECIFY_ACTION "You must specify an action." + IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." + IDS_REMOVE_ACTION "Are you sure you want to remove this action?" + IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_EDITING_ACTION "Editing action for type: " + END diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index f85423ea85..bb8b0eacb5 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -29,6 +29,7 @@ #include <atlcom.h> #include <atlwin.h> #include <atlstr.h> +#include <atlsimpcoll.h> #include <powrprof.h> #include <winnetwk.h> #include <objsafe.h> diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 6e8d624533..74bf189361 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -266,6 +266,13 @@ #define IDS_NEWEXT_ALREADY_ASSOC 30520 #define IDS_NEWEXT_EXT_IN_USE 30521 +#define IDS_SPECIFY_ACTION 30523 +#define IDS_INVALID_PROGRAM 30524 +#define IDS_REMOVE_ACTION 30525 +#define IDS_ACTION_EXISTS 30526 +#define IDS_EXE_FILTER 30527 +#define IDS_EDITING_ACTION 30528 + #define IDS_REMOVE_EXT 30522 /* Dialogs */ @@ -364,13 +371,34 @@ #define IDC_NEWEXT_COMBOBOX 14003 #define IDC_NEWEXT_ASSOC 14004 +/* Control IDs for IDD_EDITTYPE dialog */ +#define IDC_EDITTYPE_ICON 14001 +#define IDC_EDITTYPE_TEXT 14002 +#define IDC_EDITTYPE_CHANGE_ICON 14003 +#define IDC_EDITTYPE_LISTBOX 14004 +#define IDC_EDITTYPE_NEW 14005 +#define IDC_EDITTYPE_EDIT_BUTTON 14006 +#define IDC_EDITTYPE_REMOVE 14007 +#define IDC_EDITTYPE_SET_DEFAULT 14008 +#define IDC_EDITTYPE_CONFIRM_OPEN 14009 +#define IDC_EDITTYPE_SHOW_EXT 14010 +#define IDC_EDITTYPE_SAME_WINDOW 14011 + +/* Control IDs for IDD_ACTION dialog */ +#define IDC_ACTION_ACTION 14001 +#define IDC_ACTION_APP 14002 +#define IDC_ACTION_BROWSE 14003 +#define IDC_ACTION_USE_DDE 14004 + /* Other dialogs */ #define IDD_RUN_AS 23 #define IDD_OPEN_WITH 24 #define IDD_FORMAT_DRIVE 25 #define IDD_CHECK_DISK 26 #define IDD_NOOPEN 27 -#define IDD_NEWEXTENSION 28 +#define IDD_NEWEXTENSION 28 +#define IDD_EDITTYPE 36 +#define IDD_ACTION 37 /* Not used dialogs */ #define IDD_SHUTDOWN 29

7 years

01/01: [MSGINA] Remove a dialog that should not have been added.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0a792631dfa980e4e739… commit f0a792631dfa980e4e73945933aaea4cf81e736c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed May 30 15:22:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed May 30 15:22:56 2018 +0200 [MSGINA] Remove a dialog that should not have been added. --- dll/win32/msgina/lang/en-US.rc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index b0ce0c6299..8960dd6901 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -169,15 +169,6 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_HELP_DLG DIALOGEX 0, 0, 280, 200 -STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Logon Help" -FONT 8, "MS Shell Dlg" -BEGIN - EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 -END - IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Luna-XP-style Shut Down dialog"

7 years

01/01: [GDI32][LPK] BiDi support for ExtTextOut and GetCharacterPlacement (#534)

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4a59ad4137fbf959d2cc… commit a4a59ad4137fbf959d2cc7972ef4a5e33f6a80aa Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Wed May 30 15:41:22 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 30 14:41:22 2018 +0200 [GDI32][LPK] BiDi support for ExtTextOut and GetCharacterPlacement (#534) Introduce BiDi (bi-directional text) support for ExtTextOut and GetCharacterPlacement, using Wine's GDI BIDI_Reorder function. Solves the main issue with CORE-7003. To be compatible with Win2k3+, introduce the "Language Pack" (LPK) dll. - All the bidi code is removed from gdi32 and replaced by calls to LPK. Gdi32 uses dynamic linking to lpk.dll. In case of linking failure no bidi processing will be available. - Implemented LpkGetCharacterPlacement. - Implement LpkExtTextOut. - Add a demo test program to show how the apis should function. - Added all the remaining code, added special case for lpDx calculation if also GCP_GLYPHSHAPE flag was called. Applications that call GCP that use GCP_GLYPHSHAPE flags should also use the GCP_REORDER flag. (As written in https://msdn.microsoft.com/en-us/library/windows/desktop/dd144860(v=vs.85).… ) - Add ETO_RTLREADING flag handling. Imported the ETO_RTLREADING flag handling from wine, which changes the string part order (runs). A RRR1LLLRRR2 string without will show as RRR1LLLRRR2 without it, with it RRR2LLLRRR1. --- dll/win32/lpk/CMakeLists.txt | 10 +- dll/win32/lpk/bidi.c | 687 +++++++++++++++++++++ dll/win32/lpk/dllmain.c | 47 -- dll/win32/lpk/lpk.c | 181 ++++++ dll/win32/lpk/lpk.spec | 4 +- dll/win32/lpk/ros_lpk.h | 34 +- dll/win32/lpk/stub.c | 18 - media/doc/README.WINE | 3 + modules/rostests/win32/user32/CMakeLists.txt | 1 + .../rostests/win32/user32/biditext/Application.ico | Bin 0 -> 23558 bytes .../win32/user32/biditext/Application.manifest | 30 + .../rostests/win32/user32/biditext/CMakeLists.txt | 6 + modules/rostests/win32/user32/biditext/biditext.c | 273 ++++++++ modules/rostests/win32/user32/biditext/biditext.h | 34 + modules/rostests/win32/user32/biditext/biditext.rc | 69 +++ win32ss/gdi/gdi32/include/gdi32p.h | 37 ++ win32ss/gdi/gdi32/objects/font.c | 27 +- win32ss/gdi/gdi32/objects/text.c | 6 + win32ss/gdi/gdi32/objects/utils.c | 53 ++ 19 files changed, 1434 insertions(+), 86 deletions(-) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 4bd68b3486..858e468bc4 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -1,10 +1,11 @@ add_definitions(-DLANGPACK) include_directories(include) -spec2def(lpk.dll lpk.spec) +spec2def(lpk.dll lpk.spec ADD_IMPORTLIB) list(APPEND SOURCE - dllmain.c + bidi.c + lpk.c stub.c ros_lpk.h) @@ -14,6 +15,9 @@ add_library(lpk SHARED ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll UNICODE) -add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) + +target_link_libraries(lpk wine) + +add_importlibs(lpk usp10 user32 gdi32 msvcrt kernel32 ntdll) add_pch(lpk ros_lpk.h SOURCE) add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/lpk/bidi.c b/dll/win32/lpk/bidi.c new file mode 100644 index 0000000000..a380e1f2ed --- /dev/null +++ b/dll/win32/lpk/bidi.c @@ -0,0 +1,687 @@ +/* + * GDI BiDirectional handling + * + * Copyright 2003 Shachar Shemesh + * Copyright 2007 Maarten Lankhorst + * Copyright 2010 CodeWeavers, Aric Stewart + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Code derived from the modified reference implementation + * that was found in revision 17 of http://unicode.org/reports/tr9/ + * "Unicode Standard Annex #9: THE BIDIRECTIONAL ALGORITHM" + * + * -- Copyright (C) 1999-2005, ASMUS, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of the Unicode data files and any associated documentation (the + * "Data Files") or Unicode software and any associated documentation (the + * "Software") to deal in the Data Files or Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, and/or sell copies of the Data Files or Software, + * and to permit persons to whom the Data Files or Software are furnished + * to do so, provided that (a) the above copyright notice(s) and this + * permission notice appear with all copies of the Data Files or Software, + * (b) both the above copyright notice(s) and this permission notice appear + * in associated documentation, and (c) there is clear notice in each + * modified Data File or in the Software as well as in the documentation + * associated with the Data File(s) or Software that the data or software + * has been modified. + */ + +#include "ros_lpk.h" +#include "wine/unicode.h" +#include "wine/debug.h" +//#include "config.h" +//#include "gdi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bidi); + +/* HELPER FUNCTIONS AND DECLARATIONS */ + +#define odd(x) ((x) & 1) + +/*------------------------------------------------------------------------ + Bidirectional Character Types + + as defined by the Unicode Bidirectional Algorithm Table 3-7. + + Note: + + The list of bidirectional character types here is not grouped the + same way as the table 3-7, since the numberic values for the types + are chosen to keep the state and action tables compact. +------------------------------------------------------------------------*/ +enum directions +{ + /* input types */ + /* ON MUST be zero, code relies on ON = N = 0 */ + ON = 0, /* Other Neutral */ + L, /* Left Letter */ + R, /* Right Letter */ + AN, /* Arabic Number */ + EN, /* European Number */ + AL, /* Arabic Letter (Right-to-left) */ + NSM, /* Non-spacing Mark */ + CS, /* Common Separator */ + ES, /* European Separator */ + ET, /* European Terminator (post/prefix e.g. $ and %) */ + + /* resolved types */ + BN, /* Boundary neutral (type of RLE etc after explicit levels) */ + + /* input types, */ + S, /* Segment Separator (TAB) // used only in L1 */ + WS, /* White space // used only in L1 */ + B, /* Paragraph Separator (aka as PS) */ + + /* types for explicit controls */ + RLO, /* these are used only in X1-X9 */ + RLE, + LRO, + LRE, + PDF, + + /* resolved types, also resolved directions */ + N = ON, /* alias, where ON, WS and S are treated the same */ +}; + +/* HELPER FUNCTIONS */ + +/* Convert the libwine information to the direction enum */ +static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount) +{ + static const enum directions dir_map[16] = + { + L, /* unassigned defaults to L */ + L, + R, + EN, + ES, + ET, + AN, + CS, + B, + S, + WS, + ON, + AL, + NSM, + BN, + PDF /* also LRE, LRO, RLE, RLO */ + }; + + unsigned i; + + for (i = 0; i < uCount; ++i) + { + chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; + if (chartype[i] == PDF) + { + switch (lpString[i]) + { + case 0x202A: chartype[i] = LRE; break; + case 0x202B: chartype[i] = RLE; break; + case 0x202C: chartype[i] = PDF; break; + case 0x202D: chartype[i] = LRO; break; + case 0x202E: chartype[i] = RLO; break; + } + } + } +} + +/* Set a run of cval values at locations all prior to, but not including */ +/* iStart, to the new value nval. */ +static void SetDeferredRun(BYTE *pval, int cval, int iStart, int nval) +{ + int i = iStart - 1; + for (; i >= iStart - cval; i--) + { + pval[i] = nval; + } +} + +/* THE PARAGRAPH LEVEL */ + +/*------------------------------------------------------------------------ + Function: resolveParagraphs + + Resolves the input strings into blocks over which the algorithm + is then applied. + + Implements Rule P1 of the Unicode Bidi Algorithm + + Input: Text string + Character count + + Output: revised character count + + Note: This is a very simplistic function. In effect it restricts + the action of the algorithm to the first paragraph in the input + where a paragraph ends at the end of the first block separator + or at the end of the input text. + +------------------------------------------------------------------------*/ + +static int resolveParagraphs(WORD *types, int cch) +{ + /* skip characters not of type B */ + int ich = 0; + for(; ich < cch && types[ich] != B; ich++); + /* stop after first B, make it a BN for use in the next steps */ + if (ich < cch && types[ich] == B) + types[ich++] = BN; + return ich; +} + +/* REORDER */ +/*------------------------------------------------------------------------ + Function: resolveLines + + Breaks a paragraph into lines + + Input: Array of line break flags + Character count + In/Out: Array of characters + + Returns the count of characters on the first line + + Note: This function only breaks lines at hard line breaks. Other + line breaks can be passed in. If pbrk[n] is TRUE, then a break + occurs after the character in pszInput[n]. Breaks before the first + character are not allowed. +------------------------------------------------------------------------*/ +static int resolveLines(LPCWSTR pszInput, const BOOL * pbrk, int cch) +{ + /* skip characters not of type LS */ + int ich = 0; + for(; ich < cch; ich++) + { + if (pszInput[ich] == (WCHAR)'\n' || (pbrk && pbrk[ich])) + { + ich++; + break; + } + } + + return ich; +} + +/*------------------------------------------------------------------------ + Function: resolveWhiteSpace + + Resolves levels for WS and S + Implements rule L1 of the Unicode bidi Algorithm. + + Input: Base embedding level + Character count + Array of direction classes (for one line of text) + + In/Out: Array of embedding levels (for one line of text) + + Note: this should be applied a line at a time. The default driver + code supplied in this file assumes a single line of text; for + a real implementation, cch and the initial pointer values + would have to be adjusted. +------------------------------------------------------------------------*/ +static void resolveWhitespace(int baselevel, const WORD *pcls, BYTE *plevel, int cch) +{ + int cchrun = 0; + BYTE oldlevel = baselevel; + + int ich = 0; + for (; ich < cch; ich++) + { + switch(pcls[ich]) + { + default: + cchrun = 0; /* any other character breaks the run */ + break; + case WS: + cchrun++; + break; + + case RLE: + case LRE: + case LRO: + case RLO: + case PDF: + case BN: + plevel[ich] = oldlevel; + cchrun++; + break; + + case S: + case B: + /* reset levels for WS before eot */ + SetDeferredRun(plevel, cchrun, ich, baselevel); + cchrun = 0; + plevel[ich] = baselevel; + break; + } + oldlevel = plevel[ich]; + } + /* reset level before eot */ + SetDeferredRun(plevel, cchrun, ich, baselevel); +} + +/*------------------------------------------------------------------------ + Function: BidiLines + + Implements the Line-by-Line phases of the Unicode Bidi Algorithm + + Input: Count of characters + Array of character directions + + Inp/Out: Input text + Array of levels + +------------------------------------------------------------------------*/ +static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, const WORD * pclsLine, + BYTE * plevelLine, int cchPara, const BOOL * pbrk) +{ + int cchLine = 0; + int done = 0; + int *run; + + run = HeapAlloc(GetProcessHeap(), 0, cchPara * sizeof(int)); + if (!run) + { + WARN("Out of memory\n"); + return; + } + + do + { + /* break lines at LS */ + cchLine = resolveLines(pszLine, pbrk, cchPara); + + /* resolve whitespace */ + resolveWhitespace(baselevel, pclsLine, plevelLine, cchLine); + + if (pszOutLine) + { + int i; + /* reorder each line in place */ + ScriptLayout(cchLine, plevelLine, NULL, run); + for (i = 0; i < cchLine; i++) + pszOutLine[done+run[i]] = pszLine[i]; + } + + pszLine += cchLine; + plevelLine += cchLine; + pbrk += pbrk ? cchLine : 0; + pclsLine += cchLine; + cchPara -= cchLine; + done += cchLine; + + } while (cchPara); + + HeapFree(GetProcessHeap(), 0, run); +} + +/************************************************************* + * BIDI_Reorder + * + * Returns TRUE if reordering was required and done. + */ +BOOL BIDI_Reorder( + HDC hDC, /*[in] Display DC */ + LPCWSTR lpString, /* [in] The string for which information is to be returned */ + INT uCount, /* [in] Number of WCHARs in string. */ + DWORD dwFlags, /* [in] GetCharacterPlacement compatible flags specifying how to process the string */ + DWORD dwWineGCP_Flags, /* [in] Wine internal flags - Force paragraph direction */ + LPWSTR lpOutString, /* [out] Reordered string */ + INT uCountOut, /* [in] Size of output buffer */ + UINT *lpOrder, /* [out] Logical -> Visual order map */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ + ) +{ + WORD *chartype; + BYTE *levels; + INT i, done; + unsigned glyph_i; + BOOL is_complex; + + int maxItems; + int nItems; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + SCRIPT_ITEM *pItems; + HRESULT res; + SCRIPT_CACHE psc = NULL; + WORD *run_glyphs = NULL; + WORD *pwLogClust = NULL; + SCRIPT_VISATTR *psva = NULL; + DWORD cMaxGlyphs = 0; + BOOL doGlyphs = TRUE; + + TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n", + debugstr_wn(lpString, uCount), uCount, dwFlags, + lpOutString, lpOrder); + + memset(&Control, 0, sizeof(Control)); + memset(&State, 0, sizeof(State)); + if (lpGlyphs) + *lpGlyphs = NULL; + + if (!(dwFlags & GCP_REORDER)) + { + FIXME("Asked to reorder without reorder flag set\n"); + return FALSE; + } + + if (lpOutString && uCountOut < uCount) + { + FIXME("lpOutString too small\n"); + return FALSE; + } + + chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); + if (!chartype) + { + WARN("Out of memory\n"); + return FALSE; + } + + if (lpOutString) + memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + + is_complex = FALSE; + for (i = 0; i < uCount && !is_complex; i++) + { + if ((lpString[i] >= 0x900 && lpString[i] <= 0xfff) || + (lpString[i] >= 0x1cd0 && lpString[i] <= 0x1cff) || + (lpString[i] >= 0xa840 && lpString[i] <= 0xa8ff)) + is_complex = TRUE; + } + + /* Verify reordering will be required */ + if ((WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) || + ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL)) + State.uBidiLevel = 1; + else if (!is_complex) + { + done = 1; + classify(lpString, chartype, uCount); + for (i = 0; i < uCount; i++) + switch (chartype[i]) + { + case R: + case AL: + case RLE: + case RLO: + done = 0; + break; + } + if (done) + { + HeapFree(GetProcessHeap(), 0, chartype); + if (lpOrder) + { + for (i = 0; i < uCount; i++) + lpOrder[i] = i; + } + return TRUE; + } + } + + levels = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(BYTE)); + if (!levels) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + return FALSE; + } + + maxItems = 5; + pItems = HeapAlloc(GetProcessHeap(),0, maxItems * sizeof(SCRIPT_ITEM)); + if (!pItems) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + return FALSE; + } + + if (lpGlyphs) + { + cMaxGlyphs = 1.5 * uCount + 16; + run_glyphs = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * cMaxGlyphs); + if (!run_glyphs) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + return FALSE; + } + pwLogClust = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * uCount); + if (!pwLogClust) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, run_glyphs); + return FALSE; + } + psva = HeapAlloc(GetProcessHeap(),0,sizeof(SCRIPT_VISATTR) * uCount); + if (!psva) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, run_glyphs); + HeapFree(GetProcessHeap(), 0, pwLogClust); + return FALSE; + } + } + + done = 0; + glyph_i = 0; + while (done < uCount) + { + INT j; + classify(lpString + done, chartype, uCount - done); + /* limit text to first block */ + i = resolveParagraphs(chartype, uCount - done); + for (j = 0; j < i; ++j) + switch(chartype[j]) + { + case B: + case S: + case WS: + case ON: chartype[j] = N; + default: continue; + } + + if ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL) + State.uBidiLevel = 1; + else if ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_LTR) + State.uBidiLevel = 0; + + if (dwWineGCP_Flags & WINE_GCPW_LOOSE_MASK) + { + for (j = 0; j < i; ++j) + if (chartype[j] == L) + { + State.uBidiLevel = 0; + break; + } + else if (chartype[j] == R || chartype[j] == AL) + { + State.uBidiLevel = 1; + break; + } + } + + res = ScriptItemize(lpString + done, i, maxItems, &Control, &State, pItems, &nItems); + while (res == E_OUTOFMEMORY) + { + maxItems = maxItems * 2; + pItems = HeapReAlloc(GetProcessHeap(), 0, pItems, sizeof(SCRIPT_ITEM) * maxItems); + if (!pItems) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, run_glyphs); + HeapFree(GetProcessHeap(), 0, pwLogClust); + HeapFree(GetProcessHeap(), 0, psva); + return FALSE; + } + res = ScriptItemize(lpString + done, i, maxItems, &Control, &State, pItems, &nItems); + } + + if (lpOutString || lpOrder) + for (j = 0; j < nItems; j++) + { + int k; + for (k = pItems[j].iCharPos; k < pItems[j+1].iCharPos; k++) + levels[k] = pItems[j].a.s.uBidiLevel; + } + + if (lpOutString) + { + /* assign directional types again, but for WS, S this time */ + classify(lpString + done, chartype, i); + + BidiLines(State.uBidiLevel, lpOutString + done, lpString + done, + chartype, levels, i, 0); + } + + if (lpOrder) + { + int k, lastgood; + for (j = lastgood = 0; j < i; ++j) + if (levels[j] != levels[lastgood]) + { + --j; + if (odd(levels[lastgood])) + for (k = j; k >= lastgood; --k) + lpOrder[done + k] = done + j - k; + else + for (k = lastgood; k <= j; ++k) + lpOrder[done + k] = done + k; + lastgood = ++j; + } + if (odd(levels[lastgood])) + for (k = j - 1; k >= lastgood; --k) + lpOrder[done + k] = done + j - 1 - k; + else + for (k = lastgood; k < j; ++k) + lpOrder[done + k] = done + k; + } + + if (lpGlyphs && doGlyphs) + { + BYTE *runOrder; + int *visOrder; + SCRIPT_ITEM *curItem; + + runOrder = HeapAlloc(GetProcessHeap(), 0, maxItems * sizeof(*runOrder)); + visOrder = HeapAlloc(GetProcessHeap(), 0, maxItems * sizeof(*visOrder)); + if (!runOrder || !visOrder) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, psva); + HeapFree(GetProcessHeap(), 0, pwLogClust); + return FALSE; + } + + for (j = 0; j < nItems; j++) + runOrder[j] = pItems[j].a.s.uBidiLevel; + + ScriptLayout(nItems, runOrder, visOrder, NULL); + + for (j = 0; j < nItems; j++) + { + int k; + int cChars,cOutGlyphs; + curItem = &pItems[visOrder[j]]; + + cChars = pItems[visOrder[j]+1].iCharPos - curItem->iCharPos; + + res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + while (res == E_OUTOFMEMORY) + { + cMaxGlyphs *= 2; + run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(WORD) * cMaxGlyphs); + if (!run_glyphs) + { + WARN("Out of memory\n"); + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, psva); + HeapFree(GetProcessHeap(), 0, pwLogClust); + HeapFree(GetProcessHeap(), 0, *lpGlyphs); + ScriptFreeCache(&psc); + *lpGlyphs = NULL; + return FALSE; + } + res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + } + if (res) + { + if (res == USP_E_SCRIPT_NOT_IN_FONT) + TRACE("Unable to shape with currently selected font\n"); + else + FIXME("Unable to shape string (%x)\n",res); + j = nItems; + doGlyphs = FALSE; + HeapFree(GetProcessHeap(), 0, *lpGlyphs); + *lpGlyphs = NULL; + } + else + { + if (*lpGlyphs) + *lpGlyphs = HeapReAlloc(GetProcessHeap(), 0, *lpGlyphs, sizeof(WORD) * (glyph_i + cOutGlyphs)); + else + *lpGlyphs = HeapAlloc(GetProcessHeap(), 0, sizeof(WORD) * (glyph_i + cOutGlyphs)); + for (k = 0; k < cOutGlyphs; k++) + (*lpGlyphs)[glyph_i+k] = run_glyphs[k]; + glyph_i += cOutGlyphs; + } + } + HeapFree(GetProcessHeap(), 0, runOrder); + HeapFree(GetProcessHeap(), 0, visOrder); + } + + done += i; + } + if (cGlyphs) + *cGlyphs = glyph_i; + + HeapFree(GetProcessHeap(), 0, chartype); + HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, pItems); + HeapFree(GetProcessHeap(), 0, run_glyphs); + HeapFree(GetProcessHeap(), 0, pwLogClust); + HeapFree(GetProcessHeap(), 0, psva); + ScriptFreeCache(&psc); + return TRUE; +} diff --git a/dll/win32/lpk/dllmain.c b/dll/win32/lpk/dllmain.c deleted file mode 100644 index f54beb950b..0000000000 --- a/dll/win32/lpk/dllmain.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * PURPOSE: LPK Library - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#include "ros_lpk.h" - -LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMouseToIch, EditCchInWidth, - EditGetLineWidth, EditDrawText, EditHScroll, EditMoveSelection, - EditVerifyText, EditNextWord, EditSetMenu, EditProcessMenu, - EditCreateCaret, EditAdjustCaret}; - -BOOL -WINAPI -DllMain ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) -{ - - return LpkDllInitialize(hDll,dwReason,lpReserved); -} - -BOOL -WINAPI -LpkDllInitialize ( - HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) -{ - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hDll); - /* Tell usp10 it is activated usp10 */ - //LpkPresent(); - break; - - default: - break; - } - - return TRUE; -} diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c new file mode 100644 index 0000000000..fde181cc52 --- /dev/null +++ b/dll/win32/lpk/lpk.c @@ -0,0 +1,181 @@ +/* + * PROJECT: ReactOS LPK + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Language Pack DLL. + * PROGRAMMERS: Magnus Olsen (greatlrd) + * Baruch Rutman (peterooch at gmail dot com) + */ + +#include "ros_lpk.h" + +LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMouseToIch, EditCchInWidth, + EditGetLineWidth, EditDrawText, EditHScroll, EditMoveSelection, + EditVerifyText, EditNextWord, EditSetMenu, EditProcessMenu, + EditCreateCaret, EditAdjustCaret}; + +BOOL +WINAPI +DllMain( + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + + return LpkDllInitialize(hDll,dwReason,lpReserved); +} + +BOOL +WINAPI +LpkDllInitialize( + HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hDll); + /* Tell usp10 it is activated usp10 */ + //LpkPresent(); + break; + + default: + break; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +LpkExtTextOut( + HDC hdc, + int x, + int y, + UINT fuOptions, + const RECT *lprc, + LPCWSTR lpString, + UINT uCount, + const INT *lpDx, + INT unknown) +{ + LPWORD glyphs = NULL; + INT cGlyphs; + + UNREFERENCED_PARAMETER(unknown); + + if (!(fuOptions & ETO_IGNORELANGUAGE)) + fuOptions |= ETO_IGNORELANGUAGE; + + /* Check text direction */ + if ((GetLayout(hdc) & LAYOUT_RTL) || (GetTextAlign(hdc) & TA_RTLREADING)) + { + if (!(fuOptions & ETO_RTLREADING)) + fuOptions |= ETO_RTLREADING; + } + + /* Check if the string requires complex script processing and not a "glyph indices" array */ + if (ScriptIsComplex(lpString, uCount, SIC_COMPLEX) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) + { + BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, + (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, + NULL, uCount, NULL, &glyphs, &cGlyphs); + + fuOptions |= ETO_GLYPH_INDEX; + + if (uCount > cGlyphs) + cGlyphs = uCount; + + return ExtTextOutW(hdc, x, y, fuOptions, lprc, (LPWSTR)glyphs, cGlyphs, lpDx); + } + + return ExtTextOutW(hdc, x, y, fuOptions, lprc, lpString, uCount, lpDx); +} + +/* + * @implemented + */ +DWORD +WINAPI +LpkGetCharacterPlacement( + HDC hdc, + LPCWSTR lpString, + INT uCount, + INT nMaxExtent, + LPGCP_RESULTSW lpResults, + DWORD dwFlags, + DWORD dwUnused) +{ + LPWORD lpGlyphs = NULL; + SIZE size; + DWORD ret = 0; + UINT nSet, i; + INT cGlyphs; + + UNREFERENCED_PARAMETER(dwUnused); + + /* Sanity check (most likely a direct call) */ + if (!(dwFlags & GCP_REORDER)) + return GetCharacterPlacementW(hdc, lpString, uCount, nMaxExtent, lpResults, dwFlags); + + nSet = (UINT)uCount; + if (nSet > lpResults->nGlyphs) + nSet = lpResults->nGlyphs; + + BIDI_Reorder(hdc, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, + nSet, lpResults->lpOrder, &lpGlyphs, &cGlyphs); + + lpResults->nGlyphs = (UINT)cGlyphs; + + if (lpResults->lpGlyphs) + wcscpy(lpResults->lpGlyphs, lpGlyphs); + + if (lpResults->lpDx && !(dwFlags & GCP_GLYPHSHAPE)) + { + int c; + for (i = 0; i < nSet; i++) + { + if (GetCharWidth32W(hdc, lpResults->lpOutString[i], lpResults->lpOutString[i], &c)) + lpResults->lpDx[i] = c; + } + } + + /* If glyph shaping was requested */ + else if (lpResults->lpDx && (dwFlags & GCP_GLYPHSHAPE)) + { + int c; + + if (lpResults->lpGlyphs) + { + for (i = 0; i < lpResults->nGlyphs; i++) + { + if (GetCharWidth32W(hdc, lpGlyphs[i], lpGlyphs[i], &c)) + lpResults->lpDx[i] = c; + } + } + } + + /* FIXME: Currently not bidi compliant! */ + if (lpResults->lpCaretPos) + { + int pos = 0; + + lpResults->lpCaretPos[0] = 0; + for (i = 1; i < nSet; i++) + { + if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) + lpResults->lpCaretPos[i] = (pos += size.cx); + } + } + + if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) + ret = MAKELONG(size.cx, size.cy); + + HeapFree(GetProcessHeap(), 0, lpGlyphs); + + return ret; +} diff --git a/dll/win32/lpk/lpk.spec b/dll/win32/lpk/lpk.spec index 01ed057bf6..910d3dc65d 100644 --- a/dll/win32/lpk/lpk.spec +++ b/dll/win32/lpk/lpk.spec @@ -3,8 +3,8 @@ @ stdcall LpkDllInitialize(ptr long ptr) @ stdcall LpkDrawTextEx(long long long long long long long long long long) @ extern LpkEditControl -@ stdcall LpkExtTextOut(long long long long long long long long long) -@ stdcall LpkGetCharacterPlacement(long long long long long long long) +@ stdcall LpkExtTextOut(long long long long ptr wstr long ptr long) +@ stdcall LpkGetCharacterPlacement(long wstr long long ptr long long) @ stdcall LpkGetTextExtentExPoint(long long long long long long long long long) @ stdcall LpkPSMTextOut(long long long long long long) @ stdcall LpkUseGDIWidthCache(long long long long long) diff --git a/dll/win32/lpk/ros_lpk.h b/dll/win32/lpk/ros_lpk.h index 5c5a4c88a3..d82a4498bc 100644 --- a/dll/win32/lpk/ros_lpk.h +++ b/dll/win32/lpk/ros_lpk.h @@ -14,6 +14,9 @@ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winnls.h> +#include <usp10.h> /* FIXME USP10 api that does not have prototype in any include file */ VOID WINAPI LpkPresent(VOID); @@ -61,11 +64,38 @@ DWORD WINAPI LpkInitialize(DWORD x1); DWORD WINAPI LpkTabbedTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9,DWORD x10,DWORD x11,DWORD x12); BOOL WINAPI LpkDllInitialize (HANDLE hDll, DWORD dwReason, LPVOID lpReserved); DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9, DWORD x10); -DWORD WINAPI LpkExtTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); -DWORD WINAPI LpkGetCharacterPlacement(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6, DWORD x7); DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); +/* Implemented */ + +BOOL WINAPI LpkExtTextOut(HDC hdc, int x, int y, UINT fuOptions, const RECT *lprc, + LPCWSTR lpString, UINT uCount , const INT *lpDx, INT unknown); + +DWORD WINAPI LpkGetCharacterPlacement(HDC hdc, LPCWSTR lpString, INT uCount, INT nMaxExtent, + GCP_RESULTSW *lpResults, DWORD dwFlags, DWORD dwUnused); +/* bidi.c */ + +#define WINE_GCPW_FORCE_LTR 0 +#define WINE_GCPW_FORCE_RTL 1 +#define WINE_GCPW_LOOSE_LTR 2 +#define WINE_GCPW_LOOSE_RTL 3 +#define WINE_GCPW_DIR_MASK 3 +#define WINE_GCPW_LOOSE_MASK 2 + +BOOL BIDI_Reorder( + _In_ HDC hDC, /* [in] Display DC */ + _In_ LPCWSTR lpString, /* [in] The string for which information is to be returned */ + _In_ INT uCount, /* [in] Number of WCHARs in string. */ + _In_ DWORD dwFlags, /* [in] GetCharacterPlacement compatible flags specifying how to process the string */ + _In_ DWORD dwWineGCP_Flags, /* [in] Wine internal flags - Force paragraph direction */ + _Out_ LPWSTR lpOutString, /* [out] Reordered string */ + _In_ INT uCountOut, /* [in] Size of output buffer */ + _Out_ UINT *lpOrder, /* [out] Logical -> Visual order map */ + _Out_ WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + _Out_ INT *cGlyphs /* [out] number of glyphs generated */ + ); + #endif /* _LPK_H */ diff --git a/dll/win32/lpk/stub.c b/dll/win32/lpk/stub.c index 37072f05b7..51d8eda0e4 100644 --- a/dll/win32/lpk/stub.c +++ b/dll/win32/lpk/stub.c @@ -39,24 +39,6 @@ DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6 return 0; } -/* - * @unimplemented - */ -DWORD WINAPI LpkExtTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9) -{ - UNIMPLEMENTED - return 0; -} - -/* - * @unimplemented - */ -DWORD WINAPI LpkGetCharacterPlacement(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6, DWORD x7) -{ - UNIMPLEMENTED - return 0; -} - /* * @unimplemented */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 632e0ed069..b75500483f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -286,6 +286,9 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-3.3 +lpk - + reactos/dll/win32/lpk/bidi.c # Synced to WineStaging-3.7 + msvcrt - reactos/sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528 diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index b61af83ece..8298a919d3 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,2 +1,3 @@ +add_subdirectory(biditext) add_subdirectory(paintdesktop) add_subdirectory(sysicon) diff --git a/modules/rostests/win32/user32/biditext/Application.ico b/modules/rostests/win32/user32/biditext/Application.ico new file mode 100644 index 0000000000..1073447c20 Binary files /dev/null and b/modules/rostests/win32/user32/biditext/Application.ico differ diff --git a/modules/rostests/win32/user32/biditext/Application.manifest b/modules/rostests/win32/user32/biditext/Application.manifest new file mode 100644 index 0000000000..76090d4133 --- /dev/null +++ b/modules/rostests/win32/user32/biditext/Application.manifest @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> + +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> +  + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> +  + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> +  + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> +  + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> +  + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> + </application> + </compatibility> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> + <dependency> + <dependentAssembly> + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/modules/rostests/win32/user32/biditext/CMakeLists.txt b/modules/rostests/win32/user32/biditext/CMakeLists.txt new file mode 100644 index 0000000000..042ab63b43 --- /dev/null +++ b/modules/rostests/win32/user32/biditext/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_rc_deps(biditext.rc ${CMAKE_CURRENT_SOURCE_DIR}/Application.ico) +add_executable(biditext biditext.c biditext.rc) +set_module_type(biditext win32gui UNICODE) +add_importlibs(biditext lpk gdi32 user32 shell32 comctl32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET biditext SUBDIR suppl) diff --git a/modules/rostests/win32/user32/biditext/biditext.c b/modules/rostests/win32/user32/biditext/biditext.c new file mode 100644 index 0000000000..cc714c40f7 --- /dev/null +++ b/modules/rostests/win32/user32/biditext/biditext.c @@ -0,0 +1,273 @@ +/* + * PROJECT: ReactOS Tests + * FILE: rostests/win32/user32/biditext/biditext.c + * PURPOSE: Demonstrates how ExtTextOut and GetCharacterPlacement + * handle bidirectional text strings via certain selection + * of flags provided to them. + * + * PROGRAMMER: Program skeleton: https://github.com/TransmissionZero/MinGW-Win32-Application + * Test code by Baruch Rutman + */ + +#include "biditext.h" + +/* Prototypes */ +DWORD WINAPI LpkGetCharacterPlacement(HDC hdc, LPCWSTR lpString, INT uCount, INT nMaxExtent, + GCP_RESULTSW *lpResults, DWORD dwFlags, DWORD dwUnused); + +BOOL WINAPI LpkExtTextOut(HDC hdc, int x, int y, + UINT fuOptions, const RECT *lprc, LPCWSTR lpString, + UINT uCount , const INT *lpDx, INT unknown); + +/* Global instance handle */ +HINSTANCE g_hInstance = NULL; + +/* Our application entry point */ +int WINAPI +wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) +{ + INITCOMMONCONTROLSEX icc; + HWND hWnd; + HACCEL hAccelerators; + MSG msg; + + /* Assign global HINSTANCE */ + g_hInstance = hInstance; + + /* Initialise common controls */ + icc.dwSize = sizeof(icc); + icc.dwICC = ICC_WIN95_CLASSES; + InitCommonControlsEx(&icc); + + /* Register our main window class, or error */ + if (!RegisterMainWindowClass()) + { + MessageBox(NULL, TEXT("Error registering main window class."), TEXT("Error"), MB_ICONERROR | MB_OK); + return 0; + } + + /* Create our main window, or error */ + if (!(hWnd = CreateMainWindow())) + { + MessageBox(NULL, TEXT("Error creating main window."), TEXT("Error"), MB_ICONERROR | MB_OK); + return 0; + } + + /* Load accelerators */ + hAccelerators = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDR_ACCELERATOR)); + + /* Show main window and force a paint */ + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + /* Main message loop */ + while (GetMessage(&msg, NULL, 0, 0) > 0) + { + if (!TranslateAccelerator(hWnd, hAccelerators, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return (int)msg.wParam; +} + +/* Dialog procedure for our "about" dialog */ +INT_PTR CALLBACK AboutDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + WORD id = LOWORD(wParam); + + switch (id) + { + case IDOK: + case IDCANCEL: + { + EndDialog(hwndDlg, (INT_PTR)id); + return (INT_PTR)TRUE; + } + } + break; + } + + case WM_INITDIALOG: + { + return (INT_PTR)TRUE; + } + } + + return (INT_PTR)FALSE; +} + +/* Show our "about" dialog */ +void ShowAboutDialog(HWND owner) +{ + DialogBox(g_hInstance, MAKEINTRESOURCE(IDD_ABOUTDIALOG), owner, &AboutDialogProc); +} + +/* Main window class and title */ +static LPCTSTR MainWndClass = TEXT("BiDi Test"); + +/* Window procedure for our main window */ +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + { + WORD id = LOWORD(wParam); + + switch (id) + { + case ID_HELP_ABOUT: + { + ShowAboutDialog(hWnd); + return 0; + } + + case ID_FILE_EXIT: + { + DestroyWindow(hWnd); + return 0; + } + } + break; + } + + case WM_GETMINMAXINFO: + { + /* Prevent our window from being sized too small */ + MINMAXINFO *minMax = (MINMAXINFO*)lParam; + minMax->ptMinTrackSize.x = 220; + minMax->ptMinTrackSize.y = 110; + + return 0; + } + + /* Item from system menu has been invoked */ + case WM_SYSCOMMAND: + { + WORD id = LOWORD(wParam); + + switch (id) + { + /* Show "about" dialog on about system menu item */ + case ID_HELP_ABOUT: + { + ShowAboutDialog(hWnd); + return 0; + } + } + break; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + + HDC hdc = BeginPaint(hWnd, &ps); + + LPWSTR szString = L"אבגדהABCDוזחטי"; + int Len = (int)wcslen(szString); + + WCHAR Glyphs[100] = { 0 }; + WCHAR OutString[100] = { 0 }; + GCP_RESULTSW Results = { 0 }; + Results.lStructSize = sizeof(Results); + Results.lpOutString = OutString; + Results.lpGlyphs = Glyphs; + Results.nGlyphs = 100; + + TextOutW(hdc, 10, 10, L"Proper (string being used):", 27); + TextOutW(hdc, 200, 10, szString, 14); + TextOutW(hdc, 10, 30, L"Reversed (example):", 19); + TextOutW(hdc, 200, 30, L"הדגבאABCDיטחזו", 14); + + TextOutW(hdc, 10, 50, L"String with NULL LpkETO call (not reversed):", 44); + LpkExtTextOut(hdc, 10, 70, 0, NULL, szString, Len, NULL, 0); + + TextOutW(hdc, 10, 90, L"String with ETO_IGNORELANGUAGE LpkETO call (not reversed):", 58); + LpkExtTextOut(hdc, 10, 110, ETO_IGNORELANGUAGE, NULL, szString, Len, NULL, 0); + + TextOutW(hdc, 10, 130, L"String with GCP_REORDER and ETO_GLYPH_INDEX LpkGCP call (not reversed):", 71); + LpkGetCharacterPlacement(hdc, szString, Len, 0, &Results, GCP_REORDER, 0); + LpkExtTextOut(hdc, 10, 150, ETO_GLYPH_INDEX, NULL, Glyphs, Results.nGlyphs, NULL, 0); + TextOutW(hdc, 10, 170, L"String with GCP_REORDER and ETO_IGNORELANGUAGE LpkGCP call (not reversed, lpOutString):", 87); + ExtTextOutW(hdc, 10, 190, ETO_IGNORELANGUAGE, NULL, OutString, Results.nGlyphs, NULL); + + TextOutW(hdc, 10, 210, L"String without GCP_REORDER and ETO_GLYPH_INDEX LpkGCP call (reversed):", 70); + LpkGetCharacterPlacement(hdc, szString, Len, 0, &Results, 0, 0); + LpkExtTextOut(hdc, 10, 230, ETO_GLYPH_INDEX, NULL, Glyphs, Results.nGlyphs, NULL, 0); + TextOutW(hdc, 10, 250, L"String without GCP_REORDER and ETO_IGNORELANGUAGE LpkGCP call (reversed, lpOutString):", 86); + ExtTextOutW(hdc, 10, 270, ETO_IGNORELANGUAGE, NULL, OutString, Len, NULL); + + TextOutW(hdc, 10, 290, L"String with ETO_IGNORELANGUAGE ETO call (reversed, not Lpk direct call!):", 73); + ExtTextOutW(hdc, 10, 310, ETO_IGNORELANGUAGE, NULL, szString, Len, NULL); + + TextOutW(hdc, 10, 330, L"String with ETO_RTLREADING LpkETO call (slight order change)", 60); + LpkExtTextOut(hdc, 10, 350, ETO_RTLREADING, NULL, szString, Len, NULL, 0); + + TextOutW(hdc, 10, 370, L"String with ETO_RTLREADING ETO call (slight order change)", 57); + ExtTextOutW(hdc, 10, 390, ETO_RTLREADING, NULL, szString, Len, NULL); + + EndPaint(hWnd, &ps); + break; + } + + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + + return DefWindowProc(hWnd, msg, wParam, lParam); +} + +/* Register a class for our main window */ +BOOL RegisterMainWindowClass() +{ + WNDCLASSEX wc; + + /* Class for our main window */ + wc.cbSize = sizeof(wc); + wc.style = 0; + wc.lpfnWndProc = &MainWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = g_hInstance; + wc.hIcon = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | + LR_DEFAULTCOLOR | LR_SHARED); + wc.hCursor = (HCURSOR)LoadImage(NULL, IDC_ARROW, IMAGE_CURSOR, 0, 0, LR_SHARED); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); + wc.lpszClassName = MainWndClass; + wc.hIconSm = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + + return (RegisterClassEx(&wc)) ? TRUE : FALSE; +} + +/* Create an instance of our main window */ +HWND CreateMainWindow() +{ + /* Create instance of main window */ + HWND hWnd = CreateWindowEx(0, MainWndClass, MainWndClass, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 640, 480, + NULL, NULL, g_hInstance, NULL); + + if (hWnd) + { + /* Add "about" to the system menu */ + HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); + InsertMenu(hSysMenu, 5, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); + InsertMenu(hSysMenu, 6, MF_BYPOSITION, ID_HELP_ABOUT, TEXT("About")); + } + + return hWnd; +} diff --git a/modules/rostests/win32/user32/biditext/biditext.h b/modules/rostests/win32/user32/biditext/biditext.h new file mode 100644 index 0000000000..433223776d --- /dev/null +++ b/modules/rostests/win32/user32/biditext/biditext.h @@ -0,0 +1,34 @@ +#pragma once + +#include <windows.h> +#include <commctrl.h> + +/* Global instance handle */ +extern HINSTANCE g_hInstance; + +/* Window procedure for our main window */ +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + +/* Register a class for our main window */ +BOOL RegisterMainWindowClass(void); + +/* Create an instance of our main window */ +HWND CreateMainWindow(void); + +/* Dialog procedure for our "about" dialog */ +INT_PTR CALLBACK AboutDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* Show our "about" dialog */ +void ShowAboutDialog(HWND owner); + + +#define IDI_APPICON 101 +#define IDR_MAINMENU 102 +#define IDR_ACCELERATOR 103 +#define IDD_ABOUTDIALOG 104 +#define ID_FILE_EXIT 40001 +#define ID_HELP_ABOUT 40002 + +#ifndef IDC_STATIC + #define IDC_STATIC -1 +#endif diff --git a/modules/rostests/win32/user32/biditext/biditext.rc b/modules/rostests/win32/user32/biditext/biditext.rc new file mode 100644 index 0000000000..cc2a2632f8 --- /dev/null +++ b/modules/rostests/win32/user32/biditext/biditext.rc @@ -0,0 +1,69 @@ +#include "biditext.h" + +/* Our main menu */ +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "&About", ID_HELP_ABOUT + END +END + +/* Application manifest */ +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "Application.manifest" + +/* Executable version information */ +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE +#else + FILEFLAGS 0 +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904b0" + BEGIN + VALUE "CompanyName", "Transmission Zero" + VALUE "FileDescription", "Win32 Example Application" + VALUE "FileVersion", "1.0.0.0" + VALUE "InternalName", "Win32App" + VALUE "LegalCopyright", "�2017 Transmission Zero" + VALUE "OriginalFilename", "Win32App.exe" + VALUE "ProductName", "Win32 Example Application" + VALUE "ProductVersion", "1.0.0.0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1200 + END +END + +/* Our "about" dialog */ +IDD_ABOUTDIALOG DIALOGEX 0, 0, 147, 67 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_APPICON,IDC_STATIC,7,7,20,20 + LTEXT "Win32 Example Application",IDC_STATIC,34,7,89,8 + LTEXT "�2017 Transmission Zero",IDC_STATIC,34,17,86,8 + DEFPUSHBUTTON "OK",IDOK,90,46,50,14,WS_GROUP +END + +/* Our accelerators */ +IDR_ACCELERATOR ACCELERATORS +BEGIN + "A", ID_HELP_ABOUT, VIRTKEY, ALT, NOINVERT +END diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index dddbfd74b3..1b7c51856d 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -27,6 +27,34 @@ typedef INT HANDLE hPageQuery ); +typedef BOOL +(WINAPI* LPKETO)( + HDC hdc, + int x, + int y, + UINT fuOptions, + const RECT *lprc, + LPCWSTR lpString, + UINT uCount, + const INT *lpDx, + INT unknown +); + +typedef DWORD +(WINAPI* LPKGCP)( + HDC hdc, + LPCWSTR lpString, + INT uCount, + INT nMaxExtent, + LPGCP_RESULTSW lpResults, + DWORD dwFlags, + DWORD dwUnused +); + +extern HINSTANCE hLpk; +extern LPKETO LpkExtTextOut; +extern LPKGCP LpkGetCharacterPlacement; + /* DEFINES *******************************************************************/ #define HANDLE_LIST_INC 20 @@ -36,6 +64,9 @@ typedef INT #define SAPCALLBACKDELAY 244 +#define LPK_ETO 1 +#define LPK_GCP 2 + /* MACRO ********************************************************************/ #define ROP_USES_SOURCE(Rop) (((Rop) << 2 ^ Rop) & 0xCC0000) @@ -282,6 +313,12 @@ EnumLogFontExW2A( LPENUMLOGFONTEXA fontA, CONST ENUMLOGFONTEXW *fontW ); +BOOL +WINAPI +LoadLPK( + INT LpkFunctionID +); + BOOL WINAPI GetETM(HDC hdc, diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 56998ab84b..0763ff7df2 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -448,35 +448,34 @@ GetCharacterPlacementW( UINT i, nSet; DPRINT("GetCharacterPlacementW\n"); - if(dwFlags&(~GCP_REORDER)) DPRINT("flags 0x%08lx ignored\n", dwFlags); - if(lpResults->lpClass) DPRINT("classes not implemented\n"); + if (dwFlags&(~GCP_REORDER)) DPRINT("flags 0x%08lx ignored\n", dwFlags); + if (lpResults->lpClass) DPRINT("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) DPRINT("Caret positions for complex scripts not implemented\n"); nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) + if (nSet > lpResults->nGlyphs) nSet = lpResults->nGlyphs; /* return number of initialized fields */ lpResults->nGlyphs = nSet; - /*if((dwFlags&GCP_REORDER)==0 || !BidiAvail) - {*/ + if (dwFlags & GCP_REORDER) + { + if (LoadLPK(LPK_GCP)) + return LpkGetCharacterPlacement(hdc, lpString, uCount, nMaxExtent, lpResults, dwFlags, 0); + } + /* Treat the case where no special handling was requested in a fastpath way */ - /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) + /* copy will do if the GCP_REORDER flag is not set */ + if (lpResults->lpOutString) lstrcpynW( lpResults->lpOutString, lpString, nSet ); - if(lpResults->lpOrder) + if (lpResults->lpOrder) { - for(i = 0; i < nSet; i++) + for (i = 0; i < nSet; i++) lpResults->lpOrder[i] = i; } - /*} else - { - BIDI_Reorder( lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder ); - }*/ /* FIXME: Will use the placement chars */ if (lpResults->lpDx) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 31ee3ca2ff..1242020639 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -500,6 +500,12 @@ ExtTextOutW( cwc, lpDx); + if (!(fuOptions & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE))) + { + if (LoadLPK(LPK_ETO)) + return LpkExtTextOut(hdc, x, y, fuOptions, lprc, lpString, cwc , lpDx, 0); + } + return NtGdiExtTextOutW(hdc, x, y, diff --git a/win32ss/gdi/gdi32/objects/utils.c b/win32ss/gdi/gdi32/objects/utils.c index 5a0bca1e93..432c6e1482 100644 --- a/win32ss/gdi/gdi32/objects/utils.c +++ b/win32ss/gdi/gdi32/objects/utils.c @@ -1,5 +1,10 @@ #include <precomp.h> +/* LoadLPK global variables */ +HINSTANCE hLpk = NULL; +LPKETO LpkExtTextOut = NULL; +LPKGCP LpkGetCharacterPlacement = NULL; + /** * @name CalculateColorTableSize * @@ -408,3 +413,51 @@ EnumLogFontExW2A( LPENUMLOGFONTEXA fontA, CONST ENUMLOGFONTEXW *fontW ) fontA->elfScript[LF_FACESIZE-1] = '\0'; } +/* +* LPK.DLL loader function +* +* Returns TRUE if a valid parameter was passed and loading was successful, +* retruns FALSE otherwise. +*/ +BOOL WINAPI LoadLPK(INT LpkFunctionID) +{ + if(!hLpk) // Check if the DLL is already loaded + hLpk = LoadLibraryW(L"lpk.dll"); + + if (hLpk) + { + switch (LpkFunctionID) + { + case LPK_ETO: + if (!LpkExtTextOut) // Check if the function is already loaded + LpkExtTextOut = (LPKETO) GetProcAddress(hLpk, "LpkExtTextOut"); + + if (!LpkExtTextOut) + { + FreeLibrary(hLpk); + return FALSE; + } + + return TRUE; + + case LPK_GCP: + if (!LpkGetCharacterPlacement) // Check if the function is already loaded + LpkGetCharacterPlacement = (LPKGCP) GetProcAddress(hLpk, "LpkGetCharacterPlacement"); + + if (!LpkGetCharacterPlacement) + { + FreeLibrary(hLpk); + return FALSE; + } + + return TRUE; + + default: + FreeLibrary(hLpk); + return FALSE; + } + } + + else + return FALSE; +}

7 years

01/01: [REACTOS] Improve/Fix some "printf" formats (#555)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ca1ac639cb597550b535… commit 3ca1ac639cb597550b5355827d29edc485f696bb Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed May 30 14:18:23 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 30 14:18:23 2018 +0200 [REACTOS] Improve/Fix some "printf" formats (#555) The smbios.c one was initially spotted by "Alahndro" on CORE-6328. --- dll/win32/shell32/CDefView.cpp | 8 ++++---- ntoskrnl/wmi/smbios.c | 2 +- win32ss/user/ntuser/cursoricon.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 33e5b5a760..32f7e153e7 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -418,7 +418,7 @@ HRESULT CDefView::IncludeObject(PCUITEMID_CHILD pidl) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = m_pCommDlgBrowser->IncludeObject(this, pidl); - TRACE("--0x%08x\n", ret); + TRACE("-- returns 0x%08x\n", ret); } return ret; @@ -432,7 +432,7 @@ HRESULT CDefView::OnDefaultCommand() { TRACE("ICommDlgBrowser::OnDefaultCommand\n"); ret = m_pCommDlgBrowser->OnDefaultCommand(this); - TRACE("-- returns %08x\n", ret); + TRACE("-- returns 0x%08x\n", ret); } return ret; @@ -2082,7 +2082,7 @@ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg) if (::TranslateAcceleratorW(m_hWnd, m_hAccel, lpmsg) != 0) return S_OK; - TRACE("-- key=0x04%lx\n", lpmsg->wParam) ; + TRACE("-- key=0x%04lx\n", lpmsg->wParam) ; } return m_pShellBrowser->TranslateAcceleratorSB(lpmsg, 0); @@ -3179,7 +3179,7 @@ HRESULT WINAPI CDefView::Unfreeze(DWORD dwFreeze) HRESULT WINAPI CDefView::SetAdvise(DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { - FIXME("partial stub: %p %08x %08x %p\n", this, aspects, advf, pAdvSink); + FIXME("partial stub: %p 0x%08x 0x%08x %p\n", this, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ m_pAdvSink = pAdvSink; diff --git a/ntoskrnl/wmi/smbios.c b/ntoskrnl/wmi/smbios.c index 8f353fd5b3..389678d4c0 100644 --- a/ntoskrnl/wmi/smbios.c +++ b/ntoskrnl/wmi/smbios.c @@ -229,7 +229,7 @@ WmipQueryRawSMBiosTables( Status = WmipGetRawSMBiosTableData(OutBuffer ? &TableData : NULL, &TableSize); if (!NT_SUCCESS(Status)) { - DPRINT1("WmipGetRawSMBiosTableData failed: 0x08lx\n", Status); + DPRINT1("WmipGetRawSMBiosTableData failed: 0x%08lx\n", Status); return Status; } diff --git a/win32ss/user/ntuser/cursoricon.c b/win32ss/user/ntuser/cursoricon.c index a6dd22074e..80a15a39b0 100644 --- a/win32ss/user/ntuser/cursoricon.c +++ b/win32ss/user/ntuser/cursoricon.c @@ -482,7 +482,7 @@ NtUserGetIconInfo( if (!NT_SUCCESS(Status)) { - WARN("Status: 0x%08x.\n", Status); + WARN("Status: 0x%08lx\n", Status); SetLastNtError(Status); goto leave; } @@ -1334,7 +1334,7 @@ IntSetAconData( /* Check if the flags are valid */ if (pcdFrame->CURSORF_flags & ~(CURSORF_USER_MASK|CURSORF_ACONFRAME)) { - ERR("Invalid flags for acon frame %u: 0x%lx\n", + ERR("Invalid flags for acon frame %u: 0x%08lx\n", i, pcdFrame->CURSORF_flags); goto Cleanup; } @@ -1436,7 +1436,7 @@ UserSetCursorIconData( &atomModName); if (!NT_SUCCESS(status)) { - ERR("Failed to create atom from module name '%wZ': %0x8lx\n", + ERR("Failed to create atom from module name '%wZ': 0x%08lx\n", pustrModule, status); return FALSE; } @@ -2179,7 +2179,7 @@ NtUserGetCursorFrameInfo( if (!NT_SUCCESS(Status)) { - WARN("Status: 0x%08x.\n", Status); + WARN("Status: 0x%08lx\n", Status); SetLastNtError(Status); ret = NULL; }

7 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2018